mirror of
https://github.com/mpv-player/mpv
synced 2024-12-27 17:42:17 +00:00
4d016a92c8
Use codec names instead of FourCCs to identify codecs. Rewrite how codecs are selected and initialized. Now each decoder exports a list of decoders (and the codec it supports) via add_decoders(). The order matters, and the first decoder for a given decoder is preferred over the other decoders. E.g. all ad_mpg123 decoders are preferred over ad_lavc, because it comes first in the mpcodecs_ad_drivers array. Likewise, decoders within ad_lavc that are enumerated first by libavcodec (using av_codec_next()) are preferred. (This is actually critical to select h264 software decoding by default instead of vdpau. libavcodec and ffmpeg/avconv use the same method to select decoders by default, so we hope this is sane.) The codec names follow libavcodec's codec names as defined by AVCodecDescriptor.name (see libavcodec/codec_desc.c). Some decoders have names different from the canonical codec name. The AVCodecDescriptor API is relatively new, so we need a compatibility layer for older libavcodec versions for codec names that are referenced internally, and which are different from the decoder name. (Add a configure check for that, because checking versions is getting way too messy.) demux/codec_tags.c is generated from the former codecs.conf (minus "special" decoders like vdpau, and excluding the mappings that are the same as the mappings libavformat's exported RIFF tables). It contains all the mappings from FourCCs to codec name. This is needed for demux_mkv, demux_mpg, demux_avi and demux_asf. demux_lavf will set the codec as determined by libavformat, while the other demuxers have to do this on their own, using the mp_set_audio/video_codec_from_tag() functions. Note that the sh_audio/video->format members don't uniquely identify the codec anymore, and sh->codec takes over this role. Replace the --ac/--vc/--afm/--vfm with new --vd/--ad options, which provide cover the functionality of the removed switched. Note: there's no CODECS_FLAG_FLIP flag anymore. This means some obscure container/video combinations (e.g. the sample Film_200_zygo_pro.mov) are played flipped. ffplay/avplay doesn't handle this properly either, so we don't care and blame ffmeg/libav instead.
127 lines
3.6 KiB
C
127 lines
3.6 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include "core/m_option.h"
|
|
|
|
#include "stream/stream.h"
|
|
#include "demux.h"
|
|
#include "stheader.h"
|
|
#include "audio/format.h"
|
|
|
|
|
|
static int channels = 2;
|
|
static int samplerate = 44100;
|
|
static int format = AF_FORMAT_S16_NE;
|
|
|
|
const m_option_t demux_rawaudio_opts[] = {
|
|
{ "channels", &channels, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
|
|
{ "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL },
|
|
{ "format", &format, CONF_TYPE_AFMT, 0, 0, 0, NULL },
|
|
{NULL, NULL, 0, 0, 0, 0, NULL}
|
|
};
|
|
|
|
|
|
static demuxer_t* demux_rawaudio_open(demuxer_t* demuxer) {
|
|
sh_audio_t* sh_audio;
|
|
WAVEFORMATEX* w;
|
|
|
|
if ((format & AF_FORMAT_SPECIAL_MASK) != 0)
|
|
return NULL;
|
|
|
|
sh_audio = new_sh_audio(demuxer,0);
|
|
sh_audio->gsh->codec = "mp-pcm";
|
|
sh_audio->format = format;
|
|
sh_audio->wf = w = malloc(sizeof(*w));
|
|
w->wFormatTag = 0;
|
|
w->nChannels = sh_audio->channels = channels;
|
|
w->nSamplesPerSec = sh_audio->samplerate = samplerate;
|
|
int samplesize = (af_fmt2bits(format) + 7) / 8;
|
|
w->nAvgBytesPerSec = samplerate * samplesize * channels;
|
|
w->nBlockAlign = channels * samplesize;
|
|
w->wBitsPerSample = 8 * samplesize;
|
|
w->cbSize = 0;
|
|
|
|
demuxer->movi_start = demuxer->stream->start_pos;
|
|
demuxer->movi_end = demuxer->stream->end_pos;
|
|
|
|
demuxer->audio->id = 0;
|
|
demuxer->audio->sh = sh_audio;
|
|
sh_audio->ds = demuxer->audio;
|
|
sh_audio->needs_parsing = 1;
|
|
|
|
return demuxer;
|
|
}
|
|
|
|
static int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
|
|
sh_audio_t* sh_audio = demuxer->audio->sh;
|
|
int l = sh_audio->wf->nAvgBytesPerSec;
|
|
int64_t spos = stream_tell(demuxer->stream);
|
|
demux_packet_t* dp;
|
|
|
|
if(demuxer->stream->eof)
|
|
return 0;
|
|
|
|
dp = new_demux_packet(l);
|
|
dp->pts = (spos - demuxer->movi_start) / (float)(sh_audio->wf->nAvgBytesPerSec);
|
|
dp->pos = (spos - demuxer->movi_start);
|
|
|
|
l = stream_read(demuxer->stream,dp->buffer,l);
|
|
resize_demux_packet(dp, l);
|
|
ds_add_packet(ds,dp);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
|
|
stream_t* s = demuxer->stream;
|
|
sh_audio_t* sh_audio = demuxer->audio->sh;
|
|
int64_t base,pos;
|
|
|
|
base = (flags & SEEK_ABSOLUTE) ? demuxer->movi_start : stream_tell(s);
|
|
if(flags & SEEK_FACTOR)
|
|
pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs);
|
|
else
|
|
pos = base + (rel_seek_secs*sh_audio->i_bps);
|
|
|
|
pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
|
|
stream_seek(s,pos);
|
|
// printf("demux_rawaudio: streamtell=%d\n",(int)stream_tell(demuxer->stream));
|
|
}
|
|
|
|
const demuxer_desc_t demuxer_desc_rawaudio = {
|
|
"Raw audio demuxer",
|
|
"rawaudio",
|
|
"rawaudio",
|
|
"?",
|
|
"",
|
|
DEMUXER_TYPE_RAWAUDIO,
|
|
0, // no autodetect
|
|
NULL,
|
|
demux_rawaudio_fill_buffer,
|
|
demux_rawaudio_open,
|
|
NULL,
|
|
demux_rawaudio_seek,
|
|
};
|