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.

1 files changed, 27 insertions, 31 deletions

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 9442ec34ad..3988dd6cd1 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1761,37 +1761,6 @@ audiocodec ffnellymoser
   driver ffmpeg
   dll "nellymoser"
 
-audiocodec pcm
-  info "Uncompressed PCM"
-  status working
-  format 0x0
-  format 0x1
-  format 0x3         ; IEEE float
-  format 0xfffe      ; Extended
-  fourcc "raw " ; (MOV files)
-  fourcc twos ; (MOV files)
-  fourcc sowt ; (MOV files)
-  fourcc fl32 ; (MOV files)
-  fourcc 23lf ; (MOV files)
-;  fourcc fl64 ; (MOV files)
-;  fourcc 46lf ; (MOV files)
-  fourcc NONE ; (MOV files from Kodak CX6320)
-  fourcc in24 ; (MOV files)
-  fourcc 42ni ; (MOV files)
-  fourcc in32 ; (MOV files)
-  fourcc 23ni ; (MOV files)
-  fourcc lpcm ; (MOV files)
-  fourcc FL32 ; (aiff files)
-  fourcc MPaf ; internal MPlayer FourCC for demux_rawaudio
-;;;; these are for hardware support only:  (alaw,ulaw,ima-adpcm,mpeg,ac3)
-;  format 0x6
-;  format 0x7
-;  format 0x11
-;  format 0x50
-;  format 0x2000
-;;;;
-  driver pcm
-
 audiocodec ffpcmdaud
   info "D-Cinema audio (FFmpeg)"
   status untested
@@ -2140,6 +2109,33 @@ audiocodec fftwinvq
   driver ffmpeg
   dll twinvq
 
+; lavc raw audio decoders
+
+audiocodec ffpcm
+  info "FFmpeg PCM"
+  status working
+  format 0x0
+  format 0x1
+  format 0x3         ; IEEE float
+  format 0xfffe      ; Extended
+  fourcc "raw " ; (MOV files)
+  fourcc twos ; (MOV files)
+  fourcc sowt ; (MOV files)
+  fourcc fl32 ; (MOV files)
+  fourcc 23lf ; (MOV files)
+  fourcc NONE ; (MOV files from Kodak CX6320)
+  fourcc in24 ; (MOV files)
+  fourcc 42ni ; (MOV files)
+  fourcc in32 ; (MOV files)
+  fourcc 23ni ; (MOV files)
+  fourcc lpcm ; (MOV files)
+  fourcc FL32 ; (aiff files)
+  fourcc MPaf ; internal MPlayer FourCC for demux_rawaudio
+  driver ffmpeg
+  dll pcm
+
+; ad_pcm pass-through decoders
+
 audiocodec spdifaac
   info "libavformat/spdifenc AAC pass-through decoder"
   status working