X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fcommon.h;h=0c06ba967faaf1c3a2869b0aed729d15e417a97a;hb=f93c2a10768843b2f8900695bb1ab276ffc168ab;hp=1121ae8eccb0029d92f7f3519b5dd3a87da29750;hpb=746a8e0074297794f4dd1eeae4d463cd939057ab;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/common.h b/libhb/common.h index 1121ae8e..0c06ba96 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -18,6 +18,26 @@ #include #include +#if defined( __GNUC__ ) && !(defined( _WIN32 ) || defined( __MINGW32__ )) +# define HB_WPRINTF(s,v) __attribute__((format(printf,s,v))) +#else +# define HB_WPRINTF(s,v) +#endif + +#if defined( SYS_MINGW ) +# define fseek fseeko64 +# define ftell ftello64 +# undef fseeko +# define fseeko fseeko64 +# undef ftello +# define ftello ftello64 +# define flockfile(...) +# define funlockfile(...) +# define getc_unlocked getc +# undef off_t +# define off_t off64_t +#endif + #ifndef MIN #define MIN( a, b ) ( (a) > (b) ? (b) : (a) ) #endif @@ -27,7 +47,7 @@ #define EVEN( a ) ( (a) + ( (a) & 1 ) ) #define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) ) -#define MULTIPLE_MOD( a, b ) ( b * ( ( (a) + (b / 2) - 1) / b ) ) +#define MULTIPLE_MOD( a, b ) ((b==1)?a:( b * ( ( (a) + (b / 2) - 1) / b ) )) #define HB_DVD_READ_BUFFER_SIZE 2048 @@ -41,6 +61,7 @@ typedef struct hb_chapter_s hb_chapter_t; typedef struct hb_audio_s hb_audio_t; typedef struct hb_audio_config_s hb_audio_config_t; typedef struct hb_subtitle_s hb_subtitle_t; +typedef struct hb_subtitle_config_s hb_subtitle_config_t; typedef struct hb_metadata_s hb_metadata_t; typedef struct hb_state_s hb_state_t; typedef union hb_esconfig_u hb_esconfig_t; @@ -80,6 +101,11 @@ void hb_audio_config_init(hb_audio_config_t * audiocfg); int hb_audio_add(const hb_job_t * job, const hb_audio_config_t * audiocfg); hb_audio_config_t * hb_list_audio_config_item(hb_list_t * list, int i); +int hb_subtitle_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, int track); +int hb_srt_add(const hb_job_t * job, const hb_subtitle_config_t * subtitlecfg, + const char *lang); + + struct hb_rate_s { char * string; @@ -94,6 +120,16 @@ struct hb_mixdown_s int amixdown; }; +struct hb_subtitle_config_s +{ + enum subdest { RENDERSUB, PASSTHRUSUB } dest; + int force; + int default_track; + char src_filename[128]; + char src_codeset[40]; + int64_t offset; +}; + #define HB_VIDEO_RATE_BASE 27000000 extern hb_rate_t hb_video_rates[]; @@ -130,14 +166,14 @@ struct hb_job_s /* 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 + width: must be a multiple of 2 + height: must be a multiple of 2 keep_ratio: used by UIs grayscale: black and white encoding 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 - modulus: set a number besides 16 for dimensions to be multiples of + modulus: set a number for dimensions to be multiples of maxWidth: keep width below this maxHeight: keep height below this */ int crop[4]; @@ -151,14 +187,15 @@ struct hb_job_s struct { int mode; - int modulus; int itu_par; int par_width; int par_height; int dar_width; int dar_height; + int keep_display_aspect; } anamorphic; - + + int modulus; int maxWidth; int maxHeight; @@ -169,19 +206,15 @@ struct hb_job_s except with x264, to use its real QP/RF scale vbitrate: output bitrate (kbps) vrate, vrate_base: output framerate is vrate / vrate_base - vfr: boolean for variable frame rate detelecine - cfr: boolean to use constant frame rates instead of - passing through the source's frame durations. + cfr: 0 (vfr), 1 (cfr), 2 (pfr) [see render.c] pass: 0, 1 or 2 (or -1 for scan) h264_level: vestigial boolean to decide if 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 -#define HB_VCODEC_X264 0x000004 -#define HB_VCODEC_THEORA 0x000008 +#define HB_VCODEC_X264 0x000002 +#define HB_VCODEC_THEORA 0x000004 int vcodec; float vquality; @@ -193,7 +226,6 @@ struct hb_job_s int pass; int h264_13; int h264_level; - int crf; char *x264opts; int areBframes; int color_matrix; @@ -201,11 +233,9 @@ struct hb_job_s /* List of audio settings. */ hb_list_t * list_audio; - /* Subtitle settings: - subtitle: index in hb_title_t's subtitles list, starting - from 0. -1 means no subtitle */ - int subtitle; - int subtitleSmartAdjust; + /* Subtitles + */ + hb_list_t * list_subtitle; /* Muxer settings mux: output file format @@ -226,11 +256,14 @@ struct hb_job_s int mp4_optimize; int ipod_atom; - int indepth_scan; - hb_subtitle_t ** select_subtitle; - int subtitle_force; - char * native_language; + int indepth_scan; + hb_subtitle_config_t select_subtitle_config; + int angle; // dvd angle to encode + int frame_to_start; // declare eof when we hit this frame + int64_t pts_to_start; // drop frames until we pass this pts + // in the time-linearized input stream + int frame_to_stop; // declare eof when we hit this frame int64_t pts_to_stop; // declare eof when we pass this pts in // the time-linearized input stream int start_at_preview; // if non-zero, encoding will start @@ -247,6 +280,9 @@ struct hb_job_s volatile int * die; volatile int done; + uint64_t st_pause_date; + uint64_t st_paused; + hb_fifo_t * fifo_mpeg2; /* MPEG-2 video ES */ hb_fifo_t * fifo_raw; /* Raw pictures */ hb_fifo_t * fifo_sync; /* Raw pictures, framerate corrected */ @@ -254,7 +290,6 @@ struct hb_job_s hb_fifo_t * fifo_mpeg4; /* MPEG-4 video ES */ hb_thread_t * reader; - hb_thread_t * muxer; hb_list_t * list_work; @@ -275,6 +310,7 @@ struct hb_job_s #define HB_ACODEC_LPCM 0x002000 #define HB_ACODEC_DCA 0x004000 #define HB_ACODEC_FFMPEG 0x008000 +#define HB_ACODEC_CA_AAC 0x010000 /* Audio Mixdown */ /* define some masks, used to extract the various information from the HB_AMIXDOWN_XXXX values */ @@ -406,6 +442,8 @@ struct hb_audio_s struct hb_chapter_s { int index; + int pgcn; + int pgn; int cell_start; int cell_end; int block_start; @@ -427,6 +465,12 @@ struct hb_chapter_s struct hb_subtitle_s { int id; + int track; + + hb_subtitle_config_t config; + + enum subtype { PICTURESUB, TEXTSUB } format; + enum subsource { VOBSUB, SRTSUB, CC608SUB, CC708SUB } source; char lang[1024]; char iso639_2[4]; uint8_t type; /* Closed Caption, Childrens, Directors etc */ @@ -437,7 +481,10 @@ struct hb_subtitle_s #ifdef __LIBHB__ /* Internal data */ hb_fifo_t * fifo_in; /* SPU ES */ - hb_fifo_t * fifo_raw; /* Decodec SPU */ + hb_fifo_t * fifo_raw; /* Decoded SPU */ + hb_fifo_t * fifo_sync;/* Synced */ + hb_fifo_t * fifo_out; /* Correct Timestamps, ready to be muxed */ + hb_mux_data_t * mux_data; #endif }; @@ -450,14 +497,14 @@ struct hb_metadata_s char comment[1024]; char album[255]; char genre[255]; - enum arttype {UNKNOWN, BMP, GIF87A, GIF89A, JPG, PNG, TIFFL, TIFFB} coverart_type; uint32_t coverart_size; uint8_t *coverart; }; struct hb_title_s { - char dvd[1024]; + enum { HB_DVD_TYPE, HB_STREAM_TYPE } type; + char path[1024]; char name[1024]; int index; int vts; @@ -467,6 +514,7 @@ struct hb_title_s int block_start; int block_end; int block_count; + int angle_count; /* Visual-friendly duration */ int hours; @@ -521,6 +569,7 @@ struct hb_state_s #define HB_STATE_PAUSED 16 #define HB_STATE_WORKDONE 32 #define HB_STATE_MUXING 64 +#define HB_STATE_SEARCHING 128 int state; union @@ -616,7 +665,10 @@ struct hb_work_object_s hb_esconfig_t * config; /* Pointer hb_audio_t so we have access to the info in the audio worker threads. */ - hb_audio_t *audio; + hb_audio_t * audio; + + /* Pointer hb_subtitle_t so we have access to the info in the subtitle worker threads. */ + hb_subtitle_t * subtitle; hb_work_private_t * private_data; @@ -624,18 +676,22 @@ struct hb_work_object_s volatile int * done; int status; int codec_param; + hb_title_t * title; hb_work_object_t * next; - int thread_sleep_interval; + int thread_sleep_interval; #endif }; -extern hb_work_object_t hb_sync; +extern hb_work_object_t hb_sync_video; +extern hb_work_object_t hb_sync_audio; extern hb_work_object_t hb_decmpeg2; -extern hb_work_object_t hb_decsub; +extern hb_work_object_t hb_decvobsub; +extern hb_work_object_t hb_encvobsub; +extern hb_work_object_t hb_deccc608; +extern hb_work_object_t hb_decsrtsub; extern hb_work_object_t hb_render; 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_enctheora; extern hb_work_object_t hb_deca52; @@ -648,6 +704,8 @@ 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; +extern hb_work_object_t hb_muxer; +extern hb_work_object_t hb_encca_aac; #define FILTER_OK 0 #define FILTER_DELAY 1 @@ -678,9 +736,12 @@ extern hb_filter_object_t hb_filter_deinterlace; extern hb_filter_object_t hb_filter_deblock; extern hb_filter_object_t hb_filter_denoise; extern hb_filter_object_t hb_filter_decomb; +extern hb_filter_object_t hb_filter_rotate; typedef void hb_error_handler_t( const char *errmsg ); extern void hb_register_error_handler( hb_error_handler_t * handler ); +char * hb_strdup_printf( char * fmt, ... ); + #endif