summaryrefslogtreecommitdiffstats
path: root/macosx/Controller.m
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2012-05-05 18:22:37 +0000
committerjstebbins <[email protected]>2012-05-05 18:22:37 +0000
commit06254850dc2c1ec43d57f4d8e2026fa67967d5b9 (patch)
treec7ff6a64e1310d79f4f17b1a6bfe9aebaf88a958 /macosx/Controller.m
parent1c8309d77ea303954f8c9e3919c595de54f173f2 (diff)
libhb: Fix problem with positions of burned-in subs
When cropping and/or scaling, the position of burned-in SSA subs was broken. Also, when scaling, the position of all other burned-in subs was broken. Part of this fix is to revert a bit of filter initialization changes that were made in this commit https://trac.handbrake.fr/changeset/4605 The other part of the fix is to add cropping parameters to the initialization of the subtitle rendering filter. This filter needs the *original* title dimensions and the crop values in order to compute the positions properly. The changes that I am reverting gave it the scaled job dimensions and the crop values. This was wrong in so many ways it's embarassing :p git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4642 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.m')
-rw-r--r--macosx/Controller.m8
1 files changed, 6 insertions, 2 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m
index e3c85dffa..9d7830059 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -3252,7 +3252,9 @@ bool one_burned = FALSE;
if( one_burned )
{
filter = hb_filter_init( HB_FILTER_RENDER_SUB );
- hb_add_filter( job, filter, NULL );
+ hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d",
+ job->crop[0], job->crop[1],
+ job->crop[2], job->crop[3]] UTF8String] );
}
@@ -3790,7 +3792,9 @@ bool one_burned = FALSE;
if( one_burned )
{
filter = hb_filter_init( HB_FILTER_RENDER_SUB );
- hb_add_filter( job, filter, NULL );
+ hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d",
+ job->crop[0], job->crop[1],
+ job->crop[2], job->crop[3]] UTF8String] );
}
#pragma mark -