Changeset 236ca7aea13a438f92c245565208c9bb6ff9e11c

Timestamp:

08/02/05 18:00:18 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[ed0b82ee3b77a147c25977e38909a820c29d2f29]

git-author:

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

Message:

• all: added a --audio-language and --spu-language to select tracks based
  on language code.
  Both options accepts a list (comma separated) of country code(2/3 letters)
  

or name (english/native).

For demuxers that doesn't provide language info, they are ignored.

Support for dvdnav isn't complete (only first language is tried) and untested.

Ex: --spu-language en,fr will try to select english track and if none
then french one (and if none, no subtitle).
(you can also use --spu-language english,french or english,francais)

Files:

• modules/access/dvdnav.c (modified) (6 diffs)
• src/input/es_out.c (modified) (14 diffs)
• src/input/var.c (modified) (1 diff)
• src/libvlc.h (modified) (2 diffs)

modules/access/dvdnav.c

@@ -46 +46 @@
-#include "iso_lang.h"
-
+/* FIXME we should find a better way than including that */
+#include "../../src/misc/iso-639_def.h"
+
+
-#include <dvdnav/dvdnav.h>
-
@@ -65 +69 @@
-    "Allows you to start the DVD directly in the main menu. This "\
-    "will try to skip all the useless warnings introductions." )
+
+#define LANGUAGE_DEFAULT ("en")
-
-static int  Open ( vlc_object_t * );
@@ -146 +152 @@
-static int ProbeDVD( demux_t *, char * );
-
+static char *DemuxGetLanguageCode( demux_t *p_demux, char *psz_var );
+
-/*****************************************************************************
- * DemuxOpen:
@@ -156 +164 @@
-    int         i_angle;
-    char        *psz_name;
+    char        *psz_code;
-    vlc_value_t val;
-
@@ -234 +243 @@
-    }
-
-
-
-
-
-
+
+
+
+
+
+
-                  dvdnav_err_to_string( p_sys->dvdnav ) );
-    }
+
+    /* Set audio language */
+    psz_code = DemuxGetLanguageCode( p_demux, "audio-language" );
+    if( dvdnav_audio_language_select(p_sys->dvdnav, psz_code ) != DVDNAV_STATUS_OK )
+    {
+        msg_Warn( p_demux, "something failed while setting audio '%s' language (%s)",
+                  psz_code,
+                  dvdnav_err_to_string( p_sys->dvdnav ) );
+        /* We try to fall back to 'en' */
+        if( strcmp( psz_code, LANGUAGE_DEFAULT ) )
+            dvdnav_audio_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT );
+    }
+    free( psz_code );
+
+    /* Set spu language */
+    psz_code = DemuxGetLanguageCode( p_demux, "spu-language" );
+    if( dvdnav_spu_language_select( p_sys->dvdnav,psz_code ) != DVDNAV_STATUS_OK )
+    {
+        msg_Warn( p_demux, "something failed while setting spu '%s' language (%s)",
+                  psz_code,
+                  dvdnav_err_to_string( p_sys->dvdnav ) );
+        /* We try to fall back to 'en' */
+        if( strcmp( psz_code, LANGUAGE_DEFAULT ) )
+            dvdnav_spu_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT );
+    }
+    free( psz_code );
-
-    DemuxTitles( p_demux );
@@ -733 +769 @@
-}
-
+/* Get a 2 char code
+ * FIXME: partiallyy duplicated from src/input/es_out.c
+ */
+static char *DemuxGetLanguageCode( demux_t *p_demux, char *psz_var )
+{
+    const iso639_lang_t *pl;
+    char *psz_lang;
+    char *p;
+
+    psz_lang = var_CreateGetString( p_demux, psz_var );
+    /* XXX: we will use only the first value (and ignore other ones in case of a list) */
+    if( ( p = strchr( psz_lang, "," ) ) )
+        *p = '\0';
+
+    for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ )
+    {
+        if( !strcasecmp( pl->psz_eng_name, psz_lang ) ||
+            !strcasecmp( pl->psz_native_name, psz_lang ) ||
+            !strcasecmp( pl->psz_iso639_1, psz_lang ) ||
+            !strcasecmp( pl->psz_iso639_2T, psz_lang ) ||
+            !strcasecmp( pl->psz_iso639_2B, psz_lang ) )
+            break;
+    }
+
+    free( psz_lang );
+
+    if( pl->psz_iso639_1 != NULL )
+        return strdup( pl->psz_iso639_1 );
+
+    return strdup(LANGUAGE_DEFAULT);
+}
+
-static void DemuxTitles( demux_t *p_demux )
-{

src/input/es_out.c

@@ -1 @@
-
-/*****************************************************************************
- * es_out.c: Es Out handler for input.
@@ -36 +35 @@
-#include "vlc_playlist.h"
-#include "iso_lang.h"
+/* FIXME we should find a better way than including that */
+#include "../misc/iso-639_def.h"
-
-/*****************************************************************************
@@ -65 +66 @@
-    es_format_t fmt;
-    char        *psz_language;
+    char        *psz_language_code;
-    decoder_t   *p_dec;
-};
@@ -95 +97 @@
-    int         i_audio_last;
-    int         i_sub_last;
+    char        **ppsz_audio_language;
+    char        **ppsz_sub_language;
-
-    /* current main es */
@@ -117 +121 @@
-static void EsUnselect( es_out_t *out, es_out_id_t *es, vlc_bool_t b_update );
-static char *LanguageGetName( const char *psz_code );
+static char *LanguageGetCode( const char *psz_lang );
+static char **LanguageSplit( const char *psz_langs );
+static int LanguageArrayIndex( char **ppsz_langs, char *psz_lang );
-
-/*****************************************************************************
@@ -126 +133 @@
-    es_out_sys_t *p_sys = malloc( sizeof( es_out_sys_t ) );
-    vlc_value_t  val;
+    int i;
-
-    out->pf_add     = EsOutAdd;
@@ -151 +159 @@
-    p_sys->i_sub   = 0;
-
+    /* */
-    var_Get( p_input, "audio-channel", &val );
-    p_sys->i_audio_last = val.i_int;
@@ -157 +166 @@
-    p_sys->i_sub_last = val.i_int;
-
+    var_Get( p_input, "audio-language", &val );
+    p_sys->ppsz_audio_language = LanguageSplit(val.psz_string);
+    if( p_sys->ppsz_audio_language )
+    {
+        for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
+            msg_Dbg( p_input, "Select audio in language[%d] %s",
+                     i, p_sys->ppsz_audio_language[i] );
+    }
+
+    var_Get( p_input, "spu-language", &val );
+    p_sys->ppsz_sub_language = LanguageSplit(val.psz_string);
+    if( p_sys->ppsz_sub_language )
+    {
+        for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
+            msg_Dbg( p_input, "Select subtitle in language[%d] %s",
+                     i, p_sys->ppsz_sub_language[i] );
+    }
+
+    /* */
-    p_sys->p_es_audio = NULL;
-    p_sys->p_es_video = NULL;
@@ -183 +211 @@
-        if( p_sys->es[i]->psz_language )
-            free( p_sys->es[i]->psz_language );
+        if( p_sys->es[i]->psz_language_code )
+            free( p_sys->es[i]->psz_language_code );
-        es_format_Clean( &p_sys->es[i]->fmt );
-
-        free( p_sys->es[i] );
-    }
+    if( p_sys->ppsz_audio_language )
+    {
+        for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
+            free( p_sys->ppsz_audio_language[i] );
+        free( p_sys->ppsz_audio_language );
+    }
+    if( p_sys->ppsz_sub_language )
+    {
+        for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
+            free( p_sys->ppsz_sub_language[i] );
+        free( p_sys->ppsz_sub_language );
+    }
+
-    if( p_sys->es )
-        free( p_sys->es );
@@ -306 +349 @@
-    {
-        if( es->psz_language && *es->psz_language )
-   
-   
-   
-   
-   
+        
+        
+        
+        
+        
-    }
-    else
@@ -494 +537 @@
-    }
-    es->psz_language = LanguageGetName( fmt->psz_language ); /* remember so we only need to do it once */
+    es->psz_language_code = LanguageGetCode( fmt->psz_language );
-    es->p_dec = NULL;
-
@@ -668 +712 @@
-        if( i_cat == AUDIO_ES )
-        {
+            int idx1 = LanguageArrayIndex( p_sys->ppsz_audio_language,
+                                     es->psz_language_code );
+
-            if( p_sys->p_es_audio &&
-                p_sys->p_es_audio->fmt.i_priority >= es->fmt.i_priority )
-            {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else if( i_cat == SPU_ES )
-        {
+            int idx1 = LanguageArrayIndex( p_sys->ppsz_sub_language,
+                                     es->psz_language_code );
+
-            if( p_sys->p_es_sub &&
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else if( i_cat == VIDEO_ES )
@@ -833 +917 @@
-    if( es->psz_language )
-        free( es->psz_language );
+    if( es->psz_language_code )
+        free( es->psz_language_code );
-
-    es_format_Clean( &es->fmt );
@@ -1133 +1219 @@
-}
-
+/* Get a 2 char code */
+static char *LanguageGetCode( const char *psz_lang )
+{
+    const iso639_lang_t *pl;
+
+    if( psz_lang == NULL || *psz_lang == '\0' )
+        return strdup("??");
+
+    for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ )
+    {
+        if( !strcasecmp( pl->psz_eng_name, psz_lang ) ||
+            !strcasecmp( pl->psz_native_name, psz_lang ) ||
+            !strcasecmp( pl->psz_iso639_1, psz_lang ) ||
+            !strcasecmp( pl->psz_iso639_2T, psz_lang ) ||
+            !strcasecmp( pl->psz_iso639_2B, psz_lang ) )
+            break;
+    }
+
+    if( pl->psz_iso639_1 != NULL )
+        return strdup( pl->psz_iso639_1 );
+
+    return strdup("??");
+}
+
+static char **LanguageSplit( const char *psz_langs )
+{
+    char *psz_dup;
+    char *psz_parser;
+    char **ppsz = NULL;
+    int i_psz = 0;
+
+    if( psz_langs == NULL )
+        return NULL;
+
+    psz_parser = psz_dup = strdup(psz_langs);
+
+    while( psz_parser && *psz_parser )
+    {
+        char *psz;
+        char *psz_code;
+
+        psz = strchr(psz_parser, ',' );
+        if( psz )
+        {
+            *psz++ = '\0';
+        }
+
+        psz_code = LanguageGetCode( psz_parser );
+        if( strcmp( psz_code, "??" ) )
+        {
+            TAB_APPEND( i_psz, ppsz, psz_code );
+        }
+
+        psz_parser = psz;
+    }
+
+    if( i_psz )
+    {
+        TAB_APPEND( i_psz, ppsz, NULL );
+    }
+
+    return ppsz;
+}
+
+static int LanguageArrayIndex( char **ppsz_langs, char *psz_lang )
+{
+    int i;
+
+    if( !ppsz_langs || !psz_lang )
+        return -1;
+
+    for( i = 0; ppsz_langs[i]; i++ )
+        if( !strcasecmp( ppsz_langs[i], psz_lang ) )
+            return i;
+
+    return -1;
+}
+
-/****************************************************************************
- * EsOutAddInfo:

src/input/var.c

@@ -401 +401 @@
-    var_Create( p_input, "spu-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
+    var_Create( p_input, "audio-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT );
+    var_Create( p_input, "spu-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT );
+
-    var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL |

src/libvlc.h

@@ -328 +328 @@
-
-#define INPUT_SUB_TEXT N_("Choose subtitles track")
+#define INPUT_CHAN_LANG_TEXT N_("Choose audio language")
+#define INPUT_CHAN_LANG_LONGTEXT N_( \
+    "Give the language of the audio channel you want to use " \
+    "(comma separted, two or tree letter country code).")
+#define INPUT_SUB_LANG_TEXT N_("Choose subtitle track")
+#define INPUT_SUB_LANG_LONGTEXT N_( \
+    "Give the language of the subtitle channel you want to use " \
+    "(comma separted, two or tree letter country code).")
+
+
-#define INPUT_SUB_LONGTEXT N_( \
-    "Give the stream number of the subtitle channel you want to use " \
@@ -980 +990 @@
-    add_integer( "spu-channel", -1, NULL,
-                 INPUT_SUB_TEXT, INPUT_SUB_LONGTEXT, VLC_FALSE );
+    add_string( "audio-language", "", NULL,
+                 INPUT_CHAN_LANG_TEXT, INPUT_CHAN_LANG_LONGTEXT, VLC_FALSE );
+    add_string( "spu-language", "", NULL,
+                 INPUT_SUB_LANG_TEXT, INPUT_SUB_LANG_LONGTEXT, VLC_FALSE );
+
-
-    set_section( N_( "Playback control" ) , NULL);