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
CLI: SubRip Subtitle import
[handbrake-jp/handbrake-jp-git.git]
/
libhb
/
common.h
diff --git
a/libhb/common.h
b/libhb/common.h
index
b9e2668
..
808714e
100644
(file)
--- a/
libhb/common.h
+++ b/
libhb/common.h
@@
-95,6
+95,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;
@@
-113,7
+118,10
@@
struct hb_subtitle_config_s
{
enum subdest { RENDERSUB, PASSTHRUSUB } dest;
int force;
{
enum subdest { RENDERSUB, PASSTHRUSUB } dest;
int force;
- int default_track;
+ int default_track;
+ char src_filename[128];
+ char src_codeset[40];
+ int64_t offset;
};
#define HB_VIDEO_RATE_BASE 27000000
};
#define HB_VIDEO_RATE_BASE 27000000
@@
-179,6
+187,7
@@
struct hb_job_s
int par_height;
int dar_width;
int dar_height;
int par_height;
int dar_width;
int dar_height;
+ int keep_display_aspect;
} anamorphic;
int maxWidth;
} anamorphic;
int maxWidth;
@@
-245,8
+254,6
@@
struct hb_job_s
int indepth_scan;
hb_subtitle_config_t select_subtitle_config;
int indepth_scan;
hb_subtitle_config_t select_subtitle_config;
- hb_subtitle_t ** select_subtitle;
- char * native_language;
int angle; // dvd angle to encode
int frame_to_stop; // declare eof when we hit this frame
int angle; // dvd angle to encode
int frame_to_stop; // declare eof when we hit this frame
@@
-449,7
+456,7
@@
struct hb_chapter_s
struct hb_subtitle_s
{
int id;
struct hb_subtitle_s
{
int id;
- int track;
+ int
track;
hb_subtitle_config_t config;
hb_subtitle_config_t config;
@@
-670,6
+677,7
@@
extern hb_work_object_t hb_decmpeg2;
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_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_encx264;
extern hb_work_object_t hb_render;
extern hb_work_object_t hb_encavcodec;
extern hb_work_object_t hb_encx264;