[vlc-devel] commit: Support for ADPCM variant in Flash streams (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jul 18 19:48:46 2009 +0200| [42abe204599924610c2b17ec28e23d62e22a32ae] | committer: Jean-Baptiste Kempf 

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42abe204599924610c2b17ec28e23d62e22a32ae
---

 include/vlc_fourcc.h           |    1 +
 modules/codec/avcodec/fourcc.c |    1 +
 src/misc/fourcc.c              |    5 +++++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 0fe0c2d..8c5a12b 100644
--- 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 51d0c59..f0965b2 100644
--- 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 aaf31f9..d970239 100644
--- 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"),