X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Finternal.h;h=9a03074bf21510c55205d4adbe92e1e1f095a45c;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=5d7f654bbe47b08c857afb97a7dfcedffb90556c;hpb=4b7a67719d6766455c86e47e0396582692a0d74f;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/internal.h b/libhb/internal.h index 5d7f654b..9a03074b 100644 --- a/libhb/internal.h +++ b/libhb/internal.h @@ -7,16 +7,16 @@ /*********************************************************************** * 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 { - HB_SUPPORT_LOG = 1, // Logging helpful in tech support - HB_MEMORY_LOG = 2, // logging about memory usage - HB_GRANULAR_LOG = 3 // logging on sample-by-sample + 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, ...); +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 ); @@ -96,12 +96,44 @@ 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 * ); @@ -115,36 +147,51 @@ 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 ** ); 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_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 ); @@ -191,7 +238,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 @@ -206,10 +257,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, @@ -221,7 +274,8 @@ enum WORK_DECLPCM, WORK_ENCFAAC, WORK_ENCLAME, - WORK_ENCVORBIS + WORK_ENCVORBIS, + WORK_ENC_CA_AAC }; enum