X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Finternal.h;h=30bf022d5c6c562be490fbb7e6b851fd3a74f199;hb=1d6fbf402512f7cbba3c9dac7e10a72aeebd1d81;hp=88c8ef9836ec33b0fc15c5c674865554891a7af0;hpb=7dc534bc87accdf2d58a0a6e8e209fdf9c46f41a;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/internal.h b/libhb/internal.h index 88c8ef98..30bf022d 100644 --- a/libhb/internal.h +++ b/libhb/internal.h @@ -38,19 +38,38 @@ void hb_set_state( hb_handle_t *, hb_state_t * ); /*********************************************************************** * fifo.c **********************************************************************/ +/* + * Holds a packet of data that is moving through the transcoding process. + * + * May have metadata associated with it via extra fields + * that are conditionally used depending on the type of packet. + */ struct hb_buffer_s { - int size; - int alloc; - uint8_t * data; - int cur; - + int size; // size of this packet + int alloc; // used internally by the packet allocator (hb_buffer_init) + uint8_t * data; // packet data + int cur; // used internally by packet lists (hb_list_t) + + /* + * Corresponds to the order that this packet was read from the demuxer. + * + * It is important that video decoder work-objects pass this value through + * from their input packets to the output packets they generate. Otherwise + * RENDERSUB subtitles (especially VOB subtitles) will break. + * + * Subtitle decoder work-objects that output a renderable subtitle + * format (ex: PICTURESUB) must also be careful to pass the sequence number + * through for the same reason. + */ int64_t sequence; - int id; - int64_t start; - int64_t stop; - int new_chap; + enum { AUDIO_BUF, VIDEO_BUF, SUBTITLE_BUF, OTHER_BUF } type; + + int id; // ID of the track that the packet comes from + int64_t start; // Video and subtitle packets: start time of frame/subtitle + int64_t stop; // Video and subtitle packets: stop time of frame/subtitle + int new_chap; // Video packets: if non-zero, is the index of the chapter whose boundary was crossed #define HB_FRAME_IDR 0x01 #define HB_FRAME_I 0x02 @@ -66,13 +85,21 @@ struct hb_buffer_s /* Holds the output PTS from x264, for use by b-frame offsets in muxmp4.c */ int64_t renderOffset; + // PICTURESUB subtitle packets: + // Location and size of the subpicture. int x; int y; int width; int height; + hb_buffer_t * next_subpicture; + // Video packets (after processing by the hb_sync_video work-object): + // A (copy of a) PICTURESUB subtitle packet that needs to be burned into this video packet by the hb_render work-object. + // Subtitles that are simply passed thru are NOT attached to the associated video packets. hb_buffer_t * sub; + // Packets in a list: + // the next packet in the list hb_buffer_t * next; }; @@ -85,16 +112,22 @@ void hb_buffer_close( hb_buffer_t ** ); void hb_buffer_copy_settings( hb_buffer_t * dst, const hb_buffer_t * src ); -hb_fifo_t * hb_fifo_init(); +hb_fifo_t * hb_fifo_init( int capacity, int thresh ); int hb_fifo_size( hb_fifo_t * ); +int hb_fifo_size_bytes( hb_fifo_t * ); int hb_fifo_is_full( hb_fifo_t * ); float hb_fifo_percent_full( hb_fifo_t * f ); hb_buffer_t * hb_fifo_get( hb_fifo_t * ); +hb_buffer_t * hb_fifo_get_wait( hb_fifo_t * ); hb_buffer_t * hb_fifo_see( hb_fifo_t * ); +hb_buffer_t * hb_fifo_see_wait( hb_fifo_t * ); hb_buffer_t * hb_fifo_see2( hb_fifo_t * ); void hb_fifo_push( hb_fifo_t *, hb_buffer_t * ); +void hb_fifo_push_wait( hb_fifo_t *, hb_buffer_t * ); +int hb_fifo_full_wait( hb_fifo_t * f ); void hb_fifo_push_head( hb_fifo_t *, hb_buffer_t * ); void hb_fifo_close( hb_fifo_t ** ); +void hb_fifo_flush( hb_fifo_t * f ); // this routine gets a buffer for an uncompressed YUV420 video frame // with dimensions width x height. @@ -134,16 +167,21 @@ hb_thread_t * hb_update_init( int * build, char * version ); hb_thread_t * hb_scan_init( hb_handle_t *, volatile int * die, const char * path, int title_index, hb_list_t * list_title, int preview_count, - int store_previews ); + int store_previews, uint64_t min_duration ); hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count, volatile int * die, int * error, hb_job_t ** job ); hb_thread_t * hb_reader_init( hb_job_t * ); -hb_thread_t * hb_muxer_init( hb_job_t * ); +hb_work_object_t * hb_muxer_init( hb_job_t * ); hb_work_object_t * hb_get_work( int ); hb_work_object_t * hb_codec_decoder( int ); hb_work_object_t * hb_codec_encoder( int ); /*********************************************************************** + * sync.c + **********************************************************************/ +hb_work_object_t * hb_sync_init( hb_job_t * job ); + +/*********************************************************************** * mpegdemux.c **********************************************************************/ typedef struct { @@ -179,12 +217,13 @@ hb_title_t * hb_batch_title_scan( hb_batch_t * d, int t ); /*********************************************************************** * dvd.c **********************************************************************/ +typedef struct hb_bd_s hb_bd_t; typedef union hb_dvd_s hb_dvd_t; typedef struct hb_stream_s hb_stream_t; hb_dvd_t * hb_dvd_init( char * path ); int hb_dvd_title_count( hb_dvd_t * ); -hb_title_t * hb_dvd_title_scan( hb_dvd_t *, int title ); +hb_title_t * hb_dvd_title_scan( hb_dvd_t *, int title, uint64_t min_duration ); int hb_dvd_start( hb_dvd_t *, hb_title_t *title, int chapter ); void hb_dvd_stop( hb_dvd_t * ); int hb_dvd_seek( hb_dvd_t *, float ); @@ -194,19 +233,44 @@ int hb_dvd_is_break( hb_dvd_t * d ); void hb_dvd_close( hb_dvd_t ** ); int hb_dvd_angle_count( hb_dvd_t * d ); void hb_dvd_set_angle( hb_dvd_t * d, int angle ); - +int hb_dvd_main_feature( hb_dvd_t * d, hb_list_t * list_title ); + +hb_bd_t * hb_bd_init( char * path ); +int hb_bd_title_count( hb_bd_t * d ); +hb_title_t * hb_bd_title_scan( hb_bd_t * d, int t, uint64_t min_duration ); +int hb_bd_start( hb_bd_t * d, hb_title_t *title ); +void hb_bd_stop( hb_bd_t * d ); +int hb_bd_seek( hb_bd_t * d, float f ); +int hb_bd_seek_pts( hb_bd_t * d, uint64_t pts ); +int hb_bd_seek_chapter( hb_bd_t * d, int chapter ); +int hb_bd_read( hb_bd_t * d, hb_buffer_t * b ); +int hb_bd_chapter( hb_bd_t * d ); +void hb_bd_close( hb_bd_t ** _d ); +void hb_bd_set_angle( hb_bd_t * d, int angle ); +int hb_bd_main_feature( hb_bd_t * d, hb_list_t * list_title ); + +hb_stream_t * hb_bd_stream_open( hb_title_t *title ); hb_stream_t * hb_stream_open( char * path, hb_title_t *title ); void hb_stream_close( hb_stream_t ** ); hb_title_t * hb_stream_title_scan( hb_stream_t *); int hb_stream_read( hb_stream_t *, hb_buffer_t *); int hb_stream_seek( hb_stream_t *, float ); +int hb_stream_seek_ts( hb_stream_t * stream, int64_t ts ); int hb_stream_seek_chapter( hb_stream_t *, int ); int hb_stream_chapter( hb_stream_t * ); +int hb_ts_decode_pkt( hb_stream_t *stream, const uint8_t * pkt, hb_buffer_t *obuf ); + void * hb_ffmpeg_context( int codec_param ); void * hb_ffmpeg_avstream( int codec_param ); +#define STR4_TO_UINT32(p) \ + ((((const uint8_t*)(p))[0] << 24) | \ + (((const uint8_t*)(p))[1] << 16) | \ + (((const uint8_t*)(p))[2] << 8) | \ + ((const uint8_t*)(p))[3]) + /*********************************************************************** * Work objects **********************************************************************/ @@ -266,11 +330,15 @@ union hb_esconfig_u enum { - WORK_SYNC = 1, + WORK_SYNC_VIDEO = 1, + WORK_SYNC_AUDIO, WORK_DECMPEG2, WORK_DECCC608, WORK_DECVOBSUB, WORK_DECSRTSUB, + WORK_DECUTF8SUB, + WORK_DECTX3GSUB, + WORK_DECSSASUB, WORK_ENCVOBSUB, WORK_RENDER, WORK_ENCAVCODEC, @@ -286,7 +354,8 @@ enum WORK_ENCFAAC, WORK_ENCLAME, WORK_ENCVORBIS, - WORK_ENC_CA_AAC + WORK_ENC_CA_AAC, + WORK_MUX }; enum @@ -295,7 +364,8 @@ enum FILTER_DEBLOCK, FILTER_DENOISE, FILTER_DETELECINE, - FILTER_DECOMB + FILTER_DECOMB, + FILTER_ROTATE }; extern hb_work_object_t * hb_objects;