AVFormat : Don't drop metadata keys.

[vlc] / modules / demux / playlist / ifo.c

diff --git a/modules/demux/playlist/ifo.c b/modules/demux/playlist/ifo.c
index 246bfbaaca30fd29acc0d528fbc7be15caf6c1e1..b62fcfd7250ee10da2bed90b1d36a1c767bdfb16 100644 (file)
--- a/modules/demux/playlist/ifo.c
+++ b/modules/demux/playlist/ifo.c
@@ -37,6 +37,7 @@
  * Local prototypes
  *****************************************************************************/
 static int Demux( demux_t *p_demux);
+static int DemuxDVD_VR( demux_t *p_demux);
 static int Control( demux_t *p_demux, int i_query, va_list args );
 
 /*****************************************************************************
@@ -46,13 +47,17 @@ int Import_IFO( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
 
-    char *psz_file = p_demux->psz_path + strlen( p_demux->psz_path )
-                     - strlen( "VIDEO_TS.IFO" );
-    /* Valid filenamed are :
+    if( !p_demux->psz_file )
+        return VLC_EGENERIC;
+
+    size_t len = strlen( p_demux->psz_file );
+
+    char *psz_file = p_demux->psz_file + len - strlen( "VIDEO_TS.IFO" );
+    /* Valid filenames are :
      *  - VIDEO_TS.IFO
      *  - VTS_XX_X.IFO where X are digits
      */
-    if( strlen( p_demux->psz_path ) > strlen( "VIDEO_TS.IFO" )
+    if( len > strlen( "VIDEO_TS.IFO" )
         && ( !strcasecmp( psz_file, "VIDEO_TS.IFO" )
         || (!strncasecmp( psz_file, "VTS_", 4 )
         && !strcasecmp( psz_file + strlen( "VTS_00_0" ) , ".IFO" ) ) ) )
@@ -63,13 +68,26 @@ int Import_IFO( vlc_object_t *p_this )
 
         if( i_peek != 8 || memcmp( p_peek, "DVDVIDEO", 8 ) )
             return VLC_EGENERIC;
+
+        p_demux->pf_demux = Demux;
+    }
+    /* Valid filename for DVD-VR is VR_MANGR.IFO */
+    else if( len >= 12 && !strcmp( &p_demux->psz_file[len-12], "VR_MANGR.IFO" ) )
+    {
+        int i_peek;
+        const uint8_t *p_peek;
+        i_peek = stream_Peek( p_demux->s, &p_peek, 8 );
+
+        if( i_peek != 8 || memcmp( p_peek, "DVD_RTR_", 8 ) )
+            return VLC_EGENERIC;
+
+        p_demux->pf_demux = DemuxDVD_VR;
     }
     else
         return VLC_EGENERIC;
 
 //    STANDARD_DEMUX_INIT_MSG( "found valid VIDEO_TS.IFO" )
     p_demux->pf_control = Control;
-    p_demux->pf_demux = Demux;
 
     return VLC_SUCCESS;
 }
@@ -84,26 +102,50 @@ void Close_IFO( vlc_object_t *p_this )
 
 static int Demux( demux_t *p_demux )
 {
-    char *psz_url = NULL;
-    size_t len = 0;
-    input_item_t *p_input;
+    size_t len = strlen( "dvd://" ) + strlen( p_demux->psz_file )
+               - strlen( "VIDEO_TS.IFO" );
+    char *psz_url;
+
+    psz_url = malloc( len+1 );
+    if( !psz_url )
+        return 0;
+    snprintf( psz_url, len+1, "dvd://%s", p_demux->psz_file );
+
+    input_item_t *p_current_input = GetCurrentItem(p_demux);
+    input_item_t *p_input = input_item_New( p_demux, psz_url, psz_url );
+    input_item_PostSubItem( p_current_input, p_input );
+    vlc_gc_decref( p_input );
+
+    vlc_gc_decref(p_current_input);
+    free( psz_url );
 
-    INIT_PLAYLIST_STUFF;
+    return 0; /* Needed for correct operation of go back */
+}
 
-    len = strlen( "dvd://" ) + strlen( p_demux->psz_path )
-          - strlen( "VIDEO_TS.IFO" );
-    psz_url = (char *)malloc( len+1 );
-    snprintf( psz_url, len+1, "dvd://%s", p_demux->psz_path );
+static int DemuxDVD_VR( demux_t *p_demux )
+{
+    char *psz_url = strdup( p_demux->psz_file );
+
+    if( !psz_url )
+        return 0;
+
+    size_t len = strlen( psz_url );
+
+    strncpy( psz_url + len - 12, "VR_MOVIE.VRO", 12 );
+
+    input_item_t *p_current_input = GetCurrentItem(p_demux);
+    input_item_t *p_input = input_item_New( p_demux, psz_url, psz_url );
+    input_item_PostSubItem( p_current_input, p_input );
 
-    p_input = input_item_NewExt( p_demux, psz_url, psz_url, 0, NULL, 0, -1 );
-    input_item_AddSubItem( p_current_input, p_input );
     vlc_gc_decref( p_input );
 
-    HANDLE_PLAY_AND_RELEASE;
+    vlc_gc_decref(p_current_input);
+    free( psz_url );
 
     return 0; /* Needed for correct operation of go back */
 }
 
+
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);