libdvdcss changes:

  * Support for REPORT_TITLE_KEY and RPC commands by H�kan Hjort
    <d95hjort@dtek.chalmers.se>.

vlc changes:
  * Minor coding style fixes (please avoid tabs).

ChangeLog.libdvdcss

@@ -4,6 +4,8 @@
 
 HEAD
 
+  * Support for REPORT_TITLE_KEY and RPC commands by Håkan Hjort
+    <d95hjort@dtek.chalmers.se>.
   * HP-UX port courtesy of David Siebörger <drs-videolan@rucus.ru.ac.za>.
 
 1.0.1

extras/libdvdcss/ioctl.h

@@ -2,7 +2,7 @@
  * ioctl.h: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.h,v 1.10 2001/12/11 14:43:38 sam Exp $
+ * $Id: ioctl.h,v 1.11 2001/12/16 18:00:18 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -32,6 +32,10 @@ int ioctl_InvalidateAgid    ( int, int * );
 int ioctl_SendChallenge     ( int, int *, u8 * );
 int ioctl_SendKey2          ( int, int *, u8 * );
 
+#define DVD_KEY_SIZE 5
+#define DVD_CHALLENGE_SIZE 10
+#define DVD_DISCKEY_SIZE 2048
+
 /*****************************************************************************
  * Common macro, BeOS specific
  *****************************************************************************/
@@ -102,9 +106,16 @@ int ioctl_SendKey2          ( int, int *, u8 * );
 #endif
 
 /*****************************************************************************
- * Various DVD I/O tables
+ * Additional types, OpenBSD specific
  *****************************************************************************/
+#if defined( HAVE_OPENBSD_DVD_STRUCT )
+typedef union dvd_struct dvd_struct;
+typedef union dvd_authinfo dvd_authinfo;
+#endif
 
+/*****************************************************************************
+ * Various DVD I/O tables
+ *****************************************************************************/
 #if defined( SYS_BEOS ) || defined( WIN32 ) || defined ( SOLARIS_USCSI ) || defined ( HPUX_SCTL_IO )
     /* The generic packet command opcodes for CD/DVD Logical Units,
      * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
@@ -123,31 +134,21 @@ int ioctl_SendKey2          ( int, int *, u8 * );
 #   define DVD_SEND_CHALLENGE       0x01
 #   define DVD_REPORT_KEY1          0x02
 #   define DVD_SEND_KEY2            0x03
+#   define DVD_REPORT_TITLE_KEY     0x04
 #   define DVD_REPORT_ASF           0x05
+#   define DVD_SEND_RPC             0x06
+#   define DVD_REPORT_RPC           0x08
 #   define DVD_INVALIDATE_AGID      0x3f
 #endif
 
-#if defined( HAVE_OPENBSD_DVD_STRUCT )
-
 /*****************************************************************************
- * OpenBSD ioctl specific
+ * win32 ioctl specific
  *****************************************************************************/
-typedef union dvd_struct dvd_struct;
-typedef union dvd_authinfo dvd_authinfo;
-typedef u_int8_t dvd_key[5];
-typedef u_int8_t dvd_challenge[10];
-#endif
-
-
 #if defined( WIN32 )
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-/*****************************************************************************
- * win32 ioctl specific
- *****************************************************************************/
-
 #define IOCTL_DVD_START_SESSION         CTL_CODE(FILE_DEVICE_DVD, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS)
 #define IOCTL_DVD_READ_KEY              CTL_CODE(FILE_DEVICE_DVD, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)
 #define IOCTL_DVD_SEND_KEY              CTL_CODE(FILE_DEVICE_DVD, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS)

plugins/filter/bob.c

@@ -2,7 +2,7 @@
  * bob.c : BOB deinterlacer plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: bob.c,v 1.1 2001/12/16 16:18:36 sam Exp $
+ * $Id: bob.c,v 1.2 2001/12/16 18:00:18 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -352,19 +352,24 @@ static int BobNewPicture( vout_thread_t *p_vout, picture_t *p_pic )
         i_chroma_bytes = p_pic->i_chroma_size * sizeof(pixel_data_t);
 
         /* Y buffer */
-        p_pic->planes[ Y_PLANE ].p_data = malloc( i_luma_bytes + 2 * i_chroma_bytes );
+        p_pic->planes[ Y_PLANE ].p_data = malloc( i_luma_bytes
+                                                   + 2 * i_chroma_bytes );
         p_pic->planes[ Y_PLANE ].i_bytes = i_luma_bytes;
         p_pic->planes[ Y_PLANE ].i_line_bytes = i_width * sizeof(pixel_data_t);
 
         /* U buffer */
-        p_pic->planes[ U_PLANE ].p_data = p_pic->planes[ Y_PLANE ].p_data + i_height * i_width;
+        p_pic->planes[ U_PLANE ].p_data = p_pic->planes[ Y_PLANE ].p_data
+                                           + i_height * i_width;
         p_pic->planes[ U_PLANE ].i_bytes = i_chroma_bytes / 2;
-        p_pic->planes[ U_PLANE ].i_line_bytes = p_pic->i_chroma_width * sizeof(pixel_data_t);
+        p_pic->planes[ U_PLANE ].i_line_bytes = p_pic->i_chroma_width
+                                                 * sizeof(pixel_data_t);
 
         /* V buffer */
-        p_pic->planes[ V_PLANE ].p_data = p_pic->planes[ U_PLANE ].p_data + i_height * p_pic->i_chroma_width;
+        p_pic->planes[ V_PLANE ].p_data = p_pic->planes[ U_PLANE ].p_data
+                                           + i_height * p_pic->i_chroma_width;
         p_pic->planes[ V_PLANE ].i_bytes = i_chroma_bytes / 2;
-        p_pic->planes[ V_PLANE ].i_line_bytes = p_pic->i_chroma_width * sizeof(pixel_data_t);
+        p_pic->planes[ V_PLANE ].i_line_bytes = p_pic->i_chroma_width
+                                                 * sizeof(pixel_data_t);
 
         /* We allocated 3 planes */
         p_pic->i_planes = 3;