[vlc-commits] commit: Codecs: map G.722 to avcodec decoder (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Dec 20 01:18:03 2010 +0100| [b737cab7f7cd38135f4b11febd88a35fac246ca6] | committer: Jean-Baptiste Kempf 

Codecs: map G.722 to avcodec decoder

Maybe .au demuxer should be modified accordingly

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index f36651f..28acd1e 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -227,6 +227,7 @@
 #define VLC_CODEC_ADPCM_XA  VLC_FOURCC('x','a',' ',' ')
 #define VLC_CODEC_ADPCM_ADX VLC_FOURCC('a','d','x',' ')
 #define VLC_CODEC_ADPCM_IMA_WS VLC_FOURCC('A','I','W','S')
+#define VLC_CODEC_ADPCM_G722 VLC_FOURCC('g','7','2','2')
 #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_ADPCM_MS  VLC_FOURCC('m','s',0x00,0x02)
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 5eb1365..0239ef0 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -354,6 +354,9 @@ static const struct
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 47, 0 )
     { VLC_CODEC_SIPR, CODEC_ID_SIPR, AUDIO_ES },
 #endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 91, 0 )
+    { VLC_CODEC_ADPCM_G722, CODEC_ID_ADPCM_G722, AUDIO_ES },
+#endif
 
     /* Lossless */
     { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index ec33f76..1a392fa 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -937,6 +937,10 @@ static const entry_t p_list_audio[] = {
     B(VLC_CODEC_ADPCM_G726, "G.726 ADPCM Audio"),
         A("g726"),
 
+    /* G.722 ADPCM */
+    B(VLC_CODEC_ADPCM_G722, "G.722 ADPCM Audio"),
+        A("g722"),
+
     /* Flash ADPCM */
     B(VLC_CODEC_ADPCM_SWF, "Flash ADPCM Audio"),
         A("SWFa"),