OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable asserts in libdvdnav except when configured with --debug=max
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
common.h
diff --git
a/libhb/common.h
b/libhb/common.h
index
f195110
..
0c06ba9
100644
(file)
--- a/
libhb/common.h
+++ b/
libhb/common.h
@@
-18,6
+18,12
@@
#include <sys/stat.h>
#include <dirent.h>
#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
#if defined( SYS_MINGW )
# define fseek fseeko64
# define ftell ftello64
@@
-55,6
+61,7
@@
typedef struct hb_chapter_s hb_chapter_t;
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_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;
typedef struct hb_metadata_s hb_metadata_t;
typedef struct hb_state_s hb_state_t;
typedef union hb_esconfig_u hb_esconfig_t;
@@
-94,6
+101,11
@@
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);
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;
struct hb_rate_s
{
char * string;
@@
-108,6
+120,16
@@
struct hb_mixdown_s
int amixdown;
};
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[];
#define HB_VIDEO_RATE_BASE 27000000
extern hb_rate_t hb_video_rates[];
@@
-144,14
+166,14
@@
struct hb_job_s
/* Picture settings:
crop: must be multiples of 2 (top/bottom/left/right)
deinterlace: 0 or 1
/* 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
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];
maxWidth: keep width below this
maxHeight: keep height below this */
int crop[4];
@@
-165,14
+187,15
@@
struct hb_job_s
struct
{
int mode;
struct
{
int mode;
- int modulus;
int itu_par;
int par_width;
int par_height;
int dar_width;
int dar_height;
int itu_par;
int par_width;
int par_height;
int dar_width;
int dar_height;
+ int keep_display_aspect;
} anamorphic;
} anamorphic;
-
+
+ int modulus;
int maxWidth;
int maxHeight;
int maxWidth;
int maxHeight;
@@
-186,14
+209,12
@@
struct hb_job_s
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
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
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 vcodec;
float vquality;
@@
-205,7
+226,6
@@
struct hb_job_s
int pass;
int h264_13;
int h264_level;
int pass;
int h264_13;
int h264_level;
- int crf;
char *x264opts;
int areBframes;
int color_matrix;
char *x264opts;
int areBframes;
int color_matrix;
@@
-236,13
+256,14
@@
struct hb_job_s
int mp4_optimize;
int ipod_atom;
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 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
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
@@
-259,6
+280,9
@@
struct hb_job_s
volatile int * die;
volatile int done;
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_mpeg2; /* MPEG-2 video ES */
hb_fifo_t * fifo_raw; /* Raw pictures */
hb_fifo_t * fifo_sync; /* Raw pictures, framerate corrected */
@@
-266,7
+290,6
@@
struct hb_job_s
hb_fifo_t * fifo_mpeg4; /* MPEG-4 video ES */
hb_thread_t * reader;
hb_fifo_t * fifo_mpeg4; /* MPEG-4 video ES */
hb_thread_t * reader;
- hb_thread_t * muxer;
hb_list_t * list_work;
hb_list_t * list_work;
@@
-287,6
+310,7
@@
struct hb_job_s
#define HB_ACODEC_LPCM 0x002000
#define HB_ACODEC_DCA 0x004000
#define HB_ACODEC_FFMPEG 0x008000
#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 */
/* Audio Mixdown */
/* define some masks, used to extract the various information from the HB_AMIXDOWN_XXXX values */
@@
-440,11
+464,13
@@
struct hb_chapter_s
struct hb_subtitle_s
{
struct hb_subtitle_s
{
- int track;
int id;
int id;
+ int track;
+
+ hb_subtitle_config_t config;
+
enum subtype { PICTURESUB, TEXTSUB } format;
enum subtype { PICTURESUB, TEXTSUB } format;
- enum subsource { VOBSUB, SRTSUB, CCSUB } source;
- enum subdest { RENDERSUB, PASSTHRUSUB } dest;
+ enum subsource { VOBSUB, SRTSUB, CC608SUB, CC708SUB } source;
char lang[1024];
char iso639_2[4];
uint8_t type; /* Closed Caption, Childrens, Directors etc */
char lang[1024];
char iso639_2[4];
uint8_t type; /* Closed Caption, Childrens, Directors etc */
@@
-455,7
+481,10
@@
struct hb_subtitle_s
#ifdef __LIBHB__
/* Internal data */
hb_fifo_t * fifo_in; /* SPU ES */
#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
};
#endif
};
@@
-474,7
+503,8
@@
struct hb_metadata_s
struct hb_title_s
{
struct hb_title_s
{
- char dvd[1024];
+ enum { HB_DVD_TYPE, HB_STREAM_TYPE } type;
+ char path[1024];
char name[1024];
int index;
int vts;
char name[1024];
int index;
int vts;
@@
-539,6
+569,7
@@
struct hb_state_s
#define HB_STATE_PAUSED 16
#define HB_STATE_WORKDONE 32
#define HB_STATE_MUXING 64
#define HB_STATE_PAUSED 16
#define HB_STATE_WORKDONE 32
#define HB_STATE_MUXING 64
+#define HB_STATE_SEARCHING 128
int state;
union
int state;
union
@@
-634,7
+665,10
@@
struct hb_work_object_s
hb_esconfig_t * config;
/* Pointer hb_audio_t so we have access to the info in the audio worker threads. */
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;
hb_work_private_t * private_data;
@@
-642,18
+676,22
@@
struct hb_work_object_s
volatile int * done;
int status;
int codec_param;
volatile int * done;
int status;
int codec_param;
+ hb_title_t * title;
hb_work_object_t * next;
hb_work_object_t * next;
-
int
thread_sleep_interval;
+
int
thread_sleep_interval;
#endif
};
#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_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_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_encx264;
extern hb_work_object_t hb_enctheora;
extern hb_work_object_t hb_deca52;
@@
-666,6
+704,8
@@
extern hb_work_object_t hb_declpcm;
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_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
#define FILTER_OK 0
#define FILTER_DELAY 1
@@
-696,9
+736,12
@@
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_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 );
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, ... );
+
#endif
#endif