diff options
| -rw-r--r-- | macosx/Controller.mm | 43 | ||||
| -rw-r--r-- | macosx/PictureController.mm | 1 | ||||
| -rw-r--r-- | test/test.c | 14 |
3 files changed, 30 insertions, 28 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 510fd21c1..b19b9cbad 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -1611,26 +1611,20 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It /* Deinterlace */ if ([fPictureController deinterlace] == 1) { - /* Run old deinterlacer by default */ + /* Run old deinterlacer fd by default */ hb_filter_deinterlace.settings = "-1"; hb_list_add( job->filters, &hb_filter_deinterlace ); } else if ([fPictureController deinterlace] == 2) { - /* Yadif mode 0 (1-pass with spatial deinterlacing.) */ - hb_filter_deinterlace.settings = "0"; + /* Yadif mode 0 (without spatial deinterlacing.) */ + hb_filter_deinterlace.settings = "2"; hb_list_add( job->filters, &hb_filter_deinterlace ); } else if ([fPictureController deinterlace] == 3) { - /* Yadif (1-pass w/o spatial deinterlacing) and Mcdeint */ - hb_filter_deinterlace.settings = "2:-1:1"; - hb_list_add( job->filters, &hb_filter_deinterlace ); - } - else if ([fPictureController deinterlace] == 4) - { - /* Yadif (2-pass w/ spatial deinterlacing) and Mcdeint*/ - hb_filter_deinterlace.settings = "1:-1:1"; + /* Yadif (with spatial deinterlacing) */ + hb_filter_deinterlace.settings = "0"; hb_list_add( job->filters, &hb_filter_deinterlace ); } @@ -2672,10 +2666,6 @@ the user is using "Custom" settings by determining the sender*/ { [fPicSettingDeinterlace setStringValue: @"Slower"]; } - else if ([fPictureController deinterlace] ==4) - { - [fPicSettingDeinterlace setStringValue: @"Slowest"]; - } /* Denoise */ if ([fPictureController denoise] == 0) { @@ -3538,7 +3528,17 @@ if (item == nil) /* Deinterlace */ if ([chosenPreset objectForKey:@"PictureDeinterlace"]) { - [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]]; + /* We check to see if the preset used the past fourth "Slowest" deinterlaceing and set that to "Slower + * since we no longer have a fourth "Slowest" deinterlacing due to the mcdeint bug */ + if ([[chosenPreset objectForKey:@"PictureDeinterlace"] intValue] == 4) + { + [fPictureController setDeinterlace:3]; + } + else + { + + [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]]; + } } else { @@ -3596,7 +3596,16 @@ if (item == nil) /* Deinterlace */ if ([chosenPreset objectForKey:@"PictureDeinterlace"]) { - [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]]; + /* We check to see if the preset used the past fourth "Slowest" deinterlaceing and set that to "Slower + * since we no longer have a fourth "Slowest" deinterlacing due to the mcdeint bug */ + if ([[chosenPreset objectForKey:@"PictureDeinterlace"] intValue] == 4) + { + [fPictureController setDeinterlace:3]; + } + else + { + [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]]; + } } else { diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm index 60f163729..4f8eb64dd 100644 --- a/macosx/PictureController.mm +++ b/macosx/PictureController.mm @@ -126,7 +126,6 @@ are maintained across different sources */ [fDeinterlacePopUp addItemWithTitle: @"Fast"]; [fDeinterlacePopUp addItemWithTitle: @"Slow"]; [fDeinterlacePopUp addItemWithTitle: @"Slower"]; - [fDeinterlacePopUp addItemWithTitle: @"Slowest"]; /* Set deinterlaces level according to the integer in the main window */ [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace]; diff --git a/test/test.c b/test/test.c index bebc85745..106f7a2f9 100644 --- a/test/test.c +++ b/test/test.c @@ -835,8 +835,6 @@ static int HandleEvents( hb_handle_t * h ) if( audio_mixdown == HB_AMIXDOWN_DOLBYPLII_AC3) { - - int i; for( i = 3 ; i > 0; i--) { @@ -1188,7 +1186,7 @@ static void ShowHelp() " -d, --deinterlace Deinterlace video with yadif/mcdeint filter\n" " <YM:FD:MM:QP> (default 0:-1:-1:1)\n" " or\n" - " <fast/slow/slower/slowest>\n" + " <fast/slow/slower>\n" " -7, --deblock Deblock video with pp7 filter\n" " <QP:M> (default 0:2)\n" " -8, --denoise Denoise video with hqdn3d filter\n" @@ -1209,7 +1207,7 @@ static void ShowHelp() "### Audio Options-----------------------------------------------------------\n\n" " -E, --aencoder <string> Audio encoder (faac/lame/vorbis/ac3/aac+ac3) \n" - " ac3 meaning passthrough, ac3+aac meaning an\n" + " ac3 meaning passthrough, aac+ac3 meaning an\n" " aac dpl2 mixdown paired with ac3 pass-thru\n" " (default: guessed)\n" " -B, --ab <kb/s> Set audio bitrate (default: 128)\n" @@ -1493,15 +1491,11 @@ static int ParseOptions( int argc, char ** argv ) } else if (!( strcmp( optarg, "slow" ) )) { - deinterlace_opt = "0"; + deinterlace_opt = "2"; } else if (!( strcmp( optarg, "slower" ) )) { - deinterlace_opt = "2:-1:1"; - } - else if (!( strcmp( optarg, "slowest" ) )) - { - deinterlace_opt = "1:-1:1"; + deinterlace_opt = "0"; } else { |