summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-04-10 16:26:53 +0000
committerjstebbins <[email protected]>2015-04-10 16:26:53 +0000
commitf25cbb75de1978706ac48a2eaf51c3e4f54cf451 (patch)
tree454a2a404c18b2e92515b6eb076e87c4fa08c945
parent6ec1cc1e62c7df3d5cecac65d6f7446a438eefd6 (diff)
text subtitles: make font height independent of cropping
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7078 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/decsrtsub.c3
-rw-r--r--libhb/dectx3gsub.c3
-rw-r--r--libhb/decutf8sub.c3
-rw-r--r--libhb/rendersub.c3
4 files changed, 8 insertions, 4 deletions
diff --git a/libhb/decsrtsub.c b/libhb/decsrtsub.c
index 85e2a1ae0..0712a03ce 100644
--- a/libhb/decsrtsub.c
+++ b/libhb/decsrtsub.c
@@ -699,7 +699,8 @@ static int decsrtInit( hb_work_object_t * w, hb_job_t * job )
// Generate generic SSA Script Info.
int height = job->title->geometry.height - job->crop[0] - job->crop[1];
int width = job->title->geometry.width - job->crop[2] - job->crop[3];
- hb_subtitle_add_ssa_header(w->subtitle, "Arial", .066 * height,
+ hb_subtitle_add_ssa_header(w->subtitle, "Arial",
+ .066 * job->title->geometry.height,
width, height);
}
return retval;
diff --git a/libhb/dectx3gsub.c b/libhb/dectx3gsub.c
index 3aa22bf5c..76dc3b67d 100644
--- a/libhb/dectx3gsub.c
+++ b/libhb/dectx3gsub.c
@@ -250,7 +250,8 @@ static int dectx3gInit( hb_work_object_t * w, hb_job_t * job )
// For now we just create a generic SSA Script Info.
int height = job->title->geometry.height - job->crop[0] - job->crop[1];
int width = job->title->geometry.width - job->crop[2] - job->crop[3];
- hb_subtitle_add_ssa_header(w->subtitle, "Arial", .066 * height,
+ hb_subtitle_add_ssa_header(w->subtitle, "Arial",
+ .066 * job->title->geometry.height,
width, height);
return 0;
diff --git a/libhb/decutf8sub.c b/libhb/decutf8sub.c
index 82209241b..4461f1ef4 100644
--- a/libhb/decutf8sub.c
+++ b/libhb/decutf8sub.c
@@ -37,7 +37,8 @@ static int decutf8Init(hb_work_object_t *w, hb_job_t *job)
// Generate generic SSA Script Info.
int height = job->title->geometry.height - job->crop[0] - job->crop[1];
int width = job->title->geometry.width - job->crop[2] - job->crop[3];
- hb_subtitle_add_ssa_header(w->subtitle, "Arial", .066 * height,
+ hb_subtitle_add_ssa_header(w->subtitle, "Arial",
+ .066 * job->title->geometry.height,
width, height);
return 0;
diff --git a/libhb/rendersub.c b/libhb/rendersub.c
index 6c1a6339b..7b306e676 100644
--- a/libhb/rendersub.c
+++ b/libhb/rendersub.c
@@ -609,7 +609,8 @@ static int textsub_post_init( hb_filter_object_t * filter, hb_job_t * job )
// to have the header rewritten with the correct dimensions.
int height = job->title->geometry.height - job->crop[0] - job->crop[1];
int width = job->title->geometry.width - job->crop[2] - job->crop[3];
- hb_subtitle_add_ssa_header(filter->subtitle, "Arial", .066 * height,
+ hb_subtitle_add_ssa_header(filter->subtitle, "Arial",
+ .066 * job->title->geometry.height,
width, height);
return ssa_post_init(filter, job);
}