X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Finternal.h;h=8223ebfbab8c65a9d8d6401ba4f8a980f15bb894;hb=3e441ebb595c36a1f2f029e4ce907bb1bffaea50;hp=7d7594802a5d40644cee096741273ef2cb946a42;hpb=67a2494fca9ce3c00649d967f15300a505143fe6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/internal.h b/libhb/internal.h
index 7d759480..8223ebfb 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -7,7 +7,7 @@
 /***********************************************************************
  * common.c
  **********************************************************************/
-void hb_log( char * log, ... );
+void hb_log( char * log, ... ) HB_WPRINTF(1,2);
 extern int global_verbosity_level; // Global variable for hb_deep_log
 typedef enum hb_debug_level_s
 {
@@ -15,8 +15,8 @@ typedef enum hb_debug_level_s
     HB_HOUSEKEEPING_LOG = 2, // stuff we hate scrolling through  
     HB_GRANULAR_LOG     = 3  // sample-by-sample
 } hb_debug_level_t;
-void hb_deep_log( hb_debug_level_t level, char * log, ... );
-void hb_error( char * fmt, ...);
+void hb_deep_log( hb_debug_level_t level, char * log, ... ) HB_WPRINTF(2,3);
+void hb_error( char * fmt, ...) HB_WPRINTF(1,2);
 
 int  hb_list_bytes( hb_list_t * );
 void hb_list_seebytes( hb_list_t * l, uint8_t * dst, int size );
@@ -85,16 +85,22 @@ void          hb_buffer_close( hb_buffer_t ** );
 void          hb_buffer_copy_settings( hb_buffer_t * dst,
                                        const hb_buffer_t * src );
 
-hb_fifo_t   * hb_fifo_init();
+hb_fifo_t   * hb_fifo_init( int capacity, int thresh );
 int           hb_fifo_size( hb_fifo_t * );
+int           hb_fifo_size_bytes( hb_fifo_t * );
 int           hb_fifo_is_full( hb_fifo_t * );
 float         hb_fifo_percent_full( hb_fifo_t * f );
 hb_buffer_t * hb_fifo_get( hb_fifo_t * );
+hb_buffer_t * hb_fifo_get_wait( hb_fifo_t * );
 hb_buffer_t * hb_fifo_see( hb_fifo_t * );
+hb_buffer_t * hb_fifo_see_wait( hb_fifo_t * );
 hb_buffer_t * hb_fifo_see2( hb_fifo_t * );
 void          hb_fifo_push( hb_fifo_t *, hb_buffer_t * );
+void          hb_fifo_push_wait( hb_fifo_t *, hb_buffer_t * );
+int           hb_fifo_full_wait( hb_fifo_t * f );
 void          hb_fifo_push_head( hb_fifo_t *, hb_buffer_t * );
 void          hb_fifo_close( hb_fifo_t ** );
+void          hb_fifo_flush( hb_fifo_t * f );
 
 // this routine gets a buffer for an uncompressed YUV420 video frame
 // with dimensions width x height.
@@ -131,18 +137,24 @@ static inline void hb_buffer_swap_copy( hb_buffer_t *src, hb_buffer_t *dst )
  * 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 preview_count, int store_previews );
+hb_thread_t * hb_scan_init( hb_handle_t *, volatile int * die, 
+                            const char * path, 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 * );
-hb_thread_t  * hb_muxer_init( hb_job_t * );
+hb_work_object_t * hb_muxer_init( hb_job_t * );
 hb_work_object_t * hb_get_work( int );
 hb_work_object_t * hb_codec_decoder( int );
 hb_work_object_t * hb_codec_encoder( int );
 
 /***********************************************************************
+ * sync.c
+ **********************************************************************/
+hb_work_object_t * hb_sync_init( hb_job_t * job );
+
+/***********************************************************************
  * mpegdemux.c
  **********************************************************************/
 typedef struct {
@@ -166,6 +178,16 @@ extern const hb_muxer_t hb_demux[];
 extern void decmetadata( hb_title_t *title );
 
 /***********************************************************************
+ * batch.c
+ **********************************************************************/
+typedef struct hb_batch_s hb_batch_t;
+
+hb_batch_t  * hb_batch_init( char * path );
+void          hb_batch_close( hb_batch_t ** _d );
+int           hb_batch_title_count( hb_batch_t * d );
+hb_title_t  * hb_batch_title_scan( hb_batch_t * d, int t );
+
+/***********************************************************************
  * dvd.c
  **********************************************************************/
 typedef union  hb_dvd_s hb_dvd_t;
@@ -189,6 +211,10 @@ void		 hb_stream_close( hb_stream_t ** );
 hb_title_t * hb_stream_title_scan( hb_stream_t *);
 int          hb_stream_read( hb_stream_t *, hb_buffer_t *);
 int          hb_stream_seek( hb_stream_t *, float );
+int          hb_stream_seek_ts( hb_stream_t * stream, int64_t ts );
+int          hb_stream_seek_chapter( hb_stream_t *, int );
+int          hb_stream_chapter( hb_stream_t * );
+
 
 void       * hb_ffmpeg_context( int codec_param );
 void       * hb_ffmpeg_avstream( int codec_param );
@@ -252,12 +278,15 @@ union hb_esconfig_u
 
 enum
 {
-    WORK_SYNC = 1,
+    WORK_SYNC_VIDEO = 1,
+    WORK_SYNC_AUDIO,
     WORK_DECMPEG2,
-    WORK_DECSUB,
+    WORK_DECCC608,
+    WORK_DECVOBSUB,
+    WORK_DECSRTSUB,
+    WORK_ENCVOBSUB,
     WORK_RENDER,
     WORK_ENCAVCODEC,
-    WORK_ENCXVID,
     WORK_ENCX264,
     WORK_ENCTHEORA,
     WORK_DECA52,
@@ -269,7 +298,9 @@ enum
     WORK_DECLPCM,
     WORK_ENCFAAC,
     WORK_ENCLAME,
-    WORK_ENCVORBIS
+    WORK_ENCVORBIS,
+    WORK_ENC_CA_AAC,
+    WORK_MUX
 };
 
 enum
@@ -278,7 +309,8 @@ enum
     FILTER_DEBLOCK,
     FILTER_DENOISE,
     FILTER_DETELECINE,
-    FILTER_DECOMB
+    FILTER_DECOMB,
+    FILTER_ROTATE
 };
 
 extern hb_work_object_t * hb_objects;