unsigned i;
NSControl * controls[] =
{ fX264optViewTitleLabel,fDisplayX264Options,fDisplayX264OptionsLabel,fX264optBframesLabel,
- fX264optBframesPopUp,fX264optRefLabel,fX264optRefPopUp,fX264optNfpskipLabel,fX264optNfpskipSwitch,
+ fX264optBframesPopUp,fX264optRefLabel,fX264optRefPopUp,
fX264optNodctdcmtLabel,fX264optNodctdcmtSwitch,fX264optSubmeLabel,fX264optSubmePopUp,
- fX264optTrellisLabel,fX264optTrellisPopUp,fX264optMixedRefsLabel,fX264optMixedRefsSwitch,
+ fX264optTrellisLabel,fX264optTrellisPopUp, fX264optWeightPLabel, fX264optWeightPSwitch,
fX264optMotionEstLabel,fX264optMotionEstPopUp,fX264optMERangeLabel,fX264optMERangePopUp,
- fX264optWeightBLabel,fX264optWeightBSwitch, fX264optBPyramidLabel,fX264optBPyramidSwitch,
+ fX264optBPyramidLabel,fX264optBPyramidPopUp, fX264optAqLabel, fX264optAqSlider,
fX264optDirectPredLabel,fX264optDirectPredPopUp,fX264optDeblockLabel,fX264optAnalyseLabel,
fX264optAnalysePopUp,fX264opt8x8dctLabel,fX264opt8x8dctSwitch,fX264optCabacLabel,fX264optCabacSwitch,
fX264optAlphaDeblockPopUp,fX264optBetaDeblockPopUp, fX264optPsyRDSlider, fX264optPsyRDLabel, fX264optPsyTrellisSlider, fX264optPsyTrellisLabel, fX264optBAdaptPopUp, fX264optBAdaptLabel };
{
/*Set opt widget values here*/
+ NSString * toolTip = @"";
+
/*B-Frames fX264optBframesPopUp*/
int i;
[fX264optBframesPopUp removeAllItems];
- [fX264optBframesPopUp addItemWithTitle:@"Default (0)"];
+ [fX264optBframesPopUp addItemWithTitle:@"Default (3)"];
for (i=0; i<17;i++)
{
[fX264optBframesPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
}
+ toolTip =
+ @"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use. Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal. Cel-animated source material and B-pyramid also significantly increase the usefulness of larger values. Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off).";
+ [fX264optBframesPopUp setToolTip: toolTip];
+ [fX264optBframesLabel setToolTip: toolTip];
/*Reference Frames fX264optRefPopUp*/
[fX264optRefPopUp removeAllItems];
- [fX264optRefPopUp addItemWithTitle:@"Default (1)"];
- for (i=0; i<17;i++)
+ [fX264optRefPopUp addItemWithTitle:@"Default (3)"];
+ for (i=1; i<17;i++)
{
[fX264optRefPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
}
-
- /*No Fast P-Skip fX264optNfpskipSwitch BOOLEAN*/
- [fX264optNfpskipSwitch setState:0];
+ toolTip =
+ @"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode. Cel animation tends to benefit from more reference frames a lot more than film content. Note that many hardware devices have limitations on the number of supported reference frames, so if you're encoding for a handheld or standalone player, don't touch this unless you're absolutely sure you know what you're doing!";
+ [fX264optRefPopUp setToolTip: toolTip];
+ [fX264optRefLabel setToolTip: toolTip];
+
+ /*Weight-P fX264optWeightPSwitch BOOLEAN*/
+ [fX264optWeightPSwitch setState:1];
+ toolTip =
+ @"Performs extra analysis to decide upon weighting parameters for each frame. This improves overall compression slightly and improves the quality of fades greatly. Baseline profile, as required for iPods and similar devices, requires weighted P-frame prediction to be disabled. Note that some devices and players, even those that support Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.";
+ [fX264optWeightPSwitch setToolTip: toolTip];
+ [fX264optWeightPLabel setToolTip: toolTip];
/*No Dict Decimate fX264optNodctdcmtSwitch BOOLEAN*/
[fX264optNodctdcmtSwitch setState:0];
+ toolTip =
+ @"x264 normally zeroes out nearly-empty data blocks to save bits to be better used for some other purpose in the video. However, this can sometimes have slight negative effects on retention of subtle grain and dither. Don't touch this unless you're having banding issues or other such cases where you are having trouble keeping fine noise.";
+ [fX264optNodctdcmtSwitch setToolTip: toolTip];
+ [fX264optNodctdcmtLabel setToolTip: toolTip];
/*Sub Me fX264optSubmePopUp*/
[fX264optSubmePopUp removeAllItems];
- [fX264optSubmePopUp addItemWithTitle:@"Default (6)"];
- for (i=0; i<10;i++)
- {
- [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
- }
+ [fX264optSubmePopUp addItemWithTitle:@"Default (7)"];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"0: SAD, no subpel (super fast!)"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"1: SAD, qpel"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"2: SATD, qpel"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"3: SATD, multi-qpel"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"4: SATD, qpel on all"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"5: SATD, multi-qpel on all"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"6: RD in I/P-frames"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"7: RD in all frames"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"8: RD refine in I/P-frames"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"9: RD refine in all frames"]];
+ [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"10: QPRD in all frames"]];
+ toolTip =
+ @"This setting controls both subpixel-precision motion estimation and mode decision methods.\n\nSubpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n\nMode decision is the method used to choose how to encode each block of the frame: a very important decision.\n\nSAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n\n6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n\n10, the most powerful and slowest option, requires trellis=2.";
+ [fX264optSubmePopUp setToolTip: toolTip];
+ [fX264optSubmeLabel setToolTip: toolTip];
/*Trellis fX264optTrellisPopUp*/
[fX264optTrellisPopUp removeAllItems];
- [fX264optTrellisPopUp addItemWithTitle:@"Default (0)"];
- for (i=0; i<3;i++)
- {
- [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
- }
+ [fX264optTrellisPopUp addItemWithTitle:@"Default (Encode only)"];
+ [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"Off"]];
+ [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"Encode only"]];
+ [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"Always"]];
[fX264optTrellisPopUp setWantsLayer:YES];
-
- /*Mixed-references fX264optMixedRefsSwitch BOOLEAN*/
- [fX264optMixedRefsSwitch setState:0];
- [fX264optMixedRefsSwitch setWantsLayer:YES];
+ toolTip =
+ @"Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. \"Always\" uses trellis not only during the main encoding process, but also during analysis, which improves compression even more, albeit at great speed cost. Trellis costs more speed at higher bitrates.";
+ [fX264optTrellisPopUp setToolTip: toolTip];
+ [fX264optTrellisLabel setToolTip: toolTip];
/*Motion Estimation fX264optMotionEstPopUp*/
[fX264optMotionEstPopUp removeAllItems];
[fX264optMotionEstPopUp addItemWithTitle:@"Uneven Multi-Hexagon"];
[fX264optMotionEstPopUp addItemWithTitle:@"Exhaustive"];
[fX264optMotionEstPopUp addItemWithTitle:@"Transformed Exhaustive"];
+ toolTip =
+ @"Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved. A better motion search method improves compression at the cost of speed.\n\nDiamond: performs an extremely fast and simple search using a diamond pattern.\n\nHexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n\nUneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n\nExhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n\nTransformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement.";
+ [fX264optMotionEstPopUp setToolTip: toolTip];
+ [fX264optMotionEstLabel setToolTip: toolTip];
/*Motion Estimation range fX264optMERangePopUp*/
[fX264optMERangePopUp removeAllItems];
{
[fX264optMERangePopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
}
+ toolTip =
+ @"This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion. Doesn't apply to Diamond or Hexagon search options. The default is fine for most content, but extremely high motion video, especially at HD resolutions, may benefit from higher ranges, albeit at a high speed cost.";
+ [fX264optMERangePopUp setToolTip: toolTip];
+ [fX264optMERangeLabel setToolTip: toolTip];
- /*Weighted B-Frame Prediction fX264optWeightBSwitch BOOLEAN*/
- [fX264optWeightBSwitch setState:0];
- [fX264optWeightBSwitch setWantsLayer:YES];
-
- /*B-frame Pyramids fX264optBPyramidSwitch BOOLEAN*/
- [fX264optBPyramidSwitch setState:0];
- [fX264optBPyramidSwitch setWantsLayer:YES];
+ /*B-frame Pyramids fX264optBPyramidPopUp*/
+ [fX264optBPyramidPopUp removeAllItems];
+ [fX264optBPyramidPopUp addItemWithTitle:@"Default (Normal)"];
+ [fX264optBPyramidPopUp addItemWithTitle:@"Off"];
+ [fX264optBPyramidPopUp addItemWithTitle:@"Strict"];
+ [fX264optBPyramidPopUp setWantsLayer:YES];
+ toolTip =
+ @"B-pyramid improves compression by creating a pyramidal structure (hence the name) of B-frames, allowing B-frames to reference each other to improve compression. Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit.";
+ [fX264optBPyramidPopUp setToolTip: toolTip];
+ [fX264optBPyramidLabel setToolTip: toolTip];
/*Direct B-Frame Prediction Mode fX264optDirectPredPopUp*/
[fX264optDirectPredPopUp removeAllItems];
[fX264optDirectPredPopUp addItemWithTitle:@"Temporal"];
[fX264optDirectPredPopUp addItemWithTitle:@"Automatic"];
[fX264optDirectPredPopUp setWantsLayer:YES];
+ toolTip =
+ @"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n\nSpatial, the default, is almost always better, but temporal is sometimes useful too.\n\nx264 can, at the cost of a small amount of speed (and accordingly for a small compression gain), adaptively select which is better for each particular frame.";
+ [fX264optDirectPredPopUp setToolTip: toolTip];
+ [fX264optDirectPredLabel setToolTip: toolTip];
/* Adaptive B-Frames Mode fX264optBAdaptPopUp */
[fX264optBAdaptPopUp removeAllItems];
[fX264optBAdaptPopUp addItemWithTitle:@"Fast"];
[fX264optBAdaptPopUp addItemWithTitle:@"Optimal"];
[fX264optBAdaptPopUp setWantsLayer:YES];
+ toolTip =
+ @"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n\nFast mode takes roughly the same amount of time no matter how many B-frames you specify. However, while fast, its decisions are often suboptimal.\n\nOptimal mode gets slower as the maximum number of B-Frames increases, but makes much more accurate decisions, especially when used with B-pyramid.";
+ [fX264optBAdaptPopUp setToolTip: toolTip];
+ [fX264optBAdaptLabel setToolTip: toolTip];
/*Alpha Deblock*/
[fX264optAlphaDeblockPopUp removeAllItems];
{
[fX264optAlphaDeblockPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
}
+ toolTip =
+ @"H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame. This not only improves visual quality, but also helps compression significantly. The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.\n\nThe deblocking filter has two adjustable parameters, \"strength\" and \"threshold\". The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.";
+ [fX264optAlphaDeblockPopUp setToolTip: toolTip];
+ [fX264optDeblockLabel setToolTip: toolTip];
/*Beta Deblock*/
[fX264optBetaDeblockPopUp removeAllItems];
{
[fX264optBetaDeblockPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]];
}
+ [fX264optBetaDeblockPopUp setToolTip: toolTip];
+ [fX264optDeblockLabel setToolTip: toolTip];
/* Analysis fX264optAnalysePopUp */
[fX264optAnalysePopUp removeAllItems];
- [fX264optAnalysePopUp addItemWithTitle:@"Default (some)"]; /* 0=default */
+ [fX264optAnalysePopUp addItemWithTitle:@"Default (Most)"]; /* 0=default */
[fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"None"]]; /* 1=none */
- [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"All"]]; /* 2=all */
+ [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"Some"]]; /* 2=some */
+ [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"All"]]; /* 3=all */
+ toolTip =
+ @"Mode decision picks from a variety of options to make its decision: this option chooses what options those are. Fewer partitions to check means faster encoding, at the cost of worse decisions, since the best option might have been one that was turned off.";
+ [fX264optAnalysePopUp setToolTip: toolTip];
+ [fX264optAnalyseLabel setToolTip: toolTip];
/* 8x8 DCT fX264op8x8dctSwitch */
- [fX264opt8x8dctSwitch setState:0];
+ [fX264opt8x8dctSwitch setState:1];
[fX264opt8x8dctSwitch setWantsLayer:YES];
+ toolTip =
+ @"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed. It improves compression by at least 5% at a very small speed cost and may provide an unusually high visual quality benefit compared to its compression gain. However, it requires High Profile, which many devices may not support.";
+ [fX264opt8x8dctSwitch setToolTip: toolTip];
+ [fX264opt8x8dctLabel setToolTip: toolTip];
/* CABAC fX264opCabacSwitch */
[fX264optCabacSwitch setState:1];
+ toolTip =
+ @"After the encoder has done its work, it has a bunch of data that needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides two options for this: CAVLC and CABAC. CABAC decodes a lot slower but compresses significantly better (10-30%), especially at lower bitrates. If you're looking to minimize CPU requirements for video playback, disable this option. Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled.";
+ [fX264optCabacSwitch setToolTip: toolTip];
+ [fX264optCabacLabel setToolTip: toolTip];
+
+ /* Adaptive Quantization Strength fX264opAqSlider */
+ [fX264optAqSlider setMinValue:0.0];
+ [fX264optAqSlider setMaxValue:2.0];
+ [fX264optAqSlider setTickMarkPosition:NSTickMarkBelow];
+ [fX264optAqSlider setNumberOfTickMarks:21];
+ [fX264optAqSlider setAllowsTickMarkValuesOnly:YES];
+ [fX264optAqSlider setFloatValue:1.0];
+ toolTip =
+ @"Adaptive quantization controls how the encoder distributes bits across the frame. Higher values take more bits away from edges and complex areas to improve areas with finer detail.";
+ [fX264optAqSlider setToolTip: toolTip];
+ [fX264optAqLabel setToolTip: toolTip];
/* PsyRDO fX264optPsyRDSlider */
[fX264optPsyRDSlider setMinValue:0.0];
- [fX264optPsyRDSlider setMaxValue:1.0];
+ [fX264optPsyRDSlider setMaxValue:2.0];
[fX264optPsyRDSlider setTickMarkPosition:NSTickMarkBelow];
- [fX264optPsyRDSlider setNumberOfTickMarks:10];
+ [fX264optPsyRDSlider setNumberOfTickMarks:21];
[fX264optPsyRDSlider setAllowsTickMarkValuesOnly:YES];
[fX264optPsyRDSlider setFloatValue:1.0];
+ toolTip =
+ @"Psychovisual rate-distortion optimization takes advantage of the characteristics of human vision to dramatically improve apparent detail and sharpness. The effect can be made weaker or stronger by adjusting the strength. Being an RD algorithm, it requires mode decision to be at least \"6\".";
+ [fX264optPsyRDSlider setToolTip: toolTip];
+ [fX264optPsyRDLabel setToolTip: toolTip];
/* PsyTrellis fX264optPsyRDSlider */
[fX264optPsyTrellisSlider setMinValue:0.0];
[fX264optPsyTrellisSlider setMaxValue:1.0];
[fX264optPsyTrellisSlider setTickMarkPosition:NSTickMarkBelow];
- [fX264optPsyTrellisSlider setNumberOfTickMarks:10];
+ [fX264optPsyTrellisSlider setNumberOfTickMarks:21];
[fX264optPsyTrellisSlider setAllowsTickMarkValuesOnly:YES];
[fX264optPsyTrellisSlider setFloatValue:0.0];
+ toolTip =
+ @"Psychovisual trellis is an experimental algorithm to further improve sharpness and detail retention beyond what Psychovisual RD does. Recommended values are around 0.2, though higher values may help for very grainy video or lower bitrate encodes. Not recommended for cel animation and other sharp-edged graphics.";
+ [fX264optPsyTrellisSlider setToolTip: toolTip];
+ [fX264optPsyTrellisLabel setToolTip: toolTip];
/* Standardize the option string */
[self X264AdvancedOptionsStandardizeOptString:nil];
}
/* Change the option string to reflect the new standardized option string */
- [fDisplayX264Options setStringValue:[NSString stringWithFormat:changedOptString]];
+ [fDisplayX264Options setStringValue:changedOptString];
}
/**
cleanOptNameString = @"ref";
}
- /*No Fast PSkip nofast_pskip*/
- if ([cleanOptNameString isEqualToString:@"no-fast-pskip"] || [cleanOptNameString isEqualToString:@"no_fast_pskip"] || [cleanOptNameString isEqualToString:@"nofast_pskip"])
- {
- cleanOptNameString = @"no-fast-pskip";
- }
-
/*No Dict Decimate*/
if ([cleanOptNameString isEqualToString:@"no-dct-decimate"] || [cleanOptNameString isEqualToString:@"no_dct_decimate"] || [cleanOptNameString isEqualToString:@"nodct_decimate"])
{
if ([cleanOptNameString isEqualToString:@"me-range"] || [cleanOptNameString isEqualToString:@"me_range"])
cleanOptNameString = @"merange";
- /*WeightB*/
- if ([cleanOptNameString isEqualToString:@"weight-b"] || [cleanOptNameString isEqualToString:@"weight_b"])
- {
- cleanOptNameString = @"weightb";
- }
-
/*B Pyramid*/
if ([cleanOptNameString isEqualToString:@"b_pyramid"])
{
{
/* Lots of situations to cover.
- B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)
- - CABAC (when 0 turn off trellis)
- - analysis (if none, turn off 8x8dct)
- - refs (under 2, disable mixed-refs)
+ - CABAC (when 0 turn off trellis and psy-trel)
- subme (if under 6, turn off psy-rd and psy-trel)
- trellis (if 0, turn off psy-trel)
*/
if( sender == fX264optBframesPopUp || sender == nil || sender == fDisplayX264Options )
{
- if ( [fX264optBframesPopUp indexOfSelectedItem ] < 2)
+ if ( [fX264optBframesPopUp indexOfSelectedItem ] == 1 )
{
- /* If the b-frame widget is at 0 or 1, the user has chosen
+ /* If the b-frame widget is at 1, the user has chosen
not to use b-frames at all. So disable the options
that can only be used when b-frames are enabled. */
- if( [fX264optWeightBSwitch isHidden] == false)
+ if( [fX264optBPyramidPopUp isHidden] == false )
{
- [[fX264optWeightBSwitch animator] setHidden:YES];
- [[fX264optWeightBLabel animator] setHidden:YES];
- if ( [fX264optWeightBSwitch state] == 1 )
- [fX264optWeightBSwitch performClick:self];
- }
-
- if( [fX264optBPyramidSwitch isHidden] == false )
- {
- [[fX264optBPyramidSwitch animator] setHidden:YES];
+ [[fX264optBPyramidPopUp animator] setHidden:YES];
[[fX264optBPyramidLabel animator] setHidden:YES];
- if ( [fX264optBPyramidSwitch state] == 1 )
- [fX264optBPyramidSwitch performClick:self];
+ if ( [fX264optBPyramidPopUp indexOfSelectedItem] > 0 )
+ {
+ [fX264optBPyramidPopUp selectItemAtIndex: 0];
+ [[fX264optBPyramidPopUp cell] performClick:self];
+ }
}
if( [fX264optDirectPredPopUp isHidden] == false )
else if ( [fX264optBframesPopUp indexOfSelectedItem ] == 2)
{
/* Only 1 b-frame? Disable b-pyramid. */
- if( [fX264optBPyramidSwitch isHidden] == false )
+ if( [fX264optBPyramidPopUp isHidden] == false )
{
- [[fX264optBPyramidSwitch animator] setHidden:YES];
+ [[fX264optBPyramidPopUp animator] setHidden:YES];
[[fX264optBPyramidLabel animator] setHidden:YES];
- if ( [fX264optBPyramidSwitch state] == 1 )
- [fX264optBPyramidSwitch performClick:self];
+ if ( [fX264optBPyramidPopUp indexOfSelectedItem] > 0 )
+ {
+ [fX264optBPyramidPopUp selectItemAtIndex: 0];
+ [[fX264optBPyramidPopUp cell] performClick:self];
+ }
}
- if( [fX264optWeightBSwitch isHidden] == true )
- {
- [[fX264optWeightBSwitch animator] setHidden:NO];
- [[fX264optWeightBLabel animator] setHidden:NO];
- }
-
if( [fX264optDirectPredPopUp isHidden] == true )
{
[[fX264optDirectPredPopUp animator] setHidden:NO];
}
else
{
- if( [fX264optBPyramidSwitch isHidden] == true )
+ if( [fX264optBPyramidPopUp isHidden] == true )
{
- [[fX264optBPyramidSwitch animator] setHidden:NO];
+ [[fX264optBPyramidPopUp animator] setHidden:NO];
[[fX264optBPyramidLabel animator] setHidden:NO];
}
- if( [fX264optWeightBSwitch isHidden] == true )
- {
- [[fX264optWeightBSwitch animator] setHidden:NO];
- [[fX264optWeightBLabel animator] setHidden:NO];
- }
-
if( [fX264optDirectPredPopUp isHidden] == true )
{
[[fX264optDirectPredPopUp animator] setHidden:NO];
}
}
- if( sender == fX264optCabacSwitch || sender == nil || sender == fDisplayX264Options )
- {
- if ( [fX264optCabacSwitch state] == false)
- {
- if( [fX264optTrellisPopUp isHidden] == false )
- {
- /* Without CABAC entropy coding, trellis doesn't run. */
- [[fX264optTrellisPopUp animator] setHidden:YES];
- [[fX264optTrellisLabel animator] setHidden:YES];
- [fX264optTrellisPopUp selectItemAtIndex:0];
- [[fX264optTrellisPopUp cell] performClick:self];
- }
- }
- else if( [fX264optTrellisPopUp isHidden] == true)
- {
- [[fX264optTrellisPopUp animator] setHidden:NO];
- [[fX264optTrellisLabel animator] setHidden:NO];
- }
- }
-
- if( sender == fX264optAnalysePopUp || sender == nil || sender == fDisplayX264Options )
- {
- if ( [fX264optAnalysePopUp indexOfSelectedItem] == 1)
- {
- /* No analysis? Disable 8x8dct */
- if( [fX264opt8x8dctSwitch isHidden] == false )
- {
- [[fX264opt8x8dctSwitch animator] setHidden:YES];
- [[fX264opt8x8dctLabel animator] setHidden:YES];
- if ( [fX264opt8x8dctSwitch state] == 1 )
- [fX264opt8x8dctSwitch performClick:self];
- }
- }
- else
- {
- if( [fX264opt8x8dctSwitch isHidden] == true )
- {
- [[fX264opt8x8dctSwitch animator] setHidden:NO];
- [[fX264opt8x8dctLabel animator] setHidden:NO];
- }
- }
- }
-
- if( sender == fX264optRefPopUp || sender == nil || sender == fDisplayX264Options )
- {
- if ( [fX264optRefPopUp indexOfSelectedItem] < 3)
- {
- if( [fX264optMixedRefsSwitch isHidden] == false )
- {
- /* Only do mixed-refs when there are at least 2 refs to mix. */
- [[fX264optMixedRefsSwitch animator] setHidden:YES];
- [[fX264optMixedRefsLabel animator] setHidden:YES];
- if( [fX264optMixedRefsSwitch state] == 1 )
- [fX264optMixedRefsSwitch performClick:self];
- }
- }
- else
- {
- if( [fX264optMixedRefsSwitch isHidden] == true )
- {
- [[fX264optMixedRefsSwitch animator] setHidden:NO];
- [[fX264optMixedRefsLabel animator] setHidden:NO];
- }
- }
- }
-
if( sender == fX264optMotionEstPopUp || sender == nil || sender == fDisplayX264Options )
{
if ( [fX264optMotionEstPopUp indexOfSelectedItem] < 3 )
{
[[fX264optPsyRDSlider animator] setHidden:YES];
[[fX264optPsyRDLabel animator] setHidden:YES];
- [[fX264optPsyRDSlider animator] setFloatValue:1];
if ( [fX264optPsyRDSlider floatValue] < 1.0 )
{
[fX264optPsyRDSlider setFloatValue:1.0];
{
[[fX264optPsyTrellisSlider animator] setHidden:YES];
[[fX264optPsyTrellisLabel animator] setHidden:YES];
- [[fX264optPsyTrellisSlider animator] setFloatValue:0];
if ( [fX264optPsyTrellisSlider floatValue] > 0.0 )
{
[fX264optPsyTrellisSlider setFloatValue:0.0];
[[fX264optPsyRDLabel animator] setHidden:NO];
}
- if( [fX264optTrellisPopUp indexOfSelectedItem] >= 2 && [fX264optCabacSwitch state] == true && [fX264optPsyTrellisSlider isHidden] == true )
+ if( ( [fX264optTrellisPopUp indexOfSelectedItem] == 0 || [fX264optTrellisPopUp indexOfSelectedItem] >= 2 ) && [fX264optPsyTrellisSlider isHidden] == true )
{
[[fX264optPsyTrellisSlider animator] setHidden:NO];
[[fX264optPsyTrellisLabel animator] setHidden:NO];
if( sender == fX264optTrellisPopUp || sender == nil || sender == fDisplayX264Options )
{
- if( [fX264optTrellisPopUp indexOfSelectedItem] < 2 )
+ if( [fX264optTrellisPopUp indexOfSelectedItem] > 0 && [fX264optTrellisPopUp indexOfSelectedItem] < 2 )
{
if( [fX264optPsyTrellisSlider isHidden] == false )
{
}
else
{
- if( ( [fX264optSubmePopUp indexOfSelectedItem] == 0 || [fX264optSubmePopUp indexOfSelectedItem] >= 7 ) && [fX264optCabacSwitch state] == true && [fX264optPsyTrellisSlider isHidden] == true )
+ if( ( [fX264optSubmePopUp indexOfSelectedItem] == 0 || [fX264optSubmePopUp indexOfSelectedItem] >= 7 ) && [fX264optPsyTrellisSlider isHidden] == true )
{
[[fX264optPsyTrellisSlider animator] setHidden:NO];
[[fX264optPsyTrellisLabel animator] setHidden:NO];
/*ref NSPopUpButton*/
if ([optName isEqualToString:@"ref"])
{
- [fX264optRefPopUp selectItemAtIndex:[optValue intValue]+1];
+ // Clamp values to a minimum of 1 and a maximum of 16
+ if ( [optValue intValue] < 1 )
+ {
+ [fX264optRefPopUp selectItemAtIndex:1];
+ [ self X264AdvancedOptionsChanged: fX264optRefPopUp];
+ }
+ else if ( [optValue intValue] > 16 )
+ {
+ [fX264optRefPopUp selectItemAtIndex:16];
+ [ self X264AdvancedOptionsChanged: fX264optRefPopUp];
+ }
+ else
+ {
+ [fX264optRefPopUp selectItemAtIndex:[optValue intValue]];
+ }
}
- /*No Fast PSkip NSButton*/
- if ([optName isEqualToString:@"no-fast-pskip"])
+ /*WeightP NSButton*/
+ if ([optName isEqualToString:@"weightp"])
{
- [fX264optNfpskipSwitch setState:[optValue intValue]];
+ if ([optValue intValue] < 1)
+ [fX264optWeightPSwitch setState:0];
+ else
+ [fX264optWeightPSwitch setState:1];
}
/*No Dict Decimate NSButton*/
if ([optName isEqualToString:@"no-dct-decimate"])
{
[fX264optTrellisPopUp selectItemAtIndex:[optValue intValue]+1];
}
- /*Mixed Refs NSButton*/
- if ([optName isEqualToString:@"mixed-refs"])
- {
- [fX264optMixedRefsSwitch setState:[optValue intValue]];
- }
/*Motion Estimation NSPopUpButton*/
if ([optName isEqualToString:@"me"])
{
{
[fX264optBAdaptPopUp selectItemAtIndex:[optValue intValue]+1];
}
- /*Weighted B-Frames NSButton*/
- if ([optName isEqualToString:@"weightb"])
- {
- [fX264optWeightBSwitch setState:[optValue intValue]];
- }
/*B Pyramid NSPButton*/
if ([optName isEqualToString:@"b-pyramid"])
{
- [fX264optBPyramidSwitch setState:[optValue intValue]];
- }
+
+ if( [optValue isEqualToString:@"normal"] )
+ {
+ [self X264AdvancedOptionsChanged: fX264optBPyramidPopUp];
+ [fX264optBPyramidPopUp selectItemAtIndex:0];
+ }
+ else if( [optValue isEqualToString:@"2"] )
+ {
+ [fX264optBPyramidPopUp selectItemAtIndex:0];
+ [self X264AdvancedOptionsChanged: fX264optBPyramidPopUp];
+ }
+ if( [optValue isEqualToString:@"strict"] )
+ {
+ [fX264optBPyramidPopUp selectItemAtIndex:2];
+ }
+ else if( [optValue isEqualToString:@"1"] )
+ {
+ [fX264optBPyramidPopUp selectItemAtIndex:2];
+ [self X264AdvancedOptionsChanged: fX264optBPyramidPopUp];
+ }
+ if( [optValue isEqualToString:@"none"] )
+ {
+ [fX264optBPyramidPopUp selectItemAtIndex:1];
+ }
+ else if( [optValue isEqualToString:@"0"] )
+ {
+ [fX264optBPyramidPopUp selectItemAtIndex:1];
+ [self X264AdvancedOptionsChanged: fX264optBPyramidPopUp];
+ }
+ }
/*Direct B-frame Prediction NSPopUpButton*/
- if ([optName isEqualToString:@"direct"])
+ if ([optName isEqualToString:@"direct"])
{
if ([optValue isEqualToString:@"none"])
[fX264optDirectPredPopUp selectItemAtIndex:1];
{
if ([optValue isEqualToString:@"p8x8,b8x8,i8x8,i4x4"])
{
- /* Default ("some") */
+ /* Default ("most") */
[fX264optAnalysePopUp selectItemAtIndex:0];
}
- if ([optValue isEqualToString:@"none"])
+ else if ([optValue isEqualToString:@"i4x4,i8x8"] ||
+ [optValue isEqualToString:@"i8x8,i4x4"] )
+ {
+ /* Some */
+ [fX264optAnalysePopUp selectItemAtIndex:2];
+ }
+ else if ([optValue isEqualToString:@"none"])
{
[fX264optAnalysePopUp selectItemAtIndex:1];
}
- if ([optValue isEqualToString:@"all"])
+ else if ([optValue isEqualToString:@"all"])
{
- [fX264optAnalysePopUp selectItemAtIndex:2];
+ [fX264optAnalysePopUp selectItemAtIndex:3];
}
+
}
/* 8x8 DCT NSButton */
if ([optName isEqualToString:@"8x8dct"])
{
[fX264optCabacSwitch setState:[optValue intValue]];
}
+ /* Adaptive Quantization Strength NSSlider */
+ if ([optName isEqualToString:@"aq-strength"])
+ {
+ [fX264optAqSlider setFloatValue:[optValue floatValue]];
+ }
/* Psy-RD and Psy-Trellis NSSliders */
if ([optName isEqualToString:@"psy-rd"])
{
{
optNameToChange = @"ref";
}
- if (widget == fX264optNfpskipSwitch)
+ if (widget == fX264optWeightPSwitch)
{
- optNameToChange = @"no-fast-pskip";
+ optNameToChange = @"weightp";
}
if (widget == fX264optNodctdcmtSwitch)
{
{
optNameToChange = @"trellis";
}
- if (widget == fX264optMixedRefsSwitch)
- {
- optNameToChange = @"mixed-refs";
- }
if (widget == fX264optMotionEstPopUp)
{
optNameToChange = @"me";
{
optNameToChange = @"b-adapt";
}
- if (widget == fX264optWeightBSwitch)
- {
- optNameToChange = @"weightb";
- }
- if (widget == fX264optBPyramidSwitch)
+ if (widget == fX264optBPyramidPopUp)
{
optNameToChange = @"b-pyramid";
}
{
optNameToChange = @"cabac";
}
+ if( widget == fX264optAqSlider)
+ {
+ optNameToChange = @"aq-strength";
+ }
if( widget == fX264optPsyRDSlider)
{
optNameToChange = @"psy-rd";
}
}
+ else if ([optName isEqualToString:@"aq-strength"])
+ {
+ if( [fX264optAqSlider floatValue] == 1.0 )
+ {
+ /* When Aq is 1 it's the default value and can be ignored. */
+ thisOpt = @"";
+ }
+ else
+ {
+ thisOpt = [NSString stringWithFormat:@"%@=%0.1f", optName, [fX264optAqSlider floatValue] ];
+ }
+ }
+
else if ([optName isEqualToString:@"psy-rd"])
{
if( [fX264optPsyRDSlider floatValue] == 1.0 && [fX264optPsyTrellisSlider floatValue] == 0.0 )
{
/* Otherwise the format is deblock=a,b, where a and b both have an array
offset of 7 because deblocking values start at -6 instead of at zero. */
- thisOpt = [NSString stringWithFormat:@"%@=%0.1f,%0.1f", optName, [fX264optPsyRDSlider floatValue], [fX264optPsyTrellisSlider floatValue] ];
+ thisOpt = [NSString stringWithFormat:@"%@=%0.1f,%0.2f", optName, [fX264optPsyRDSlider floatValue], [fX264optPsyTrellisSlider floatValue] ];
}
}
- else if /*Boolean Switches*/ ([optName isEqualToString:@"mixed-refs"] || [optName isEqualToString:@"weightb"] || [optName isEqualToString:@"b-pyramid"] || [optName isEqualToString:@"no-fast-pskip"] || [optName isEqualToString:@"no-dct-decimate"] || [optName isEqualToString:@"8x8dct"] )
+ else if /*Boolean Switches*/ ( [optName isEqualToString:@"no-dct-decimate"] )
{
/* Here is where we take care of the boolean options that work overtly:
no-dct-decimate being on means no-dct-decimate=1, etc. Some options
}
}
- else if ([optName isEqualToString:@"cabac"])
+ else if ( [optName isEqualToString:@"8x8dct"] || [optName isEqualToString:@"cabac"] || [optName isEqualToString:@"weightp"] )
{
- /* CABAC is odd, in that it defaults to being on. That means
- it only needs to be included in the string when turned off. */
+ /* These options default to being on. That means they
+ only need to be included in the string when turned off. */
if ([sender state] == 1)
{
/* It's true so don't include it. */
}
else
{
- /* Otherwise, include cabac=0 in the string to enable CAVLC. */
+ /* Otherwise, include cabac=0, etc, in the string. */
thisOpt = [NSString stringWithFormat:@"%@=%d",optName,0];
}
}
case 1:
thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"none"];
break;
-
case 2:
+ thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"i4x4,i8x8"];
+ break;
+ case 3:
thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"all"];
break;
break;
}
}
+
+ else if ([optName isEqualToString:@"b-pyramid"])
+ {
+ /* B-pyramid uses string values too. */
+ switch ([sender indexOfSelectedItem])
+ {
+ case 1:
+ thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"none"];
+ break;
+ case 2:
+ thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"strict"];
+ break;
+ case 0:
+ thisOpt = @"";
+ break;
+
+ default:
+ break;
+ }
+ }
else if ([optName isEqualToString:@"merange"])
{
thisOpt = [NSString stringWithFormat:@"%@=%d", optName, [sender indexOfSelectedItem]-1];
}
+ else if ([optName isEqualToString:@"ref"])
+ {
+ /* Refs use actual index numbers */
+ thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]];
+ }
+
else // we have a valid value to change, so change it
{
if ( [sender indexOfSelectedItem] != 0 )
- /* Here's our general case, that catches things like ref frames and b-frames.
+ /* Here's our general case, that catches things like b-frames.
Basically, any options that are PopUp menus with index 0 as default and
- index 1 as 1, with numerical values, are all handled right here. All of
+ index 1 as 0, with numerical values, are all handled right here. All of
the above stuff is for the exceptions to the general case. */
thisOpt = [NSString stringWithFormat:@"%@=%d",optName,[sender indexOfSelectedItem]-1];
}
}
/* Change the dislayed option string to reflect the new modified settings */
- [fDisplayX264Options setStringValue:[NSString stringWithFormat:changedOptString]];
+ [fDisplayX264Options setStringValue:changedOptString];
}
else // if none exists, add it to the string
{
OSDN Git Service
