X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fcommon.h;h=416a93eb6f2ad47512ad9a56398d53d4eb23aee9;hb=82b355cdf1fee6612f0e165d6c8ea96b17b50514;hp=e78f71bd8e0a0db83b004e3053be9732d5d2a837;hpb=8888fe1daf29d0194b6958f544125fb7036a9e03;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/common.h b/libhb/common.h index e78f71bd..416a93eb 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -28,6 +28,8 @@ #define EVEN( a ) ( (a) + ( (a) & 1 ) ) #define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) ) +#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; @@ -41,6 +43,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; @@ -124,6 +128,7 @@ struct hb_job_s int crop[4]; int deinterlace; + hb_list_t * filters; int width; int height; int keep_ratio; @@ -140,12 +145,12 @@ struct hb_job_s 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 + 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 */ + 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 @@ -158,44 +163,56 @@ struct hb_job_s int vrate_base; int pass; int h264_13; - int h264_level; - int crf; - char *x264opts; - int areBframes; - + int h264_level; + int crf; + char *x264opts; + int areBframes; + /* Audio tracks: 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[] */ + 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_A52_FORMAT_MASK 0x00FF0000 -#define HB_AMIXDOWN_DISCRETE_CHANNEL_COUNT_MASK 0x0000F000 -#define HB_AMIXDOWN_FRONT_CHANNEL_COUNT_MASK 0x00000F00 -#define HB_AMIXDOWN_REAR_CHANNEL_COUNT_MASK 0x000000F0 -#define HB_AMIXDOWN_LFE_CHANNEL_COUNT_MASK 0x0000000F +#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 0x01011100 // A52_FORMAT of A52_MONO = 1 = 0x01 -#define HB_AMIXDOWN_STEREO 0x02022200 // A52_FORMAT of A52_STEREO = 2 = 0x02 -#define HB_AMIXDOWN_DOLBY 0x040A2310 // A52_FORMAT of A52_DOLBY = 10 = 0x0A -#define HB_AMIXDOWN_DOLBYPLII 0x084A2320 // A52_FORMAT of A52_DOLBY | A52_USE_DPLII = 74 = 0x4A -#define HB_AMIXDOWN_6CH 0x10176321 // A52_FORMAT of A52_3F2R | A52_LFE = 23 = 0x17 + +#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_A52_FORMAT( a ) ( ( a & HB_AMIXDOWN_A52_FORMAT_MASK ) >> 16 ) -#define HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT( a ) ( ( a & HB_AMIXDOWN_DISCRETE_CHANNEL_COUNT_MASK ) >> 12 ) -#define HB_AMIXDOWN_GET_FRONT_CHANNEL_COUNT( a ) ( ( a & HB_AMIXDOWN_FRONT_CHANNEL_COUNT_MASK ) >> 8 ) -#define HB_AMIXDOWN_GET_REAR_CHANNEL_COUNT( a ) ( ( a & HB_AMIXDOWN_REAR_CHANNEL_COUNT_MASK ) >> 4 ) -#define HB_AMIXDOWN_GET_LFE_CHANNEL_COUNT( a ) ( ( a & HB_AMIXDOWN_LFE_CHANNEL_COUNT_MASK ) ) -#define HB_AMIXDOWN_GET_NORMAL_CHANNEL_COUNT( a ) ( (( a & HB_AMIXDOWN_FRONT_CHANNEL_COUNT_MASK ) >> 8) + (( a & HB_AMIXDOWN_REAR_CHANNEL_COUNT_MASK ) >> 4) ) +#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]; - /* this "surround" property will be removed shortly, - as soon as the AMIXDOWN code has been integrated into the Mac GUI - it's still included here to avoid breaking the Mac GUI short-term - however, it won't be applied in deca52.c etc. any more */ - int surround; - /* Audio settings: acodec: output codec abitrate: output bitrate (kbps) @@ -209,6 +226,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; @@ -217,6 +235,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 @@ -227,10 +246,20 @@ 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; const char * file; + /* Allow MP4 files > 4 gigs */ + int largeFileSize; + + + int subtitle_scan; + hb_subtitle_t ** select_subtitle; + int subtitle_force; + char * native_language; + #ifdef __LIBHB__ /* Internal data */ hb_handle_t * h; @@ -264,20 +293,45 @@ struct hb_audio_s int codec; int rate; int bitrate; - /* src_discrete_front_channels: The # of discrete front channels in the source audio - src_discrete_rear_channels: The # of discrete rear channels in the source audio - src_discrete_lfe_channels: The # of discrete lfe channels in the source audio - src_encoded_front_channels: The # of front channels encoded into the source audio - src_encoded_rear_channels: The # of rear channels encoded into the source audio */ - int src_discrete_front_channels; - int src_discrete_rear_channels; - int src_discrete_lfe_channels; - int src_encoded_front_channels; - int src_encoded_rear_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 */ hb_fifo_t * fifo_in; /* AC3/MPEG/LPCM ES */ @@ -291,6 +345,8 @@ struct hb_audio_s /* 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 }; @@ -310,6 +366,9 @@ struct hb_chapter_s /* Exact duration (in 1/90000s) */ uint64_t duration; + + /* Optional chapter title */ + char title[1024]; }; struct hb_subtitle_s @@ -318,6 +377,9 @@ struct hb_subtitle_s 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 */ hb_fifo_t * fifo_in; /* SPU ES */ @@ -431,6 +493,8 @@ struct hb_work_object_s /* 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; @@ -450,10 +514,40 @@ 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; + #endif