#include <sys/stat.h>
#include <dirent.h>
+#if defined( SYS_MINGW )
+# define fseek fseeko64
+# define ftell ftello64
+# undef fseeko
+# define fseeko fseeko64
+# undef ftello
+# define ftello ftello64
+# define flockfile(...)
+# define funlockfile(...)
+# define getc_unlocked getc
+# undef off_t
+# define off_t off64_t
+#endif
+
#ifndef MIN
#define MIN( a, b ) ( (a) > (b) ? (b) : (a) )
#endif
#define EVEN( a ) ( (a) + ( (a) & 1 ) )
#define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) )
-#define MULTIPLE_MOD( a, b ) ( b * ( ( (a) + (b / 2) - 1) / b ) )
+#define MULTIPLE_MOD( a, b ) ((b==1)?a:( b * ( ( (a) + (b / 2) - 1) / 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;
+ char src_filename[128];
+ char src_codeset[40];
+ int64_t offset;
+};
+
#define HB_VIDEO_RATE_BASE 27000000
extern hb_rate_t hb_video_rates[];
int height;
int keep_ratio;
int grayscale;
- int pixel_ratio;
- int pixel_aspect_width;
- int pixel_aspect_height;
- int modulus;
+
+ 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 maxWidth;
int maxHeight;
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
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;
/* 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
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
#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 */
struct hb_chapter_s
{
int index;
+ int pgcn;
+ int pgn;
int cell_start;
int cell_end;
int block_start;
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 */
#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
};
char comment[1024];
char album[255];
char genre[255];
- enum arttype {UNKNOWN, BMP, GIF87A, GIF89A, JPG, PNG, TIFFL, TIFFB} coverart_type;
uint32_t coverart_size;
uint8_t *coverart;
};
int block_start;
int block_end;
int block_count;
+ int angle_count;
/* Visual-friendly duration */
int hours;
/* Job template for this title */
hb_job_t * job;
+
+ uint32_t flags;
+ // set if video stream doesn't have IDR frames
+#define HBTF_NO_IDR (1 << 0)
};
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_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;
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
OSDN Git Service
