Commit eeb90473 authored by Francois Cartegnie's avatar Francois Cartegnie

fourcc: add EIA608

parent 99b90a8a
...@@ -460,6 +460,11 @@ ...@@ -460,6 +460,11 @@
/* EBU STL (TECH. 3264-E) */ /* EBU STL (TECH. 3264-E) */
#define VLC_CODEC_EBU_STL VLC_FOURCC('S','T','L',' ') #define VLC_CODEC_EBU_STL VLC_FOURCC('S','T','L',' ')
#define VLC_CODEC_SCTE_27 VLC_FOURCC('S','C','2','7') #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| */ /* XYZ colorspace 12 bits packed in 16 bits, organisation |XXX0|YYY0|ZZZ0| */
#define VLC_CODEC_XYZ12 VLC_FOURCC('X','Y','1','2') #define VLC_CODEC_XYZ12 VLC_FOURCC('X','Y','1','2')
......
...@@ -167,16 +167,16 @@ static int Open( vlc_object_t *p_this ) ...@@ -167,16 +167,16 @@ static int Open( vlc_object_t *p_this )
switch( p_dec->fmt_in.i_codec ) switch( p_dec->fmt_in.i_codec )
{ {
case VLC_FOURCC('c','c','1',' '): case VLC_CODEC_EIA608_1:
i_field = 0; i_channel = 1; i_field = 0; i_channel = 1;
break; break;
case VLC_FOURCC('c','c','2',' '): case VLC_CODEC_EIA608_2:
i_field = 0; i_channel = 2; i_field = 0; i_channel = 2;
break; break;
case VLC_FOURCC('c','c','3',' '): case VLC_CODEC_EIA608_3:
i_field = 1; i_channel = 1; i_field = 1; i_channel = 1;
break; break;
case VLC_FOURCC('c','c','4',' '): case VLC_CODEC_EIA608_4:
i_field = 1; i_channel = 2; i_field = 1; i_channel = 2;
break; break;
......
...@@ -1574,6 +1574,12 @@ static const staticentry_t p_list_spu[] = { ...@@ -1574,6 +1574,12 @@ static const staticentry_t p_list_spu[] = {
B(VLC_CODEC_SCTE_27, "SCTE-27 subtitles"), B(VLC_CODEC_SCTE_27, "SCTE-27 subtitles"),
A("SC27"), A("SC27"),
B(VLC_CODEC_EIA608_1, "EIA-608 subtitles"),
A("cc1 "),
A("cc2 "),
A("cc3 "),
A("cc4 "),
B(0, "") B(0, "")
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment