[vlc-commits] avcodec: map EA MAD and EA ADPCM R1

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Thu Jun 19 23:25:19 2014 -0700| [75292985e626c1bbabba7b2b060b94d6071b39b1] | committer: Jean-Baptiste Kempf

avcodec: map EA MAD and EA ADPCM R1

Sample:
http://fate-suite.libav.org/ea-mad/NFS6LogoE.mad

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 include/vlc_fourcc.h           |    3 +++
 modules/codec/avcodec/fourcc.c |    6 +++---
 src/misc/fourcc.c              |    6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 21e278f..825a049 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -166,6 +166,8 @@
 #define VLC_CODEC_MOTIONPIXELS    VLC_FOURCC('M','P','I','X')
 #define VLC_CODEC_TGV             VLC_FOURCC('T','G','V','V')
 #define VLC_CODEC_TGQ             VLC_FOURCC('T','G','Q','V')
+#define VLC_CODEC_TQI             VLC_FOURCC('T','Q','I','V')
+#define VLC_CODEC_MAD             VLC_FOURCC('M','A','D','V')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
@@ -426,6 +428,7 @@
 #define VLC_CODEC_TAK                        VLC_FOURCC('t','a','k',' ')
 #define VLC_CODEC_SMACKAUDIO                 VLC_FOURCC('S','M','K','A')
 #define VLC_CODEC_ADPCM_IMA_EA_SEAD          VLC_FOURCC('S','E','A','D')
+#define VLC_CODEC_ADPCM_EA_R1                VLC_FOURCC('E','A','R','1')
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 54700e0..639138a 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -176,14 +176,14 @@ static const struct
     { VLC_CODEC_MOTIONPIXELS, AV_CODEC_ID_MOTIONPIXELS, VIDEO_ES },
     { VLC_CODEC_TGV, AV_CODEC_ID_TGV, VIDEO_ES },
     { VLC_CODEC_TGQ, AV_CODEC_ID_TGQ, VIDEO_ES },
-    /* AV_CODEC_ID_TQI */
+    { VLC_CODEC_TQI, AV_CODEC_ID_TQI, VIDEO_ES },
     { VLC_CODEC_AURA, AV_CODEC_ID_AURA, VIDEO_ES },
     /* AV_CODEC_ID_AURA2 */
     /* AV_CODEC_ID_V210X */
     { VLC_CODEC_TMV, AV_CODEC_ID_TMV, VIDEO_ES },
     { VLC_CODEC_V210, AV_CODEC_ID_V210, VIDEO_ES },
     /* AV_CODEC_ID_DPX */
-    /* AV_CODEC_ID_MAD */
+    { VLC_CODEC_MAD, AV_CODEC_ID_MAD, VIDEO_ES },
     { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU, VIDEO_ES },
     { VLC_CODEC_FLASHSV2, AV_CODEC_ID_FLASHSV2, VIDEO_ES },
     /* AV_CODEC_ID_CDGRAPHICS */
@@ -340,7 +340,7 @@ static const struct
     /* AV_CODEC_ID_ADPCM_SBPRO_2 */
     { VLC_CODEC_ADPCM_THP, AV_CODEC_ID_ADPCM_THP, AUDIO_ES },
     { VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
-    /* AV_CODEC_ID_ADPCM_EA_R1 */
+    { VLC_CODEC_ADPCM_EA_R1, AV_CODEC_ID_ADPCM_EA_R1, AUDIO_ES },
     /* AV_CODEC_ID_ADPCM_EA_R3 */
     /* AV_CODEC_ID_ADPCM_EA_R2 */
     { VLC_CODEC_ADPCM_IMA_EA_SEAD, AV_CODEC_ID_ADPCM_IMA_EA_SEAD, AUDIO_ES },
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 8f2e97a..69f04bf 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1091,6 +1091,10 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_TGQ, "Electronic Arts TGQ"),
 
+    B(VLC_CODEC_TQI, "Electronic Arts TQI"),
+
+    B(VLC_CODEC_MAD, "Electronic Arts MAD"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {
@@ -1490,6 +1494,8 @@ static const staticentry_t p_list_audio[] = {
 
     B(VLC_CODEC_ADPCM_IMA_EA_SEAD, "ADPCM IMA Electronic Arts SEAD"),
 
+    B(VLC_CODEC_ADPCM_EA_R1, "ADPCM Electronic Arts R1"),
+
     B(0, "")
 };
 static const staticentry_t p_list_spu[] = {