X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fcommon.h;h=808714ee7b5a7e968eba5c26d996fe7108f922a8;hb=d6a4ae73b86cca10f2342c9e26c132855cad6356;hp=73ebfda76d1a8a3b53afb7db9f1d4d3138f0b3bc;hpb=64a48a58d954017539afc5e4f1d5c6201873149e;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/common.h b/libhb/common.h index 73ebfda7..808714ee 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -55,6 +55,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; @@ -94,6 +95,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; @@ -108,6 +114,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[]; @@ -171,6 +187,7 @@ struct hb_job_s int par_height; int dar_width; int dar_height; + int keep_display_aspect; } anamorphic; int maxWidth; @@ -183,9 +200,7 @@ 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 @@ -193,9 +208,8 @@ struct hb_job_s 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; @@ -215,11 +229,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 @@ -240,10 +252,8 @@ 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_stop; // declare eof when we hit this frame @@ -291,6 +301,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 */ @@ -422,6 +433,8 @@ struct hb_audio_s struct hb_chapter_s { int index; + int pgcn; + int pgn; int cell_start; int cell_end; int block_start; @@ -443,6 +456,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 */ @@ -453,7 +472,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 }; @@ -632,7 +654,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; @@ -640,18 +665,21 @@ 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_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; @@ -664,6 +692,7 @@ 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_encca_aac; #define FILTER_OK 0 #define FILTER_DELAY 1