From 2dd2d9bcfcf57b9921c9ef360746dd59c45574fd Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 9 Dec 2012 18:53:24 +0100 Subject: audio/decode: remove ad_pcm and use ad_lavc for PCM Since libavcodec doesn't have a "generic" PCM decoder, we have to go out of out way to make it look like ad_lavc provides one: make it provide a pseudo "pcm" decoder, which maps some format tags manually to the individual libavcodec PCM decoders. Format tags which uniquely map to one libavcodec could be mapped via codecs.conf. Since defining these in tag_map[] is much shorter (one line vs. a full codec entry in codecs.conf), and since we need tag_map[] anyway, we don't use codecs.conf for these. ad_pcm is evil because it still does partial packet reads (with demux_read_data()), and it's redundant to libavcodec anyway. --- demux/mp_taglists.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'demux') diff --git a/demux/mp_taglists.c b/demux/mp_taglists.c index afd1b971ce..d5bbcae693 100644 --- a/demux/mp_taglists.c +++ b/demux/mp_taglists.c @@ -74,14 +74,6 @@ static const struct tag mp_codecid_override_tags[] = { { CODEC_ID_H264, MKTAG('H', '2', '6', '4')}, { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'V')}, { CODEC_ID_PCM_BLURAY, MKTAG('B', 'P', 'C', 'M')}, - { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, - { CODEC_ID_PCM_U8, 1}, - { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')}, - { CODEC_ID_PCM_S16LE, 1}, - { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, - { CODEC_ID_PCM_S24LE, 1}, - { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2')}, - { CODEC_ID_PCM_S32LE, 1}, { CODEC_ID_MP2, 0x50}, { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'G', '2')}, { CODEC_ID_TRUEHD, MKTAG('T', 'R', 'H', 'D')}, -- cgit v1.2.3