summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macosx/Controller.h6
-rw-r--r--macosx/Controller.mm155
-rw-r--r--macosx/English.lproj/MainMenu.nib/classes.nib6
-rw-r--r--macosx/English.lproj/MainMenu.nib/info.nib10
-rw-r--r--macosx/English.lproj/MainMenu.nib/keyedobjects.nibbin120112 -> 125835 bytes
5 files changed, 168 insertions, 9 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h
index 16383ac80..685e37ecd 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -178,6 +178,12 @@
IBOutlet NSTextField * fX264optDeblockLabel;
IBOutlet NSPopUpButton * fX264optAlphaDeblockPopUp;
IBOutlet NSPopUpButton * fX264optBetaDeblockPopUp;
+ IBOutlet NSTextField * fX264optAnalyseLabel;
+ IBOutlet NSPopUpButton * fX264optAnalysePopUp;
+ IBOutlet NSTextField * fX264opt8x8dctLabel;
+ IBOutlet NSButton * fX264opt8x8dctSwitch;
+ IBOutlet NSTextField * fX264optCabacLabel;
+ IBOutlet NSButton * fX264optCabacSwitch;
/* User Preset variables here fPresetNewDesc*/
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index a36398bcc..7bf9b50d5 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -996,7 +996,8 @@ list = hb_get_titles( fHandle );
fX264optMotionEstLabel,fX264optMotionEstPopUp,fX264optMERangeLabel,fX264optMERangePopUp,
fX264optWeightBLabel,fX264optWeightBSwitch,fX264optBRDOLabel,fX264optBRDOSwitch,
fX264optBPyramidLabel,fX264optBPyramidSwitch,fX264optBiMELabel,fX264optBiMESwitch,
- fX264optDirectPredLabel,fX264optDirectPredPopUp,fX264optDeblockLabel,
+ fX264optDirectPredLabel,fX264optDirectPredPopUp,fX264optDeblockLabel,fX264optAnalyseLabel,
+ fX264optAnalysePopUp,fX264opt8x8dctLabel,fX264opt8x8dctSwitch,fX264optCabacLabel,fX264optCabacSwitch,
fX264optAlphaDeblockPopUp,fX264optBetaDeblockPopUp,fVidTurboPassCheck,fDstMpgLargeFileCheck,fPicSettingAutoCropLabel,
fPicSettingAutoCropDsply};
@@ -2456,6 +2457,18 @@ the user is using "Custom" settings by determining the sender*/
[fX264optBetaDeblockPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
}
+ /* Analysis fX264optAnalysePopUp */
+ [fX264optAnalysePopUp removeAllItems];
+ [fX264optAnalysePopUp addItemWithTitle:@"Default (some)"]; /* 0=default */
+ [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"None"]]; /* 1=none */
+ [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"All"]]; /* 2=all */
+
+ /* 8x8 DCT fX264op8x8dctSwitch */
+ [fX264opt8x8dctSwitch setState:0];
+
+ /* CABAC fX264opCabacSwitch */
+ [fX264optCabacSwitch setState:1];
+
/* Standardize the option string */
[self X264AdvancedOptionsStandardizeOptString: NULL];
/* Set Current GUI Settings based on newly standardized string */
@@ -2588,6 +2601,13 @@ the user is using "Custom" settings by determining the sender*/
{
cleanOptNameString = @"deblock";
}
+
+ /*Analysis*/
+ if ([cleanOptNameString isEqualToString:@"partitions"])
+ {
+ cleanOptNameString = @"analyse";
+ }
+
return cleanOptNameString;
}
@@ -2750,6 +2770,32 @@ the user is using "Custom" settings by determining the sender*/
[fX264optBetaDeblockPopUp selectItemAtIndex:7];
}
}
+ }
+ /* Analysis NSPopUpButton */
+ if ([optName isEqualToString:@"analyse"])
+ {
+ if ([optValue isEqualToString:@"p8x8,b8x8,i8x8,i4x4"])
+ {
+ [fX264optAnalysePopUp selectItemAtIndex:0];
+ }
+ if ([optValue isEqualToString:@"none"])
+ {
+ [fX264optAnalysePopUp selectItemAtIndex:1];
+ }
+ if ([optValue isEqualToString:@"all"])
+ {
+ [fX264optAnalysePopUp selectItemAtIndex:2];
+ }
+ }
+ /* 8x8 DCT NSButton */
+ if ([optName isEqualToString:@"8x8dct"])
+ {
+ [fX264opt8x8dctSwitch setState:[optValue intValue]];
+ }
+ /* CABAC NSButton */
+ if ([optName isEqualToString:@"cabac"])
+ {
+ [fX264optCabacSwitch setState:[optValue intValue]];
}
}
}
@@ -2825,6 +2871,18 @@ the user is using "Custom" settings by determining the sender*/
{
optNameToChange = @"deblock";
}
+ if (sender == fX264optAnalysePopUp)
+ {
+ optNameToChange = @"analyse";
+ }
+ if (sender == fX264opt8x8dctSwitch)
+ {
+ optNameToChange = @"8x8dct";
+ }
+ if (sender == fX264optCabacSwitch)
+ {
+ optNameToChange = @"cabac";
+ }
/* Set widgets depending on the opt string in field */
NSString * thisOpt; // The separated option such as "bframes=3"
@@ -2887,7 +2945,7 @@ the user is using "Custom" settings by determining the sender*/
thisOpt = [NSString stringWithFormat:@"%@=%d,%d",optName, ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0,([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0];
}
}
- else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] || [optNameToChange isEqualToString:@"brdo"] || [optNameToChange isEqualToString:@"bime"] || [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"])
+ else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] || [optNameToChange isEqualToString:@"brdo"] || [optNameToChange isEqualToString:@"bime"] || [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"] || [optNameToChange isEqualToString:@"8x8dct"] )
{
if ([sender state] == 0)
{
@@ -2897,6 +2955,17 @@ the user is using "Custom" settings by determining the sender*/
{
thisOpt = [NSString stringWithFormat:@"%@=%d",optName,1];
}
+ }
+ else if ([optNameToChange isEqualToString:@"cabac"])
+ {
+ if ([sender state] == 1)
+ {
+ thisOpt = @"";
+ }
+ else
+ {
+ thisOpt = [NSString stringWithFormat:@"%@=%d",optName,0];
+ }
}
else if (([sender indexOfSelectedItem] == 0) && (sender != fX264optAlphaDeblockPopUp) && (sender != fX264optBetaDeblockPopUp) ) // means that "unspecified" is chosen, lets then remove it from the string
{
@@ -2950,6 +3019,22 @@ the user is using "Custom" settings by determining the sender*/
break;
}
}
+ else if ([optNameToChange isEqualToString:@"analyse"])
+ {
+ switch ([sender indexOfSelectedItem])
+ {
+ case 1:
+ thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"none"];
+ break;
+
+ case 2:
+ thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"all"];
+ break;
+
+ default:
+ break;
+ }
+ }
else if ([optNameToChange isEqualToString:@"merange"])
{
thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]+3];
@@ -3042,6 +3127,24 @@ the user is using "Custom" settings by determining the sender*/
break;
}
}
+ else if ([optNameToChange isEqualToString:@"analyse"])
+ {
+ switch ([sender indexOfSelectedItem])
+ {
+ case 1:
+ [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@",
+ [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"none"]]];
+ break;
+
+ case 2:
+ [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@",
+ [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"all"]]];
+ break;
+
+ default:
+ break;
+ }
+ }
else if ([optNameToChange isEqualToString:@"merange"])
{
@@ -3052,7 +3155,7 @@ the user is using "Custom" settings by determining the sender*/
{
[fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@", [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d,%d", ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0, ([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0]]];
}
- else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] || [optNameToChange isEqualToString:@"brdo"] || [optNameToChange isEqualToString:@"bime"] || [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"]) {
+ else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] || [optNameToChange isEqualToString:@"brdo"] || [optNameToChange isEqualToString:@"bime"] || [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"] || [optNameToChange isEqualToString:@"8x8dct"] ) {
if ([sender state] == 0)
{
[fDisplayX264Options setStringValue:[NSString stringWithFormat:@""]];
@@ -3062,6 +3165,18 @@ the user is using "Custom" settings by determining the sender*/
[fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@",
[NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender state]]]];
}
+ }
+ else if ([optNameToChange isEqualToString:@"cabac"])
+ {
+ if ([sender state] == 1)
+ {
+ [fDisplayX264Options setStringValue:[NSString stringWithFormat:@""]];
+ }
+ else
+ {
+ [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@=%@",
+ [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender state]]]];
+ }
}
else
{
@@ -3135,6 +3250,26 @@ the user is using "Custom" settings by determining the sender*/
break;
}
}
+ else if ([optNameToChange isEqualToString:@"analyse"])
+ {
+ switch ([sender indexOfSelectedItem])
+ {
+ case 1:
+ [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@",
+ [NSString stringWithFormat:[fDisplayX264Options stringValue]],
+ [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"none"]]];
+ break;
+
+ case 2:
+ [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@",
+ [NSString stringWithFormat:[fDisplayX264Options stringValue]],
+ [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"all"]]];
+ break;
+
+ default:
+ break;
+ }
+ }
else if ([optNameToChange isEqualToString:@"merange"])
{
@@ -3145,7 +3280,7 @@ the user is using "Custom" settings by determining the sender*/
{
[fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@", [NSString stringWithFormat:[fDisplayX264Options stringValue]], [NSString stringWithFormat:optNameToChange], [NSString stringWithFormat:@"%d,%d", ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0, ([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0]]];
}
- else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] || [optNameToChange isEqualToString:@"brdo"] || [optNameToChange isEqualToString:@"bime"] || [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"])
+ else if /*Boolean Switches*/ ([optNameToChange isEqualToString:@"mixed-refs"] || [optNameToChange isEqualToString:@"weightb"] || [optNameToChange isEqualToString:@"brdo"] || [optNameToChange isEqualToString:@"bime"] || [optNameToChange isEqualToString:@"b-pyramid"] || [optNameToChange isEqualToString:@"no-fast-pskip"] || [optNameToChange isEqualToString:@"no-dct-decimate"] || [optNameToChange isEqualToString:@"8x8dct"] )
{
if ([sender state] == 0)
{
@@ -3157,6 +3292,18 @@ the user is using "Custom" settings by determining the sender*/
[NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender state]]]];
}
}
+ else if ([optNameToChange isEqualToString:@"cabac"])
+ {
+ if ([sender state] == 1)
+ {
+ [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]]]];
+ }
+ else
+ {
+ [fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]],
+ [NSString stringWithFormat:optNameToChange],[NSString stringWithFormat:@"%d",[sender state]]]];
+ }
+ }
else
{
[fDisplayX264Options setStringValue:[NSString stringWithFormat:@"%@:%@=%@",[NSString stringWithFormat:[fDisplayX264Options stringValue]],
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index f5db02cb8..f7a627c78 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -147,7 +147,11 @@
fVidTurboPassCheck = NSButton;
fVidTwoPassCheck = NSButton;
fWindow = NSWindow;
+ fX264opt8x8dctLabel = NSTextField;
+ fX264opt8x8dctSwitch = NSButton;
fX264optAlphaDeblockPopUp = NSPopUpButton;
+ fX264optAnalyseLabel = NSTextField;
+ fX264optAnalysePopUp = NSPopUpButton;
fX264optBPyramidLabel = NSTextField;
fX264optBPyramidSwitch = NSButton;
fX264optBRDOLabel = NSTextField;
@@ -157,6 +161,8 @@
fX264optBframesPopUp = NSPopUpButton;
fX264optBiMELabel = NSTextField;
fX264optBiMESwitch = NSButton;
+ fX264optCabacLabel = NSTextField;
+ fX264optCabacSwitch = NSButton;
fX264optDeblockLabel = NSTextField;
fX264optDirectPredLabel = NSTextField;
fX264optDirectPredPopUp = NSPopUpButton;
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index f5460bdc4..e6b203aaa 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -7,9 +7,9 @@
<key>IBEditorPositions</key>
<dict>
<key>1843</key>
- <string>620 338 200 530 0 0 1440 878 </string>
+ <string>873 440 200 530 0 0 1920 1058 </string>
<key>29</key>
- <string>155 478 365 44 0 0 1440 878 </string>
+ <string>224 581 365 44 0 0 1920 1058 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -25,13 +25,13 @@
<integer>4</integer>
<key>IBOpenObjects</key>
<array>
+ <integer>1843</integer>
+ <integer>1162</integer>
<integer>29</integer>
<integer>21</integer>
- <integer>1162</integer>
- <integer>1843</integer>
</array>
<key>IBSystem Version</key>
- <string>8R2218</string>
+ <string>8R218</string>
<key>IBUserGuides</key>
<dict>
<key>21</key>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 609ee5b88..51112c94c 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 04:10:37 +0000