x264 bump to r1338-19977e9

[handbrake-jp/handbrake-jp-git.git] / macosx / Controller.m

diff --git a/macosx/Controller.m b/macosx/Controller.m
index f9c4f6b..8fcd1ba 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2154,6 +2154,8 @@ fWorkingCount = 0;
     /* if we are custom anamorphic, store the exact storage, par and display dims */
     if (fTitle->job->anamorphic.mode == 3)
     {
+        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.modulus] forKey:@"PicturePARModulus"];
+        
         [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->width] forKey:@"PicturePARStorageWidth"];
         [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->height] forKey:@"PicturePARStorageHeight"];
         
@@ -2870,12 +2872,6 @@ fWorkingCount = 0;
     
        if( job->vcodec & HB_VCODEC_X264 )
     {
-               /* Set this flag to switch from Constant Quantizer(default) to Constant Rate Factor Thanks jbrjake
-         Currently only used with Constant Quality setting*/
-               if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultCrf"] > 0 && [fVidQualityMatrix selectedRow] == 2)
-               {
-               job->crf = 1;
-               }
                
                /* Below Sends x264 options to the core library if x264 is selected*/
                /* Lets use this as per Nyx, Thanks Nyx!*/
@@ -3403,6 +3399,8 @@ bool one_burned = FALSE;
         job->width = [[queueToApply objectForKey:@"PicturePARStorageWidth"]  intValue];
         job->height = [[queueToApply objectForKey:@"PicturePARStorageHeight"]  intValue];
         
+        job->anamorphic.modulus = [[queueToApply objectForKey:@"PicturePARModulus"] intValue];
+        
         job->anamorphic.par_width = [[queueToApply objectForKey:@"PicturePARPixelWidth"]  intValue];
         job->anamorphic.par_height = [[queueToApply objectForKey:@"PicturePARPixelHeight"]  intValue];
         
@@ -4578,10 +4576,7 @@ the user is using "Custom" settings by determining the sender*/
         /* As x264 allows for qp/rf values that are fractional, we get the value from the preferences */
         int fractionalGranularity = 1 / [[NSUserDefaults standardUserDefaults] floatForKey:@"x264CqSliderFractional"];
         [fVidQualitySlider setNumberOfTickMarks:(([fVidQualitySlider maxValue] - [fVidQualitySlider minValue]) * fractionalGranularity) + 1];
-        if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultCrf"] > 0)
-        {
-            qpRFLabelString = @"RF:";
-        }
+        qpRFLabelString = @"RF:";
     }
     /* ffmpeg  1-31 */
     if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_FFMPEG )
@@ -4992,7 +4987,7 @@ the user is using "Custom" settings by determining the sender*/
         [fAudTrack1MixPopUp removeAllItems];
         [fAudTrack1RatePopUp removeAllItems];
         [fAudTrack1BitratePopUp removeAllItems];
-        [fAudTrack1DrcSlider setFloatValue: 1.00];
+        [fAudTrack1DrcSlider setFloatValue: 0.00];
         [self audioDRCSliderChanged: fAudTrack1DrcSlider];
     }
     else if ([[fAudTrack1MixPopUp selectedItem] tag] == HB_ACODEC_AC3 || [[fAudTrack1MixPopUp selectedItem] tag] == HB_ACODEC_DCA)
@@ -5016,7 +5011,7 @@ the user is using "Custom" settings by determining the sender*/
         [fAudTrack2MixPopUp removeAllItems];
         [fAudTrack2RatePopUp removeAllItems];
         [fAudTrack2BitratePopUp removeAllItems];
-        [fAudTrack2DrcSlider setFloatValue: 1.00];
+        [fAudTrack2DrcSlider setFloatValue: 0.00];
         [self audioDRCSliderChanged: fAudTrack2DrcSlider];
     }
     else if ([[fAudTrack2MixPopUp selectedItem] tag] == HB_ACODEC_AC3 || [[fAudTrack2MixPopUp selectedItem] tag] == HB_ACODEC_DCA)
@@ -5040,7 +5035,7 @@ the user is using "Custom" settings by determining the sender*/
         [fAudTrack3MixPopUp removeAllItems];
         [fAudTrack3RatePopUp removeAllItems];
         [fAudTrack3BitratePopUp removeAllItems];
-        [fAudTrack3DrcSlider setFloatValue: 1.00];
+        [fAudTrack3DrcSlider setFloatValue: 0.00];
         [self audioDRCSliderChanged: fAudTrack3DrcSlider];
     }
     else if ([[fAudTrack3MixPopUp selectedItem] tag] == HB_ACODEC_AC3 || [[fAudTrack3MixPopUp selectedItem] tag] == HB_ACODEC_DCA)
@@ -5064,7 +5059,7 @@ the user is using "Custom" settings by determining the sender*/
         [fAudTrack4MixPopUp removeAllItems];
         [fAudTrack4RatePopUp removeAllItems];
         [fAudTrack4BitratePopUp removeAllItems];
-        [fAudTrack4DrcSlider setFloatValue: 1.00];
+        [fAudTrack4DrcSlider setFloatValue: 0.00];
         [self audioDRCSliderChanged: fAudTrack4DrcSlider];
     }
     else if ([[fAudTrack4MixPopUp selectedItem] tag] == HB_ACODEC_AC3 || [[fAudTrack4MixPopUp selectedItem] tag] == HB_ACODEC_DCA)
@@ -5740,7 +5735,7 @@ the user is using "Custom" settings by determining the sender*/
         [bitratePopUp setEnabled: NO];
         [sampleratePopUp setEnabled: NO];
         
-        [drcSlider setFloatValue: 1.00];
+        [drcSlider setFloatValue: 0.00];
         [self audioDRCSliderChanged: drcSlider];
         [drcSlider setEnabled: NO];
         [drcField setEnabled: NO];