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 3359e5466de7fba211ecca5f49e055c84c9f102f..f582c36eb2c179c841298086ecdaed04e5bc05b7 100644 (file)
--- a/modules/codec/cc.h
+++ b/modules/codec/cc.h
@@ -45,18 +45,6 @@ typedef struct
     uint8_t p_data[CC_MAX_DATA_SIZE];
 } cc_data_t;
 
-static inline int cc_Channel( int i_field, const uint8_t p_data[2] )
-{
-    const uint8_t d = p_data[0] & 0x7f;
-    if( i_field != 0 && i_field != 1 )
-        return -1;
-    if( d == 0x14 )
-        return 2*i_field + 0;
-    else if( d == 0x1c )
-        return 2*i_field + 1;
-    /* unknown(middle of a command)  or not cc channel */
-    return -1;
-}
 static inline void cc_Init( cc_data_t *c )
 {
     int i;
@@ -75,7 +63,21 @@ static inline void cc_Flush( cc_data_t *c )
 {
     c->i_data = 0;
 }
-static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
+
+static inline void cc_AppendData( cc_data_t *c, int i_field, const uint8_t cc[2] )
+{
+    if( i_field == 0 || i_field == 1 )
+    {
+        c->pb_present[2*i_field+0] =
+        c->pb_present[2*i_field+1] = true;
+    }
+
+    c->p_data[c->i_data++] = i_field;
+    c->p_data[c->i_data++] = cc[0];
+    c->p_data[c->i_data++] = cc[1];
+}
+
+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 };
@@ -84,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 )
@@ -129,7 +132,6 @@ static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
         for( i = 0; i < i_count_cc; i++, cc += 3 )
         {
             int i_field = cc[0] & 0x03;
-            int i_channel;
             if( ( cc[0] & 0xfc ) != 0xfc )
                 continue;
             if( i_field != 0 && i_field != 1 )
@@ -137,13 +139,7 @@ static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
             if( c->i_data + 3 > CC_MAX_DATA_SIZE )
                 continue;
 
-            i_channel = cc_Channel( i_field, &cc[1] );
-            if( i_channel >= 0 && i_channel < 4 )
-                c->pb_present[i_channel] = true;
-
-            c->p_data[c->i_data++] = i_field;
-            c->p_data[c->i_data++] = cc[1];
-            c->p_data[c->i_data++] = cc[2];
+            cc_AppendData( c, i_field, &cc[1] );
         }
         c->b_reorder = true;
     }
@@ -164,7 +160,6 @@ static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
             for( j = 0; j < 2; j++, cc += 3 )
             {
                 const int i_field = j == i_field_first ? 0 : 1;
-                int i_channel;
 
                 if( b_truncate && i == i_count_cc2 - 1 && j == 1 )
                     break;
@@ -173,12 +168,7 @@ static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
                 if( c->i_data + 3 > CC_MAX_DATA_SIZE )
                     continue;
 
-                i_channel = cc_Channel( i_field, &cc[1] );
-                if( i_channel >= 0 && i_channel < 4 )
-                    c->pb_present[i_channel] = true;
-                c->p_data[c->i_data++] = i_field;
-                c->p_data[c->i_data++] = cc[1];
-                c->p_data[c->i_data++] = cc[2];
+                cc_AppendData( c, i_field, &cc[1] );
             }
         }
         c->b_reorder = false;
@@ -196,16 +186,13 @@ static inline void cc_Extract( cc_data_t *c, const uint8_t *p_src, int i_src )
         for( i = 0; i < 2; i++, cc += 4 )
         {
             const int i_field = i == 0 ? 1 : 0;
-            int i_channel = cc_Channel( i_field, &cc[2] );
-            if( i_channel >= 0 && i_channel < 4 )
-                c->pb_present[i_channel] = true;
-            c->p_data[c->i_data++] = i_field;
-            c->p_data[c->i_data++] = cc[2];
-            c->p_data[c->i_data++] = cc[3];
+
+            cc_AppendData( c, i_field, &cc[2] );
         }
         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;
@@ -225,19 +212,17 @@ 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;
-            const int i_channel = cc_Channel( i_field, cc );
-            if( i_channel >= 0 && i_channel < 4 )
-                c->pb_present[i_channel] = true;
+            /* 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;
 
-            c->p_data[c->i_data++] = i_field;
-            c->p_data[c->i_data++] = cc[0];
-            c->p_data[c->i_data++] = cc[1];
+            cc_AppendData( c, i_field, &cc[0] );
         }
         c->b_reorder = true;
     }