text subtitles: make font height independent of cropping

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7078 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/decsrtsub.c b/libhb/decsrtsub.c
index 85e2a1ae0329eb5e3cc4235ea0a16ba38a61d3f1..0712a03ce5bfa33b90004b7b094e23b7eda25cec 100644 (file)
--- 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 3aa22bf5c2048d0b12d7787984020bc155540640..76dc3b67d907f57f7bf82688d111c2cf5042814f 100644 (file)
--- 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 82209241b4bf4e84fa2960bb17009d9131587c8b..4461f1ef4687ed1db9a2e062f128a9f343a18a68 100644 (file)
--- 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 6c1a6339b5ff329da1487451b5818baf4a1240f4..7b306e676d89201377ecfecbbc8ed8a50e039490 100644 (file)
--- 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);
 }