Changeset db7c88851fa45ecc3160a27f9a26e2f62b589baa

Timestamp:

01/19/07 19:26:39 (2 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1169231199 +0000

git-parent:

[e92542211f05387f69987541df48ac25d480e878]

git-author:

Christophe Massiot <massiot@videolan.org> 1169231199 +0000

Message:

• modules/demux/ts.c: Parse the telx descriptor and create pseudo ES
  for different languages. Slightly changed the way the dvbsub parser
  works to allow correct streaming with --sout-all or --programs.
  
• modules/mux/mpeg/ts.c: Changes to allow descriptor pass-through with
  telx and dvbsub. This is kind of kludgy.
  
• module/codec/telx.c: Got rid of the ugly static variables and use
  info from the TS demux.
  

Files:

• modules/codec/telx.c (modified) (14 diffs)
• modules/demux/ts.c (modified) (4 diffs)
• modules/mux/mpeg/ts.c (modified) (1 diff)

modules/codec/telx.c

@@ -42 +42 @@
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int telx_conf_cb ( vlc_object_t *,      /* variable's object */
-                          char const *,            /* variable name */
-                          vlc_value_t,                 /* old value */
-                          vlc_value_t,                 /* new value */
-                          void * );                /* callback data */
-
-/*****************************************************************************
- * Module descriptor.
- *****************************************************************************/
@@ -57 +48 @@
-static subpicture_t *Decode( decoder_t *, block_t ** );
-
-
-PAGE_TEXT N_("Teletext page")
-#define PAGE_LONGTEXT N_("Set displayed teletext page for subtitles, 0 for all pages, 888 should be a standard value. Just leave it to zero if your stream has only one language for subtitles
+
+OVERRIDE_PAGE_LONGTEXT N_("Override the indicated page, try this if " \
+        "your subtitles don't appear (0 = autodetect, usually 888 or 889)
-
-#define IGNORE_SUB_FLAG_TEXT N_("Ignore subtitle flag")
-
+
+
-
-vlc_module_begin();
@@ -72 +64 @@
-    set_callbacks( Open, Close );
-
-page", 0, telx_conf_cb, PAGE_TEXT, PAGE_LONGTEXT
-VLC_FALS
-telx_conf_cb
+override-page", -1, NULL
+OVERRIDE_PAGE_TEXT, OVERRIDE_PAGE_LONGTEXT, VLC_TRU
+NULL
-              IGNORE_SUB_FLAG_TEXT, IGNORE_SUB_FLAG_LONGTEXT, VLC_TRUE );
-
@@ -93 +85 @@
-  vlc_bool_t  b_erase[9];
-  uint16_t *  pi_active_national_set[9];
+  int         i_wanted_page, i_wanted_magazine;
+  vlc_bool_t  b_ignore_sub_flag;
-};
-
@@ -98 +92 @@
- * Local data
- ****************************************************************************/
-
-static int i_conf_wanted_page = 0; /* default 0 = all pages */
-static vlc_bool_t b_ignore_sub_flag = 0;
-
-/*
@@ -189 +180 @@
-        p_sys->pi_active_national_set[i] = ppi_national_subsets[1];
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    var_Create( p_dec, "telx-ignore-subtitle-flag",
-                VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-    var_Get( p_dec, "telx-ignore-subtitle-flag", &val );
-
+
+
+
+
+
-
-    return VLC_SUCCESS;
@@ -207 +220 @@
-/*     return VLC_EGENERIC; */
-}
-
-/*****************************************************************************
- * Config callback
- *****************************************************************************/
-static int telx_conf_cb ( vlc_object_t * obj,      /* variable's object */
-                          char const * name,       /* variable name */
-                          vlc_value_t oldv,        /* old value */
-                          vlc_value_t newv,        /* new value */
-                          void * data)             /* callback data */
-{
-    if ( !strcmp(name, "telx-page") )
-    {
-        i_conf_wanted_page = newv.i_int;
-        dbg((obj, "display teletext page changed to %d\n", i_conf_wanted_page));
-    }
-    else if ( !strcmp(name, "telx-ignore-subtitle-flag") )
-    {
-        b_ignore_sub_flag = newv.b_bool;
-        dbg((obj, "ignore sub flag changed to %d\n", (int) b_ignore_sub_flag));
-    }
-
-    return 0;
-}
-
-
-/*****************************************************************************
@@ -431 +420 @@
-    /* int erase = 0; */
-    int len, offset;
+#if 0
-    int i_wanted_magazine = i_conf_wanted_page / 100;
-    int i_wanted_page = 0x10 * ((i_conf_wanted_page % 100) / 10)
-                         | (i_conf_wanted_page % 10);
+#endif
-    vlc_bool_t b_update = VLC_FALSE;
-    char psz_text[512], *pt = psz_text;
@@ -473 +464 @@
-        row >>= 3;
-
-
+
+
+
-
-        if ( row == 0 )
@@ -487 +480 @@
-            }
-
-
+p_sys->
-    /*           continue; */
-
@@ -503 +496 @@
-                                 ppi_national_subsets[7 & (flag >> 21)];
-
-
+p_sys->
-                                              || ( (1 & (flag >> 15))
-                                                  && (1 & (flag>>16)) );
@@ -517 +510 @@
-                  (1 & (flag>>20)) ));
-           
-
+
+
-                   || !p_sys->b_is_subtitle[magazine] )
-                continue;
@@ -561 +555 @@
-            /* row 1-23 : normal lines */
-
-
+
+
-                   || !p_sys->b_is_subtitle[magazine] 
-
+
+
-                continue;
-
@@ -616 +612 @@
-        {
-            /* row 25 : alternate header line */
-
+
+
-                   || !p_sys->b_is_subtitle[magazine] )
-                continue;

modules/demux/ts.c

@@ -2656 +2656 @@
-#endif
-    if( p_demux->p_sys->pid[0].psi->i_pat_version == -1 )
-   
+        
-
-    if( i_table_id == 0x42 )
@@ -3017 +3017 @@
-                    pid->es->fmt.i_cat = SPU_ES;
-                    pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
-                    pid->es->fmt.psz_description = strdup( "Teletext" );
-                    pid->es->fmt.i_extra = p_dr->i_length;
-                    pid->es->fmt.p_extra = malloc( p_dr->i_length );
-                    memcpy( pid->es->fmt.p_extra, p_dr->p_data,
-                            p_dr->i_length );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                else if( p_dr->i_tag == 0x59 )
-                {
-                    uint16_t n;
-                    dvbpsi_subtitling_dr_t *sub;
-
-                    /* DVB subtitles */
-                    pid->es->fmt.i_cat = SPU_ES;
-                    pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' );
+                    pid->es->fmt.i_extra = p_dr->i_length;
+                    pid->es->fmt.p_extra = malloc( p_dr->i_length );
+                    memcpy( pid->es->fmt.p_extra, p_dr->p_data,
+                            p_dr->i_length );
+
+#ifdef _DVBPSI_DR_59_H_
-                    pid->es->fmt.i_group = p_pmt->i_program_number;
-
-sub = dvbpsi_DecodeSubtitlingDr( p_dr );
-if( !sub ) continue;
-
-/* Each subtitle ES contains n languages,
-We are going to create n ES for the n tracks
-sub->i_subtitles_number > 0
+/* If i_dvb_program == -1 it means the user specified
+ * --sout-all or --programs, so she want to stream, and
+
+ * with different language descriptors. So for -1 we
+just enable descriptor pass-through. --Meuuh
+p_sys->i_dvb_program != -1
-                    {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    }
-                    else pid->es->fmt.i_cat = UNKNOWN_ES;
-
-                    for( n = 1; n < sub->i_subtitles_number; n++ )
-                    {
-                        ts_es_t *p_es = malloc( sizeof( ts_es_t ) );
-                        p_es->fmt = pid->es->fmt;
-                        p_es->id = NULL;
-                        p_es->p_pes = NULL;
-                        p_es->i_pes_size = 0;
-                        p_es->i_pes_gathered = 0;
-                        p_es->pp_last = &p_es->p_pes;
-                        p_es->p_mpeg4desc = NULL;
-
-                        p_es->fmt.psz_language = malloc( 4 );
-                        memcpy( p_es->fmt.psz_language,
-                                sub->p_subtitle[n].i_iso6392_language_code, 3);
-                        p_es->fmt.psz_language[3] = 0;
-
-                        p_es->fmt.subs.dvb.i_id =
-                            sub->p_subtitle[n].i_composition_page_id;
-                        /* Hack, FIXME */
-                        p_es->fmt.subs.dvb.i_id |=
-                          ((int)sub->p_subtitle[n].i_ancillary_page_id << 16);
-
-                        TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
-                    }
-                }
-#endif /* _DVBPSI_DR_59_H_ */
+                }
-            }
-        }
@@ -3122 +3263 @@
-        if( pid->es->fmt.i_cat == AUDIO_ES ||
-            ( pid->es->fmt.i_cat == SPU_ES &&
-
+
+
-        {
-            /* get language descriptor */
@@ -3134 +3276 @@
-                if( p_decoded )
-                {
-DR_0A_API_VER >= 2
+defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2)
-                    pid->es->fmt.psz_language = malloc( 4 );
-                    memcpy( pid->es->fmt.psz_language,

modules/mux/mpeg/ts.c

@@ -2498 +2498 @@
-        else if( p_stream->i_codec == VLC_FOURCC('t','e','l','x') )
-        {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#ifdef _DVBPSI_DR_59_H_
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            continue;
-        }
-#endif /* _DVBPSI_DR_59_H_ */
-
-        if( p_stream->lang[0] != 0 )