X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Finternal.h;h=fa3fe86f682dd5aa6ea6b68acc1ae6d2daaf84fe;hb=c5c381e3579de78ead6a777da6c8b934aeaba19e;hp=39364fcd3afd938001e59d844eeae6a87ac5eb3a;hpb=e27fb1a19129ca0ec31571e0f6c9db8c79ce20e2;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/internal.h b/libhb/internal.h index 39364fcd..fa3fe86f 100644 --- a/libhb/internal.h +++ b/libhb/internal.h @@ -8,6 +8,14 @@ * common.c **********************************************************************/ void hb_log( char * log, ... ); +extern int global_verbosity_level; // Global variable for hb_deep_log +typedef enum hb_debug_level_s +{ + HB_SUPPORT_LOG = 1, // helpful in tech support + 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, ...); int hb_list_bytes( hb_list_t * ); @@ -85,45 +93,77 @@ hb_buffer_t * hb_fifo_get( hb_fifo_t * ); hb_buffer_t * hb_fifo_see( 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_head( hb_fifo_t *, hb_buffer_t * ); void hb_fifo_close( hb_fifo_t ** ); +// this routine gets a buffer for an uncompressed YUV420 video frame +// with dimensions width x height. +static inline hb_buffer_t * hb_video_buffer_init( int width, int height ) +{ + // Y requires w x h bytes. U & V each require (w+1)/2 x + // (h+1)/2 bytes (the "+1" is to round up). We shift rather + // than divide by 2 since the compiler can't know these ints + // are positive so it generates very expensive integer divides + // if we do "/2". The code here matches the calculation for + // PIX_FMT_YUV420P in ffmpeg's avpicture_fill() which is required + // for most of HB's filters to work right. + return hb_buffer_init( width * height + ( ( width+1 ) >> 1 ) * + ( ( 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 * ); hb_thread_t * hb_muxer_init( hb_job_t * ); - -/*********************************************************************** - * libmpeg2 wrapper - *********************************************************************** - * It is exported here because it is used at several places - **********************************************************************/ -typedef struct hb_libmpeg2_s hb_libmpeg2_t; - -hb_libmpeg2_t * hb_libmpeg2_init(); -int hb_libmpeg2_decode( hb_libmpeg2_t *, - hb_buffer_t * es_buf, - hb_list_t * raw_list ); -void hb_libmpeg2_info( hb_libmpeg2_t * m, int * width, - int * height, int * rate, int * aspect_ratio ); -void hb_libmpeg2_close( hb_libmpeg2_t ** ); -int hb_libmpeg2_clear_aspect_ratio( hb_libmpeg2_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 ); /*********************************************************************** * mpegdemux.c **********************************************************************/ typedef struct { int64_t last_scr; /* unadjusted SCR from most recent pack */ - int64_t scr_offset; /* discontinuity correction adjustment */ + int64_t last_pts; /* last pts we saw */ int scr_changes; /* number of SCR discontinuities */ + 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 @@ -142,12 +182,15 @@ int hb_dvd_chapter( hb_dvd_t * ); int hb_dvd_is_break( hb_dvd_t * d ); void hb_dvd_close( hb_dvd_t ** ); -hb_stream_t * hb_stream_open( char * path, int opentype ); +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 ); +void * hb_ffmpeg_context( int codec_param ); +void * hb_ffmpeg_avstream( int codec_param ); + /*********************************************************************** * Work objects **********************************************************************/ @@ -167,6 +210,7 @@ union hb_esconfig_u int sps_length; uint8_t pps[HB_CONFIG_MAX_SIZE]; int pps_length; + uint32_t init_delay; } h264; struct @@ -189,7 +233,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 @@ -213,6 +261,9 @@ enum WORK_DECA52, WORK_DECDCA, WORK_DECAVCODEC, + WORK_DECAVCODECV, + WORK_DECAVCODECVI, + WORK_DECAVCODECAI, WORK_DECLPCM, WORK_ENCFAAC, WORK_ENCLAME,