X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Finternal.h;h=a00142b8f70bfebb02da23e8766a96b2ae550f01;hb=d6a4ae73b86cca10f2342c9e26c132855cad6356;hp=3ae1dad79bb24d85b6e15b8f181172339fdd6a0d;hpb=5846d37d995f4b03815c58b736305d6e7f8c51ce;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/internal.h b/libhb/internal.h
index 3ae1dad7..a00142b8 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -111,12 +111,29 @@ static inline hb_buffer_t * hb_video_buffer_init( int width, int height )
                            ( ( height+1 ) >> 1 ) * 2 );
 }
 
+// this routine 'moves' data from src to dst by interchanging 'data',
+// 'size' & 'alloc' between them and copying the rest of the fields
+// from src to dst.
+static inline void hb_buffer_swap_copy( hb_buffer_t *src, hb_buffer_t *dst )
+{
+    uint8_t *data  = dst->data;
+    int      size  = dst->size;
+    int      alloc = dst->alloc;
+
+    *dst = *src;
+
+    src->data  = data;
+    src->size  = size;
+    src->alloc = alloc;
+}
+
 /***********************************************************************
  * Threads: update.c, scan.c, work.c, reader.c, muxcommon.c
  **********************************************************************/
 hb_thread_t * hb_update_init( int * build, char * version );
 hb_thread_t * hb_scan_init( hb_handle_t *, const char * path,
-                            int title_index, hb_list_t * list_title );
+                            int title_index, hb_list_t * list_title,
+                            int preview_count, int store_previews );
 hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count,
                             volatile int * die, int * error, hb_job_t ** job );
 hb_thread_t  * hb_reader_init( hb_job_t * );
@@ -130,30 +147,42 @@ hb_work_object_t * hb_codec_encoder( int );
  **********************************************************************/
 typedef struct {
     int64_t last_scr;       /* unadjusted SCR from most recent pack */
+    int64_t last_pts;       /* last pts we saw */
     int     scr_changes;    /* number of SCR discontinuities */
-    int     flaky_clock;    /* try to compensate for PCR drops */
     int     dts_drops;      /* number of drops because DTS too far from SCR */
 } hb_psdemux_t;
 
+typedef int (*hb_muxer_t)(hb_buffer_t *, hb_list_t *, hb_psdemux_t*);
+
 int hb_demux_ps( hb_buffer_t * ps_buf, hb_list_t * es_list, hb_psdemux_t * );
+int hb_demux_ss( hb_buffer_t * ps_buf, hb_list_t * es_list, hb_psdemux_t * );
 int hb_demux_null( hb_buffer_t * ps_buf, hb_list_t * es_list, hb_psdemux_t * );
 
+extern const hb_muxer_t hb_demux[];
+
+/***********************************************************************
+ * decmetadata.c
+ **********************************************************************/
+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 );
 int          hb_dvd_title_count( hb_dvd_t * );
 hb_title_t * hb_dvd_title_scan( hb_dvd_t *, int title );
-int          hb_dvd_start( hb_dvd_t *, int title, int chapter );
+int          hb_dvd_start( hb_dvd_t *, hb_title_t *title, int chapter );
 void         hb_dvd_stop( hb_dvd_t * );
 int          hb_dvd_seek( hb_dvd_t *, float );
 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 ** );
@@ -206,7 +235,11 @@ union hb_esconfig_u
     struct
     {
     	/* ac3flags stores the flags from the AC3 source, as found in scan.c */
-    	int  ac3flags;
+    	int     ac3flags;
+        // next two items are used by the bsinfo routine to accumulate small
+        // frames until we have enough to validate the crc.
+        int     len;        // space currently used in 'buf'
+        uint8_t buf[HB_CONFIG_MAX_SIZE-sizeof(int)];
     } a52;
 
     struct
@@ -221,10 +254,12 @@ enum
 {
     WORK_SYNC = 1,
     WORK_DECMPEG2,
-    WORK_DECSUB,
+    WORK_DECCC608,
+    WORK_DECVOBSUB,
+    WORK_DECSRTSUB,
+    WORK_ENCVOBSUB,
     WORK_RENDER,
     WORK_ENCAVCODEC,
-    WORK_ENCXVID,
     WORK_ENCX264,
     WORK_ENCTHEORA,
     WORK_DECA52,
@@ -236,7 +271,8 @@ enum
     WORK_DECLPCM,
     WORK_ENCFAAC,
     WORK_ENCLAME,
-    WORK_ENCVORBIS
+    WORK_ENCVORBIS,
+    WORK_ENC_CA_AAC
 };
 
 enum