Use var_InheritString for --decklink-video-connection.

[vlc] / modules / codec / cc.h

diff --git a/modules/codec/cc.h b/modules/codec/cc.h
index 80ee56b0b7427b60a7fabb9d5c36be5014c4b91f..f582c36eb2c179c841298086ecdaed04e5bc05b7 100644 (file)
--- a/modules/codec/cc.h
+++ b/modules/codec/cc.h
@@ -77,7 +77,7 @@ static inline void cc_AppendData( cc_data_t *c, int i_field, const uint8_t cc[2]
     c->p_data[c->i_data++] = cc[1];
 }
 
-static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
+static inline void cc_Extract( cc_data_t *c, bool b_top_field_first, const uint8_t *p_src, int i_src )
 {
     static const uint8_t p_cc_ga94[4] = { 0x47, 0x41, 0x39, 0x34 };
     static const uint8_t p_cc_dvd[4] = { 0x43, 0x43, 0x01, 0xf8 };
@@ -86,6 +86,7 @@ static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
     static const uint8_t p_cc_replaytv5a[2] = { 0x99, 0x02 };
     static const uint8_t p_cc_replaytv5b[2] = { 0xaa, 0x02 };
     static const uint8_t p_cc_scte20[2] = { 0x03, 0x81 };
+    static const uint8_t p_cc_scte20_old[2] = { 0x03, 0x01 };
     //static const uint8_t p_afd_start[4] = { 0x44, 0x54, 0x47, 0x31 };
 
     if( i_src < 4 )
@@ -190,7 +191,8 @@ static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
         }
         c->b_reorder = false;
     }
-    else if( !memcmp( p_cc_scte20, p_src, 2 ) && i_src > 2 )
+    else if( ( !memcmp( p_cc_scte20, p_src, 2 ) ||
+               !memcmp( p_cc_scte20_old, p_src, 2 ) ) && i_src > 2 )
     {
         /* SCTE-20 CC */
         bs_t s;
@@ -210,12 +212,15 @@ static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
             }
             bs_skip( &s, 1 );
 
-            if( i_field_idx != 1 && i_field_idx != 2 )
+            if( i_field_idx == 0 )
                 continue;
             if( c->i_data + 2*3 > CC_MAX_DATA_SIZE )
                 continue;
 
-            const int i_field = i_field_idx - 1;
+            /* 1,2,3 -> 0,1,0. I.E. repeated field 3 is merged with field 1 */
+            int i_field = ((i_field_idx - 1) & 1);
+            if (!b_top_field_first)
+                i_field ^= 1;
 
             cc_AppendData( c, i_field, &cc[0] );
         }