diff options
| author | jbrjake <[email protected]> | 2009-06-06 17:02:17 +0000 |
|---|---|---|
| committer | jbrjake <[email protected]> | 2009-06-06 17:02:17 +0000 |
| commit | 40399c191cf7c62a590f6fce67f4a2da14e0289a (patch) | |
| tree | 87f5f8d0937eb1b459526ac51498cce1ac1126d9 /test | |
| parent | 7168c40b5207df0a67dc74b34bf0f06ea323c9ae (diff) | |
Adds a keep_display_aspect toggle to the job->anamorphic struct in order to fix a bug and implements it in the CLI. Also adds some more anamorphic settings to the job config display.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2492 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/test/test.c b/test/test.c index d956966e8..94404d2cc 100644 --- a/test/test.c +++ b/test/test.c @@ -1105,6 +1105,8 @@ static int HandleEvents( hb_handle_t * h ) if( keep_display_aspect ) { + job->anamorphic.keep_display_aspect = 1; + /* First, what *is* the display aspect? */ int cropped_width = title->width - job->crop[2] - job->crop[3]; int cropped_height = title->height - job->crop[0] - job->crop[1]; @@ -1114,8 +1116,7 @@ static int HandleEvents( hb_handle_t * h ) asked for ITU values instead. */ float source_display_width = (float)cropped_width * (float)title->pixel_aspect_width / (float)title->pixel_aspect_height; - float display_aspect = source_display_width / cropped_height; - + float display_aspect = source_display_width / (float)cropped_height; /* When keeping display aspect, we have to rank some values by priority in order to consistently handle situations when more than one might be specified by default. @@ -1134,24 +1135,6 @@ static int HandleEvents( hb_handle_t * h ) /* We scale the height to the new display width */ height = (int)( (double)display_width / display_aspect ); } - else if( width ) - { - /* We assume the source height minus cropping, round - to a mod-friendly number, figure out the proper - display width at that height, and adjust the PAR - to create that display width from the new source width. */ - int temp_height; - temp_height = title->height - job->crop[0] - job->crop[1]; - int temp_modulus; - if( modulus ) - temp_modulus = modulus; - else - temp_modulus = 16; - - temp_height = MULTIPLE_MOD( temp_height, temp_modulus ); - job->anamorphic.par_width = (int)( (double)temp_height * display_aspect ); - job->anamorphic.par_height = width; - } } if( display_width ) |