X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fcommon.h;h=1cf6cdb597ca20dd2116cb037b8c959762ad840f;hb=df549f07f39e6eb545562d043179ca795d2161c4;hp=0bd8971e388127dc40ecc2310fe2097f19de0264;hpb=db27e0f2df5e2a09a9a664aa35dfe9a6f5cdcff2;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/common.h b/libhb/common.h index 0bd8971e..1cf6cdb5 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -7,6 +7,7 @@ #ifndef HB_COMMON_H #define HB_COMMON_H +#include #include #include #include @@ -26,10 +27,14 @@ #define EVEN( a ) ( (a) + ( (a) & 1 ) ) #define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) ) +#define MULTIPLE_MOD( a, b ) ( b * ( ( (a) + (b / 2) ) / b ) ) + +#define HB_DVD_READ_BUFFER_SIZE 2048 typedef struct hb_handle_s hb_handle_t; typedef struct hb_list_s hb_list_t; typedef struct hb_rate_s hb_rate_t; +typedef struct hb_mixdown_s hb_mixdown_t; typedef struct hb_job_s hb_job_t; typedef struct hb_title_s hb_title_t; typedef struct hb_chapter_s hb_chapter_t; @@ -39,6 +44,8 @@ typedef struct hb_state_s hb_state_t; typedef union hb_esconfig_u hb_esconfig_t; typedef struct hb_work_private_s hb_work_private_t; typedef struct hb_work_object_s hb_work_object_t; +typedef struct hb_filter_private_s hb_filter_private_t; +typedef struct hb_filter_object_s hb_filter_object_t; typedef struct hb_buffer_s hb_buffer_t; typedef struct hb_fifo_s hb_fifo_t; typedef struct hb_lock_s hb_lock_t; @@ -55,6 +62,8 @@ void hb_list_rem( hb_list_t *, void * ); void * hb_list_item( hb_list_t *, int ); void hb_list_close( hb_list_t ** ); +void hb_reduce( int *x, int *y, int num, int den ); + #define HB_KEEP_WIDTH 0 #define HB_KEEP_HEIGHT 1 void hb_fix_aspect( hb_job_t * job, int keep ); @@ -67,23 +76,38 @@ struct hb_rate_s int rate; }; +struct hb_mixdown_s +{ + char * human_readable_name; + char * internal_name; + char * short_name; + int amixdown; +}; + #define HB_ASPECT_BASE 9 #define HB_VIDEO_RATE_BASE 27000000 -extern hb_rate_t hb_video_rates[]; -extern int hb_video_rates_count; -extern hb_rate_t hb_audio_rates[]; -extern int hb_audio_rates_count; -extern int hb_audio_rates_default; -extern hb_rate_t hb_audio_bitrates[]; -extern int hb_audio_bitrates_count; -extern int hb_audio_bitrates_default; +extern hb_rate_t hb_video_rates[]; +extern int hb_video_rates_count; +extern hb_rate_t hb_audio_rates[]; +extern int hb_audio_rates_count; +extern int hb_audio_rates_default; +extern hb_rate_t hb_audio_bitrates[]; +extern int hb_audio_bitrates_count; +extern int hb_audio_bitrates_default; +extern hb_mixdown_t hb_audio_mixdowns[]; +extern int hb_audio_mixdowns_count; +int hb_mixdown_get_mixdown_from_short_name( const char * short_name ); +const char * hb_mixdown_get_short_name_from_mixdown( int amixdown ); /****************************************************************************** * hb_job_t: settings to be filled by the UI *****************************************************************************/ struct hb_job_s { + /* ID assigned by UI so it can groups job passes together */ + int sequence_id; + /* Pointer to the title to be ripped */ hb_title_t * title; @@ -91,26 +115,47 @@ struct hb_job_s int chapter_start; int chapter_end; + /* Include chapter marker track in mp4? */ + int chapter_markers; + /* Picture settings: - crop: must be multiples of 2 (top/bottom/left/right) - deinterlace: 0 or 1 - width: must be a multiple of 16 - height: must be a multiple of 16 - keep_ratio: used by UIs */ + crop: must be multiples of 2 (top/bottom/left/right) + deinterlace: 0 or 1 + width: must be a multiple of 16 + height: must be a multiple of 16 + keep_ratio: used by UIs + pixel_ratio: store pixel aspect ratio in the video + pixel_aspect_width: numerator for pixel aspect ratio + pixel_aspect_height: denominator for pixel aspect ratio + maxWidth: keep width below this + maxHeight: keep height below this */ + int crop[4]; int deinterlace; + hb_list_t * filters; int width; int height; int keep_ratio; int grayscale; + int pixel_ratio; + int pixel_aspect_width; + int pixel_aspect_height; + int modulus; + int maxWidth; + int maxHeight; + /* Video settings: vcodec: output codec vquality: output quality (0.0..1.0) if < 0.0 or > 1.0, bitrate is used instead vbitrate: output bitrate (kbps) - pass: 0, 1 or 2 - vrate, vrate_base: output framerate is vrate / vrate_base */ + pass: 0, 1 or 2 (or -1 for scan) + vrate, vrate_base: output framerate is vrate / vrate_base + h264_level: boolean for whether or not we're encoding for iPod + crf: boolean for whether to use constant rate factor with x264 + x264opts: string of extra x264 options + areBframes: boolean to note if b-frames are included in x264opts */ #define HB_VCODEC_MASK 0x0000FF #define HB_VCODEC_FFMPEG 0x000001 #define HB_VCODEC_XVID 0x000002 @@ -123,12 +168,55 @@ struct hb_job_s int vrate_base; int pass; int h264_13; - int h264_level; - + int h264_level; + int crf; + char *x264opts; + int areBframes; + /* Audio tracks: - Indexes in hb_title_t's audios list, starting from 0. - -1 indicates the end of the list */ + audios: Indexes in hb_title_t's audios list, starting from 0. + -1 indicates the end of the list + audio_mixdowns: The mixdown to be used for each audio track in audios[] */ + +/* define some masks, used to extract the various information from the HB_AMIXDOWN_XXXX values */ +#define HB_AMIXDOWN_DCA_FORMAT_MASK 0x00FFF000 +#define HB_AMIXDOWN_A52_FORMAT_MASK 0x00000FF0 +#define HB_AMIXDOWN_DISCRETE_CHANNEL_COUNT_MASK 0x0000000F + +/* define the HB_AMIXDOWN_XXXX values */ + +#define HB_AMIXDOWN_MONO 0x01000001 +// DCA_FORMAT of DCA_MONO = 0 = 0x000 +// A52_FORMAT of A52_MONO = 1 = 0x01 +// discrete channel count of 1 + +#define HB_AMIXDOWN_STEREO 0x02002022 +// DCA_FORMAT of DCA_STEREO = 2 = 0x002 +// A52_FORMAT of A52_STEREO = 2 = 0x02 +// discrete channel count of 2 + +#define HB_AMIXDOWN_DOLBY 0x042070A2 +// DCA_FORMAT of DCA_3F1R | DCA_OUT_DPLI = 519 = 0x207 +// A52_FORMAT of A52_DOLBY = 10 = 0x0A +// discrete channel count of 2 + +#define HB_AMIXDOWN_DOLBYPLII 0x084094A2 +// DCA_FORMAT of DCA_3F2R | DCA_OUT_DPLII = 1033 = 0x409 +// A52_FORMAT of A52_DOLBY | A52_USE_DPLII = 74 = 0x4A +// discrete channel count of 2 + +#define HB_AMIXDOWN_6CH 0x10089176 +// DCA_FORMAT of DCA_3F2R | DCA_LFE = 137 = 0x089 +// A52_FORMAT of A52_3F2R | A52_LFE = 23 = 0x17 +// discrete channel count of 6 + +/* define some macros to extract the various information from the HB_AMIXDOWN_XXXX values */ +#define HB_AMIXDOWN_GET_DCA_FORMAT( a ) ( ( a & HB_AMIXDOWN_DCA_FORMAT_MASK ) >> 12 ) +#define HB_AMIXDOWN_GET_A52_FORMAT( a ) ( ( a & HB_AMIXDOWN_A52_FORMAT_MASK ) >> 4 ) +#define HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT( a ) ( ( a & HB_AMIXDOWN_DISCRETE_CHANNEL_COUNT_MASK ) ) + int audios[8]; + int audio_mixdowns[8]; /* Audio settings: acodec: output codec @@ -143,6 +231,7 @@ struct hb_job_s #define HB_ACODEC_AC3 0x000800 #define HB_ACODEC_MPGA 0x001000 #define HB_ACODEC_LPCM 0x002000 +#define HB_ACODEC_DCA 0x004000 int acodec; int abitrate; int arate; @@ -151,6 +240,7 @@ struct hb_job_s subtitle: index in hb_title_t's subtitles list, starting from 0. -1 means no subtitle */ int subtitle; + int subtitleSmartAdjust; /* Muxer settings mux: output file format @@ -161,9 +251,19 @@ struct hb_job_s #define HB_MUX_AVI 0x040000 #define HB_MUX_OGM 0x080000 #define HB_MUX_IPOD 0x100000 +#define HB_MUX_MKV 0x200000 int mux; - char * file; + const char * file; + + /* Allow MP4 files > 4 gigs */ + int largeFileSize; + + + int indepth_scan; + hb_subtitle_t ** select_subtitle; + int subtitle_force; + char * native_language; #ifdef __LIBHB__ /* Internal data */ @@ -194,10 +294,48 @@ struct hb_audio_s int id; char lang[1024]; char lang_simple[1024]; + char iso639_2[4]; int codec; int rate; int bitrate; - int channels; + + /* ac3flags is only set when the source audio format is HB_ACODEC_AC3 */ + int ac3flags; + + /* dcaflags is only set when the source audio format is HB_ACODEC_DCA */ + int dcaflags; + +/* define some masks, used to extract the various information from the HB_AMIXDOWN_XXXX values */ +#define HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK 0x00F0000 +#define HB_INPUT_CH_LAYOUT_DISCRETE_REAR_MASK 0x000F000 +#define HB_INPUT_CH_LAYOUT_DISCRETE_LFE_MASK 0x0000F00 +#define HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK 0xFFFF0FF +#define HB_INPUT_CH_LAYOUT_ENCODED_FRONT_MASK 0x00000F0 +#define HB_INPUT_CH_LAYOUT_ENCODED_REAR_MASK 0x000000F + +/* define the input channel layouts used to describe the channel layout of this audio */ +#define HB_INPUT_CH_LAYOUT_MONO 0x0110010 +#define HB_INPUT_CH_LAYOUT_STEREO 0x0220020 +#define HB_INPUT_CH_LAYOUT_DOLBY 0x0320031 +#define HB_INPUT_CH_LAYOUT_3F 0x0430030 +#define HB_INPUT_CH_LAYOUT_2F1R 0x0521021 +#define HB_INPUT_CH_LAYOUT_3F1R 0x0631031 +#define HB_INPUT_CH_LAYOUT_2F2R 0x0722022 +#define HB_INPUT_CH_LAYOUT_3F2R 0x0832032 +#define HB_INPUT_CH_LAYOUT_4F2R 0x0942042 +#define HB_INPUT_CH_LAYOUT_HAS_LFE 0x0000100 + +/* define some macros to extract the various information from the HB_AMIXDOWN_XXXX values */ +#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_FRONT_COUNT( a ) ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK ) >> 16 ) +#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_REAR_COUNT( a ) ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_REAR_MASK ) >> 12 ) +#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_LFE_COUNT( a ) ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_LFE_MASK ) >> 8 ) +#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( a ) ( ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK ) >> 16 ) + ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_REAR_MASK ) >> 12 ) + ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_LFE_MASK ) >> 8 ) ) +#define HB_INPUT_CH_LAYOUT_GET_ENCODED_FRONT_COUNT( a ) ( ( a & HB_INPUT_CH_LAYOUT_ENCODED_FRONT_MASK ) >> 4 ) +#define HB_INPUT_CH_LAYOUT_GET_ENCODED_REAR_COUNT( a ) ( ( a & HB_INPUT_CH_LAYOUT_ENCODED_REAR_MASK ) ) + + /* input_channel_layout is the channel layout of this audio */ + /* this is used to provide a common way of describing the source audio */ + int input_channel_layout; #ifdef __LIBHB__ /* Internal data */ @@ -208,6 +346,12 @@ struct hb_audio_s hb_esconfig_t config; hb_mux_data_t * mux_data; + + /* amixdown is the mixdown format to be used for this audio track */ + int amixdown; + + /* Source PID is only valid for MPEG Transport Streams */ + int source_pid; #endif }; @@ -227,12 +371,19 @@ struct hb_chapter_s /* Exact duration (in 1/90000s) */ uint64_t duration; + + /* Optional chapter title */ + char title[1024]; }; struct hb_subtitle_s { int id; char lang[1024]; + char iso639_2[4]; + + int hits; /* How many hits/occurrences of this subtitle */ + int forced_hits; /* How many forced hits in this subtitle */ #ifdef __LIBHB__ /* Internal data */ @@ -288,6 +439,7 @@ struct hb_state_s #define HB_STATE_WORKING 8 #define HB_STATE_PAUSED 16 #define HB_STATE_WORKDONE 32 +#define HB_STATE_MUXING 64 int state; union @@ -321,6 +473,11 @@ struct hb_state_s int error; } workdone; + struct + { + /* HB_STATE_MUXING */ + float progress; + } muxing; } param; }; @@ -339,12 +496,18 @@ struct hb_work_object_s hb_fifo_t * fifo_out; hb_esconfig_t * config; + /* amixdown is the mixdown format to be used if the work object is an audio track */ + int amixdown; + /* source_acodec is the source audio codec if the work object is an audio track */ + int source_acodec; + hb_work_private_t * private_data; hb_thread_t * thread; volatile int * done; hb_work_object_t * next; + int thread_sleep_interval; #endif }; @@ -356,10 +519,44 @@ extern hb_work_object_t hb_encavcodec; extern hb_work_object_t hb_encxvid; extern hb_work_object_t hb_encx264; extern hb_work_object_t hb_deca52; +extern hb_work_object_t hb_decdca; extern hb_work_object_t hb_decavcodec; extern hb_work_object_t hb_declpcm; extern hb_work_object_t hb_encfaac; extern hb_work_object_t hb_enclame; extern hb_work_object_t hb_encvorbis; +#define FILTER_OK 0 +#define FILTER_DELAY 1 +#define FILTER_FAILED 2 +#define FILTER_DROP 3 + +struct hb_filter_object_s +{ + int id; + char * name; + char * settings; + +#ifdef __LIBHB__ + hb_filter_private_t* (* init) ( int, int, int, char * ); + + int (* work) ( const hb_buffer_t *, hb_buffer_t **, + int, int, int, hb_filter_private_t * ); + + void (* close) ( hb_filter_private_t * ); + + hb_filter_private_t * private_data; + //hb_buffer_t * buffer; +#endif +}; + +extern hb_filter_object_t hb_filter_detelecine; +extern hb_filter_object_t hb_filter_deinterlace; +extern hb_filter_object_t hb_filter_deblock; +extern hb_filter_object_t hb_filter_denoise; + +typedef void hb_error_handler_t( const char *errmsg ); + +extern void hb_register_error_handler( hb_error_handler_t * handler ); + #endif