[vlc-commits] avcodec: map YOP video and ADPCM IMA APC

[Daniel Verkamp]

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

avcodec: map YOP video and ADPCM IMA APC

Sample:
http://fate-suite.libav.org/yop/test1.yop

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

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

 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 58bbdad..ee88096 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -169,6 +169,7 @@
 #define VLC_CODEC_TQI             VLC_FOURCC('T','Q','I','V')
 #define VLC_CODEC_MAD             VLC_FOURCC('M','A','D','V')
 #define VLC_CODEC_ANM             VLC_FOURCC('A','N','I','M')
+#define VLC_CODEC_YOP             VLC_FOURCC('Y','O','P','V')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
@@ -431,6 +432,7 @@
 #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')
+#define VLC_CODEC_ADPCM_IMA_APC              VLC_FOURCC('A','I','P','C')
 
 /* 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 ab285b6..6c167b6 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -193,7 +193,7 @@ static const struct
     /* AV_CODEC_ID_IFF_ILBM */
     /* AV_CODEC_ID_IFF_BYTERUN1 */
     { VLC_CODEC_KGV1, AV_CODEC_ID_KGV1, VIDEO_ES },
-    /* AV_CODEC_ID_YOP */
+    { VLC_CODEC_YOP, AV_CODEC_ID_YOP, VIDEO_ES },
     { VLC_CODEC_VP8, AV_CODEC_ID_VP8, VIDEO_ES },
     /* AV_CODEC_ID_PICTOR */
     /* AV_CODEC_ID_ANSI */
@@ -349,7 +349,7 @@ static const struct
     /* AV_CODEC_ID_ADPCM_EA_MAXIS_XA */
     /* AV_CODEC_ID_ADPCM_IMA_ISS */
     { VLC_CODEC_ADPCM_G722, AV_CODEC_ID_ADPCM_G722, AUDIO_ES },
-    /* AV_CODEC_ID_ADPCM_IMA_APC */
+    { VLC_CODEC_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_IMA_APC, AUDIO_ES },
     /* ffmpeg only: AV_CODEC_ID_VIMA */
     /* ffmpeg only: AV_CODEC_ID_ADPCM_AFC */
     /* ffmpeg only: AV_CODEC_ID_ADPCM_IMA_OKI */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 1527fd2..d08d5ce 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1097,6 +1097,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_ANM, "DeluxePaint animation"),
 
+    B(VLC_CODEC_YOP, "Psygnosis YOP"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {
@@ -1500,6 +1502,8 @@ static const staticentry_t p_list_audio[] = {
 
     B(VLC_CODEC_ADPCM_EA_R1, "ADPCM Electronic Arts R1"),
 
+    B(VLC_CODEC_ADPCM_IMA_APC, "ADPCM APC"),
+
     B(0, "")
 };
 static const staticentry_t p_list_spu[] = {