Changeset 1559e11e0001f39c791289c2c7f3734277934bdc

Timestamp:

04/08/04 12:40:43 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1091616043 +0000

git-parent:

[ce2d74fd095331aff8bfbc0c3aa8af5f0a908d8b]

git-author:

Gildas Bazin <gbazin@videolan.org> 1091616043 +0000

Message:

* modules/access/dvdnav.c: very basic probing that avoids doing a dvdnav_open() on files when they are not DVD images.
* src/input/input.c: auto-probe access_demux as well.
* modules/access/vcd/vcd.c: raised priority above the file access one.

Files:

• modules/access/dvdnav.c (modified) (6 diffs)
• modules/access/vcd/vcd.c (modified) (1 diff)
• src/input/input.c (modified) (1 diff)

modules/access/dvdnav.c

@@ -30 +30 @@
-#include <vlc/input.h>
-
+#ifdef HAVE_SYS_TYPES_H
+#   include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#   include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#   include <fcntl.h>
+#endif
+
-#include "vlc_keys.h"
-#include "iso_lang.h"
@@ -52 +62 @@
-    add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL,
-        CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-0
+5
-    add_shortcut( "dvd" );
-    add_shortcut( "dvdnav" );
@@ -122 +132 @@
-static void ButtonUpdate( demux_t * );
-
+static int ProbeDVD( demux_t *, char * );
+
-/*****************************************************************************
- * DemuxOpen:
@@ -139 +151 @@
-        return VLC_EGENERIC;
-    }
+
+    /* Try some simple probing to avoid going through dvdnav_open too often */
+    if( ProbeDVD( p_demux, psz_name ) != VLC_SUCCESS )
+    {
+        free( psz_name );
+        return VLC_EGENERIC;
+    }
+
+    msg_Dbg( p_this, "dvdroot=%s title=%d chapter=%d angle=%d",
+             psz_name, i_title, i_chapter, i_angle );
-
-    /* Open dvdnav */
@@ -780 +802 @@
-#endif
-
-    msg_Dbg( p_this, "dvdroot=%s title=%d chapter=%d angle=%d",
-             psz_source, *i_title, *i_chapter, *i_angle );
-
-    return psz_source;
-}
@@ -1318 +1337 @@
-    return VLC_SUCCESS;
-}
+
+/*****************************************************************************
+ * ProbeDVD: very weak probing that avoids going too often into a dvdnav_open()
+ *****************************************************************************/
+static int ProbeDVD( demux_t *p_demux, char *psz_name )
+{
+#ifdef HAVE_SYS_STAT_H
+    struct stat stat_info;
+    uint8_t pi_anchor[2];
+    uint16_t i_tag_id = 0;
+    int i_fd, i_ret;
+
+    if( stat( psz_name, &stat_info ) || !S_ISREG( stat_info.st_mode ) )
+    {
+        /* Let dvdnav_open() do the probing */
+        return VLC_SUCCESS;
+    }
+
+    if( (i_fd = open( psz_name, O_RDONLY )) == -1 )
+    {
+        /* Let dvdnav_open() do the probing */
+        return VLC_SUCCESS;
+    }
+
+    /* Try to find the anchor (2 bytes at LBA 256) */
+    i_ret = VLC_SUCCESS;
+    if( lseek( i_fd, 256 * DVD_VIDEO_LB_LEN, SEEK_SET ) == -1 )
+    {
+        i_ret = VLC_EGENERIC;
+    }
+
+    if( read( i_fd, pi_anchor, 2 ) == 2 )
+    {
+        i_tag_id = GetWLE(pi_anchor);
+        if( i_tag_id != 2 ) i_ret = VLC_EGENERIC; /* Not an anchor */
+    }
+    else
+    {
+        i_ret = VLC_EGENERIC;
+    }
+
+    close( i_fd );
+
+    return i_ret;
+#else
+
+    return VLC_SUCCESS;
+#endif
+}

modules/access/vcd/vcd.c

@@ -45 +45 @@
-vlc_module_begin();
-    set_description( _("VCD input") );
-1
+6
-    set_callbacks( Open, Close );
-

src/input/input.c

@@ -1456 +1456 @@
-
-    /* Try access_demux if no demux given */
-access && *psz_
+
-    {
-        in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,