X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fcommon.h;h=2a3d070389db69f20e52747923a2be889220867d;hb=37bbf6c1646ca3b539d1b6f1b5f2a1bb779042a2;hp=cf1dc02d826b970ab487aa3ac50a0269c76e3cab;hpb=a9ba7b2e29125df32483cc79ab0315bcec728d9f;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/common.h b/libhb/common.h index cf1dc02d..2a3d0703 100644 --- a/libhb/common.h +++ b/libhb/common.h @@ -48,6 +48,7 @@ #define EVEN( a ) ( (a) + ( (a) & 1 ) ) #define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) ) #define MULTIPLE_MOD( a, b ) ((b==1)?a:( b * ( ( (a) + (b / 2) - 1) / b ) )) +#define MULTIPLE_MOD_DOWN( a, b ) ((b==1)?a:( b * ( (a) / b ) )) #define HB_DVD_READ_BUFFER_SIZE 2048 @@ -62,6 +63,7 @@ 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_attachment_s hb_attachment_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; @@ -101,10 +103,12 @@ 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); +hb_subtitle_t *hb_subtitle_copy(const hb_subtitle_t *src); 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); +hb_attachment_t *hb_attachment_copy(const hb_attachment_t *src); struct hb_rate_s { @@ -125,6 +129,8 @@ struct hb_subtitle_config_s enum subdest { RENDERSUB, PASSTHRUSUB } dest; int force; int default_track; + + /* SRT subtitle tracks only */ char src_filename[128]; char src_codeset[40]; int64_t offset; @@ -144,6 +150,12 @@ 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 ); +int hb_get_best_mixdown( uint32_t codec, int layout ); +int hb_get_default_mixdown( uint32_t codec, int layout ); +int hb_find_closest_audio_bitrate(int bitrate); +void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown, int *low, int *high); +int hb_get_best_audio_bitrate( uint32_t codec, int bitrate, int samplerate, int mixdown); +int hb_get_default_audio_bitrate( uint32_t codec, int samplerate, int mixdown ); /****************************************************************************** * hb_job_t: settings to be filled by the UI @@ -155,6 +167,7 @@ struct hb_job_s /* Pointer to the title to be ripped */ hb_title_t * title; + int feature; // Detected DVD feature title /* Chapter selection */ int chapter_start; @@ -190,8 +203,8 @@ struct hb_job_s int itu_par; int par_width; int par_height; - int dar_width; - int dar_height; + int dar_width; // 0 if normal + int dar_height; // 0 if normal int keep_display_aspect; } anamorphic; @@ -233,8 +246,7 @@ struct hb_job_s /* List of audio settings. */ hb_list_t * list_audio; - /* Subtitles - */ + /* Subtitles */ hb_list_t * list_subtitle; /* Muxer settings @@ -301,16 +313,21 @@ struct hb_job_s /* Audio starts here */ /* Audio Codecs */ -#define HB_ACODEC_MASK 0x00FF00 -#define HB_ACODEC_FAAC 0x000100 -#define HB_ACODEC_LAME 0x000200 -#define HB_ACODEC_VORBIS 0x000400 -#define HB_ACODEC_AC3 0x000800 -#define HB_ACODEC_MPGA 0x001000 -#define HB_ACODEC_LPCM 0x002000 -#define HB_ACODEC_DCA 0x004000 -#define HB_ACODEC_FFMPEG 0x008000 -#define HB_ACODEC_CA_AAC 0x010000 +#define HB_ACODEC_MASK 0x000FFF00 +#define HB_ACODEC_FAAC 0x00000100 +#define HB_ACODEC_LAME 0x00000200 +#define HB_ACODEC_VORBIS 0x00000400 +#define HB_ACODEC_AC3 0x00000800 +#define HB_ACODEC_MPGA 0x00001000 +#define HB_ACODEC_LPCM 0x00002000 +#define HB_ACODEC_DCA 0x00004000 +#define HB_ACODEC_FFMPEG 0x00008000 +#define HB_ACODEC_CA_AAC 0x00010000 +#define HB_ACODEC_PASS_FLAG 0x40000000 +#define HB_ACODEC_PASS_MASK (HB_ACODEC_AC3 | HB_ACODEC_DCA) +#define HB_ACODEC_AC3_PASS (HB_ACODEC_AC3 | HB_ACODEC_PASS_FLAG) +#define HB_ACODEC_DCA_PASS (HB_ACODEC_DCA | HB_ACODEC_PASS_FLAG) +#define HB_ACODEC_ANY (HB_ACODEC_MASK | HB_ACODEC_PASS_FLAG) /* Audio Mixdown */ /* define some masks, used to extract the various information from the HB_AMIXDOWN_XXXX values */ @@ -393,6 +410,7 @@ struct hb_audio_config_s { int track; /* Input track number */ PRIVATE uint32_t codec; /* Input audio codec */ + PRIVATE uint32_t stream_type; /* stream type from source stream */ PRIVATE uint32_t codec_param; /* per-codec config info */ PRIVATE uint32_t version; /* Bitsream version */ PRIVATE uint32_t mode; /* Bitstream mode, codec dependent encoding */ @@ -436,6 +454,7 @@ struct hb_audio_s hb_esconfig_t config; hb_mux_data_t * mux_data; + hb_fifo_t * scan_cache; } priv; }; #endif @@ -447,9 +466,9 @@ struct hb_chapter_s int pgn; int cell_start; int cell_end; - int block_start; - int block_end; - int block_count; + uint64_t block_start; + uint64_t block_end; + uint64_t block_count; /* Visual-friendly duration */ int hours; @@ -463,6 +482,34 @@ struct hb_chapter_s char title[1024]; }; +/* + * A subtitle track. + * + * Required fields when a demuxer creates a subtitle track are: + * > id + * - ID of this track + * - must be unique for all tracks within a single job, + * since it is used to look up the appropriate in-FIFO with GetFifoForId() + * > format + * - format of the packets the subtitle decoder work-object sends to sub->fifo_raw + * - for passthru subtitles, is also the format of the final packets sent to sub->fifo_out + * - PICTURESUB for banded 8-bit YAUV pixels; see decvobsub.c documentation for more info + * - TEXTSUB for UTF-8 text marked up with , , or + * - read by the muxers, and by the subtitle burn-in logic in the hb_sync_video work-object + * > source + * - used to create the appropriate subtitle decoder work-object in do_job() + * > config.dest + * - whether to render the subtitle on the video track (RENDERSUB) or + * to pass it through its own subtitle track in the output container (PASSTHRUSUB) + * - all newly created non-VOBSUB tracks should default to PASSTHRUSUB + * - all newly created VOBSUB tracks should default to RENDERSUB, for legacy compatibility + * > lang + * - user-readable description of the subtitle track + * - may correspond to the language of the track (see the 'iso639_2' field) + * - may correspond to the type of track (see the 'type' field; ex: "Closed Captions") + * > iso639_2 + * - language code for the subtitle, or "und" if unknown + */ struct hb_subtitle_s { int id; @@ -471,10 +518,20 @@ struct hb_subtitle_s hb_subtitle_config_t config; enum subtype { PICTURESUB, TEXTSUB } format; - enum subsource { VOBSUB, SRTSUB, CC608SUB, CC708SUB } source; + enum subsource { VOBSUB, SRTSUB, CC608SUB, /*unused*/CC708SUB, UTF8SUB, TX3GSUB, SSASUB } source; char lang[1024]; char iso639_2[4]; uint8_t type; /* Closed Caption, Childrens, Directors etc */ + + // Color lookup table for VOB subtitle tracks. Each entry is in YCbCr format. + // Must be filled out by the demuxer for VOB subtitle tracks. + uint32_t palette[16]; + int width; + int height; + + // Codec private data for subtitles originating from FFMPEG sources + uint8_t * extradata; + int extradata_size; int hits; /* How many hits/occurrences of this subtitle */ int forced_hits; /* How many forced hits in this subtitle */ @@ -489,6 +546,19 @@ struct hb_subtitle_s #endif }; +/* + * An attachment. + * + * These are usually used for attaching embedded fonts to movies containing SSA subtitles. + */ +struct hb_attachment_s +{ + enum attachtype { FONT_TTF_ATTACH } type; + char * name; + char * data; + int size; +}; + struct hb_metadata_s { char name[255]; @@ -504,7 +574,8 @@ struct hb_metadata_s struct hb_title_s { - enum { HB_DVD_TYPE, HB_STREAM_TYPE } type; + enum { HB_DVD_TYPE, HB_BD_TYPE, HB_STREAM_TYPE } type; + uint32_t reg_desc; char path[1024]; char name[1024]; int index; @@ -512,9 +583,9 @@ struct hb_title_s int ttn; int cell_start; int cell_end; - int block_start; - int block_end; - int block_count; + uint64_t block_start; + uint64_t block_end; + uint64_t block_count; int angle_count; /* Visual-friendly duration */ @@ -536,21 +607,22 @@ struct hb_title_s int crop[4]; enum { HB_MPEG2_PS_DEMUXER = 0, HB_MPEG2_TS_DEMUXER, HB_NULL_DEMUXER } demuxer; int detected_interlacing; + int pcr_pid; /* PCR PID for TS streams */ int video_id; /* demuxer stream id for video */ int video_codec; /* worker object id of video codec */ + uint32_t video_stream_type; /* stream type from source stream */ int video_codec_param; /* codec specific config */ const char *video_codec_name; int video_bitrate; const char *container_name; int data_rate; - uint32_t palette[16]; - hb_metadata_t *metadata; hb_list_t * list_chapter; hb_list_t * list_audio; hb_list_t * list_subtitle; + hb_list_t * list_attachment; /* Job template for this title */ hb_job_t * job; @@ -691,6 +763,9 @@ 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_decutf8sub; +extern hb_work_object_t hb_dectx3gsub; +extern hb_work_object_t hb_decssasub; extern hb_work_object_t hb_render; extern hb_work_object_t hb_encavcodec; extern hb_work_object_t hb_encx264; @@ -707,6 +782,7 @@ 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; +extern hb_work_object_t hb_encac3; #define FILTER_OK 0 #define FILTER_DELAY 1 @@ -732,6 +808,13 @@ struct hb_filter_object_s #endif }; +#define HB_FILTER_DETELECINE 1 +#define HB_FILTER_DEINTERLACE 2 +#define HB_FILTER_DEBLOCK 3 +#define HB_FILTER_DENOISE 4 +#define HB_FILTER_DECOMB 5 +#define HB_FILTER_ROTATE 6 + extern hb_filter_object_t hb_filter_detelecine; extern hb_filter_object_t hb_filter_deinterlace; extern hb_filter_object_t hb_filter_deblock; @@ -745,4 +828,9 @@ extern void hb_register_error_handler( hb_error_handler_t * handler ); char * hb_strdup_printf( char * fmt, ... ); +int hb_yuv2rgb(int yuv); +int hb_rgb2yuv(int rgb); + +const char * hb_subsource_name( int source ); + #endif