X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Finternal.h;h=135d73fcc328e5b7e818d8fafef9d41ed87b39f4;hb=55b0015a8c50106e553bc2f48336cc2a1c495459;hp=d21a281e0b9cac89b69c59832c278b62cb5de494;hpb=4318591edb12c04004d3c40dbab887b97279d770;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/internal.h b/libhb/internal.h index d21a281e..135d73fc 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 ); @@ -38,19 +38,36 @@ void hb_set_state( hb_handle_t *, hb_state_t * ); /*********************************************************************** * fifo.c **********************************************************************/ +/* + * Holds a packet of data that is moving through the transcoding process. + * + * May have metadata associated with it via extra fields + * that are conditionally used depending on the type of packet. + */ struct hb_buffer_s { - int size; - int alloc; - uint8_t * data; - int cur; - + int size; // size of this packet + int alloc; // used internally by the packet allocator (hb_buffer_init) + uint8_t * data; // packet data + int cur; // used internally by packet lists (hb_list_t) + + /* + * Corresponds to the order that this packet was read from the demuxer. + * + * It is important that video decoder work-objects pass this value through + * from their input packets to the output packets they generate. Otherwise + * RENDERSUB subtitles (especially VOB subtitles) will break. + * + * Subtitle decoder work-objects that output a renderable subtitle + * format (ex: PICTURESUB) must also be careful to pass the sequence number + * through for the same reason. + */ int64_t sequence; - int id; - int64_t start; - int64_t stop; - int new_chap; + int id; // ID of the track that the packet comes from + int64_t start; // Video and subtitle packets: start time of frame/subtitle + int64_t stop; // Video and subtitle packets: stop time of frame/subtitle + int new_chap; // Video packets: if non-zero, is the index of the chapter whose boundary was crossed #define HB_FRAME_IDR 0x01 #define HB_FRAME_I 0x02 @@ -66,13 +83,20 @@ struct hb_buffer_s /* Holds the output PTS from x264, for use by b-frame offsets in muxmp4.c */ int64_t renderOffset; + // VOB subtitle packets: + // Location and size of the subpicture. int x; int y; int width; int height; + // Video packets (after processing by the hb_sync_video work-object): + // A (copy of a) VOB subtitle packet that needs to be burned into this video packet by the hb_render work-object. + // Subtitles that are simply passed thru are NOT attached to the associated video packets. hb_buffer_t * sub; + // Packets in a list: + // the next packet in the list hb_buffer_t * next; }; @@ -85,16 +109,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,24 +161,30 @@ 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 { 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; @@ -161,27 +197,49 @@ 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 ); + +/*********************************************************************** + * 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 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 ); +int hb_dvd_main_feature( hb_dvd_t * d, hb_list_t * list_title ); hb_stream_t * hb_stream_open( char * path, hb_title_t *title ); 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 ); @@ -228,7 +286,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 @@ -241,12 +303,18 @@ 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_DECUTF8SUB, + WORK_DECTX3GSUB, + WORK_DECSSASUB, + WORK_ENCVOBSUB, WORK_RENDER, WORK_ENCAVCODEC, - WORK_ENCXVID, WORK_ENCX264, WORK_ENCTHEORA, WORK_DECA52, @@ -258,7 +326,9 @@ enum WORK_DECLPCM, WORK_ENCFAAC, WORK_ENCLAME, - WORK_ENCVORBIS + WORK_ENCVORBIS, + WORK_ENC_CA_AAC, + WORK_MUX }; enum @@ -267,7 +337,8 @@ enum FILTER_DEBLOCK, FILTER_DENOISE, FILTER_DETELECINE, - FILTER_DECOMB + FILTER_DECOMB, + FILTER_ROTATE }; extern hb_work_object_t * hb_objects;