OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Some DVB programs have a lot of streams (20 for BBC HD) so up max from 16 to 32
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
dvd.c
diff --git
a/libhb/dvd.c
b/libhb/dvd.c
index
d07ccc6
..
39b519d
100644
(file)
--- a/
libhb/dvd.c
+++ b/
libhb/dvd.c
@@
-9,6
+9,7
@@
#include "dvd.h"
#include "dvdread/ifo_read.h"
#include "dvd.h"
#include "dvdread/ifo_read.h"
+#include "dvdread/ifo_print.h"
#include "dvdread/nav_read.h"
static hb_dvd_t * hb_dvdread_init( char * path );
#include "dvdread/nav_read.h"
static hb_dvd_t * hb_dvdread_init( char * path );
@@
-86,10
+87,21
@@
hb_dvd_t * hb_dvdread_init( char * path )
{
hb_dvd_t * e;
hb_dvdread_t * d;
{
hb_dvd_t * e;
hb_dvdread_t * d;
+ int region_mask;
e = calloc( sizeof( hb_dvd_t ), 1 );
d = &(e->dvdread);
e = calloc( sizeof( hb_dvd_t ), 1 );
d = &(e->dvdread);
+ /* Log DVD drive region code */
+ if ( hb_dvd_region( path, ®ion_mask ) == 0 )
+ {
+ hb_log( "dvd: Region mask 0x%02x", region_mask );
+ if ( region_mask == 0xFF )
+ {
+ hb_log( "dvd: Warning, DVD device has no region set" );
+ }
+ }
+
/* Open device */
if( !( d->reader = DVDOpen( path ) ) )
{
/* Open device */
if( !( d->reader = DVDOpen( path ) ) )
{
@@
-231,7
+243,7
@@
static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t )
pgn = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgn;
d->pgc = vts->vts_pgcit->pgci_srp[pgc_id-1].pgc;
pgn = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgn;
d->pgc = vts->vts_pgcit->pgci_srp[pgc_id-1].pgc;
- hb_log("pgc_id: %d, pgn: %d: pgc:
0x%x
", pgc_id, pgn, d->pgc);
+ hb_log("pgc_id: %d, pgn: %d: pgc:
%p
", pgc_id, pgn, d->pgc);
if( !d->pgc )
{
if( !d->pgc )
{
@@
-275,7
+287,7
@@
static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t )
title->hours = title->duration / 90000 / 3600;
title->minutes = ( ( title->duration / 90000 ) % 3600 ) / 60;
title->seconds = ( title->duration / 90000 ) % 60;
title->hours = title->duration / 90000 / 3600;
title->minutes = ( ( title->duration / 90000 ) % 3600 ) / 60;
title->seconds = ( title->duration / 90000 ) % 60;
- hb_log( "scan: duration is %02d:%02d:%02d (%
lld
ms)",
+ hb_log( "scan: duration is %02d:%02d:%02d (%
"PRId64"
ms)",
title->hours, title->minutes, title->seconds,
title->duration / 90 );
title->hours, title->minutes, title->seconds,
title->duration / 90 );
@@
-596,7
+608,7
@@
static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t )
chapter->minutes = ( seconds % 3600 ) / 60;
chapter->seconds = seconds % 60;
chapter->minutes = ( seconds % 3600 ) / 60;
chapter->seconds = seconds % 60;
- hb_log( "scan: chap %d c=%d->%d, b=%d->%d (%d), %
lld
ms",
+ hb_log( "scan: chap %d c=%d->%d, b=%d->%d (%d), %
"PRId64"
ms",
chapter->index, chapter->cell_start, chapter->cell_end,
chapter->block_start, chapter->block_end,
chapter->block_count, chapter->duration / 90 );
chapter->index, chapter->cell_start, chapter->cell_end,
chapter->block_start, chapter->block_end,
chapter->block_count, chapter->duration / 90 );