[vlc-commits] Map Bink Audio and Video codecs

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jan  9 21:58:43 2014 +0100| [6d07bbb99f5d1bfc8046d729518e9af430946497] | committer: Jean-Baptiste Kempf

Map Bink Audio and Video codecs

For some reasons, the video part does not work yet.

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 62d050a..59caac5 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -136,6 +136,9 @@
 #define VLC_CODEC_G2M2            VLC_FOURCC('G','2','M','2')
 #define VLC_CODEC_G2M3            VLC_FOURCC('G','2','M','3')
 #define VLC_CODEC_G2M4            VLC_FOURCC('G','2','M','4')
+#define VLC_CODEC_BINKVIDEO       VLC_FOURCC('B','I','K','f')
+#define VLC_CODEC_BINKAUDIO_DCT   VLC_FOURCC('B','A','U','1')
+#define VLC_CODEC_BINKAUDIO_RDFT  VLC_FOURCC('B','A','U','2')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 670f1f4..5dd2360 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -188,7 +188,9 @@ static const struct
     /* AV_CODEC_ID_CDGRAPHICS */
     /* AV_CODEC_ID_R210 */
     /* AV_CODEC_ID_ANM */
-    /* AV_CODEC_ID_BINKVIDEO */
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 55, 0 )
+    { VLC_CODEC_BINKVIDEO, AV_CODEC_ID_BINKVIDEO, VIDEO_ES },
+#endif
     /* AV_CODEC_ID_IFF_ILBM */
     /* AV_CODEC_ID_IFF_BYTERUN1 */
     /* AV_CODEC_ID_KGV1 */
@@ -414,8 +416,10 @@ static const struct
     { VLC_CODEC_TRUEHD, AV_CODEC_ID_TRUEHD, AUDIO_ES },
     { VLC_CODEC_ALS, AV_CODEC_ID_MP4ALS, AUDIO_ES },
     { VLC_CODEC_ATRAC1, AV_CODEC_ID_ATRAC1, AUDIO_ES },
-    /* AV_CODEC_ID_BINKAUDIO_RDFT */
-    /* AV_CODEC_ID_BINKAUDIO_DCT */
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 55, 0 )
+    { VLC_CODEC_BINKAUDIO_DCT, AV_CODEC_ID_BINKAUDIO_DCT, AUDIO_ES },
+    { VLC_CODEC_BINKAUDIO_RDFT, AV_CODEC_ID_BINKAUDIO_RDFT, AUDIO_ES },
+#endif
     { VLC_CODEC_MP4A, AV_CODEC_ID_AAC_LATM, AUDIO_ES },
     /* AV_CODEC_ID_QDMC */
     /* AV_CODEC_ID_CELT */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 2025c64..a87cc64 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -678,6 +678,12 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_AMV, "AMV"),
 
+    B(VLC_CODEC_BINKVIDEO, "Bink Video"),
+
+    B(VLC_CODEC_BINKAUDIO_DCT, "Bink Audio (DCT)"),
+
+    B(VLC_CODEC_BINKAUDIO_RDFT, "Bink Audio (RDFT)"),
+
     /* */
     B(VLC_CODEC_DNXHD, "DNxHD"),
         A("AVdn"),