2011-10-12 17:23:08 +00:00
|
|
|
/*
|
|
|
|
* This file is part of MPlayer.
|
|
|
|
*
|
core: redo how codecs are mapped, remove codecs.conf
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.
2013-02-09 14:15:19 +00:00
|
|
|
* Copyright (C) 2012 Naoya OYAMA
|
|
|
|
*
|
2011-10-12 17:23:08 +00:00
|
|
|
* 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 <string.h>
|
|
|
|
|
|
|
|
#include <libavformat/avformat.h>
|
|
|
|
#include <libavcodec/avcodec.h>
|
|
|
|
#include <libavutil/opt.h>
|
|
|
|
|
|
|
|
#include "config.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "core/mp_msg.h"
|
core: redo how codecs are mapped, remove codecs.conf
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.
2013-02-09 14:15:19 +00:00
|
|
|
#include "core/av_common.h"
|
2013-03-03 17:48:20 +00:00
|
|
|
#include "core/options.h"
|
2011-10-12 17:23:08 +00:00
|
|
|
#include "ad_internal.h"
|
|
|
|
|
|
|
|
LIBAD_EXTERN(spdif)
|
|
|
|
|
|
|
|
#define FILENAME_SPDIFENC "spdif"
|
|
|
|
#define OUTBUF_SIZE 65536
|
|
|
|
struct spdifContext {
|
|
|
|
AVFormatContext *lavf_ctx;
|
|
|
|
int iec61937_packet_size;
|
|
|
|
int out_buffer_len;
|
|
|
|
int out_buffer_size;
|
|
|
|
uint8_t *out_buffer;
|
|
|
|
uint8_t pb_buffer[OUTBUF_SIZE];
|
|
|
|
};
|
|
|
|
|
|
|
|
static int read_packet(void *p, uint8_t *buf, int buf_size)
|
|
|
|
{
|
|
|
|
// spdifenc does not use read callback.
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int write_packet(void *p, uint8_t *buf, int buf_size)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
struct spdifContext *ctx = p;
|
|
|
|
|
|
|
|
len = FFMIN(buf_size, ctx->out_buffer_size -ctx->out_buffer_len);
|
|
|
|
memcpy(&ctx->out_buffer[ctx->out_buffer_len], buf, len);
|
|
|
|
ctx->out_buffer_len += len;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int64_t seek(void *p, int64_t offset, int whence)
|
|
|
|
{
|
|
|
|
// spdifenc does not use seek callback.
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int preinit(sh_audio_t *sh)
|
|
|
|
{
|
|
|
|
sh->samplesize = 2;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
core: redo how codecs are mapped, remove codecs.conf
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.
2013-02-09 14:15:19 +00:00
|
|
|
static int codecs[] = {
|
2013-03-09 07:49:56 +00:00
|
|
|
AV_CODEC_ID_AAC,
|
|
|
|
AV_CODEC_ID_AC3,
|
|
|
|
AV_CODEC_ID_DTS,
|
|
|
|
AV_CODEC_ID_EAC3,
|
|
|
|
AV_CODEC_ID_MP3,
|
|
|
|
AV_CODEC_ID_TRUEHD,
|
|
|
|
AV_CODEC_ID_NONE
|
core: redo how codecs are mapped, remove codecs.conf
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.
2013-02-09 14:15:19 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static int init(sh_audio_t *sh, const char *decoder)
|
2011-10-12 17:23:08 +00:00
|
|
|
{
|
2013-07-11 17:10:33 +00:00
|
|
|
int srate, bps, *dtshd_rate;
|
2011-10-12 17:23:08 +00:00
|
|
|
AVFormatContext *lavf_ctx = NULL;
|
|
|
|
AVStream *stream = NULL;
|
|
|
|
const AVOption *opt = NULL;
|
|
|
|
struct spdifContext *spdif_ctx = NULL;
|
|
|
|
|
|
|
|
spdif_ctx = av_mallocz(sizeof(*spdif_ctx));
|
|
|
|
if (!spdif_ctx)
|
|
|
|
goto fail;
|
|
|
|
spdif_ctx->lavf_ctx = avformat_alloc_context();
|
|
|
|
if (!spdif_ctx->lavf_ctx)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
sh->context = spdif_ctx;
|
|
|
|
lavf_ctx = spdif_ctx->lavf_ctx;
|
|
|
|
|
|
|
|
lavf_ctx->oformat = av_guess_format(FILENAME_SPDIFENC, NULL, NULL);
|
|
|
|
if (!lavf_ctx->oformat)
|
|
|
|
goto fail;
|
|
|
|
lavf_ctx->priv_data = av_mallocz(lavf_ctx->oformat->priv_data_size);
|
|
|
|
if (!lavf_ctx->priv_data)
|
|
|
|
goto fail;
|
|
|
|
lavf_ctx->pb = avio_alloc_context(spdif_ctx->pb_buffer, OUTBUF_SIZE, 1, spdif_ctx,
|
|
|
|
read_packet, write_packet, seek);
|
|
|
|
if (!lavf_ctx->pb)
|
|
|
|
goto fail;
|
|
|
|
stream = avformat_new_stream(lavf_ctx, 0);
|
|
|
|
if (!stream)
|
|
|
|
goto fail;
|
|
|
|
lavf_ctx->duration = AV_NOPTS_VALUE;
|
|
|
|
lavf_ctx->start_time = AV_NOPTS_VALUE;
|
core: redo how codecs are mapped, remove codecs.conf
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.
2013-02-09 14:15:19 +00:00
|
|
|
lavf_ctx->streams[0]->codec->codec_id = mp_codec_to_av_codec_id(decoder);
|
2011-10-12 17:23:08 +00:00
|
|
|
lavf_ctx->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE;
|
|
|
|
if (AVERROR_PATCHWELCOME == lavf_ctx->oformat->write_header(lavf_ctx)) {
|
|
|
|
mp_msg(MSGT_DECAUDIO,MSGL_INFO,
|
|
|
|
"This codec is not supported by spdifenc.\n");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2012-11-29 17:03:04 +00:00
|
|
|
srate = 48000; //fake value
|
|
|
|
bps = 768000/8; //fake value
|
2011-10-12 17:23:08 +00:00
|
|
|
|
2013-04-06 20:43:12 +00:00
|
|
|
int num_channels = 0;
|
2011-10-12 17:23:08 +00:00
|
|
|
switch (lavf_ctx->streams[0]->codec->codec_id) {
|
2013-03-09 07:49:56 +00:00
|
|
|
case AV_CODEC_ID_AAC:
|
2011-10-12 17:23:08 +00:00
|
|
|
spdif_ctx->iec61937_packet_size = 16384;
|
|
|
|
sh->sample_format = AF_FORMAT_IEC61937_LE;
|
|
|
|
sh->samplerate = srate;
|
2013-04-06 20:43:12 +00:00
|
|
|
num_channels = 2;
|
2011-10-12 17:23:08 +00:00
|
|
|
sh->i_bps = bps;
|
|
|
|
break;
|
2013-03-09 07:49:56 +00:00
|
|
|
case AV_CODEC_ID_AC3:
|
2011-10-12 17:23:08 +00:00
|
|
|
spdif_ctx->iec61937_packet_size = 6144;
|
2012-11-29 17:03:04 +00:00
|
|
|
sh->sample_format = AF_FORMAT_AC3_LE;
|
2011-10-12 17:23:08 +00:00
|
|
|
sh->samplerate = srate;
|
2013-04-06 20:43:12 +00:00
|
|
|
num_channels = 2;
|
2011-10-12 17:23:08 +00:00
|
|
|
sh->i_bps = bps;
|
|
|
|
break;
|
2013-03-09 07:49:56 +00:00
|
|
|
case AV_CODEC_ID_DTS:
|
2013-03-03 17:48:20 +00:00
|
|
|
if(sh->opts->dtshd) {
|
|
|
|
opt = av_opt_find(&lavf_ctx->oformat->priv_class,
|
|
|
|
"dtshd_rate", NULL, 0, 0);
|
|
|
|
if (!opt)
|
|
|
|
goto fail;
|
|
|
|
dtshd_rate = (int*)(((uint8_t*)lavf_ctx->priv_data) +
|
|
|
|
opt->offset);
|
|
|
|
*dtshd_rate = 192000*4;
|
|
|
|
spdif_ctx->iec61937_packet_size = 32768;
|
|
|
|
sh->sample_format = AF_FORMAT_IEC61937_LE;
|
|
|
|
sh->samplerate = 192000; // DTS core require 48000
|
2013-04-06 20:43:12 +00:00
|
|
|
num_channels = 2*4;
|
2013-03-03 17:48:20 +00:00
|
|
|
sh->i_bps = bps;
|
|
|
|
} else {
|
|
|
|
spdif_ctx->iec61937_packet_size = 32768;
|
|
|
|
sh->sample_format = AF_FORMAT_AC3_LE;
|
|
|
|
sh->samplerate = srate;
|
2013-04-06 20:43:12 +00:00
|
|
|
num_channels = 2;
|
2013-03-03 17:48:20 +00:00
|
|
|
sh->i_bps = bps;
|
|
|
|
}
|
2011-10-12 17:23:08 +00:00
|
|
|
break;
|
2013-03-09 07:49:56 +00:00
|
|
|
case AV_CODEC_ID_EAC3:
|
2011-10-12 17:23:08 +00:00
|
|
|
spdif_ctx->iec61937_packet_size = 24576;
|
|
|
|
sh->sample_format = AF_FORMAT_IEC61937_LE;
|
|
|
|
sh->samplerate = 192000;
|
2013-04-06 20:43:12 +00:00
|
|
|
num_channels = 2;
|
2011-10-12 17:23:08 +00:00
|
|
|
sh->i_bps = bps;
|
|
|
|
break;
|
2013-03-09 07:49:56 +00:00
|
|
|
case AV_CODEC_ID_MP3:
|
2011-10-12 17:23:08 +00:00
|
|
|
spdif_ctx->iec61937_packet_size = 4608;
|
|
|
|
sh->sample_format = AF_FORMAT_MPEG2;
|
|
|
|
sh->samplerate = srate;
|
2013-04-06 20:43:12 +00:00
|
|
|
num_channels = 2;
|
2011-10-12 17:23:08 +00:00
|
|
|
sh->i_bps = bps;
|
|
|
|
break;
|
2013-03-09 07:49:56 +00:00
|
|
|
case AV_CODEC_ID_TRUEHD:
|
2011-10-12 17:23:08 +00:00
|
|
|
spdif_ctx->iec61937_packet_size = 61440;
|
|
|
|
sh->sample_format = AF_FORMAT_IEC61937_LE;
|
|
|
|
sh->samplerate = 192000;
|
2013-04-06 20:43:12 +00:00
|
|
|
num_channels = 8;
|
2011-10-12 17:23:08 +00:00
|
|
|
sh->i_bps = bps;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2013-04-06 20:43:12 +00:00
|
|
|
if (num_channels)
|
|
|
|
mp_chmap_from_channels(&sh->channels, num_channels);
|
2011-10-12 17:23:08 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
uninit(sh);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int decode_audio(sh_audio_t *sh, unsigned char *buf,
|
|
|
|
int minlen, int maxlen)
|
|
|
|
{
|
|
|
|
struct spdifContext *spdif_ctx = sh->context;
|
|
|
|
AVFormatContext *lavf_ctx = spdif_ctx->lavf_ctx;
|
|
|
|
AVPacket pkt;
|
|
|
|
|
2013-07-11 17:10:33 +00:00
|
|
|
spdif_ctx->out_buffer_len = 0;
|
2011-10-12 17:23:08 +00:00
|
|
|
spdif_ctx->out_buffer_size = maxlen;
|
|
|
|
spdif_ctx->out_buffer = buf;
|
|
|
|
while (spdif_ctx->out_buffer_len + spdif_ctx->iec61937_packet_size < maxlen
|
|
|
|
&& spdif_ctx->out_buffer_len < minlen) {
|
2013-07-11 17:10:33 +00:00
|
|
|
struct demux_packet *mpkt = demux_read_packet(sh->gsh);
|
|
|
|
if (!mpkt)
|
2011-10-12 17:23:08 +00:00
|
|
|
break;
|
2013-07-11 17:10:33 +00:00
|
|
|
mp_set_av_packet(&pkt, mpkt);
|
|
|
|
mp_msg(MSGT_DECAUDIO,MSGL_V, "pkt.data[%p] pkt.size[%d]\n",
|
|
|
|
pkt.data, pkt.size);
|
|
|
|
if (mpkt->pts != MP_NOPTS_VALUE) {
|
|
|
|
sh->pts = mpkt->pts;
|
2011-10-12 17:23:08 +00:00
|
|
|
sh->pts_bytes = 0;
|
|
|
|
}
|
2013-07-11 17:14:30 +00:00
|
|
|
int out_len = spdif_ctx->out_buffer_len;
|
2013-07-11 17:10:33 +00:00
|
|
|
int ret = lavf_ctx->oformat->write_packet(lavf_ctx, &pkt);
|
2013-07-11 17:14:30 +00:00
|
|
|
avio_flush(lavf_ctx->pb);
|
|
|
|
sh->pts_bytes += spdif_ctx->out_buffer_len - out_len;
|
2013-07-11 17:10:33 +00:00
|
|
|
talloc_free(mpkt);
|
2011-10-12 17:23:08 +00:00
|
|
|
if (ret < 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return spdif_ctx->out_buffer_len;
|
|
|
|
}
|
|
|
|
|
2013-04-12 18:32:10 +00:00
|
|
|
static int control(sh_audio_t *sh, int cmd, void *arg)
|
2011-10-12 17:23:08 +00:00
|
|
|
{
|
|
|
|
return CONTROL_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void uninit(sh_audio_t *sh)
|
|
|
|
{
|
|
|
|
struct spdifContext *spdif_ctx = sh->context;
|
|
|
|
AVFormatContext *lavf_ctx = spdif_ctx->lavf_ctx;
|
|
|
|
|
|
|
|
if (lavf_ctx) {
|
|
|
|
if (lavf_ctx->oformat)
|
|
|
|
lavf_ctx->oformat->write_trailer(lavf_ctx);
|
|
|
|
av_freep(&lavf_ctx->pb);
|
|
|
|
if (lavf_ctx->streams) {
|
|
|
|
av_freep(&lavf_ctx->streams[0]->codec);
|
|
|
|
av_freep(&lavf_ctx->streams[0]->info);
|
|
|
|
av_freep(&lavf_ctx->streams[0]);
|
|
|
|
}
|
|
|
|
av_freep(&lavf_ctx->streams);
|
|
|
|
av_freep(&lavf_ctx->priv_data);
|
|
|
|
}
|
|
|
|
av_freep(&lavf_ctx);
|
|
|
|
av_freep(&spdif_ctx);
|
|
|
|
}
|
core: redo how codecs are mapped, remove codecs.conf
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.
2013-02-09 14:15:19 +00:00
|
|
|
|
|
|
|
static void add_decoders(struct mp_decoder_list *list)
|
|
|
|
{
|
2013-03-09 07:49:56 +00:00
|
|
|
for (int n = 0; codecs[n] != AV_CODEC_ID_NONE; n++) {
|
core: redo how codecs are mapped, remove codecs.conf
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.
2013-02-09 14:15:19 +00:00
|
|
|
const char *format = mp_codec_from_av_codec_id(codecs[n]);
|
|
|
|
if (format) {
|
|
|
|
mp_add_decoder(list, "spdif", format, format,
|
|
|
|
"libavformat/spdifenc audio pass-through decoder");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|