Changeset 2004c8ba498700ca9f6fe616a3d076ff9a5d59ee

Timestamp:

10/18/07 20:18:09 (11 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1192731489 +0000

git-parent:

[fc5954abbb4cb84a170ff960e88f90a60a4d1794]

git-author:

Laurent Aimar <fenrir@videolan.org> 1192731489 +0000

Message:

Fixed closed captions channel >= 2

Files:

• src/input/es_out.c (modified) (5 diffs)

src/input/es_out.c

@@ -149 +149 @@
-static char *EsOutProgramGetMetaName( es_out_pgrm_t *p_pgrm );
-
+static const vlc_fourcc_t EsOutFourccClosedCaptions[4] = {
+    VLC_FOURCC('c', 'c', '1', ' '),
+    VLC_FOURCC('c', 'c', '2', ' '),
+    VLC_FOURCC('c', 'c', '3', ' '),
+    VLC_FOURCC('c', 'c', '4', ' '),
+};
+static inline int EsOutGetClosedCaptionsChannel( vlc_fourcc_t fcc )
+{
+    int i;
+    for( i = 0; i < 4; i++ )
+    {
+        if( fcc == EsOutFourccClosedCaptions[i] )
+            return i;
+    }
+    return -1;
+}
+
+
-/*****************************************************************************
- * input_EsOutNew:
@@ -658 +676 @@
-        !vlc_meta_Get( p_meta, vlc_meta_Publisher) &&
-        vlc_dictionary_keys_count( &p_meta->extra_tags ) <= 0 )
-
+
+
+
-    /* Find program */
-    for( i = 0; i < p_sys->i_pgrm; i++ )
@@ -985 +1005 @@
-        vlc_bool_t b_decode = VLC_FALSE;
-        if( es->p_master->p_dec )
-
-
+
+
+
+
+
-        return b_decode;
-    }
@@ -1009 +1032 @@
-    if( es->p_master )
-    {
+        int i_channel;
-        if( !es->p_master->p_dec )
-            return;
-
-f( input_DecoderSetCcState( es->p_master->p_dec, VLC_TRUE,
-                             es->fmt.i_codec == VLC_FOURCC('c','c','1',' ') ? 0 : 1
+_channel = EsOutGetClosedCaptionsChannel( es->fmt.i_codec );
+if( i_channel == -1 || input_DecoderSetCcState( es->p_master->p_dec, VLC_TRUE, i_channel
-            return;
-    }
@@ -1089 +1113 @@
-    {
-        if( es->p_master->p_dec )
-
+
+
+
+
+
-    }
-    else