*/
int64_t sequence;
+ 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
/* Holds the output PTS from x264, for use by b-frame offsets in muxmp4.c */
int64_t renderOffset;
- // VOB subtitle packets:
+ // 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) VOB subtitle packet that needs to be burned into this video packet by the hb_render 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;
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_push_list_element( hb_fifo_t *fifo, hb_buffer_t *buffer_list );
+hb_buffer_t * hb_fifo_get_list_element( hb_fifo_t *fifo );
void hb_fifo_close( hb_fifo_t ** );
void hb_fifo_flush( hb_fifo_t * f );
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 );
-hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count,
+ int store_previews, uint64_t min_duration );
+hb_thread_t * hb_work_init( hb_list_t * jobs,
volatile int * die, int * error, hb_job_t ** job );
hb_thread_t * hb_reader_init( hb_job_t * );
hb_work_object_t * hb_muxer_init( hb_job_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 );
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_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
**********************************************************************/
WORK_DECSRTSUB,
WORK_DECUTF8SUB,
WORK_DECTX3GSUB,
+ WORK_DECSSASUB,
WORK_ENCVOBSUB,
WORK_RENDER,
WORK_ENCAVCODEC,
WORK_ENCLAME,
WORK_ENCVORBIS,
WORK_ENC_CA_AAC,
+ WORK_ENCAC3,
WORK_MUX
};
FILTER_ROTATE
};
+// Picture flags used by filters
+#ifndef PIC_FLAG_REPEAT_FIRST_FIELD
+#define PIC_FLAG_REPEAT_FIRST_FIELD 256
+#endif
+#ifndef PIC_FLAG_TOP_FIELD_FIRST
+#define PIC_FLAG_TOP_FIELD_FIRST 8
+#endif
+#ifndef PIC_FLAG_PROGRESSIVE_FRAME
+#define PIC_FLAG_PROGRESSIVE_FRAME 16
+#endif
+
extern hb_work_object_t * hb_objects;
#define HB_WORK_IDLE 0