Changeset fb0991c4183d6399b021e4baf1b4d3cf1c9e1763

Timestamp:

18/07/06 10:48:53 (2 years ago)

Author:

Sigmund Augdal Helberg <sigmunau@videolan.org>

git-committer:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1153212533 +0000

git-parent:

[665d0ef43005bd1073b995d1a91516109d2906fe]

git-author:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1153212533 +0000

Message:

support muxing and demuxing of dual mono mpeg ts streams if libdvbpsi is up to date

Files:

• include/vlc_es.h (modified) (5 diffs)
• modules/demux/ts.c (modified) (1 diff)
• modules/mux/mpeg/ts.c (modified) (6 diffs)

include/vlc_es.h

@@ -157 +157 @@
-                                        when no other stream
-                                    >=0: priority */
+
-    char            *psz_language;
-    char            *psz_description;
-
+
+
+
+
+
+
-    audio_format_t audio;
-    video_format_t video;
@@ -191 +197 @@
-    fmt->psz_description        = NULL;
-
+    fmt->i_extra_languages      = 0;
+    fmt->p_extra_languages      = NULL;    
+
-    memset( &fmt->audio, 0, sizeof(audio_format_t) );
-    memset( &fmt->video, 0, sizeof(video_format_t) );
@@ -203 +212 @@
-static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
-{
+    int i;
-    memcpy( dst, src, sizeof( es_format_t ) );
-    if( src->psz_language )
@@ -230 +240 @@
-                sizeof( video_palette_t ) );
-    }
+
+    dst->i_extra_languages = src->i_extra_languages;
+    dst->p_extra_languages = malloc( dst->i_extra_languages * sizeof(*dst->p_extra_languages ) );
+    for( i = 0; i < dst->i_extra_languages; i++ ) {
+        if( src->p_extra_languages[i].psz_language )
+            dst->p_extra_languages[i].psz_language = strdup(src->p_extra_languages[i].psz_language);
+        else
+            dst->p_extra_languages[i].psz_language = NULL;
+        if( src->p_extra_languages[i].psz_description )
+            dst->p_extra_languages[i].psz_description = strdup(src->p_extra_languages[i].psz_description);
+        else
+            dst->p_extra_languages[i].psz_description = NULL;
+    }
-}
-
@@ -248 +271 @@
-    if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );
-    fmt->subs.psz_encoding = NULL;
+
+    if( fmt->i_extra_languages && fmt->p_extra_languages ) {
+        int i = 0;
+        while( i < fmt->i_extra_languages ) {
+            if( fmt->p_extra_languages[i].psz_language )
+                free( fmt->p_extra_languages[i].psz_language );
+            if( fmt->p_extra_languages[i].psz_description )
+                free( fmt->p_extra_languages[i].psz_description );
+            i++;
+        }
+        free(fmt->p_extra_languages);
+    }
-}
-

modules/demux/ts.c

@@ -3123 +3123 @@
-                if( p_decoded )
-                {
+#if DR_0A_API_VER >= 2
+                    pid->es->fmt.psz_language = malloc( 4 );
+                    memcpy( pid->es->fmt.psz_language,
+                            p_decoded->code[0].iso_639_code, 3 );
+                    pid->es->fmt.psz_language[3] = 0;
+                    msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language);
+                    switch( p_decoded->code[0].i_audio_type ) {
+                    case 0:
+                        pid->es->fmt.psz_description = NULL;
+                        break;
+                    case 1:
+                        pid->es->fmt.psz_description =
+                            strdup(_("clean effects"));
+                        break;
+                    case 2:
+                        pid->es->fmt.psz_description =
+                            strdup(_("hearing impaired"));
+                        break;
+                    case 3:
+                        pid->es->fmt.psz_description =
+                            strdup(_("visual impaired commentary"));
+                        break;
+                    default:
+                        msg_Dbg( p_demux, "unknown audio type: %d",
+                                 p_decoded->code[0].i_audio_type);
+                        pid->es->fmt.psz_description = NULL;
+                        break;
+                    }
+                    pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1;
+                    pid->es->fmt.p_extra_languages =
+                        malloc( sizeof(*pid->es->fmt.p_extra_languages) *
+                                pid->es->fmt.i_extra_languages );
+                    for( i = 0; i < pid->es->fmt.i_extra_languages; i++ ) {
+                        msg_Dbg( p_demux, "bang" );
+                        pid->es->fmt.p_extra_languages[i].psz_language =
+                            malloc(4);
+                        memcpy(pid->es->fmt.p_extra_languages[i].psz_language,
+                               p_decoded->code[i+1].iso_639_code, 3 );
+                        pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0';
+                        switch( p_decoded->code[i].i_audio_type ) {
+                        case 0:
+                            pid->es->fmt.p_extra_languages[i].psz_description =
+                                NULL;
+                            break;
+                        case 1:
+                            pid->es->fmt.p_extra_languages[i].psz_description =
+                                strdup(_("clean effects"));
+                            break;
+                        case 2:
+                            pid->es->fmt.p_extra_languages[i].psz_description =
+                                strdup(_("hearing impaired"));
+                            break;
+                        case 3:
+                            pid->es->fmt.p_extra_languages[i].psz_description =
+                                strdup(_("visual impaired commentary"));
+                            break;
+                        default:
+                            msg_Dbg( p_demux, "unknown audio type: %d",
+                                     p_decoded->code[i].i_audio_type);
+                            pid->es->fmt.psz_description = NULL;
+                            break;
+                        }
+
+                    }
+#else
-                    pid->es->fmt.psz_language = malloc( 4 );
-                    memcpy( pid->es->fmt.psz_language,
-                            p_decoded->i_iso_639_code, 3 );
-                    pid->es->fmt.psz_language[3] = 0;
+#endif
-                }
-            }

modules/mux/mpeg/ts.c

@@ -338 +338 @@
-
-    /* language is iso639-2T */
-
+
+
-
-    sout_buffer_chain_t chain_pes;
@@ -886 +887 @@
-    sout_mux_sys_t      *p_sys = p_mux->p_sys;
-    ts_stream_t         *p_stream;
+    int                  i;
-
-    p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) );
@@ -1014 +1016 @@
-    }
-
+    p_stream->i_langs = 1+p_input->p_fmt->i_extra_languages;
+    p_stream->lang = malloc(p_stream->i_langs*3);
+    i = 1;
-    p_stream->lang[0] =
-    p_stream->lang[1] =
@@ -1041 +1046 @@
-
-            msg_Dbg( p_mux, "    - lang=%c%c%c",
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -1184 +1221 @@
-    BufferChainClean( p_mux->p_sout, &p_stream->chain_pes );
-
+    if( p_stream->lang )
+    {
+        free(p_stream->lang);
+    }
-    if( p_stream->p_decoder_specific_info )
-    {
@@ -2486 +2527 @@
-        if( p_stream->lang[0] != 0 )
-        {
-
+*p_stream->i_langs
-
-            /* I construct the content myself, way faster than looking at
-             * over complicated/mind broken libdvbpsi way */
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-    }