#include <sys/stat.h>
#include <dirent.h>
+#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
#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
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;
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;
int amixdown;
};
+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;
+};
+
#define HB_VIDEO_RATE_BASE 27000000
extern hb_rate_t hb_video_rates[];
/* Pointer to the title to be ripped */
hb_title_t * title;
+ int feature; // Detected DVD feature title
/* Chapter selection */
int chapter_start;
/* 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];
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;
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;
int pass;
int h264_13;
int h264_level;
- int crf;
char *x264opts;
int areBframes;
int color_matrix;
/* 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
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
+ 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
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 */
hb_fifo_t * fifo_mpeg4; /* MPEG-4 video ES */
hb_thread_t * reader;
- hb_thread_t * muxer;
hb_list_t * list_work;
#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 */
#define HB_INPUT_CH_LAYOUT_2F2R 0x0722022
#define HB_INPUT_CH_LAYOUT_3F2R 0x0832032
#define HB_INPUT_CH_LAYOUT_4F2R 0x0942042
+#define HB_INPUT_CH_LAYOUT_3F4R 0x0a34034
#define HB_INPUT_CH_LAYOUT_HAS_LFE 0x0000100
/* define some macros to extract the various information from the HB_AMIXDOWN_XXXX values */
#define HB_INPUT_CH_LAYOUT_GET_DISCRETE_FRONT_COUNT( a ) ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK ) >> 16 )
{
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 */
hb_esconfig_t config;
hb_mux_data_t * mux_data;
+ hb_fifo_t * scan_cache;
} priv;
};
#endif
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;
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 <b>, <i>, or <u>
+ * - 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)
+ * - for legacy compatibility, all newly created VOBSUB tracks should default to RENDERSUB
+ * - since only VOBSUBs are renderable (as of 2010-04-25), all other newly created
+ * subtitle track types should default to PASSTHRUSUB
+ * > 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;
+ int track;
+
+ hb_subtitle_config_t config;
+
+ enum subtype { PICTURESUB, TEXTSUB } format;
+ 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;
int hits; /* How many hits/occurrences of this subtitle */
int forced_hits; /* How many forced hits in this subtitle */
#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
};
struct hb_title_s
{
- char dvd[1024];
+ enum { HB_DVD_TYPE, HB_BD_TYPE, HB_STREAM_TYPE } type;
+ uint32_t reg_desc;
+ char path[1024];
char name[1024];
int index;
int vts;
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 */
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;
#define HB_STATE_PAUSED 16
#define HB_STATE_WORKDONE 32
#define HB_STATE_MUXING 64
+#define HB_STATE_SEARCHING 128
int state;
union
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;
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_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_encxvid;
extern hb_work_object_t hb_encx264;
extern hb_work_object_t hb_enctheora;
extern hb_work_object_t hb_deca52;
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
#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;
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, ... );
+
+int hb_yuv2rgb(int yuv);
+int hb_rgb2yuv(int rgb);
+
#endif