[vlc-commits] avcodec: map EA TGV and SEAD

[Daniel Verkamp]

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

avcodec: map EA TGV and SEAD

Sample:
http://fate-suite.libav.org/ea-tgv/INTEL_S.TGV

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

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index f90bbc3..29e1f10 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -164,6 +164,7 @@
 #define VLC_CODEC_BFI             VLC_FOURCC('B','F','&','I')
 #define VLC_CODEC_CMV             VLC_FOURCC('E','C','M','V')
 #define VLC_CODEC_MOTIONPIXELS    VLC_FOURCC('M','P','I','X')
+#define VLC_CODEC_TGV             VLC_FOURCC('T','G','V','V')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
@@ -423,6 +424,7 @@
 #define VLC_CODEC_ON2AVC                     VLC_FOURCC('m','s',0x05,0x00)
 #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')
 
 /* 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 1240266..40268a5 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -174,7 +174,7 @@ static const struct
     { VLC_CODEC_BFI, AV_CODEC_ID_BFI, VIDEO_ES },
     { VLC_CODEC_CMV, AV_CODEC_ID_CMV, VIDEO_ES },
     { VLC_CODEC_MOTIONPIXELS, AV_CODEC_ID_MOTIONPIXELS, VIDEO_ES },
-    /* AV_CODEC_ID_TGV */
+    { VLC_CODEC_TGV, AV_CODEC_ID_TGV, VIDEO_ES },
     /* AV_CODEC_ID_TGQ */
     /* AV_CODEC_ID_TQI */
     { VLC_CODEC_AURA, AV_CODEC_ID_AURA, VIDEO_ES },
@@ -343,7 +343,7 @@ static const struct
     /* AV_CODEC_ID_ADPCM_EA_R1 */
     /* AV_CODEC_ID_ADPCM_EA_R3 */
     /* AV_CODEC_ID_ADPCM_EA_R2 */
-    /* AV_CODEC_ID_ADPCM_IMA_EA_SEAD */
+    { VLC_CODEC_ADPCM_IMA_EA_SEAD, AV_CODEC_ID_ADPCM_IMA_EA_SEAD, AUDIO_ES },
     /* AV_CODEC_ID_ADPCM_IMA_EA_EACS */
     /* AV_CODEC_ID_ADPCM_EA_XAS */
     /* AV_CODEC_ID_ADPCM_EA_MAXIS_XA */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 7d08a8f..2715f5f 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1087,6 +1087,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_MOTIONPIXELS, "Sirius Publishing Motion Pixels"),
 
+    B(VLC_CODEC_TGV, "Electronic Arts TGV"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {
@@ -1484,6 +1486,8 @@ static const staticentry_t p_list_audio[] = {
 
     B(VLC_CODEC_SMACKAUDIO, "Smacker audio"),
 
+    B(VLC_CODEC_ADPCM_IMA_EA_SEAD, "ADPCM IMA Electronic Arts SEAD"),
+
     B(0, "")
 };
 static const staticentry_t p_list_spu[] = {