[vlc-commits] fourcc: add EIA608

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Sep 24 16:03:05 2014 +0200| [eeb90473f69cd3b7c37438cb956efcfd87facf53] | committer: Francois Cartegnie

fourcc: add EIA608

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index d8d8324..d63493a 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -460,6 +460,11 @@
 /* EBU STL (TECH. 3264-E) */
 #define VLC_CODEC_EBU_STL   VLC_FOURCC('S','T','L',' ')
 #define VLC_CODEC_SCTE_27   VLC_FOURCC('S','C','2','7')
+/* EIA-608 */
+#define VLC_CODEC_EIA608_1  VLC_FOURCC('c','c','1',' ')
+#define VLC_CODEC_EIA608_2  VLC_FOURCC('c','c','2',' ')
+#define VLC_CODEC_EIA608_3  VLC_FOURCC('c','c','3',' ')
+#define VLC_CODEC_EIA608_4  VLC_FOURCC('c','c','4',' ')
 
 /* XYZ colorspace 12 bits packed in 16 bits, organisation |XXX0|YYY0|ZZZ0| */
 #define VLC_CODEC_XYZ12     VLC_FOURCC('X','Y','1','2')
diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index 7931e31..678f9b9 100644
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -167,16 +167,16 @@ static int Open( vlc_object_t *p_this )
 
     switch( p_dec->fmt_in.i_codec )
     {
-        case VLC_FOURCC('c','c','1',' '):
+        case VLC_CODEC_EIA608_1:
             i_field = 0; i_channel = 1;
             break;
-        case VLC_FOURCC('c','c','2',' '):
+        case VLC_CODEC_EIA608_2:
             i_field = 0; i_channel = 2;
             break;
-        case VLC_FOURCC('c','c','3',' '):
+        case VLC_CODEC_EIA608_3:
             i_field = 1; i_channel = 1;
             break;
-        case VLC_FOURCC('c','c','4',' '):
+        case VLC_CODEC_EIA608_4:
             i_field = 1; i_channel = 2;
             break;
 
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 10f3d66..accc2cf 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1574,6 +1574,12 @@ static const staticentry_t p_list_spu[] = {
     B(VLC_CODEC_SCTE_27, "SCTE-27 subtitles"),
         A("SC27"),
 
+    B(VLC_CODEC_EIA608_1, "EIA-608 subtitles"),
+        A("cc1 "),
+        A("cc2 "),
+        A("cc3 "),
+        A("cc4 "),
+
     B(0, "")
 };