From 6ea68caa3d291b5ca003246eefe04d0bc728dbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Borel?= Date: Mon, 15 Oct 2001 13:33:00 +0000 Subject: [PATCH] Reverted one change from my previous commit: when using title cracking method in libdvdcss, the key is only checked at title start, not before each chapter. The behaviour when we have decrypted the disc key is to check the key before each seek (although I'm still fighting against a bug). --- plugins/dvd/input_dvd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c index 770d24c801..44946fab32 100644 --- a/plugins/dvd/input_dvd.c +++ b/plugins/dvd/input_dvd.c @@ -10,7 +10,7 @@ * -dvd_udf to find files ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: input_dvd.c,v 1.89 2001/10/14 03:26:20 stef Exp $ + * $Id: input_dvd.c,v 1.90 2001/10/15 13:33:00 stef Exp $ * * Author: Stéphane Borel * @@ -461,7 +461,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) p_input->b_error = 1; return -1; } - + /* temporary hack to fix size in some dvds */ if( p_dvd->i_cell >= vts.cell_inf.i_cell_nb ) { @@ -477,6 +477,13 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) p_input->b_error = 1; return -1; } + + /* + * Force libdvdcss to check its title key. + * It is only useful for title cracking method. Methods using the decrypted + * disc key are fast enough to check the key at each seek + */ + dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start, DVDCSS_SEEK_INI ); p_dvd->i_size -= p_dvd->i_sector + 1; @@ -742,13 +749,6 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area ) } } - /* - * Force libdvdcss to check its title key. - * It is only useful for title cracking method. Methods using the decrypted - * disc key are fast enough to check the key at each seek - */ - dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start, DVDCSS_SEEK_INI ); - #define title \ p_dvd->p_ifo->vts.title_unit.p_title[p_dvd->i_title_id-1].title if( p_area->i_angle != p_dvd->i_angle )