*With DVDCSS_METHOD=disc or key, the keys are no longer buffered on start.

[vlc] / extras / libdvdcss / libdvdcss.c

diff --git a/extras/libdvdcss/libdvdcss.c b/extras/libdvdcss/libdvdcss.c
index 3367df4a3b51a6c132b2d78912bc08cb5569509f..638fb8c0b4ddc975c9f9c3c5701f7a0dea087d80 100644 (file)
--- a/extras/libdvdcss/libdvdcss.c
+++ b/extras/libdvdcss/libdvdcss.c
@@ -2,7 +2,7 @@
  * libdvdcss.c: DVD reading library.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: libdvdcss.c,v 1.21 2001/11/13 02:03:46 sam Exp $
+ * $Id: libdvdcss.c,v 1.27 2002/01/14 22:06:57 stef Exp $
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -26,8 +26,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include "defs.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,6 +33,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include <videolan/vlc.h>
+
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
@@ -45,9 +45,6 @@
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
 
-#include "config.h"
-#include "common.h"
-
 #if defined( WIN32 )
 #   include "input_iovec.h"
 #endif
@@ -73,6 +70,8 @@ static int _win32_dvdcss_aopen  ( char c_drive, dvdcss_handle dvdcss );
 static int _win32_dvdcss_aclose ( int i_fd );
 static int _win32_dvdcss_aseek  ( int i_fd, int i_blocks, int i_method );
 static int _win32_dvdcss_aread  ( int i_fd, void *p_data, int i_blocks );
+#else
+static int _dvdcss_raw_open     ( dvdcss_handle, char *psz_target );
 #endif
 
 /*****************************************************************************
@@ -84,6 +83,9 @@ extern dvdcss_handle dvdcss_open ( char *psz_target )
 
     char *psz_method = getenv( "DVDCSS_METHOD" );
     char *psz_verbose = getenv( "DVDCSS_VERBOSE" );
+#ifndef WIN32
+    char *psz_raw_device = getenv( "DVDCSS_RAW_DEVICE" );
+#endif
 
     dvdcss_handle dvdcss;
 
@@ -182,6 +184,15 @@ extern dvdcss_handle dvdcss_open ( char *psz_target )
         }
     }
 
+    memset( dvdcss->css.p_unenc_key, 0, KEY_SIZE );
+
+#ifndef WIN32
+    if( psz_raw_device != NULL )
+    {
+        _dvdcss_raw_open( dvdcss, psz_raw_device );
+    }
+#endif
+
     return dvdcss;
 }
 
@@ -199,8 +210,26 @@ extern char * dvdcss_error ( dvdcss_handle dvdcss )
 extern int dvdcss_seek ( dvdcss_handle dvdcss, int i_blocks, int i_flags )
 {
     /* title cracking method is too slow to be used at each seek */
-    if( !( i_flags & DVDCSS_SEEK_MPEG )
-             || ( dvdcss->i_method != DVDCSS_METHOD_TITLE ) )
+    if( ( ( i_flags & DVDCSS_SEEK_MPEG )
+             && ( dvdcss->i_method != DVDCSS_METHOD_TITLE ) ) )
+    {
+        int     i_ret;
+
+        /* Crack or decrypt CSS title key for current VTS */
+        i_ret = CSSGetTitleKey( dvdcss, i_blocks );
+
+        if( i_ret < 0 )
+        {
+            _dvdcss_error( dvdcss, "fatal error in vts css key" );
+            return i_ret;
+        }
+        else if( i_ret > 0 )
+        {
+            _dvdcss_error( dvdcss, "decryption unavailable" );
+            return -1;
+        }
+    }
+    else if( i_flags & DVDCSS_SEEK_KEY )
     {
         /* check the title key */
         if( dvdcss_title( dvdcss, i_blocks ) ) 
@@ -456,7 +485,7 @@ static int _dvdcss_open ( dvdcss_handle dvdcss, char *psz_target )
     dvdcss->i_readv_buf_size = 0;
 
 #else
-    dvdcss->i_fd = open( psz_target, 0 );
+    dvdcss->i_fd = dvdcss->i_read_fd = open( psz_target, 0 );
 
     if( dvdcss->i_fd == -1 )
     {
@@ -469,6 +498,25 @@ static int _dvdcss_open ( dvdcss_handle dvdcss, char *psz_target )
     return 0;
 }
 
+#ifndef WIN32
+static int _dvdcss_raw_open ( dvdcss_handle dvdcss, char *psz_target )
+{
+    dvdcss->i_raw_fd = open( psz_target, 0 );
+
+    if( dvdcss->i_raw_fd == -1 )
+    {
+        _dvdcss_error( dvdcss, "failed opening raw device, continuing" );
+        return -1;
+    }
+    else
+    {
+        dvdcss->i_read_fd = dvdcss->i_raw_fd;
+    }
+
+    return 0;
+}
+#endif
+
 static int _dvdcss_close ( dvdcss_handle dvdcss )
 {
 #if defined( WIN32 )
@@ -492,6 +540,12 @@ static int _dvdcss_close ( dvdcss_handle dvdcss )
 #else
     close( dvdcss->i_fd );
 
+    if( dvdcss->i_raw_fd >= 0 )
+    {
+        close( dvdcss->i_raw_fd );
+        dvdcss->i_raw_fd = -1;
+    }
+
 #endif
 
     return 0;
@@ -529,11 +583,11 @@ int _dvdcss_seek ( dvdcss_handle dvdcss, int i_blocks )
         return ( _win32_dvdcss_aseek( dvdcss->i_fd, i_blocks, SEEK_SET ) );
     }
 #else
-    off_t i_read;
+    off_t   i_read;
 
     dvdcss->i_seekpos = i_blocks;
 
-    i_read = lseek( dvdcss->i_fd,
+    i_read = lseek( dvdcss->i_read_fd,
                     (off_t)i_blocks * (off_t)DVDCSS_BLOCK_SIZE, SEEK_SET );
 
     return i_read / DVDCSS_BLOCK_SIZE;
@@ -564,7 +618,7 @@ int _dvdcss_read ( dvdcss_handle dvdcss, void *p_buffer, int i_blocks )
 #else
     int i_bytes;
 
-    i_bytes = read( dvdcss->i_fd, p_buffer,
+    i_bytes = read( dvdcss->i_read_fd, p_buffer,
                     (size_t)i_blocks * DVDCSS_BLOCK_SIZE );
     return i_bytes / DVDCSS_BLOCK_SIZE;
 #endif
@@ -600,7 +654,7 @@ static int _dvdcss_readv ( dvdcss_handle dvdcss, struct iovec *p_iovec,
     return i_read;
 
 #else
-    i_read = readv( dvdcss->i_fd, p_iovec, i_blocks );
+    i_read = readv( dvdcss->i_read_fd, p_iovec, i_blocks );
     return i_read / DVDCSS_BLOCK_SIZE;
 
 #endif