summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
Diffstat (limited to 'libhb')
-rw-r--r--libhb/common.h2
-rw-r--r--libhb/dvd.c224
-rw-r--r--libhb/dvd.h88
-rw-r--r--libhb/dvdnav.c1097
-rw-r--r--libhb/hb.h1
-rw-r--r--libhb/internal.h4
-rw-r--r--libhb/module.defs4
-rw-r--r--libhb/reader.c4
-rw-r--r--libhb/scan.c4
9 files changed, 1367 insertions, 61 deletions
diff --git a/libhb/common.h b/libhb/common.h
index 5a6320a43..73ebfda76 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -245,6 +245,7 @@ struct hb_job_s
int subtitle_force;
char * native_language;
+ int angle; // dvd angle to encode
int frame_to_stop; // declare eof when we hit this frame
int64_t pts_to_stop; // declare eof when we pass this pts in
// the time-linearized input stream
@@ -481,6 +482,7 @@ struct hb_title_s
int block_start;
int block_end;
int block_count;
+ int angle_count;
/* Visual-friendly duration */
int hours;
diff --git a/libhb/dvd.c b/libhb/dvd.c
index 479157e8a..8bc61944f 100644
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -6,47 +6,55 @@
#include "hb.h"
#include "lang.h"
+#include "dvd.h"
#include "dvdread/ifo_read.h"
#include "dvdread/nav_read.h"
-struct hb_dvd_s
+static hb_dvd_t * hb_dvdread_init( char * path );
+static void hb_dvdread_close( hb_dvd_t ** _d );
+static char * hb_dvdread_name( char * path );
+static int hb_dvdread_title_count( hb_dvd_t * d );
+static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * d, int t );
+static int hb_dvdread_start( hb_dvd_t * d, int title, int chapter );
+static void hb_dvdread_stop( hb_dvd_t * d );
+static int hb_dvdread_seek( hb_dvd_t * d, float f );
+static int hb_dvdread_read( hb_dvd_t * d, hb_buffer_t * b );
+static int hb_dvdread_chapter( hb_dvd_t * d );
+static int hb_dvdread_angle_count( hb_dvd_t * d );
+static void hb_dvdread_set_angle( hb_dvd_t * d, int angle );
+
+hb_dvd_func_t hb_dvdread_func =
{
- char * path;
-
- dvd_reader_t * reader;
- ifo_handle_t * vmg;
-
- int vts;
- int ttn;
- ifo_handle_t * ifo;
- dvd_file_t * file;
-
- pgc_t * pgc;
- int cell_start;
- int cell_end;
- int title_start;
- int title_end;
- int title_block_count;
- int cell_cur;
- int cell_next;
- int cell_overlap;
- int block;
- int pack_len;
- int next_vobu;
- int in_cell;
- int in_sync;
- uint16_t cur_vob_id;
- uint8_t cur_cell_id;
+ hb_dvdread_init,
+ hb_dvdread_close,
+ hb_dvdread_name,
+ hb_dvdread_title_count,
+ hb_dvdread_title_scan,
+ hb_dvdread_start,
+ hb_dvdread_stop,
+ hb_dvdread_seek,
+ hb_dvdread_read,
+ hb_dvdread_chapter,
+ hb_dvdread_angle_count,
+ hb_dvdread_set_angle
};
+static hb_dvd_func_t *dvd_methods = &hb_dvdread_func;
+
/***********************************************************************
* Local prototypes
**********************************************************************/
-static void FindNextCell( hb_dvd_t * );
+static void FindNextCell( hb_dvdread_t * );
static int dvdtime2msec( dvd_time_t * );
+static int hb_dvdread_is_break( hb_dvdread_t * d );
-char * hb_dvd_name( char * path )
+hb_dvd_func_t * hb_dvdread_methods( void )
+{
+ return &hb_dvdread_func;
+}
+
+static char * hb_dvdread_name( char * path )
{
static char name[1024];
unsigned char unused[1024];
@@ -70,15 +78,17 @@ char * hb_dvd_name( char * path )
}
/***********************************************************************
- * hb_dvd_init
+ * hb_dvdread_init
***********************************************************************
*
**********************************************************************/
-hb_dvd_t * hb_dvd_init( char * path )
+hb_dvd_t * hb_dvdread_init( char * path )
{
- hb_dvd_t * d;
+ hb_dvd_t * e;
+ hb_dvdread_t * d;
- d = calloc( sizeof( hb_dvd_t ), 1 );
+ e = calloc( sizeof( hb_dvd_t ), 1 );
+ d = &(e->dvdread);
/* Open device */
if( !( d->reader = DVDOpen( path ) ) )
@@ -99,7 +109,7 @@ hb_dvd_t * hb_dvd_init( char * path )
d->path = strdup( path );
- return d;
+ return e;
fail:
if( d->vmg ) ifoClose( d->vmg );
@@ -109,19 +119,21 @@ fail:
}
/***********************************************************************
- * hb_dvd_title_count
+ * hb_dvdread_title_count
**********************************************************************/
-int hb_dvd_title_count( hb_dvd_t * d )
+static int hb_dvdread_title_count( hb_dvd_t * e )
{
+ hb_dvdread_t *d = &(e->dvdread);
return d->vmg->tt_srpt->nr_of_srpts;
}
/***********************************************************************
- * hb_dvd_title_scan
+ * hb_dvdread_title_scan
**********************************************************************/
-hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t )
+static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t )
{
+ hb_dvdread_t *d = &(e->dvdread);
hb_title_t * title;
ifo_handle_t * vts = NULL;
int pgc_id, pgn, i;
@@ -198,7 +210,7 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t )
if( global_verbosity_level == 3 )
{
- ifoPrint( d->reader, title->vts );
+ ifo_print( d->reader, title->vts );
}
/* Position of the title in the VTS */
@@ -635,12 +647,13 @@ cleanup:
}
/***********************************************************************
- * hb_dvd_start
+ * hb_dvdread_start
***********************************************************************
* Title and chapter start at 1
**********************************************************************/
-int hb_dvd_start( hb_dvd_t * d, int title, int chapter )
+static int hb_dvdread_start( hb_dvd_t * e, int title, int chapter )
{
+ hb_dvdread_t *d = &(e->dvdread);
int pgc_id, pgn;
int i;
@@ -696,12 +709,13 @@ int hb_dvd_start( hb_dvd_t * d, int title, int chapter )
}
/***********************************************************************
- * hb_dvd_stop
+ * hb_dvdread_stop
***********************************************************************
*
**********************************************************************/
-void hb_dvd_stop( hb_dvd_t * d )
+static void hb_dvdread_stop( hb_dvd_t * e )
{
+ hb_dvdread_t *d = &(e->dvdread);
if( d->ifo )
{
ifoClose( d->ifo );
@@ -715,12 +729,13 @@ void hb_dvd_stop( hb_dvd_t * d )
}
/***********************************************************************
- * hb_dvd_seek
+ * hb_dvdread_seek
***********************************************************************
*
**********************************************************************/
-int hb_dvd_seek( hb_dvd_t * d, float f )
+static int hb_dvdread_seek( hb_dvd_t * e, float f )
{
+ hb_dvdread_t *d = &(e->dvdread);
int count, sizeCell;
int i;
@@ -737,7 +752,7 @@ int hb_dvd_seek( hb_dvd_t * d, float f )
d->cur_cell_id = 0;
FindNextCell( d );
- /* Now let hb_dvd_read find the next VOBU */
+ /* Now let hb_dvdread_read find the next VOBU */
d->next_vobu = d->pgc->cell_playback[i].first_sector + count;
d->pack_len = 0;
break;
@@ -805,12 +820,13 @@ int is_nav_pack( unsigned char *buf )
/***********************************************************************
- * hb_dvd_read
+ * hb_dvdread_read
***********************************************************************
*
**********************************************************************/
-int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b )
+static int hb_dvdread_read( hb_dvd_t * e, hb_buffer_t * b )
{
+ hb_dvdread_t *d = &(e->dvdread);
top:
if( !d->pack_len )
{
@@ -1012,7 +1028,7 @@ int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b )
if( d->cell_overlap )
{
- b->new_chap = hb_dvd_is_break( d );
+ b->new_chap = hb_dvdread_is_break( d );
d->cell_overlap = 0;
}
}
@@ -1056,13 +1072,14 @@ int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b )
}
/***********************************************************************
- * hb_dvd_chapter
+ * hb_dvdread_chapter
***********************************************************************
* Returns in which chapter the next block to be read is.
* Chapter numbers start at 1.
**********************************************************************/
-int hb_dvd_chapter( hb_dvd_t * d )
+static int hb_dvdread_chapter( hb_dvd_t * e )
{
+ hb_dvdread_t *d = &(e->dvdread);
int i;
int pgc_id, pgn;
int nr_of_ptts = d->ifo->vts_ptt_srpt->title[d->ttn-1].nr_of_ptts;
@@ -1090,15 +1107,15 @@ int hb_dvd_chapter( hb_dvd_t * d )
}
/***********************************************************************
- * hb_dvd_is_break
+ * hb_dvdread_is_break
***********************************************************************
* Returns chapter number if the current block is a new chapter start
**********************************************************************/
-int hb_dvd_is_break( hb_dvd_t * d )
+static int hb_dvdread_is_break( hb_dvdread_t * d )
{
int i;
int pgc_id, pgn;
- int nr_of_ptts = d->ifo->vts_ptt_srpt->title[d->ttn-1].nr_of_ptts;
+ int nr_of_ptts = d->ifo->vts_ptt_srpt->title[d->ttn-1].nr_of_ptts;
pgc_t * pgc;
int cell;
@@ -1126,13 +1143,13 @@ int hb_dvd_is_break( hb_dvd_t * d )
}
/***********************************************************************
- * hb_dvd_close
+ * hb_dvdread_close
***********************************************************************
* Closes and frees everything
**********************************************************************/
-void hb_dvd_close( hb_dvd_t ** _d )
+static void hb_dvdread_close( hb_dvd_t ** _d )
{
- hb_dvd_t * d = *_d;
+ hb_dvdread_t * d = &((*_d)->dvdread);
if( d->vmg )
{
@@ -1148,12 +1165,32 @@ void hb_dvd_close( hb_dvd_t ** _d )
}
/***********************************************************************
+ * hb_dvdread_angle_count
+ ***********************************************************************
+ * Returns the number of angles supported. We do not support angles
+ * with dvdread
+ **********************************************************************/
+static int hb_dvdread_angle_count( hb_dvd_t * d )
+{
+ return 1;
+}
+
+/***********************************************************************
+ * hb_dvdread_set_angle
+ ***********************************************************************
+ * Sets the angle to read. Not supported with dvdread
+ **********************************************************************/
+static void hb_dvdread_set_angle( hb_dvd_t * d, int angle )
+{
+}
+
+/***********************************************************************
* FindNextCell
***********************************************************************
* Assumes pgc and cell_cur are correctly set, and sets cell_next to the
* cell to be read when we will be done with cell_cur.
**********************************************************************/
-static void FindNextCell( hb_dvd_t * d )
+static void FindNextCell( hb_dvdread_t * d )
{
int i = 0;
@@ -1199,3 +1236,74 @@ static int dvdtime2msec(dvd_time_t * dt)
return ms;
}
+
+char * hb_dvd_name( char * path )
+{
+ return dvd_methods->name(path);
+}
+
+hb_dvd_t * hb_dvd_init( char * path )
+{
+ return dvd_methods->init(path);
+}
+
+int hb_dvd_title_count( hb_dvd_t * d )
+{
+ return dvd_methods->title_count(d);
+}
+
+hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t )
+{
+ return dvd_methods->title_scan(d, t);
+}
+
+int hb_dvd_start( hb_dvd_t * d, int title, int chapter )
+{
+ return dvd_methods->start(d, title, chapter);
+}
+
+void hb_dvd_stop( hb_dvd_t * d )
+{
+ dvd_methods->stop(d);
+}
+
+int hb_dvd_seek( hb_dvd_t * d, float f )
+{
+ return dvd_methods->seek(d, f);
+}
+
+int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b )
+{
+ return dvd_methods->read(d, b);
+}
+
+int hb_dvd_chapter( hb_dvd_t * d )
+{
+ return dvd_methods->chapter(d);
+}
+
+void hb_dvd_close( hb_dvd_t ** _d )
+{
+ dvd_methods->close(_d);
+}
+
+int hb_dvd_angle_count( hb_dvd_t * d )
+{
+ return dvd_methods->angle_count(d);
+}
+
+void hb_dvd_set_angle( hb_dvd_t * d, int angle )
+{
+ dvd_methods->set_angle(d, angle);
+}
+
+// hb_dvd_set_dvdnav must only be called when no dvd source is open
+// it rips the rug out from under things so be careful
+void hb_dvd_set_dvdnav( int enable )
+{
+ if (enable)
+ dvd_methods = hb_dvdnav_methods();
+ else
+ dvd_methods = hb_dvdread_methods();
+}
+
diff --git a/libhb/dvd.h b/libhb/dvd.h
new file mode 100644
index 000000000..8f89a82cc
--- /dev/null
+++ b/libhb/dvd.h
@@ -0,0 +1,88 @@
+/* $Id: dvd.h,v 1.1 2004/08/02 07:19:05 stebbins Exp $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#ifndef HB_DVD_H
+#define HB_DVD_H
+
+#include "dvdnav/dvdnav.h"
+#include "dvdread/ifo_read.h"
+#include "dvdread/nav_read.h"
+
+struct hb_dvdread_s
+{
+ char * path;
+
+ dvd_reader_t * reader;
+ ifo_handle_t * vmg;
+
+ int vts;
+ int ttn;
+ ifo_handle_t * ifo;
+ dvd_file_t * file;
+
+ pgc_t * pgc;
+ int cell_start;
+ int cell_end;
+ int title_start;
+ int title_end;
+ int title_block_count;
+ int cell_cur;
+ int cell_next;
+ int cell_overlap;
+ int block;
+ int pack_len;
+ int next_vobu;
+ int in_cell;
+ int in_sync;
+ uint16_t cur_vob_id;
+ uint8_t cur_cell_id;
+};
+
+struct hb_dvdnav_s
+{
+ char * path;
+
+ dvdnav_t * dvdnav;
+ dvd_reader_t * reader;
+ ifo_handle_t * vmg;
+ int title;
+ int title_block_count;
+ int chapter;
+};
+
+typedef struct hb_dvdnav_s hb_dvdnav_t;
+typedef struct hb_dvdread_s hb_dvdread_t;
+
+union hb_dvd_s
+{
+ hb_dvdread_t dvdread;
+ hb_dvdnav_t dvdnav;
+};
+
+
+struct hb_dvd_func_s
+{
+ hb_dvd_t * (* init) ( char * );
+ void (* close) ( hb_dvd_t ** );
+ char * (* name) ( char * );
+ int (* title_count) ( hb_dvd_t * );
+ hb_title_t * (* title_scan) ( hb_dvd_t *, int );
+ int (* start) ( hb_dvd_t *, int, int );
+ void (* stop) ( hb_dvd_t * );
+ int (* seek) ( hb_dvd_t *, float );
+ int (* read) ( hb_dvd_t *, hb_buffer_t * );
+ int (* chapter) ( hb_dvd_t * );
+ int (* angle_count) ( hb_dvd_t * );
+ void (* set_angle) ( hb_dvd_t *, int );
+};
+typedef struct hb_dvd_func_s hb_dvd_func_t;
+
+hb_dvd_func_t * hb_dvdnav_methods( void );
+hb_dvd_func_t * hb_dvdread_methods( void );
+
+#endif // HB_DVD_H
+
+
diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c
new file mode 100644
index 000000000..c46d7faae
--- /dev/null
+++ b/libhb/dvdnav.c
@@ -0,0 +1,1097 @@
+/* $Id: dvd.c,v 1.12 2005/11/25 15:05:25 titer Exp $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#include "hb.h"
+#include "lang.h"
+#include "dvd.h"
+
+#include "dvdnav/dvdnav.h"
+#include "dvdread/ifo_read.h"
+#include "dvdread/nav_read.h"
+
+#define DVD_READ_CACHE 1
+
+static char * hb_dvdnav_name( char * path );
+static hb_dvd_t * hb_dvdnav_init( char * path );
+static int hb_dvdnav_title_count( hb_dvd_t * d );
+static hb_title_t * hb_dvdnav_title_scan( hb_dvd_t * d, int t );
+static int hb_dvdnav_start( hb_dvd_t * d, int title, int chapter );
+static void hb_dvdnav_stop( hb_dvd_t * d );
+static int hb_dvdnav_seek( hb_dvd_t * d, float f );
+static int hb_dvdnav_read( hb_dvd_t * d, hb_buffer_t * b );
+static int hb_dvdnav_chapter( hb_dvd_t * d );
+static void hb_dvdnav_close( hb_dvd_t ** _d );
+static int hb_dvdnav_angle_count( hb_dvd_t * d );
+static void hb_dvdnav_set_angle( hb_dvd_t * e, int angle );
+
+hb_dvd_func_t hb_dvdnav_func =
+{
+ hb_dvdnav_init,
+ hb_dvdnav_close,
+ hb_dvdnav_name,
+ hb_dvdnav_title_count,
+ hb_dvdnav_title_scan,
+ hb_dvdnav_start,
+ hb_dvdnav_stop,
+ hb_dvdnav_seek,
+ hb_dvdnav_read,
+ hb_dvdnav_chapter,
+ hb_dvdnav_angle_count,
+ hb_dvdnav_set_angle
+};
+
+/***********************************************************************
+ * Local prototypes
+ **********************************************************************/
+static int FindNextCell( pgc_t *pgc, int cell_cur );
+static int dvdtime2msec( dvd_time_t * );
+//static int hb_dvdnav_is_break( hb_dvdnav_t * d );
+
+hb_dvd_func_t * hb_dvdnav_methods( void )
+{
+ return &hb_dvdnav_func;
+}
+
+static char * hb_dvdnav_name( char * path )
+{
+ static char name[1024];
+ unsigned char unused[1024];
+ dvd_reader_t * reader;
+
+ reader = DVDOpen( path );
+ if( !reader )
+ {
+ return NULL;
+ }
+
+ if( DVDUDFVolumeInfo( reader, name, sizeof( name ),
+ unused, sizeof( unused ) ) )
+ {
+ DVDClose( reader );
+ return NULL;
+ }
+
+ DVDClose( reader );
+ return name;
+}
+
+/***********************************************************************
+ * hb_dvdnav_init
+ ***********************************************************************
+ *
+ **********************************************************************/
+static hb_dvd_t * hb_dvdnav_init( char * path )
+{
+ hb_dvd_t * e;
+ hb_dvdnav_t * d;
+
+ e = calloc( sizeof( hb_dvd_t ), 1 );
+ d = &(e->dvdnav);
+
+ /* Open device */
+ if( dvdnav_open(&d->dvdnav, path) != DVDNAV_STATUS_OK )
+ {
+ /*
+ * Not an error, may be a stream - which we'll try in a moment.
+ */
+ hb_log( "dvd: not a dvd - trying as a stream/file instead" );
+ goto fail;
+ }
+
+ if (dvdnav_set_readahead_flag(d->dvdnav, DVD_READ_CACHE) !=
+ DVDNAV_STATUS_OK)
+ {
+ hb_error("Error: dvdnav_set_readahead_flag: %s\n",
+ dvdnav_err_to_string(d->dvdnav));
+ goto fail;
+ }
+
+ /*
+ ** set the PGC positioning flag to have position information
+ ** relatively to the whole feature instead of just relatively to the
+ ** current chapter
+ **/
+ if (dvdnav_set_PGC_positioning_flag(d->dvdnav, 1) != DVDNAV_STATUS_OK)
+ {
+ hb_error("Error: dvdnav_set_PGC_positioning_flag: %s\n",
+ dvdnav_err_to_string(d->dvdnav));
+ goto fail;
+ }
+
+ /* Open device */
+ if( !( d->reader = DVDOpen( path ) ) )
+ {
+ /*
+ * Not an error, may be a stream - which we'll try in a moment.
+ */
+ hb_log( "dvd: not a dvd - trying as a stream/file instead" );
+ goto fail;
+ }
+
+ /* Open main IFO */
+ if( !( d->vmg = ifoOpen( d->reader, 0 ) ) )
+ {
+ hb_error( "dvd: ifoOpen failed" );
+ goto fail;
+ }
+
+ d->path = strdup( path );
+
+ return e;
+
+fail:
+ if( d->dvdnav ) dvdnav_close( d->dvdnav );
+ if( d->vmg ) ifoClose( d->vmg );
+ if( d->reader ) DVDClose( d->reader );
+ free( e );
+ return NULL;
+}
+
+/***********************************************************************
+ * hb_dvdnav_title_count
+ **********************************************************************/
+static int hb_dvdnav_title_count( hb_dvd_t * e )
+{
+ int titles = 0;
+ hb_dvdnav_t * d = &(e->dvdnav);
+
+ dvdnav_get_number_of_titles(d->dvdnav, &titles);
+ return titles;
+}
+
+/***********************************************************************
+ * hb_dvdnav_title_scan
+ **********************************************************************/
+static hb_title_t * hb_dvdnav_title_scan( hb_dvd_t * e, int t )
+{
+
+ hb_dvdnav_t * d = &(e->dvdnav);
+ hb_title_t * title;
+ ifo_handle_t * vts = NULL;
+ int pgc_id, pgn, i;
+ pgc_t * pgc;
+ int cell_cur;
+ hb_chapter_t * chapter;
+ int c;
+ uint64_t duration;
+ float duration_correction;
+ const char * name;
+
+ hb_log( "scan: scanning title %d", t );
+
+ title = hb_title_init( d->path, t );
+ if (dvdnav_get_title_string(d->dvdnav, &name) == DVDNAV_STATUS_OK)
+ {
+ strncpy( title->name, name, sizeof( title->name ) );
+ }
+ else
+ {
+ char * p_cur, * p_last = d->path;
+ for( p_cur = d->path; *p_cur; p_cur++ )
+ {
+ if( p_cur[0] == '/' && p_cur[1] )
+ {
+ p_last = &p_cur[1];
+ }
+ }
+ snprintf( title->name, sizeof( title->name ), "%s", p_last );
+ }
+
+ /* VTS which our title is in */
+ title->vts = d->vmg->tt_srpt->title[t-1].title_set_nr;
+
+ if ( !title->vts )
+ {
+ /* A VTS of 0 means the title wasn't found in the title set */
+ hb_error("Invalid VTS (title set) number: %i", title->vts);
+ goto fail;
+ }
+
+ hb_log( "scan: opening IFO for VTS %d", title->vts );
+ if( !( vts = ifoOpen( d->reader, title->vts ) ) )
+ {
+ hb_error( "scan: ifoOpen failed" );
+ goto fail;
+ }
+
+ /* ignore titles with bogus cell addresses so we don't abort later
+ ** in libdvdread. */
+ for ( i = 0; i < vts->vts_c_adt->nr_of_vobs; ++i)
+ {
+ if( (vts->vts_c_adt->cell_adr_table[i].start_sector & 0xffffff ) ==
+ 0xffffff )
+ {
+ hb_error( "scan: cell_adr_table[%d].start_sector invalid (0x%x) "
+ "- skipping title", i,
+ vts->vts_c_adt->cell_adr_table[i].start_sector );
+ goto fail;
+ }
+ if( (vts->vts_c_adt->cell_adr_table[i].last_sector & 0xffffff ) ==
+ 0xffffff )
+ {
+ hb_error( "scan: cell_adr_table[%d].last_sector invalid (0x%x) "
+ "- skipping title", i,
+ vts->vts_c_adt->cell_adr_table[i].last_sector );
+ goto fail;
+ }
+ if( vts->vts_c_adt->cell_adr_table[i].start_sector >=
+ vts->vts_c_adt->cell_adr_table[i].last_sector )
+ {
+ hb_error( "scan: cell_adr_table[%d].start_sector (0x%x) "
+ "is not before last_sector (0x%x) - skipping title", i,
+ vts->vts_c_adt->cell_adr_table[i].start_sector,
+ vts->vts_c_adt->cell_adr_table[i].last_sector );
+ goto fail;
+ }
+ }
+
+ if( global_verbosity_level == 3 )
+ {
+ ifo_print( d->reader, title->vts );
+ }
+
+ /* Position of the title in the VTS */
+ title->ttn = d->vmg->tt_srpt->title[t-1].vts_ttn;
+ if ( title->ttn < 1 || title->ttn > vts->vts_ptt_srpt->nr_of_srpts )
+ {
+ hb_error( "invalid VTS PTT offset %d for title %d, skipping", title->ttn, t );
+ goto fail;
+ }
+
+
+ /* Get pgc */
+ pgc_id = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgcn;
+ if ( pgc_id < 1 || pgc_id > vts->vts_pgcit->nr_of_pgci_srp )
+ {
+ hb_error( "invalid PGC ID %d for title %d, skipping", pgc_id, t );
+ goto fail;
+ }
+ pgn = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgn;
+ pgc = vts->vts_pgcit->pgci_srp[pgc_id-1].pgc;
+
+ hb_log("pgc_id: %d, pgn: %d: pgc: 0x%x", pgc_id, pgn, pgc);
+
+ if( !pgc )
+ {
+ hb_error( "scan: pgc not valid, skipping" );
+ goto fail;
+ }
+
+ if( pgn <= 0 || pgn > 99 )
+ {
+ hb_error( "scan: pgn %d not valid, skipping", pgn );
+ goto fail;
+ }
+
+ /* Start cell */
+ title->cell_start = pgc->program_map[pgn-1] - 1;
+ title->block_start = pgc->cell_playback[title->cell_start].first_sector;
+
+ /* End cell */
+ title->cell_end = pgc->nr_of_cells - 1;
+ title->block_end = pgc->cell_playback[title->cell_end].last_sector;
+
+ /* Block count */
+ title->block_count = 0;
+ cell_cur = title->cell_start;
+ while( cell_cur <= title->cell_end )
+ {
+#define cp pgc->cell_playback[cell_cur]
+ title->block_count += cp.last_sector + 1 - cp.first_sector;
+#undef cp
+ cell_cur = FindNextCell( pgc, cell_cur );
+ }
+
+ hb_log( "scan: vts=%d, ttn=%d, cells=%d->%d, blocks=%d->%d, "
+ "%d blocks", title->vts, title->ttn, title->cell_start,
+ title->cell_end, title->block_start, title->block_end,
+ title->block_count );
+
+ /* Get duration */
+ title->duration = 90LL * dvdtime2msec( &pgc->playback_time );
+ 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)",
+ title->hours, title->minutes, title->seconds,
+ title->duration / 90 );
+
+ /* ignore titles under 10 seconds because they're often stills or
+ * clips with no audio & our preview code doesn't currently handle
+ * either of these. */
+ if( title->duration < 900000LL )
+ {
+ hb_log( "scan: ignoring title (too short)" );
+ goto fail;
+ }
+
+ /* Detect languages */
+ for( i = 0; i < vts->vtsi_mat->nr_of_vts_audio_streams; i++ )
+ {
+ hb_audio_t * audio, * audio_tmp;
+ int audio_format, lang_code, audio_control,
+ position, j;
+ iso639_lang_t * lang;
+ int lang_extension = 0;
+
+ hb_log( "scan: checking audio %d", i + 1 );
+
+ audio = calloc( sizeof( hb_audio_t ), 1 );
+
+ audio_format = vts->vtsi_mat->vts_audio_attr[i].audio_format;
+ lang_code = vts->vtsi_mat->vts_audio_attr[i].lang_code;
+ lang_extension = vts->vtsi_mat->vts_audio_attr[i].code_extension;
+ audio_control =
+ vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->audio_control[i];
+
+ if( !( audio_control & 0x8000 ) )
+ {
+ hb_log( "scan: audio channel is not active" );
+ free( audio );
+ continue;
+ }
+
+ position = ( audio_control & 0x7F00 ) >> 8;
+
+ switch( audio_format )
+ {
+ case 0x00:
+ audio->id = ( ( 0x80 + position ) << 8 ) | 0xbd;
+ audio->config.in.codec = HB_ACODEC_AC3;
+ break;
+
+ case 0x02:
+ case 0x03:
+ audio->id = 0xc0 + position;
+ audio->config.in.codec = HB_ACODEC_MPGA;
+ break;
+
+ case 0x04:
+ audio->id = ( ( 0xa0 + position ) << 8 ) | 0xbd;
+ audio->config.in.codec = HB_ACODEC_LPCM;
+ break;
+
+ case 0x06:
+ audio->id = ( ( 0x88 + position ) << 8 ) | 0xbd;
+ audio->config.in.codec = HB_ACODEC_DCA;
+ break;
+
+ default:
+ audio->id = 0;
+ audio->config.in.codec = 0;
+ hb_log( "scan: unknown audio codec (%x)",
+ audio_format );
+ break;
+ }
+ if( !audio->id )
+ {
+ continue;
+ }
+
+ /* Check for duplicate tracks */
+ audio_tmp = NULL;
+ for( j = 0; j < hb_list_count( title->list_audio ); j++ )
+ {
+ audio_tmp = hb_list_item( title->list_audio, j );
+ if( audio->id == audio_tmp->id )
+ {
+ break;
+ }
+ audio_tmp = NULL;
+ }
+ if( audio_tmp )
+ {
+ hb_log( "scan: duplicate audio track" );
+ free( audio );
+ continue;
+ }
+
+ audio->config.lang.type = lang_extension;
+
+ lang = lang_for_code( vts->vtsi_mat->vts_audio_attr[i].lang_code );
+
+ snprintf( audio->config.lang.description, sizeof( audio->config.lang.description ), "%s (%s)",
+ strlen(lang->native_name) ? lang->native_name : lang->eng_name,
+ audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" : ( audio->config.in.codec ==
+ HB_ACODEC_DCA ? "DTS" : ( audio->config.in.codec ==
+ HB_ACODEC_MPGA ? "MPEG" : "LPCM" ) ) );
+ snprintf( audio->config.lang.simple, sizeof( audio->config.lang.simple ), "%s",
+ strlen(lang->native_name) ? lang->native_name : lang->eng_name );
+ snprintf( audio->config.lang.iso639_2, sizeof( audio->config.lang.iso639_2 ), "%s",
+ lang->iso639_2);
+
+ switch( lang_extension )
+ {
+ case 0:
+ case 1:
+ break;
+ case 2:
+ strcat( audio->config.lang.description, " (Visually Impaired)" );
+ break;
+ case 3:
+ strcat( audio->config.lang.description, " (Director's Commentary 1)" );
+ break;
+ case 4:
+ strcat( audio->config.lang.description, " (Director's Commentary 2)" );
+ break;
+ default:
+ break;
+ }
+
+ hb_log( "scan: id=%x, lang=%s, 3cc=%s ext=%i", audio->id,
+ audio->config.lang.description, audio->config.lang.iso639_2,
+ lang_extension );
+
+ audio->config.in.track = i;
+ hb_list_add( title->list_audio, audio );
+ }
+
+ if( !hb_list_count( title->list_audio ) )
+ {
+ hb_log( "scan: ignoring title (no audio track)" );
+ goto fail;
+ }
+
+ memcpy( title->palette,
+ vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette,
+ 16 * sizeof( uint32_t ) );
+
+ /* Check for subtitles */
+ for( i = 0; i < vts->vtsi_mat->nr_of_vts_subp_streams; i++ )
+ {
+ hb_subtitle_t * subtitle;
+ int spu_control;
+ int position;
+ iso639_lang_t * lang;
+ int lang_extension = 0;
+
+ hb_log( "scan: checking subtitle %d", i + 1 );
+
+ spu_control =
+ vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->subp_control[i];
+
+ if( !( spu_control & 0x80000000 ) )
+ {
+ hb_log( "scan: subtitle channel is not active" );
+ continue;
+ }
+
+ if( vts->vtsi_mat->vts_video_attr.display_aspect_ratio )
+ {
+ switch( vts->vtsi_mat->vts_video_attr.permitted_df )
+ {
+ case 1:
+ position = spu_control & 0xFF;
+ break;
+ case 2:
+ position = ( spu_control >> 8 ) & 0xFF;
+ break;
+ default:
+ position = ( spu_control >> 16 ) & 0xFF;
+ }
+ }
+ else
+ {
+ position = ( spu_control >> 24 ) & 0x7F;
+ }
+
+ lang_extension = vts->vtsi_mat->vts_subp_attr[i].code_extension;
+
+ lang = lang_for_code( vts->vtsi_mat->vts_subp_attr[i].lang_code );
+
+ subtitle = calloc( sizeof( hb_subtitle_t ), 1 );
+ subtitle->id = ( ( 0x20 + position ) << 8 ) | 0xbd;
+ snprintf( subtitle->lang, sizeof( subtitle->lang ), "%s",
+ strlen(lang->native_name) ? lang->native_name : lang->eng_name);
+ snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "%s",
+ lang->iso639_2);
+
+ subtitle->type = lang_extension;
+
+ switch( lang_extension )
+ {
+ case 0:
+ break;
+ case 1:
+ break;
+ case 2:
+ strcat( subtitle->lang, " (Caption with bigger size character)");
+ break;
+ case 3:
+ strcat( subtitle->lang, " (Caption for Children)");
+ break;
+ case 4:
+ break;
+ case 5:
+ strcat( subtitle->lang, " (Closed Caption)");
+ break;
+ case 6:
+ strcat( subtitle->lang, " (Closed Caption with bigger size character)");
+ break;
+ case 7:
+ strcat( subtitle->lang, " (Closed Caption for Children)");
+ break;
+ case 8:
+ break;
+ case 9:
+ strcat( subtitle->lang, " (Forced Caption)");
+ break;
+ case 10:
+ break;
+ case 11:
+ break;
+ case 12:
+ break;
+ case 13:
+ strcat( subtitle->lang, " (Director's Commentary)");
+ break;
+ case 14:
+ strcat( subtitle->lang, " (Director's Commentary with bigger size character)");
+ break;
+ case 15:
+ strcat( subtitle->lang, " (Director's Commentary for Children)");
+ default:
+ break;
+ }
+
+ hb_log( "scan: id=%x, lang=%s, 3cc=%s", subtitle->id,
+ subtitle->lang, subtitle->iso639_2 );
+
+ hb_list_add( title->list_subtitle, subtitle );
+ }
+
+ /* Chapters */
+ hb_log( "scan: title %d has %d chapters", t,
+ vts->vts_ptt_srpt->title[title->ttn-1].nr_of_ptts );
+ for( i = 0, c = 1;
+ i < vts->vts_ptt_srpt->title[title->ttn-1].nr_of_ptts; i++ )
+ {
+ int pgc_id_next, pgn_next;
+ pgc_t * pgc_next;
+
+ chapter = calloc( sizeof( hb_chapter_t ), 1 );
+ /* remember the on-disc chapter number */
+ chapter->index = i + 1;
+
+ pgc_id = vts->vts_ptt_srpt->title[title->ttn-1].ptt[i].pgcn;
+ pgn = vts->vts_ptt_srpt->title[title->ttn-1].ptt[i].pgn;
+ pgc = vts->vts_pgcit->pgci_srp[pgc_id-1].pgc;
+
+ /* Start cell */
+ chapter->cell_start = pgc->program_map[pgn-1] - 1;
+ chapter->block_start =
+ pgc->cell_playback[chapter->cell_start].first_sector;
+
+ /* End cell */
+ if( i != vts->vts_ptt_srpt->title[title->ttn-1].nr_of_ptts - 1 )
+ {
+ /* The cell before the starting cell of the next chapter,
+ or... */
+ pgc_id_next = vts->vts_ptt_srpt->title[title->ttn-1].ptt[i+1].pgcn;
+ pgn_next = vts->vts_ptt_srpt->title[title->ttn-1].ptt[i+1].pgn;
+ pgc_next = vts->vts_pgcit->pgci_srp[pgc_id_next-1].pgc;
+ chapter->cell_end = pgc_next->program_map[pgn_next-1] - 2;
+ if( chapter->cell_end < 0 )
+ {
+ /* Huh? */
+ free( chapter );
+ continue;
+ }
+ }
+ else
+ {
+ /* ... the last cell of the title */
+ chapter->cell_end = title->cell_end;
+ }
+ chapter->block_end =
+ pgc->cell_playback[chapter->cell_end].last_sector;
+
+ /* Block count, duration */
+ pgc_id = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgcn;
+ pgn = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgn;
+ pgc = vts->vts_pgcit->pgci_srp[pgc_id-1].pgc;
+ chapter->block_count = 0;
+ chapter->duration = 0;
+
+ cell_cur = chapter->cell_start;
+ while( cell_cur <= chapter->cell_end )
+ {
+#define cp pgc->cell_playback[cell_cur]
+ chapter->block_count += cp.last_sector + 1 - cp.first_sector;
+ chapter->duration += 90LL * dvdtime2msec( &cp.playback_time );
+#undef cp
+ cell_cur = FindNextCell( pgc, cell_cur );
+ }
+ hb_list_add( title->list_chapter, chapter );
+ c++;
+ }
+
+ /* The durations we get for chapters aren't precise. Scale them so
+ the total matches the title duration */
+ duration = 0;
+ for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
+ {
+ chapter = hb_list_item( title->list_chapter, i );
+ duration += chapter->duration;
+ }
+ duration_correction = (float) title->duration / (float) duration;
+ for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
+ {
+ int seconds;
+ chapter = hb_list_item( title->list_chapter, i );
+ chapter->duration = duration_correction * chapter->duration;
+ seconds = ( chapter->duration + 45000 ) / 90000;
+ chapter->hours = seconds / 3600;
+ chapter->minutes = ( seconds % 3600 ) / 60;
+ chapter->seconds = seconds % 60;
+
+ hb_log( "scan: chap %d c=%d->%d, b=%d->%d (%d), %lld ms",
+ chapter->index, chapter->cell_start, chapter->cell_end,
+ chapter->block_start, chapter->block_end,
+ chapter->block_count, chapter->duration / 90 );
+ }
+
+ /* Get aspect. We don't get width/height/rate infos here as
+ they tend to be wrong */
+ switch( vts->vtsi_mat->vts_video_attr.display_aspect_ratio )
+ {
+ case 0:
+ title->container_aspect = 4. / 3.;
+ break;
+ case 3:
+ title->container_aspect = 16. / 9.;
+ break;
+ default:
+ hb_log( "scan: unknown aspect" );
+ goto fail;
+ }
+
+ hb_log( "scan: aspect = %g", title->aspect );
+
+ /* This title is ok so far */
+ goto cleanup;
+
+fail:
+ hb_list_close( &title->list_audio );
+ free( title );
+ title = NULL;
+
+cleanup:
+ if( vts ) ifoClose( vts );
+
+ return title;
+}
+
+/***********************************************************************
+ * hb_dvdnav_start
+ ***********************************************************************
+ * Title and chapter start at 1
+ **********************************************************************/
+static int hb_dvdnav_start( hb_dvd_t * e, int title, int chapter )
+{
+ hb_dvdnav_t * d = &(e->dvdnav);
+ ifo_handle_t *ifo;
+ int ii;
+ int vts, ttn, pgc_id, pgn;
+ pgc_t *pgc;
+ int cell_start, cell_end, title_start, title_end;
+
+ vts = d->vmg->tt_srpt->title[title-1].title_set_nr;
+ ttn = d->vmg->tt_srpt->title[title-1].vts_ttn;
+ if( !( ifo = ifoOpen( d->reader, vts ) ) )
+ {
+ hb_error( "dvd: ifoOpen failed for VTS %d", vts );
+ return 0;
+ }
+
+ /* Get title first and last blocks */
+ pgc_id = ifo->vts_ptt_srpt->title[ttn-1].ptt[0].pgcn;
+ pgn = ifo->vts_ptt_srpt->title[ttn-1].ptt[0].pgn;
+ pgc = ifo->vts_pgcit->pgci_srp[pgc_id-1].pgc;
+ cell_start = pgc->program_map[pgn - 1] - 1;
+ cell_end = pgc->nr_of_cells - 1;
+ title_start = pgc->cell_playback[cell_start].first_sector;
+ title_end = pgc->cell_playback[cell_end].last_sector;
+
+ /* Block count */
+ d->title_block_count = 0;
+ for( ii = cell_start; ii <= cell_end; ii++ )
+ {
+ d->title_block_count += pgc->cell_playback[ii].last_sector + 1 -
+ pgc->cell_playback[ii].first_sector;
+ }
+ ifoClose(ifo);
+
+ if ( dvdnav_part_play(d->dvdnav, title, chapter) != DVDNAV_STATUS_OK )
+ {
+ hb_error( "dvd: dvdnav_title_play failed - %s",
+ dvdnav_err_to_string(d->dvdnav) );
+ return 0;
+ }
+ d->title = title;
+ return 1;
+}
+
+/***********************************************************************
+ * hb_dvdnav_stop
+ ***********************************************************************
+ *
+ **********************************************************************/
+static void hb_dvdnav_stop( hb_dvd_t * e )
+{
+}
+
+/***********************************************************************
+ * hb_dvdnav_seek
+ ***********************************************************************
+ *
+ **********************************************************************/
+static int hb_dvdnav_seek( hb_dvd_t * e, float f )
+{
+ hb_dvdnav_t * d = &(e->dvdnav);
+ uint64_t sector;
+ int result, event, len;
+ uint8_t buf[HB_DVD_READ_BUFFER_SIZE];
+ int done = 0, ii;
+
+ // dvdnav will not let you seek or poll current position
+ // till it reaches a certain point in parsing. so we
+ // have to get blocks until we reach a cell
+ // Put an arbitrary limit of 100 blocks on how long we search
+ for (ii = 0; ii < 100 && !done; ii++)
+ {
+ result = dvdnav_get_next_block( d->dvdnav, buf, &event, &len );
+ if ( result == DVDNAV_STATUS_ERR )
+ {
+ hb_log("dvdnav: Read Error, %s", dvdnav_err_to_string(d->dvdnav));
+ return 0;
+ }
+ switch ( event )
+ {
+ case DVDNAV_BLOCK_OK:
+ case DVDNAV_CELL_CHANGE:
+ done = 1;
+
+ case DVDNAV_STILL_FRAME:
+ dvdnav_still_skip( d->dvdnav );
+ break;
+
+ case DVDNAV_WAIT:
+ dvdnav_wait_skip( d->dvdnav );
+ break;
+
+ case DVDNAV_STOP:
+ return 0;
+
+ case DVDNAV_HOP_CHANNEL:
+ case DVDNAV_NAV_PACKET:
+ case DVDNAV_VTS_CHANGE:
+ case DVDNAV_HIGHLIGHT:
+ case DVDNAV_AUDIO_STREAM_CHANGE:
+ case DVDNAV_SPU_STREAM_CHANGE:
+ case DVDNAV_SPU_CLUT_CHANGE:
+ case DVDNAV_NOP:
+ default:
+ break;
+ }
+ } while (!(event == DVDNAV_CELL_CHANGE || event == DVDNAV_BLOCK_OK));
+
+ sector = f * d->title_block_count;
+ if (dvdnav_sector_search(d->dvdnav, sector, SEEK_SET) != DVDNAV_STATUS_OK)
+ {
+ hb_error( "dvd: dvdnav_sector_search failed - %s",
+ dvdnav_err_to_string(d->dvdnav) );
+ return 0;
+ }
+ return 1;
+}
+
+/***********************************************************************
+ * hb_dvdnav_read
+ ***********************************************************************
+ *
+ **********************************************************************/
+static int hb_dvdnav_read( hb_dvd_t * e, hb_buffer_t * b )
+{
+ hb_dvdnav_t * d = &(e->dvdnav);
+ int result, event, len;
+ int chapter = 0;
+
+ while ( 1 )
+ {
+ result = dvdnav_get_next_block( d->dvdnav, b->data, &event, &len );
+ if ( result == DVDNAV_STATUS_ERR )
+ {
+ hb_log("dvdnav: Read Error, %s", dvdnav_err_to_string(d->dvdnav));
+ return 0;
+ }
+ switch ( event )
+ {
+ case DVDNAV_BLOCK_OK:
+ // We have received a regular block of the currently playing
+ // MPEG stream.
+
+ // The muxers expect to only get chapter 2 and above
+ // They write chapter 1 when chapter 2 is detected.
+ if (chapter > 1)
+ b->new_chap = chapter;
+ chapter = 0;
+ return 1;
+
+ case DVDNAV_NOP:
+ /*
+ * Nothing to do here.
+ */
+ break;
+
+ case DVDNAV_STILL_FRAME:
+ /*
+ * We have reached a still frame. A real player application
+ * would wait the amount of time specified by the still's
+ * length while still handling user input to make menus and
+ * other interactive stills work. A length of 0xff means an
+ * indefinite still which has to be skipped indirectly by some
+ * user interaction.
+ */
+ dvdnav_still_skip( d->dvdnav );
+ break;
+
+ case DVDNAV_WAIT:
+ /*
+ * We have reached a point in DVD playback, where timing is
+ * critical. Player application with internal fifos can
+ * introduce state inconsistencies, because libdvdnav is
+ * always the fifo's length ahead in the stream compared to
+ * what the application sees. Such applications should wait
+ * until their fifos are empty when they receive this type of
+ * event.
+ */
+ dvdnav_wait_skip( d->dvdnav );
+ break;
+
+ case DVDNAV_SPU_CLUT_CHANGE:
+ /*
+ * Player applications should pass the new colour lookup table
+ * to their SPU decoder
+ */
+ break;
+
+ case DVDNAV_SPU_STREAM_CHANGE:
+ /*
+ * Player applications should inform their SPU decoder to
+ * switch channels
+ */
+ break;
+
+ case DVDNAV_AUDIO_STREAM_CHANGE:
+ /*
+ * Player applications should inform their audio decoder to
+ * switch channels
+ */
+ break;
+
+ case DVDNAV_HIGHLIGHT:
+ /*
+ * Player applications should inform their overlay engine to
+ * highlight the given button
+ */
+ break;
+
+ case DVDNAV_VTS_CHANGE:
+ /*
+ * Some status information like video aspect and video scale
+ * permissions do not change inside a VTS. Therefore this
+ * event can be used to query such information only when
+ * necessary and update the decoding/displaying accordingly.
+ */
+ break;
+
+ case DVDNAV_CELL_CHANGE:
+ /*
+ * Some status information like the current Title and Part
+ * numbers do not change inside a cell. Therefore this event
+ * can be used to query such information only when necessary
+ * and update the decoding/displaying accordingly.
+ */
+ {
+ int tt = 0, ptt = 0;
+
+ dvdnav_current_title_info(d->dvdnav, &tt, &ptt);
+ if (tt != d->title)
+ {
+ // Transition to another title signals that we are done.
+ return 0;
+ }
+ if (ptt > d->chapter)
+ chapter = d->chapter = ptt;
+ }
+ break;
+
+ case DVDNAV_NAV_PACKET:
+ /*
+ * A NAV packet provides PTS discontinuity information, angle
+ * linking information and button definitions for DVD menus.
+ * Angles are handled completely inside libdvdnav. For the
+ * menus to work, the NAV packet information has to be passed
+ * to the overlay engine of the player so that it knows the
+ * dimensions of the button areas.
+ */
+
+ // mpegdemux expects to get these. I don't think it does
+ // anything useful with them however.
+
+ // The muxers expect to only get chapter 2 and above
+ // They write chapter 1 when chapter 2 is detected.
+ if (chapter > 1)
+ b->new_chap = chapter;
+ chapter = 0;
+ return 1;
+
+ break;
+
+ case DVDNAV_HOP_CHANNEL:
+ /*
+ * This event is issued whenever a non-seamless operation has
+ * been executed. Applications with fifos should drop the
+ * fifos content to speed up responsiveness.
+ */
+ break;
+
+ case DVDNAV_STOP:
+ /*
+ * Playback should end here.
+ */
+ return 0;
+
+ default:
+ break;
+ }
+ }
+ return 0;
+}
+
+/***********************************************************************
+ * hb_dvdnav_chapter
+ ***********************************************************************
+ * Returns in which chapter the next block to be read is.
+ * Chapter numbers start at 1.
+ **********************************************************************/
+static int hb_dvdnav_chapter( hb_dvd_t * e )
+{
+ hb_dvdnav_t * d = &(e->dvdnav);
+ int32_t t, c;
+
+ if (dvdnav_current_title_info(d->dvdnav, &t, &c) != DVDNAV_STATUS_OK)
+ {
+ return -1;
+ }
+ return c;
+}
+
+/***********************************************************************
+ * hb_dvdnav_close
+ ***********************************************************************
+ * Closes and frees everything
+ **********************************************************************/
+static void hb_dvdnav_close( hb_dvd_t ** _d )
+{
+ hb_dvdnav_t * d = &((*_d)->dvdnav);
+
+ if( d->dvdnav ) dvdnav_close( d->dvdnav );
+ if( d->vmg ) ifoClose( d->vmg );
+ if( d->reader ) DVDClose( d->reader );
+
+ free( d );
+ *_d = NULL;
+}
+
+/***********************************************************************
+ * hb_dvdnav_angle_count
+ ***********************************************************************
+ * Returns the number of angles supported.
+ **********************************************************************/
+static int hb_dvdnav_angle_count( hb_dvd_t * e )
+{
+ hb_dvdnav_t * d = &(e->dvdnav);
+ int current, angle_count;
+
+ if (dvdnav_get_angle_info( d->dvdnav, &current, &angle_count) != DVDNAV_STATUS_OK)
+ {
+ hb_log("dvdnav_get_angle_info %s", dvdnav_err_to_string(d->dvdnav));
+ angle_count = 1;
+ }
+ return angle_count;
+}
+
+/***********************************************************************
+ * hb_dvdnav_set_angle
+ ***********************************************************************
+ * Sets the angle to read
+ **********************************************************************/
+static void hb_dvdnav_set_angle( hb_dvd_t * e, int angle )
+{
+ hb_dvdnav_t * d = &(e->dvdnav);
+
+ if (dvdnav_angle_change( d->dvdnav, angle) != DVDNAV_STATUS_OK)
+ {
+ hb_log("dvdnav_angle_change %s", dvdnav_err_to_string(d->dvdnav));
+ }
+}
+
+/***********************************************************************
+ * FindNextCell
+ ***********************************************************************
+ * Assumes pgc and cell_cur are correctly set, and sets cell_next to the
+ * cell to be read when we will be done with cell_cur.
+ **********************************************************************/
+static int FindNextCell( pgc_t *pgc, int cell_cur )
+{
+ int i = 0;
+ int cell_next;
+
+ if( pgc->cell_playback[cell_cur].block_type ==
+ BLOCK_TYPE_ANGLE_BLOCK )
+ {
+
+ while( pgc->cell_playback[cell_cur+i].block_mode !=
+ BLOCK_MODE_LAST_CELL )
+ {
+ i++;
+ }
+ cell_next = cell_cur + i + 1;
+ hb_log( "dvd: Skipping multi-angle cells %d-%d",
+ cell_cur,
+ cell_next - 1 );
+ }
+ else
+ {
+ cell_next = cell_cur + 1;
+ }
+ return cell_next;
+}
+
+/***********************************************************************
+ * dvdtime2msec
+ ***********************************************************************
+ * From lsdvd
+ **********************************************************************/
+static int dvdtime2msec(dvd_time_t * dt)
+{
+ double frames_per_s[4] = {-1.0, 25.00, -1.0, 29.97};
+ double fps = frames_per_s[(dt->frame_u & 0xc0) >> 6];
+ long ms;
+ ms = (((dt->hour & 0xf0) >> 3) * 5 + (dt->hour & 0x0f)) * 3600000;
+ ms += (((dt->minute & 0xf0) >> 3) * 5 + (dt->minute & 0x0f)) * 60000;
+ ms += (((dt->second & 0xf0) >> 3) * 5 + (dt->second & 0x0f)) * 1000;
+
+ if( fps > 0 )
+ {
+ ms += ((dt->frame_u & 0x30) >> 3) * 5 +
+ (dt->frame_u & 0x0f) * 1000.0 / fps;
+ }
+
+ return ms;
+}
diff --git a/libhb/hb.h b/libhb/hb.h
index 5d517d3d8..0c96656d6 100644
--- a/libhb/hb.h
+++ b/libhb/hb.h
@@ -72,6 +72,7 @@ int hb_check_update( hb_handle_t * h, char ** version );
void hb_set_cpu_count( hb_handle_t *, int );
char * hb_dvd_name( char * path );
+void hb_dvd_set_dvdnav( int enable );
/* hb_scan()
Scan the specified path. Can be a DVD device, a VIDEO_TS folder or
diff --git a/libhb/internal.h b/libhb/internal.h
index fa3fe86f6..8d927501c 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -168,7 +168,7 @@ extern void decmetadata( hb_title_t *title );
/***********************************************************************
* dvd.c
**********************************************************************/
-typedef struct hb_dvd_s hb_dvd_t;
+typedef union hb_dvd_s hb_dvd_t;
typedef struct hb_stream_s hb_stream_t;
hb_dvd_t * hb_dvd_init( char * path );
@@ -181,6 +181,8 @@ int hb_dvd_read( hb_dvd_t *, hb_buffer_t * );
int hb_dvd_chapter( hb_dvd_t * );
int hb_dvd_is_break( hb_dvd_t * d );
void hb_dvd_close( hb_dvd_t ** );
+int hb_dvd_angle_count( hb_dvd_t * d );
+void hb_dvd_set_angle( hb_dvd_t * d, int angle );
hb_stream_t * hb_stream_open( char * path, hb_title_t *title );
void hb_stream_close( hb_stream_t ** );
diff --git a/libhb/module.defs b/libhb/module.defs
index dc2fb1ad5..725ebc116 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -1,5 +1,5 @@
__deps__ := A52DEC BZIP2 FAAC FAAD2 FFMPEG LAME LIBDCA \
- LIBDVDREAD LIBMKV LIBMP4V2 LIBOGG LIBSAMPLERATE LIBTHEORA \
+ LIBDVDREAD LIBDVDNAV LIBMKV LIBMP4V2 LIBOGG LIBSAMPLERATE LIBTHEORA \
LIBVORBIS MPEG2DEC PTHREADW32 X264 XVIDCORE ZLIB
$(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__)))
@@ -87,7 +87,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll
LIBHB.lib = $(LIBHB.build/)hb.lib
LIBHB.dll.libs = $(foreach n, \
- a52 bz2 avcodec avformat avutil dca dvdread faac faad mkv mpeg2 mp3lame mp4v2 \
+ a52 bz2 avcodec avformat avutil dca dvdnav dvdread faac faad mkv mpeg2 mp3lame mp4v2 \
ogg pthreadGC2 samplerate swscale theora vorbis vorbisenc x264 xvidcore z, \
$(CONTRIB.build/)lib/lib$(n).a )
diff --git a/libhb/reader.c b/libhb/reader.c
index 8c5ecdd2a..78f24a457 100644
--- a/libhb/reader.c
+++ b/libhb/reader.c
@@ -225,6 +225,10 @@ static void ReaderFunc( void * _r )
hb_dvd_close( &r->dvd );
return;
}
+ if (r->job->angle)
+ {
+ hb_dvd_set_angle( r->dvd, r->job->angle );
+ }
if ( r->job->start_at_preview )
{
diff --git a/libhb/scan.c b/libhb/scan.c
index 2088883ab..db179ef75 100644
--- a/libhb/scan.c
+++ b/libhb/scan.c
@@ -406,7 +406,11 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
hb_log( "scan: decoding previews for title %d", title->index );
if (data->dvd)
+ {
hb_dvd_start( data->dvd, title->index, 1 );
+ title->angle_count = hb_dvd_angle_count( data->dvd );
+ hb_log( "scan: title angle(s) %d", title->angle_count );
+ }
for( i = 0; i < data->preview_count; i++ )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 06:53:20 +0000