Support for ADPCM variant in Flash streams

Sample: http://streams.videolan.org/streams-videolan/flv/Porgi_Amor_Mirusia_123nl_Orbit.flv
This could be backported, if someone needs it.

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 0fe0c2dd9710b835d1bdaf6927e200442ad0d734..8c5a12b9d48d9fdce4bdc17fc08109c9742c467b 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -220,6 +220,7 @@
 #define VLC_CODEC_ADPCM_IMA_WS VLC_FOURCC('A','I','W','S')
 #define VLC_CODEC_VMDAUDIO  VLC_FOURCC('v','m','d','a')
 #define VLC_CODEC_ADPCM_G726 VLC_FOURCC('g','7','2','6')
+#define VLC_CODEC_ADPCM_SWF VLC_FOURCC('S','W','F','a')
 #define VLC_CODEC_AMR_NB    VLC_FOURCC('s','a','m','r')
 #define VLC_CODEC_AMR_WB    VLC_FOURCC('s','a','w','b')
 #define VLC_CODEC_ALAC      VLC_FOURCC('a','l','a','c')

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 51d0c598f62aed7b828ed2fb8076cfd9a42d23c8..f0965b26852b70f86179145011b72e65565ad588 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -330,6 +330,7 @@ static const struct
     { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES },
 
     { VLC_CODEC_ADPCM_G726, CODEC_ID_ADPCM_G726, AUDIO_ES },
+    { VLC_CODEC_ADPCM_SWF, CODEC_ID_ADPCM_SWF, AUDIO_ES },
 
     { VLC_CODEC_AMR_NB, CODEC_ID_AMR_NB, AUDIO_ES },
     { VLC_CODEC_AMR_WB, CODEC_ID_AMR_WB, AUDIO_ES },

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index aaf31f97bc09c5e60adc6eaa0899ed38ef938617..d9702399febe96e2deb094f24ebe895298052874 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -901,6 +901,11 @@ static const entry_t p_list_audio[] = {
     B(VLC_CODEC_ADPCM_G726, "G.726 ADPCM Audio"),
         A("g726"),
 
+    /* G.726 ADPCM */
+    B(VLC_CODEC_ADPCM_SWF, "Flash ADPCM Audio"),
+        A("SWFa"),
+
+
     /* AMR */
     B(VLC_CODEC_AMR_NB, "AMR narrow band"),
         A("samr"),