diff options
| author | Damiano Galassi <[email protected]> | 2019-01-30 11:09:02 +0100 |
|---|---|---|
| committer | Damiano Galassi <[email protected]> | 2019-01-30 11:09:02 +0100 |
| commit | baa1c20502544db435c555bff3b2559f4ba13ea7 (patch) | |
| tree | 9d90b1bfc6d062e6f2b00d002845d6b527ad42a7 | |
| parent | d1a9db0b1eb385f221e6fed7ffd0218a3ed71335 (diff) | |
MacGui: remove the old advanced x264 options view.
| -rw-r--r-- | macosx/Base.lproj/AdvancedView.xib | 590 | ||||
| -rw-r--r-- | macosx/HBAdvancedController.h | 18 | ||||
| -rw-r--r-- | macosx/HBAdvancedController.m | 1364 | ||||
| -rw-r--r-- | macosx/HBVideo+UIAdditions.h | 1 | ||||
| -rw-r--r-- | macosx/HBVideo+UIAdditions.m | 5 | ||||
| -rw-r--r-- | macosx/HBVideoController.m | 56 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 35 | ||||
| -rw-r--r-- | macosx/de.lproj/AdvancedView.strings | 216 | ||||
| -rw-r--r-- | macosx/en.lproj/InfoPlist.strings (renamed from macosx/English.lproj/InfoPlist.strings) | 0 |
9 files changed, 12 insertions, 2273 deletions
diff --git a/macosx/Base.lproj/AdvancedView.xib b/macosx/Base.lproj/AdvancedView.xib deleted file mode 100644 index 8e8cdc445..000000000 --- a/macosx/Base.lproj/AdvancedView.xib +++ /dev/null @@ -1,590 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.30.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> - <dependencies> - <deployment identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.30.1"/> - <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> - </dependencies> - <objects> - <customObject id="-2" userLabel="File's Owner" customClass="HBAdvancedController"> - <connections> - <outlet property="fDisplayX264Options" destination="30" id="191"/> - <outlet property="fX264opt8x8dctLabel" destination="88" id="196"/> - <outlet property="fX264opt8x8dctSwitch" destination="87" id="195"/> - <outlet property="fX264optAlphaDeblockPopUp" destination="56" id="197"/> - <outlet property="fX264optAnalyseLabel" destination="86" id="199"/> - <outlet property="fX264optAnalysePopUp" destination="81" id="200"/> - <outlet property="fX264optAqLabel" destination="421" id="426"/> - <outlet property="fX264optAqSlider" destination="420" id="425"/> - <outlet property="fX264optBAdaptLabel" destination="396" id="404"/> - <outlet property="fX264optBAdaptPopUp" destination="398" id="405"/> - <outlet property="fX264optBPyramidLabel" destination="46" id="206"/> - <outlet property="fX264optBPyramidPopUp" destination="427" id="434"/> - <outlet property="fX264optBetaDeblockPopUp" destination="61" id="198"/> - <outlet property="fX264optBframesLabel" destination="12" id="202"/> - <outlet property="fX264optBframesPopUp" destination="13" id="201"/> - <outlet property="fX264optCabacLabel" destination="90" id="210"/> - <outlet property="fX264optCabacSwitch" destination="89" id="209"/> - <outlet property="fX264optDeblockLabel" destination="66" id="211"/> - <outlet property="fX264optDirectPredLabel" destination="49" id="213"/> - <outlet property="fX264optDirectPredPopUp" destination="50" id="212"/> - <outlet property="fX264optMERangeLabel" destination="38" id="219"/> - <outlet property="fX264optMERangePopUp" destination="39" id="218"/> - <outlet property="fX264optMotionEstLabel" destination="37" id="221"/> - <outlet property="fX264optMotionEstPopUp" destination="32" id="220"/> - <outlet property="fX264optNodctdcmtLabel" destination="24" id="224"/> - <outlet property="fX264optNodctdcmtSwitch" destination="73" id="225"/> - <outlet property="fX264optPsyRDLabel" destination="382" id="386"/> - <outlet property="fX264optPsyRDSlider" destination="384" id="387"/> - <outlet property="fX264optPsyTrellisLabel" destination="388" id="392"/> - <outlet property="fX264optPsyTrellisSlider" destination="389" id="393"/> - <outlet property="fX264optRefLabel" destination="11" id="227"/> - <outlet property="fX264optRefPopUp" destination="6" id="226"/> - <outlet property="fX264optSubmeLabel" destination="44" id="229"/> - <outlet property="fX264optSubmePopUp" destination="18" id="228"/> - <outlet property="fX264optTrellisLabel" destination="23" id="231"/> - <outlet property="fX264optTrellisPopUp" destination="74" id="230"/> - <outlet property="fX264optWeightPLabel" destination="408" id="413"/> - <outlet property="fX264optWeightPSwitch" destination="407" id="414"/> - <outlet property="view" destination="5" id="eJR-m1-Nl1"/> - </connections> - </customObject> - <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> - <customObject id="-3" userLabel="Application" customClass="NSObject"/> - <customView translatesAutoresizingMaskIntoConstraints="NO" id="5" userLabel="x264"> - <rect key="frame" x="0.0" y="0.0" width="843" height="374"/> - <autoresizingMask key="autoresizingMask"/> - <subviews> - <slider verticalHuggingPriority="750" id="389"> - <rect key="frame" x="442" y="128" width="146" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="390"> - <font key="font" metaFont="miniSystem"/> - </sliderCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="395"/> - </connections> - </slider> - <textField verticalHuggingPriority="750" id="388"> - <rect key="frame" x="285" y="130" width="151" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Psychovisual Trellis:" id="391"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <slider verticalHuggingPriority="750" id="384"> - <rect key="frame" x="442" y="149" width="146" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" doubleValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="385"> - <font key="font" metaFont="miniSystem"/> - </sliderCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="394"/> - </connections> - </slider> - <textField verticalHuggingPriority="750" id="90"> - <rect key="frame" x="21" y="277" width="123" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="right" title="CABAC Entropy Coding:" id="380"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button id="89"> - <rect key="frame" x="146" y="277" width="22" height="18"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="379"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="253"/> - </connections> - </button> - <textField verticalHuggingPriority="750" id="88"> - <rect key="frame" x="19" y="256" width="125" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="8x8 Transform:" id="378"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button id="87"> - <rect key="frame" x="146" y="256" width="22" height="18"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="377"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="247"/> - </connections> - </button> - <textField verticalHuggingPriority="750" id="86"> - <rect key="frame" x="599" y="319" width="95" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Partition Types:" id="376"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <popUpButton verticalHuggingPriority="750" id="81"> - <rect key="frame" x="695" y="321" width="130" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="84" id="375"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="82"> - <items> - <menuItem title="Item1" state="on" id="84"/> - <menuItem title="Item2" id="85"/> - <menuItem title="Item3" id="83"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="246"/> - </connections> - </popUpButton> - <popUpButton verticalHuggingPriority="750" id="74"> - <rect key="frame" x="695" y="300" width="130" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="77" id="374"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="75"> - <items> - <menuItem title="Item1" state="on" id="77"/> - <menuItem title="Item2" id="76"/> - <menuItem title="Item3" id="78"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="250"/> - </connections> - </popUpButton> - <button id="73"> - <rect key="frame" x="146" y="172" width="22" height="18"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="373"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="252"/> - </connections> - </button> - <textField verticalHuggingPriority="750" id="66"> - <rect key="frame" x="626" y="172" width="68" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Deblocking:" id="366"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <popUpButton verticalHuggingPriority="750" id="61"> - <rect key="frame" x="695" y="153" width="130" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingHead" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="63" id="365"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="62"> - <items> - <menuItem title="Item1" state="on" id="63"/> - <menuItem title="Item2" id="64"/> - <menuItem title="Item3" id="65"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="249"/> - </connections> - </popUpButton> - <popUpButton verticalHuggingPriority="750" id="56"> - <rect key="frame" x="695" y="174" width="130" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingHead" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="58" id="364"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="57"> - <items> - <menuItem title="Item1" state="on" id="58"/> - <menuItem title="Item2" id="59"/> - <menuItem title="Item3" id="60"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="248"/> - </connections> - </popUpButton> - <popUpButton verticalHuggingPriority="750" id="50"> - <rect key="frame" x="441" y="300" width="149" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="54" id="362"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="51"> - <items> - <menuItem title="Item1" state="on" id="54"/> - <menuItem title="Item2" id="53"/> - <menuItem title="Item3" id="52"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="238"/> - </connections> - </popUpButton> - <textField verticalHuggingPriority="750" id="49"> - <rect key="frame" x="285" y="298" width="151" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive Direct Mode:" id="361"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="382"> - <rect key="frame" x="285" y="151" width="151" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Psychovisual Rate Distortion:" id="383"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="46"> - <rect key="frame" x="19" y="214" width="125" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Pyramidal B-Frames:" id="358"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="44"> - <rect key="frame" x="272" y="256" width="164" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Subpixel ME & Mode Decision:" id="356"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <popUpButton verticalHuggingPriority="750" id="39"> - <rect key="frame" x="441" y="237" width="149" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="41" id="355"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="40"> - <items> - <menuItem title="Item1" state="on" id="41"/> - <menuItem title="Item2" id="42"/> - <menuItem title="Item3" id="43"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="244"/> - </connections> - </popUpButton> - <textField verticalHuggingPriority="750" id="38"> - <rect key="frame" x="285" y="235" width="151" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Motion Estimation Range:" id="354"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="37"> - <rect key="frame" x="285" y="277" width="151" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Motion Estimation Method:" id="353"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <popUpButton verticalHuggingPriority="750" id="32"> - <rect key="frame" x="441" y="279" width="149" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="36" id="352"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="33"> - <items> - <menuItem title="Item1" state="on" id="36"/> - <menuItem title="Item2" id="35"/> - <menuItem title="Item3" id="34"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="243"/> - </connections> - </popUpButton> - <textField verticalHuggingPriority="750" id="30"> - <rect key="frame" x="20" y="50" width="803" height="34"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> - <textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="350"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - <connections> - <action selector="X264AdvancedOptionsSet:" target="-2" id="193"/> - </connections> - </textField> - <textField verticalHuggingPriority="750" id="24"> - <rect key="frame" x="41" y="172" width="103" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="No DCT Decimation:" id="348"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="23"> - <rect key="frame" x="599" y="298" width="95" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Trellis:" id="347"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <popUpButton verticalHuggingPriority="750" id="18"> - <rect key="frame" x="441" y="258" width="149" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="20" id="346"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="19"> - <items> - <menuItem title="Item1" state="on" id="20"/> - <menuItem title="Item2" id="21"/> - <menuItem title="Item3" id="22"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="245"/> - </connections> - </popUpButton> - <popUpButton verticalHuggingPriority="750" id="398"> - <rect key="frame" x="441" y="321" width="149" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="403" id="399"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="400"> - <items> - <menuItem title="Item1" state="on" id="403"/> - <menuItem title="Item2" id="401"/> - <menuItem title="Item3" id="402"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="406"/> - </connections> - </popUpButton> - <popUpButton verticalHuggingPriority="750" id="13"> - <rect key="frame" x="148" y="300" width="97" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="17" id="345"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="14"> - <items> - <menuItem title="Item1" state="on" id="17"/> - <menuItem title="Item2" id="15"/> - <menuItem title="Item3" id="16"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="237"/> - </connections> - </popUpButton> - <textField verticalHuggingPriority="750" id="396"> - <rect key="frame" x="285" y="319" width="151" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive B-Frames:" id="397"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="12"> - <rect key="frame" x="19" y="298" width="125" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Maximum B-Frames:" id="344"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="11"> - <rect key="frame" x="19" y="319" width="125" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Reference Frames:" id="343"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <popUpButton verticalHuggingPriority="750" id="6"> - <rect key="frame" x="148" y="321" width="97" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="8" id="342"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="7"> - <items> - <menuItem title="Item1" state="on" id="8"/> - <menuItem title="Item2" id="10"/> - <menuItem title="Item3" id="9"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="235"/> - </connections> - </popUpButton> - <button id="407"> - <rect key="frame" x="146" y="235" width="22" height="18"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="410"> - <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> - <font key="font" metaFont="smallSystem"/> - </buttonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="411"/> - </connections> - </button> - <textField verticalHuggingPriority="750" id="408"> - <rect key="frame" x="19" y="235" width="125" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Weighted P-Frames:" id="409"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <slider verticalHuggingPriority="750" id="420"> - <rect key="frame" x="442" y="170" width="146" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <sliderCell key="cell" controlSize="mini" continuous="YES" state="on" alignment="left" maxValue="1" tickMarkPosition="below" numberOfTickMarks="11" allowsTickMarkValuesOnly="YES" sliderType="linear" id="423"> - <font key="font" metaFont="miniSystem"/> - </sliderCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="424"/> - </connections> - </slider> - <textField verticalHuggingPriority="750" id="421"> - <rect key="frame" x="285" y="172" width="151" height="16"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Adaptive Quantization:" id="422"> - <font key="font" metaFont="label"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <popUpButton verticalHuggingPriority="750" id="427"> - <rect key="frame" x="148" y="216" width="97" height="15"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingMiddle" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="430" id="428"> - <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="miniSystem"/> - <menu key="menu" title="OtherViews" id="429"> - <items> - <menuItem title="Item1" state="on" id="430"/> - <menuItem title="Item2" id="432"/> - <menuItem title="Item3" id="431"/> - </items> - </menu> - </popUpButtonCell> - <connections> - <action selector="X264AdvancedOptionsChanged:" target="-2" id="433"/> - </connections> - </popUpButton> - <textField verticalHuggingPriority="750" id="438"> - <rect key="frame" x="18" y="193" width="91" height="14"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Psychovisual" id="439"> - <font key="font" metaFont="smallSystemBold"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="440"> - <rect key="frame" x="18" y="340" width="66" height="14"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Encoding" id="441"> - <font key="font" metaFont="smallSystemBold"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <textField verticalHuggingPriority="750" id="442"> - <rect key="frame" x="285" y="340" width="61" height="14"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Analysis" id="443"> - <font key="font" metaFont="smallSystemBold"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button verticalHuggingPriority="750" id="qjC-VL-t4n"> - <rect key="frame" x="752" y="14" width="76" height="27"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="lV4-j0-O2Y"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <string key="keyEquivalent" base64-UTF8="YES"> -DQ -</string> - </buttonCell> - <connections> - <action selector="ok:" target="-2" id="IhB-Gf-tDt"/> - </connections> - </button> - <button verticalHuggingPriority="750" id="c1F-sK-kU5"> - <rect key="frame" x="662" y="14" width="84" height="27"/> - <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/> - <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="w0T-fl-8Fm"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="smallSystem"/> - <string key="keyEquivalent" base64-UTF8="YES"> -Gw -</string> - </buttonCell> - <connections> - <action selector="dismissController:" target="-2" id="gbL-jp-jfc"/> - </connections> - </button> - <textField verticalHuggingPriority="750" id="55"> - <rect key="frame" x="19" y="92" width="222" height="14"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Current x264 Advanced Option String" id="363"> - <font key="font" metaFont="smallSystemBold"/> - <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - </subviews> - <point key="canvasLocation" x="114.5" y="209"/> - </customView> - </objects> -</document> diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h deleted file mode 100644 index d0714ebd7..000000000 --- a/macosx/HBAdvancedController.h +++ /dev/null @@ -1,18 +0,0 @@ -/* HBAdvancedController - - This file is part of the HandBrake source code. - Homepage: <http://handbrake.fr/>. - It may be used under the terms of the GNU General Public License. */ - -#import <Cocoa/Cocoa.h> - -@class HBVideo; - -/** - * HBAdvancedController - */ -@interface HBAdvancedController : NSViewController - -@property (nonatomic, readwrite, weak) HBVideo *videoSettings; - -@end diff --git a/macosx/HBAdvancedController.m b/macosx/HBAdvancedController.m deleted file mode 100644 index 1d38a1e00..000000000 --- a/macosx/HBAdvancedController.m +++ /dev/null @@ -1,1364 +0,0 @@ -/* HBAdvancedController - - This file is part of the HandBrake source code. - Homepage: <http://handbrake.fr/>. - It may be used under the terms of the GNU General Public License. */ - -#import "HBAdvancedController.h" - -@import HandBrakeKit; - -@interface HBAdvancedController () -{ - IBOutlet NSTextField * fDisplayX264Options; - - IBOutlet NSTextField * fX264optBframesLabel; - IBOutlet NSPopUpButton * fX264optBframesPopUp; - IBOutlet NSTextField * fX264optRefLabel; - IBOutlet NSPopUpButton * fX264optRefPopUp; - IBOutlet NSButton * fX264optWeightPSwitch; - IBOutlet NSTextField * fX264optWeightPLabel; - IBOutlet NSTextField * fX264optNodctdcmtLabel; - IBOutlet NSButton * fX264optNodctdcmtSwitch; - IBOutlet NSTextField * fX264optSubmeLabel; - IBOutlet NSPopUpButton * fX264optSubmePopUp; - IBOutlet NSTextField * fX264optTrellisLabel; - IBOutlet NSPopUpButton * fX264optTrellisPopUp; - IBOutlet NSTextField * fX264optMotionEstLabel; - IBOutlet NSPopUpButton * fX264optMotionEstPopUp; - IBOutlet NSTextField * fX264optMERangeLabel; - IBOutlet NSPopUpButton * fX264optMERangePopUp; - IBOutlet NSTextField * fX264optBPyramidLabel; - IBOutlet NSPopUpButton * fX264optBPyramidPopUp; - IBOutlet NSTextField * fX264optDirectPredLabel; - IBOutlet NSPopUpButton * fX264optDirectPredPopUp; - 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; - IBOutlet NSSlider * fX264optAqSlider; - IBOutlet NSTextField * fX264optAqLabel; - IBOutlet NSSlider * fX264optPsyRDSlider; - IBOutlet NSTextField * fX264optPsyRDLabel; - IBOutlet NSSlider * fX264optPsyTrellisSlider; - IBOutlet NSTextField * fX264optPsyTrellisLabel; - IBOutlet NSPopUpButton * fX264optBAdaptPopUp; - IBOutlet NSTextField * fX264optBAdaptLabel; -} - -@property (nonatomic, readwrite) HBVideo *internalVideoSettings; - -- (IBAction) X264AdvancedOptionsAnimate: (id) sender; -- (IBAction) X264AdvancedOptionsSet: (id) sender; -- (IBAction) X264AdvancedOptionsStandardizeOptString: (id) sender; -- (IBAction) X264AdvancedOptionsSetCurrentSettings: (id) sender; -- (NSString *) X264AdvancedOptionsStandardizeOptNames:(NSString *) cleanOptNameString; -- (NSString *) X264AdvancedOptionsOptIDToString: (id) sender; -- (NSString *) X264AdvancedOptionsWidgetToString: (NSString *) optName withID: (id) sender; -- (BOOL) X264AdvancedOptionsIsOpt: (NSString *) optNameToChange inString: (NSString *) currentOptString; -- (IBAction) X264AdvancedOptionsChanged: (id) sender; - -@end - -@implementation HBAdvancedController - -- (instancetype)init -{ - self = [super initWithNibName:@"AdvancedView" bundle:nil]; - return self; -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - fDisplayX264Options.stringValue = _videoSettings.unparseOptions; - [self X264AdvancedOptionsSet:nil]; -} - -- (IBAction)ok:(id)sender -{ - HBVideo *video = self.videoSettings; - video.preset = @"medium"; - video.tune = @""; - video.profile = @"auto"; - video.level = @"auto"; - video.fastDecode = NO; - video.videoOptionExtra = self.internalVideoSettings.videoOptionExtra; - - [self dismissViewController:self]; -} - -- (void)setVideoSettings:(HBVideo *)videoSettings -{ - _videoSettings = videoSettings; - self.internalVideoSettings = [videoSettings copy]; - - if (_videoSettings) - { - fDisplayX264Options.stringValue = _videoSettings.unparseOptions; - } - else - { - fDisplayX264Options.stringValue = @""; - } - [self X264AdvancedOptionsSet:nil]; -} - -/** - * Populates the option widgets - */ -- (IBAction) X264AdvancedOptionsSet: (id) sender -{ - /*Set opt widget values here*/ - - NSString * toolTip = @""; - - /*B-Frames fX264optBframesPopUp*/ - int i; - [fX264optBframesPopUp removeAllItems]; - [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 (3)"]; - for (i=1; i<17;i++) - { - [fX264optRefPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]]; - } - 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 (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"]]; - [fX264optSubmePopUp addItemWithTitle:[NSString stringWithFormat:@"11: No early terminations in analysis"]]; - 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\n11 disables all early terminations in analysis.\n\n10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."; - [fX264optSubmePopUp setToolTip: toolTip]; - [fX264optSubmeLabel setToolTip: toolTip]; - - /*Trellis fX264optTrellisPopUp*/ - [fX264optTrellisPopUp removeAllItems]; - [fX264optTrellisPopUp addItemWithTitle:@"Default (Encode only)"]; - [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"Off"]]; - [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"Encode only"]]; - [fX264optTrellisPopUp addItemWithTitle:[NSString stringWithFormat:@"Always"]]; - [fX264optTrellisPopUp 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:@"Default (Hexagon)"]; - [fX264optMotionEstPopUp addItemWithTitle:@"Diamond"]; - [fX264optMotionEstPopUp addItemWithTitle:@"Hexagon"]; - [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:@"Default (16)"]; - for (i=4; i<65;i++) - { - [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]; - - /*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:@"Default (Spatial)"]; - [fX264optDirectPredPopUp addItemWithTitle:@"None"]; - [fX264optDirectPredPopUp addItemWithTitle:@"Spatial"]; - [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:@"Default (Fast)"]; - [fX264optBAdaptPopUp addItemWithTitle:@"Off"]; - [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:@"Default (0)"]; - for (i=-6; i<7;i++) - { - [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:@"Default (0)"]; - for (i=-6; i<7;i++) - { - [fX264optBetaDeblockPopUp addItemWithTitle:[NSString stringWithFormat:@"%d",i]]; - } - [fX264optBetaDeblockPopUp setToolTip: toolTip]; - [fX264optDeblockLabel setToolTip: toolTip]; - - /* Analysis fX264optAnalysePopUp */ - [fX264optAnalysePopUp removeAllItems]; - [fX264optAnalysePopUp addItemWithTitle:@"Default (Most)"]; /* 0=default */ - [fX264optAnalysePopUp addItemWithTitle:[NSString stringWithFormat:@"None"]]; /* 1=none */ - [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: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:NSTickMarkPositionBelow]; - [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:2.0]; - [fX264optPsyRDSlider setTickMarkPosition:NSTickMarkPositionBelow]; - [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:NSTickMarkPositionBelow]; - [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]; - - /* Set Current GUI Settings based on newly standardized string */ - [self X264AdvancedOptionsSetCurrentSettings:sender]; - - /* Fade out options that don't apply */ - [self X264AdvancedOptionsAnimate: sender]; -} - -/** - * Cleans the option string to use a standard format of option=value - */ -- (IBAction) X264AdvancedOptionsStandardizeOptString: (id) sender -{ - /* Set widgets depending on the opt string in field */ - NSString * thisOpt; // The separated option such as "bframes=3" - NSString * optName = @""; // The option name such as "bframes" - NSString * optValue = @"";// The option value such as "3" - NSString * changedOptString = @""; - NSArray *currentOptsArray; - - /*First, we get an opt string to process */ - NSString *currentOptString = [fDisplayX264Options stringValue]; - - /* Verify there is an opt string to process by making sure an - option is getting its value set. If so, start to process it. */ - NSRange currentOptRange = [currentOptString rangeOfString:@"="]; - if (currentOptRange.location != NSNotFound) - { - /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/ - currentOptsArray = [currentOptString componentsSeparatedByString:@":"]; - - /*iterate through the array and get <opts> and <values*/ - NSUInteger loopcounter; - NSUInteger currentOptsArrayCount = [currentOptsArray count]; - for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++) - { - thisOpt = currentOptsArray[loopcounter]; - - NSRange splitOptRange = [thisOpt rangeOfString:@"="]; - if (splitOptRange.location != NSNotFound) - { - optName = [thisOpt substringToIndex:splitOptRange.location]; - optValue = [thisOpt substringFromIndex:splitOptRange.location + 1]; - - /* Standardize the names here depending on whats in the string */ - optName = [self X264AdvancedOptionsStandardizeOptNames:optName]; - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,optValue]; - } - else // No value given so we use a default of "1" - { - optName = thisOpt; - - /* Standardize the names here depending on whats in the string */ - optName = [self X264AdvancedOptionsStandardizeOptNames:optName]; - thisOpt = [NSString stringWithFormat:@"%@=%d",optName,1]; - } - - /* Construct New String for opts here.*/ - if ([thisOpt isEqualToString:@""]) - { - /* Blank option, just add it to the string. (Why?) */ - changedOptString = [NSString stringWithFormat:@"%@%@",changedOptString,thisOpt]; - } - else - { - if ([changedOptString isEqualToString:@""]) - { - /* Blank string, output the current option. */ - changedOptString = [NSString stringWithFormat:@"%@",thisOpt]; - } - else - { - /* Option exists and string exists, so append the option - to the string with a semi-colon inbetween them. */ - changedOptString = [NSString stringWithFormat:@"%@:%@",changedOptString,thisOpt]; - } - } - } - } - - /* Change the option string to reflect the new standardized option string */ - [fDisplayX264Options setStringValue:changedOptString]; - self.internalVideoSettings.videoOptionExtra = changedOptString; -} - -/** - * Cleans the option string to use a standard set of option names, by conflating synonyms. - */ -- (NSString *) X264AdvancedOptionsStandardizeOptNames:(NSString *) cleanOptNameString -{ - /* Reference Frames */ - if ([cleanOptNameString isEqualToString:@"ref"] || [cleanOptNameString isEqualToString:@"frameref"]) - { - cleanOptNameString = @"ref"; - } - - /*No Dict Decimate*/ - if ([cleanOptNameString isEqualToString:@"no-dct-decimate"] || [cleanOptNameString isEqualToString:@"no_dct_decimate"] || [cleanOptNameString isEqualToString:@"nodct_decimate"]) - { - cleanOptNameString = @"no-dct-decimate"; - } - - /*Subme*/ - if ([cleanOptNameString isEqualToString:@"subme"]) - { - cleanOptNameString = @"subq"; - } - - /*ME Range*/ - if ([cleanOptNameString isEqualToString:@"me-range"] || [cleanOptNameString isEqualToString:@"me_range"]) - cleanOptNameString = @"merange"; - - /*B Pyramid*/ - if ([cleanOptNameString isEqualToString:@"b_pyramid"]) - { - cleanOptNameString = @"b-pyramid"; - } - - /*Direct Prediction*/ - if ([cleanOptNameString isEqualToString:@"direct-pred"] || [cleanOptNameString isEqualToString:@"direct_pred"]) - { - cleanOptNameString = @"direct"; - } - - /*Deblocking*/ - if ([cleanOptNameString isEqualToString:@"filter"]) - { - cleanOptNameString = @"deblock"; - } - - /*Analysis*/ - if ([cleanOptNameString isEqualToString:@"partitions"]) - { - cleanOptNameString = @"analyse"; - } - - return cleanOptNameString; -} - -/** - * Fades options in and out depending on whether they're available.. - */ -- (IBAction) X264AdvancedOptionsAnimate: (id) sender -{ - /* 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 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 ] == 1 ) - { - /* 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( [fX264optBPyramidPopUp isHidden] == false ) - { - [[fX264optBPyramidPopUp animator] setHidden:YES]; - [[fX264optBPyramidLabel animator] setHidden:YES]; - if ( [fX264optBPyramidPopUp indexOfSelectedItem] > 0 ) - { - [fX264optBPyramidPopUp selectItemAtIndex: 0]; - [[fX264optBPyramidPopUp cell] performClick:self]; - } - } - - if( [fX264optDirectPredPopUp isHidden] == false ) - { - [[fX264optDirectPredPopUp animator] setHidden:YES]; - [[fX264optDirectPredLabel animator] setHidden:YES]; - if ( [fX264optDirectPredPopUp indexOfSelectedItem] > 0 ) - { - [fX264optDirectPredPopUp selectItemAtIndex: 0]; - [[fX264optDirectPredPopUp cell] performClick:self]; - } - } - - if( [fX264optBAdaptPopUp isHidden] == false ) - { - [[fX264optBAdaptPopUp animator] setHidden:YES]; - [[fX264optBAdaptLabel animator] setHidden:YES]; - if ( [fX264optBAdaptPopUp indexOfSelectedItem] > 0 ) - { - [fX264optBAdaptPopUp selectItemAtIndex: 0]; - [[fX264optBAdaptPopUp cell] performClick:self]; - } - } - } - else if ( [fX264optBframesPopUp indexOfSelectedItem ] == 2) - { - /* Only 1 b-frame? Disable b-pyramid. */ - if( [fX264optBPyramidPopUp isHidden] == false ) - { - [[fX264optBPyramidPopUp animator] setHidden:YES]; - [[fX264optBPyramidLabel animator] setHidden:YES]; - if ( [fX264optBPyramidPopUp indexOfSelectedItem] > 0 ) - { - [fX264optBPyramidPopUp selectItemAtIndex: 0]; - [[fX264optBPyramidPopUp cell] performClick:self]; - } - } - - if( [fX264optDirectPredPopUp isHidden] == true ) - { - [[fX264optDirectPredPopUp animator] setHidden:NO]; - [[fX264optDirectPredLabel animator] setHidden:NO]; - } - - if( [fX264optBAdaptPopUp isHidden] == true ) - { - [[fX264optBAdaptPopUp animator] setHidden:NO]; - [[fX264optBAdaptLabel animator] setHidden:NO]; - } - } - else - { - if( [fX264optBPyramidPopUp isHidden] == true ) - { - [[fX264optBPyramidPopUp animator] setHidden:NO]; - [[fX264optBPyramidLabel animator] setHidden:NO]; - } - - if( [fX264optDirectPredPopUp isHidden] == true ) - { - [[fX264optDirectPredPopUp animator] setHidden:NO]; - [[fX264optDirectPredLabel animator] setHidden:NO]; - } - - if( [fX264optBAdaptPopUp isHidden] == true ) - { - [[fX264optBAdaptPopUp animator] setHidden:NO]; - [[fX264optBAdaptLabel animator] setHidden:NO]; - } - } - } - - if( sender == fX264optMotionEstPopUp || sender == nil || sender == fDisplayX264Options ) - { - if ( [fX264optMotionEstPopUp indexOfSelectedItem] < 3 ) - { - /* ME-range can only be above 16 if me >= umh - and changing it to < 16 is idiotic so hide it . */ - if( [fX264optMERangePopUp isHidden] == false ) - { - [[fX264optMERangePopUp animator] setHidden:YES]; - [[fX264optMERangeLabel animator] setHidden:YES]; - if ( [fX264optMERangePopUp indexOfSelectedItem] > 0 ) - { - [fX264optMERangePopUp selectItemAtIndex:0]; - [[fX264optMERangePopUp cell] performClick:self]; - } - } - } - else - { - if( [fX264optMERangePopUp isHidden] == true ) - { - [[fX264optMERangePopUp animator] setHidden:NO]; - [[fX264optMERangeLabel animator] setHidden:NO]; - } - } - } - - if( sender == fX264optSubmePopUp || sender == nil || sender == fDisplayX264Options ) - { - if( [fX264optSubmePopUp indexOfSelectedItem] != 0 && [fX264optSubmePopUp indexOfSelectedItem] < 7 ) - { - /* No Psy-RDO or Psy=trel if subme < 6. */ - if( [fX264optPsyRDSlider isHidden] == false ) - { - [[fX264optPsyRDSlider animator] setHidden:YES]; - [[fX264optPsyRDLabel animator] setHidden:YES]; - [fX264optPsyRDSlider setFloatValue:1.0]; - [[fX264optPsyRDSlider cell] performClick:self]; - } - - if( [fX264optPsyTrellisSlider isHidden] == false) - { - [[fX264optPsyTrellisSlider animator] setHidden:YES]; - [[fX264optPsyTrellisLabel animator] setHidden:YES]; - [fX264optPsyTrellisSlider setFloatValue:0.0]; - [[fX264optPsyTrellisSlider cell] performClick:self]; - } - } - else - { - if( [fX264optPsyRDSlider isHidden] == true ) - { - [[fX264optPsyRDSlider animator] setHidden:NO]; - [[fX264optPsyRDLabel animator] setHidden:NO]; - } - - 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] > 0 && [fX264optTrellisPopUp indexOfSelectedItem] < 2 ) - { - if( [fX264optPsyTrellisSlider isHidden] == false ) - { - /* No Psy-trellis without trellis. */ - [[fX264optPsyTrellisSlider animator] setHidden:YES]; - [[fX264optPsyTrellisLabel animator] setHidden:YES]; - [[fX264optPsyTrellisSlider animator] setFloatValue:0.0]; - [[fX264optPsyTrellisSlider cell] performClick:self]; - } - } - else - { - if( ( [fX264optSubmePopUp indexOfSelectedItem] == 0 || [fX264optSubmePopUp indexOfSelectedItem] >= 7 ) && [fX264optPsyTrellisSlider isHidden] == true ) - { - [[fX264optPsyTrellisSlider animator] setHidden:NO]; - [[fX264optPsyTrellisLabel animator] setHidden:NO]; - } - } - } -} - -/** - * Resets the GUI widgets to the contents of the option string. - */ -- (IBAction) X264AdvancedOptionsSetCurrentSettings: (id) sender -{ - /* Set widgets depending on the opt string in field */ - NSString * thisOpt; // The separated option such as "bframes=3" - NSString * optName = @""; // The option name such as "bframes" - NSString * optValue = @"";// The option value such as "3" - NSArray *currentOptsArray; - - /*First, we get an opt string to process */ - NSString *currentOptString = [fDisplayX264Options stringValue]; - - /* Verify there is an opt string to process by making sure an - option is getting its value set. If so, start to process it. */ - NSRange currentOptRange = [currentOptString rangeOfString:@"="]; - if (currentOptRange.location != NSNotFound) - { - /*Put individual options into an array based on the ":" separator for processing, result is "<opt>=<value>"*/ - currentOptsArray = [currentOptString componentsSeparatedByString:@":"]; - - /*iterate through the array and get <opts> and <values*/ - NSUInteger loopcounter; - NSUInteger currentOptsArrayCount = [currentOptsArray count]; - for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++) - { - thisOpt = currentOptsArray[loopcounter]; - - /* Verify the option sets a value */ - NSRange splitOptRange = [thisOpt rangeOfString:@"="]; - if (splitOptRange.location != NSNotFound) - { - /* Split thisOpt into an optName setting an optValue. */ - optName = [thisOpt substringToIndex:splitOptRange.location]; - optValue = [thisOpt substringFromIndex:splitOptRange.location + 1]; - - /*Run through the available widgets for x264 opts and set them, as you add widgets, - they need to be added here. This should be moved to its own method probably*/ - - /*bframes NSPopUpButton*/ - if ([optName isEqualToString:@"bframes"]) - { - [fX264optBframesPopUp selectItemAtIndex:[optValue intValue]+1]; - } - /*ref NSPopUpButton*/ - if ([optName isEqualToString:@"ref"]) - { - // 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]]; - } - } - /*WeightP NSButton*/ - if ([optName isEqualToString:@"weightp"]) - { - if ([optValue intValue] < 1) - [fX264optWeightPSwitch setState:0]; - else - [fX264optWeightPSwitch setState:1]; - } - /*No Dict Decimate NSButton*/ - if ([optName isEqualToString:@"no-dct-decimate"]) - { - [fX264optNodctdcmtSwitch setState:[optValue intValue]]; - } - /*Sub Me NSPopUpButton*/ - if ([optName isEqualToString:@"subq"]) - { - [fX264optSubmePopUp selectItemAtIndex:[optValue intValue]+1]; - } - /*Trellis NSPopUpButton*/ - if ([optName isEqualToString:@"trellis"]) - { - [fX264optTrellisPopUp selectItemAtIndex:[optValue intValue]+1]; - } - /*Motion Estimation NSPopUpButton*/ - if ([optName isEqualToString:@"me"]) - { - if ([optValue isEqualToString:@"dia"]) - [fX264optMotionEstPopUp selectItemAtIndex:1]; - else if ([optValue isEqualToString:@"hex"]) - [fX264optMotionEstPopUp selectItemAtIndex:2]; - else if ([optValue isEqualToString:@"umh"]) - [fX264optMotionEstPopUp selectItemAtIndex:3]; - else if ([optValue isEqualToString:@"esa"]) - [fX264optMotionEstPopUp selectItemAtIndex:4]; - else if ([optValue isEqualToString:@"tesa"]) - [fX264optMotionEstPopUp selectItemAtIndex:5]; - } - /*ME Range NSPopUpButton*/ - if ([optName isEqualToString:@"merange"]) - { - [fX264optMERangePopUp selectItemAtIndex:[optValue intValue]-3]; - } - /* Adaptive B-Frames NSPopUpButton*/ - if ([optName isEqualToString:@"b-adapt"]) - { - [fX264optBAdaptPopUp selectItemAtIndex:[optValue intValue]+1]; - } - /*B Pyramid NSPButton*/ - if ([optName isEqualToString:@"b-pyramid"]) - { - - 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 ([optValue isEqualToString:@"none"]) - [fX264optDirectPredPopUp selectItemAtIndex:1]; - else if ([optValue isEqualToString:@"spatial"]) - [fX264optDirectPredPopUp selectItemAtIndex:2]; - else if ([optValue isEqualToString:@"temporal"]) - [fX264optDirectPredPopUp selectItemAtIndex:3]; - else if ([optValue isEqualToString:@"auto"]) - [fX264optDirectPredPopUp selectItemAtIndex:4]; - } - /*Deblocking NSPopUpButtons*/ - if ([optName isEqualToString:@"deblock"]) - { - NSString * alphaDeblock = @""; - NSString * betaDeblock = @""; - - NSRange splitDeblock = [optValue rangeOfString:@","]; - alphaDeblock = [optValue substringToIndex:splitDeblock.location]; - betaDeblock = [optValue substringFromIndex:splitDeblock.location + 1]; - - if ([alphaDeblock isEqualToString:@"0"] && [betaDeblock isEqualToString:@"0"]) - { - /* When both filters are at 0, default */ - [fX264optAlphaDeblockPopUp selectItemAtIndex:0]; - [fX264optBetaDeblockPopUp selectItemAtIndex:0]; - } - else - { - if (![alphaDeblock isEqualToString:@"0"]) - { - /* Alpha isn't 0, so set it. The offset of 7 is - because filters start at -6 instead of at 0. */ - [fX264optAlphaDeblockPopUp selectItemAtIndex:[alphaDeblock intValue]+7]; - } - else - { - /* Set alpha filter to 0, which is 7 up - because filters start at -6, not 0. */ - [fX264optAlphaDeblockPopUp selectItemAtIndex:7]; - } - - if (![betaDeblock isEqualToString:@"0"]) - { - /* Beta isn't 0, so set it. */ - [fX264optBetaDeblockPopUp selectItemAtIndex:[betaDeblock intValue]+7]; - } - else - { - /* Set beta filter to 0. */ - [fX264optBetaDeblockPopUp selectItemAtIndex:7]; - } - } - } - /* Analysis NSPopUpButton */ - if ([optName isEqualToString:@"analyse"]) - { - if ([optValue isEqualToString:@"p8x8,b8x8,i8x8,i4x4"]) - { - /* Default ("most") */ - [fX264optAnalysePopUp selectItemAtIndex:0]; - } - else if ([optValue isEqualToString:@"i4x4,i8x8"] || - [optValue isEqualToString:@"i8x8,i4x4"] ) - { - /* Some */ - [fX264optAnalysePopUp selectItemAtIndex:2]; - } - else if ([optValue isEqualToString:@"none"]) - { - [fX264optAnalysePopUp selectItemAtIndex:1]; - } - else if ([optValue isEqualToString:@"all"]) - { - [fX264optAnalysePopUp selectItemAtIndex:3]; - } - - } - /* 8x8 DCT NSButton */ - if ([optName isEqualToString:@"8x8dct"]) - { - [fX264opt8x8dctSwitch setState:[optValue intValue]]; - } - /* CABAC NSButton */ - if ([optName isEqualToString:@"cabac"]) - { - [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"]) - { - NSString * rdOpt = @""; - NSString * trellisOpt = @""; - - NSRange splitRD = [optValue rangeOfString:@","]; - rdOpt = [optValue substringToIndex:splitRD.location]; - trellisOpt = [optValue substringFromIndex:splitRD.location + 1]; - - [fX264optPsyRDSlider setFloatValue:[rdOpt floatValue]]; - [fX264optPsyTrellisSlider setFloatValue:[trellisOpt floatValue]]; - } - } - } - } -} - -- (NSString *) X264AdvancedOptionsOptIDToString: (id) widget -{ - /*Determine which outlet is being used and set optName to process accordingly */ - NSString * optNameToChange = @""; // The option name such as "bframes" - - if (widget == fX264optBframesPopUp) - { - optNameToChange = @"bframes"; - } - if (widget == fX264optRefPopUp) - { - optNameToChange = @"ref"; - } - if (widget == fX264optWeightPSwitch) - { - optNameToChange = @"weightp"; - } - if (widget == fX264optNodctdcmtSwitch) - { - optNameToChange = @"no-dct-decimate"; - } - if (widget == fX264optSubmePopUp) - { - optNameToChange = @"subq"; - } - if (widget == fX264optTrellisPopUp) - { - optNameToChange = @"trellis"; - } - if (widget == fX264optMotionEstPopUp) - { - optNameToChange = @"me"; - } - if (widget == fX264optMERangePopUp) - { - optNameToChange = @"merange"; - } - if (widget == fX264optBAdaptPopUp) - { - optNameToChange = @"b-adapt"; - } - if (widget == fX264optBPyramidPopUp) - { - optNameToChange = @"b-pyramid"; - } - if (widget == fX264optDirectPredPopUp) - { - optNameToChange = @"direct"; - } - if (widget == fX264optAlphaDeblockPopUp) - { - optNameToChange = @"deblock"; - } - if (widget == fX264optBetaDeblockPopUp) - { - optNameToChange = @"deblock"; - } - if (widget == fX264optAnalysePopUp) - { - optNameToChange = @"analyse"; - } - if (widget == fX264opt8x8dctSwitch) - { - optNameToChange = @"8x8dct"; - } - if (widget == fX264optCabacSwitch) - { - optNameToChange = @"cabac"; - } - if( widget == fX264optAqSlider) - { - optNameToChange = @"aq-strength"; - } - if( widget == fX264optPsyRDSlider) - { - optNameToChange = @"psy-rd"; - } - if( widget == fX264optPsyTrellisSlider) - { - optNameToChange = @"psy-rd"; - } - - return optNameToChange; -} - -- (NSString *) X264AdvancedOptionsWidgetToString: (NSString *) optName withID: (id) sender -{ - NSString * thisOpt = @""; // The option=value string the method will return - - if ([optName isEqualToString:@"deblock"]) - { - if ((([fX264optAlphaDeblockPopUp indexOfSelectedItem] == 0) || ([fX264optAlphaDeblockPopUp indexOfSelectedItem] == 7)) && (([fX264optBetaDeblockPopUp indexOfSelectedItem] == 0) || ([fX264optBetaDeblockPopUp indexOfSelectedItem] == 7))) - { - /* When both deblock widgets are 0 or default or a mix of the two, - use a blank string, since deblocking defaults to 0,0. */ - thisOpt = @""; - } - else - { - /* 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:@"%@=%ld,%ld",optName, ([fX264optAlphaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optAlphaDeblockPopUp indexOfSelectedItem]-7 : 0,([fX264optBetaDeblockPopUp indexOfSelectedItem] != 0) ? [fX264optBetaDeblockPopUp indexOfSelectedItem]-7 : 0]; - } - } - - 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 ) - { - /* When PsyRD is 1 and PsyTrel is 0 they're default values and can be ignored. */ - thisOpt = @""; - } - else - { - /* Otherwise the format is psy-rd=a,b */ - thisOpt = [NSString stringWithFormat:@"%@=%0.1f,%0.2f", optName, [fX264optPsyRDSlider floatValue], [fX264optPsyTrellisSlider floatValue] ]; - } - } - - 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 - require the inverse, but those will be handled a couple lines down. */ - if ([sender state] == 0) - { - /* When these options are false, don't include them. They all default - to being set off, so they don't need to be mentioned at all. */ - thisOpt = @""; - } - else - { - /* Otherwise, include them as optioname=1 */ - thisOpt = [NSString stringWithFormat:@"%@=%d",optName,1]; - } - } - - else if ( [optName isEqualToString:@"8x8dct"] || [optName isEqualToString:@"cabac"] || [optName isEqualToString:@"weightp"] ) - { - /* 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. */ - thisOpt = @""; - } - else - { - /* Otherwise, include cabac=0, etc, in the string. */ - 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 - { - /* When a widget is at index 0, it's default. Default means don't add to the string. - The exception for deblocking is because for those, *both* need to at index 0 - for it to default, so it's handled separately, above this section. */ - thisOpt = @""; - } - - else if ([optName isEqualToString:@"me"]) - { - /* Motion estimation uses string values, so this switch - pairs the widget index with the right value string. */ - switch ([sender indexOfSelectedItem]) - { - case 1: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"dia"]; - break; - - case 2: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"hex"]; - break; - - case 3: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"umh"]; - break; - - case 4: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"esa"]; - break; - - case 5: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"tesa"]; - - default: - break; - } - } - - else if ([optName isEqualToString:@"direct"]) - { - /* Direct prediction uses string values, so this switch - pairs the right string value with the right widget index. */ - switch ([sender indexOfSelectedItem]) - { - case 1: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"none"]; - break; - - case 2: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"spatial"]; - break; - - case 3: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"temporal"]; - break; - - case 4: - thisOpt = [NSString stringWithFormat:@"%@=%@",optName,@"auto"]; - break; - - default: - break; - } - } - - else if ([optName isEqualToString:@"analyse"]) - { - /* Analysis uses string values as well. */ - switch ([sender indexOfSelectedItem]) - { - 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; - - default: - 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"]) - { - /* Motion estimation range uses an odd array offset because in addition - to starting with index 0 as default, index 1 starts at 4 instead of 1, - because merange can't go below 4. So it has to be handled separately. */ - thisOpt = [NSString stringWithFormat:@"%@=%ld",optName,[sender indexOfSelectedItem]+3]; - } - - else if ([optName isEqualToString:@"b-adapt"]) - { - /* B-adapt starts at index 0 with default then goes 0, 1, 2)*/ - thisOpt = [NSString stringWithFormat:@"%@=%ld", optName, [sender indexOfSelectedItem]-1]; - } - - else if ([optName isEqualToString:@"ref"]) - { - /* Refs use actual index numbers */ - thisOpt = [NSString stringWithFormat:@"%@=%ld",optName,(long)[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 b-frames. - Basically, any options that are PopUp menus with index 0 as default and - 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:@"%@=%ld",optName,[sender indexOfSelectedItem]-1]; - } - - return thisOpt; -} - -- (BOOL) X264AdvancedOptionsIsOpt: (NSString *) optNameToChange inString: (NSString *) currentOptString -{ - /* If the option is in the string but not the beginning of it, - it will be in the form of ":optName=value" so we really want - to be looking for ":optNameToChange=" rather than "optNameToChange". */ - NSString *checkOptNameToChange = [NSString stringWithFormat:@":%@=",optNameToChange]; - - /* Now we store the part of the string up through the option name in currentOptRange. */ - NSRange currentOptRange = [currentOptString rangeOfString:checkOptNameToChange]; - - /* We need to know if the option is at the beginning of the string. - If it is at the start, it won't be preceded by a colon. - To figure this out, we'll use the rangeOfString method. First, - store what the option name would be if if it was at the beginning, - in checkOptNameToChangeBeginning. Then, find its range in the string. - If the range is 0, it's the first option listed in the string. */ - NSString *checkOptNameToChangeBeginning = [NSString stringWithFormat:@"%@=",optNameToChange]; - NSRange currentOptRangeBeginning = [currentOptString rangeOfString:checkOptNameToChangeBeginning]; - - if (currentOptRange.location != NSNotFound || currentOptRangeBeginning.location == 0) - return true; - else - return false; -} - -/** - * Resets the option string to mirror the GUI widgets. - */ -- (IBAction) X264AdvancedOptionsChanged: (id) sender -{ - /* Look up the equivalent string option name of the calling widget. */ - NSString * optNameToChange = [self X264AdvancedOptionsOptIDToString: sender]; - - NSString * thisOpt = @""; // The separated option such as "bframes=3" - NSString * optName = @""; // The option name such as "bframes" - NSArray *currentOptsArray; - - /* Get the current opt string being displayed. */ - NSString *currentOptString = [fDisplayX264Options stringValue]; - - /* There are going to be a few possibilities. - - The option might start off the string. - - The option might be in the middle of the string. - - The option might not be in the string at all yet. - - The string itself might not yet exist. */ - - if( [self X264AdvancedOptionsIsOpt: optNameToChange inString: currentOptString] ) - { - /* If the option is in the string with a semicolon, or starts the string, it's time to edit. - This means parsing the whole string into an array of options and values. From there, - iterate through the options, and when you reach the one that's been changed, edit it. */ - - /* Create new empty opt string*/ - NSString *changedOptString = @""; - - /* Put individual options into an array based on the ":" - separator for processing, result is "<opt>=<value>" */ - currentOptsArray = [currentOptString componentsSeparatedByString:@":"]; - - /* Iterate through the array and get <opts> and <values*/ - NSUInteger loopcounter; - NSUInteger currentOptsArrayCount = [currentOptsArray count]; - for (loopcounter = 0; loopcounter < currentOptsArrayCount; loopcounter++) - { - thisOpt = currentOptsArray[loopcounter]; - NSRange splitOptRange = [thisOpt rangeOfString:@"="]; - - if (splitOptRange.location != NSNotFound) - { - /* First off, it's time to handle option strings that - already have at least one option=value pair in them. */ - - optName = [thisOpt substringToIndex:splitOptRange.location]; - - /*If the optNameToChange is found, appropriately change the value or delete it if - "Unspecified" is set.*/ - if ([optName isEqualToString:optNameToChange]) - { - thisOpt = [self X264AdvancedOptionsWidgetToString: optName withID: sender]; - } - } - - /* Construct New String for opts here */ - if ([thisOpt isEqualToString:@""]) - { - /* Blank option, so just add it to the string. (Why?) */ - changedOptString = [NSString stringWithFormat:@"%@%@",changedOptString,thisOpt]; - } - else - { - if ([changedOptString isEqualToString:@""]) - { - /* No existing string, make the string this option. */ - changedOptString = [NSString stringWithFormat:@"%@",thisOpt]; - } - else - { - /* Existing string, existing option. Append the - option to the string, preceding it with a colon. */ - changedOptString = [NSString stringWithFormat:@"%@:%@",changedOptString,thisOpt]; - } - } - } - - /* Change the displayed option string to reflect the new modified settings */ - [fDisplayX264Options setStringValue:changedOptString]; - } - else // if none exists, add it to the string - { - /* This is where options that aren't already in the string are handled. */ - if ([[fDisplayX264Options stringValue] isEqualToString: @""]) - { - - [fDisplayX264Options setStringValue: - [self X264AdvancedOptionsWidgetToString: optNameToChange withID: sender]]; - } - else - { - /* The string isn't empty, and the option isn't already in it, so - it will need to be appended to the current string with a colon, - as long as the string to be appended isn't just blank (default). */ - if( [[self X264AdvancedOptionsWidgetToString: optNameToChange withID: sender] isEqualToString: @""] == false ) - { - [fDisplayX264Options setStringValue: - [NSString stringWithFormat:@"%@:%@", - currentOptString, - [self X264AdvancedOptionsWidgetToString: optNameToChange withID: sender] ]]; - } - } - } - - /* We now need to reset the opt widgets since we changed some stuff */ - [self X264AdvancedOptionsSet:sender]; - self.internalVideoSettings.videoOptionExtra = fDisplayX264Options.stringValue; -} - -@end diff --git a/macosx/HBVideo+UIAdditions.h b/macosx/HBVideo+UIAdditions.h index 236096916..22c9d85b6 100644 --- a/macosx/HBVideo+UIAdditions.h +++ b/macosx/HBVideo+UIAdditions.h @@ -58,7 +58,6 @@ - (BOOL)isUnparsedSupported:(int)encoder; - (BOOL)isPresetSystemSupported:(int)encoder; - (BOOL)isSimpleOptionsPanelSupported:(int)encoder; -- (BOOL)isOldAdvancedPanelSupported:(int)encoder; - (void)qualityLimitsForEncoder:(int)encoder low:(float *)low high:(float *)high granularity:(float *)granularity direction:(int *)direction; @end diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m index d7cbc0eda..5f8740287 100644 --- a/macosx/HBVideo+UIAdditions.m +++ b/macosx/HBVideo+UIAdditions.m @@ -440,11 +440,6 @@ return (encoder & HB_VCODEC_FFMPEG_MASK) != 0; } -- (BOOL)isOldAdvancedPanelSupported:(int)encoder -{ - return (encoder & HB_VCODEC_X264_MASK) != 0; -} - - (void)qualityLimitsForEncoder:(int)encoder low:(float *)low high:(float *)high granularity:(float *)granularity direction:(int *)direction { hb_video_quality_get_limits(encoder, low, high, granularity, direction); diff --git a/macosx/HBVideoController.m b/macosx/HBVideoController.m index 5eee2a4f8..e5bc66ad5 100644 --- a/macosx/HBVideoController.m +++ b/macosx/HBVideoController.m @@ -5,7 +5,6 @@ It may be used under the terms of the GNU General Public License. */ #import "HBVideoController.h" -#import "HBAdvancedController.h" @import HandBrakeKit; @@ -48,12 +47,6 @@ static void *HBVideoControllerContext = &HBVideoControllerContext; { _labelColor = [NSColor disabledControlTextColor]; - // Observe the advanced tab pref shown/hided state. - [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self - forKeyPath:@"values.HBShowAdvancedTab" - options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial - context:HBVideoControllerContext]; - // Observe the x264 slider granularity, to update the slider when the pref is changed. [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.x264CqSliderFractional" @@ -66,57 +59,11 @@ static void *HBVideoControllerContext = &HBVideoControllerContext; [self addObserver:self forKeyPath:@"video.quality" options:NSKeyValueObservingOptionInitial context:HBVideoControllerContext]; [self addObserver:self forKeyPath:@"video.preset" options:NSKeyValueObservingOptionInitial context:HBVideoControllerContext]; [self addObserver:self forKeyPath:@"video.unparseOptions" options:NSKeyValueObservingOptionInitial context:HBVideoControllerContext]; - [self addObserver:self forKeyPath:@"video.advancedOptions" options:NSKeyValueObservingOptionInitial context:HBVideoControllerContext]; } return self; } -- (BOOL)validateMenuItem:(NSMenuItem *)menuItem -{ - SEL action = menuItem.action; - - if (action == @selector(showAdvancedX264Panel:)) - { - return [self.video isOldAdvancedPanelSupported:self.video.encoder]; - } - return [self.nextResponder validateMenuItem:menuItem]; -} - -- (void)viewDidAppear -{ - NSText *defaultFieldEditor = [self.view.window fieldEditor:YES forObject:self.additionalsOptions]; - // defaultEditor.delegate = self; didn't help - NSMenu *mu = defaultFieldEditor.menu; - NSMenuItem *separator = [NSMenuItem separatorItem]; - separator.tag = 1; - NSMenuItem *action = [[NSMenuItem alloc] - initWithTitle:NSLocalizedString(@"Show advanced editor", @"Video -> Advanced editor") - action:@selector(showAdvancedX264Panel:) - keyEquivalent:@""]; - action.tag = 2; - action.enabled = YES; - [mu insertItem:separator atIndex:0]; - [mu insertItem:action atIndex:0]; -} - -- (void)viewWillDisappear -{ - NSText *defaultFieldEditor = [self.view.window fieldEditor:YES forObject:self.additionalsOptions]; - NSMenu *mu = defaultFieldEditor.menu; - NSMenuItem *separator = [mu itemWithTag:1]; - NSMenuItem *action = [mu itemWithTag:2]; - if (separator) { [mu removeItem:separator]; } - if (action) { [mu removeItem:action]; } -} - -- (IBAction)showAdvancedX264Panel:(id)sender -{ - HBAdvancedController *controller = [[HBAdvancedController alloc] init]; - controller.videoSettings = self.video; - [self presentViewControllerAsSheet:controller]; -} - - (void)setVideo:(HBVideo *)video { _video = video; @@ -243,11 +190,10 @@ static void *HBVideoControllerContext = &HBVideoControllerContext; } /** - * Enables/disables the advanced panel and the preset panel. + * Enables/disables the preset panel. */ - (void)enableEncoderOptionsWidgets:(BOOL)enable { - // enable/disable the checkbox and advanced panel self.presetViewEnabled = enable; } diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index b70911fe3..e759deed1 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -46,7 +46,6 @@ 273F208A14ADBE3B0021BE6D /* parsecsv.c in Sources */ = {isa = PBXBuildFile; fileRef = 273F208614ADBE3B0021BE6D /* parsecsv.c */; }; 273F208B14ADBE3B0021BE6D /* test.c in Sources */ = {isa = PBXBuildFile; fileRef = 273F208814ADBE3B0021BE6D /* test.c */; }; 273F20AC14ADBE670021BE6D /* HBController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F208F14ADBE670021BE6D /* HBController.m */; }; - 273F20AD14ADBE670021BE6D /* HBAdvancedController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209014ADBE670021BE6D /* HBAdvancedController.m */; }; 273F20AF14ADBE670021BE6D /* HBAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209414ADBE670021BE6D /* HBAudioController.m */; }; 273F20B214ADBE670021BE6D /* HBImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209A14ADBE670021BE6D /* HBImageAndTextCell.m */; }; 273F20B314ADBE670021BE6D /* HBOutputPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209C14ADBE670021BE6D /* HBOutputPanelController.m */; }; @@ -235,7 +234,6 @@ A9A96BB920CAD5EE00A39AFB /* HBPictureViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BB720CAD5ED00A39AFB /* HBPictureViewController.xib */; }; A9A96BBC20CAD5F400A39AFB /* HBFiltersViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BBA20CAD5F300A39AFB /* HBFiltersViewController.xib */; }; A9A96BBF20CAD5F800A39AFB /* Video.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BBD20CAD5F700A39AFB /* Video.xib */; }; - A9A96BC220CAD60400A39AFB /* AdvancedView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BC020CAD60300A39AFB /* AdvancedView.xib */; }; A9A96BC520CAD60A00A39AFB /* Audio.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BC320CAD60900A39AFB /* Audio.xib */; }; A9A96BC820CAD61000A39AFB /* AudioDefaults.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BC620CAD61000A39AFB /* AudioDefaults.xib */; }; A9A96BCB20CAD61800A39AFB /* Subtitles.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BC920CAD61800A39AFB /* Subtitles.xib */; }; @@ -379,7 +377,6 @@ 273F208814ADBE3B0021BE6D /* test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = test.c; sourceTree = "<group>"; }; 273F208E14ADBE670021BE6D /* HBController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBController.h; sourceTree = "<group>"; }; 273F208F14ADBE670021BE6D /* HBController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBController.m; sourceTree = "<group>"; }; - 273F209014ADBE670021BE6D /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = "<group>"; }; 273F209114ADBE670021BE6D /* HBAudioTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioTrack.h; sourceTree = "<group>"; }; 273F209214ADBE670021BE6D /* HBAudioTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioTrack.m; sourceTree = "<group>"; }; 273F209314ADBE670021BE6D /* HBAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioController.h; sourceTree = "<group>"; }; @@ -402,7 +399,6 @@ 273F20AA14ADBE670021BE6D /* HBPictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPictureController.m; sourceTree = "<group>"; }; 273F20BD14ADC09F0021BE6D /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; }; 273F20C014ADC1250021BE6D /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; }; - 273F217D14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; }; 275916DA14B2AB27007211E9 /* native.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = native.xcconfig; sourceTree = "<group>"; }; 276941FA14B161B70027798C /* osx107.i386.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = osx107.i386.xcconfig; sourceTree = "<group>"; }; 277A3FD014AE84C500A835E4 /* osx106.i386.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx106.i386.xcconfig; sourceTree = "<group>"; }; @@ -532,7 +528,6 @@ A9637DA220F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HBSummaryViewController.strings; sourceTree = "<group>"; }; A9637DA320F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PicturePreview.strings; sourceTree = "<group>"; }; A9637DA420F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SubtitlesDefaults.strings; sourceTree = "<group>"; }; - A9637DA520F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/AdvancedView.strings; sourceTree = "<group>"; }; A9637DA620F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/AudioDefaults.strings; sourceTree = "<group>"; }; A9637DA720F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Queue.strings; sourceTree = "<group>"; }; A9637DA820F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HBPictureViewController.strings; sourceTree = "<group>"; }; @@ -581,6 +576,7 @@ A9A0CBE51CCEA1D10045B3DF /* HBPlayerTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPlayerTrack.h; sourceTree = "<group>"; }; A9A0CBE61CCEA1D10045B3DF /* HBPlayerTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPlayerTrack.m; sourceTree = "<group>"; }; A9A25D9B21182741005A8A0F /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + A9A70DB621FB1A980038085A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = ../en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; A9A7E2791FE2A0B5006BE79F /* HBPreviewViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPreviewViewController.h; sourceTree = "<group>"; }; A9A7E27A1FE2A0B5006BE79F /* HBPreviewViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBPreviewViewController.m; sourceTree = "<group>"; }; A9A96B8320CAD2C200A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HBPictureHUDController.xib; sourceTree = "<group>"; }; @@ -595,7 +591,6 @@ A9A96BB820CAD5ED00A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HBPictureViewController.xib; sourceTree = "<group>"; }; A9A96BBB20CAD5F300A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HBFiltersViewController.xib; sourceTree = "<group>"; }; A9A96BBE20CAD5F700A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Video.xib; sourceTree = "<group>"; }; - A9A96BC120CAD60300A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AdvancedView.xib; sourceTree = "<group>"; }; A9A96BC420CAD60900A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Audio.xib; sourceTree = "<group>"; }; A9A96BC720CAD61000A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AudioDefaults.xib; sourceTree = "<group>"; }; A9A96BCA20CAD61800A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Subtitles.xib; sourceTree = "<group>"; }; @@ -609,7 +604,6 @@ A9A96BE220CAD6CD00A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HBPreviewViewController.xib; sourceTree = "<group>"; }; A9AA44781970664A00D7DEFC /* HBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HBUtilities.h; path = ../HBUtilities.h; sourceTree = "<group>"; }; A9AA44791970664A00D7DEFC /* HBUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HBUtilities.m; path = ../HBUtilities.m; sourceTree = "<group>"; }; - A9AA447B1970724D00D7DEFC /* HBAdvancedController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; }; A9AA447C1970726500D7DEFC /* HBQueueController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueController.h; sourceTree = "<group>"; }; A9AA447D1970729300D7DEFC /* HBPreviewGenerator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPreviewGenerator.h; sourceTree = "<group>"; }; A9AB9AA4211819A500BB3C7E /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; }; @@ -1300,9 +1294,6 @@ A93E0ED01972957000FD67FB /* HBVideoController.h */, A93E0ED11972957000FD67FB /* HBVideoController.m */, A9A96BBD20CAD5F700A39AFB /* Video.xib */, - A9AA447B1970724D00D7DEFC /* HBAdvancedController.h */, - 273F209014ADBE670021BE6D /* HBAdvancedController.m */, - A9A96BC020CAD60300A39AFB /* AdvancedView.xib */, 273F209314ADBE670021BE6D /* HBAudioController.h */, 273F209414ADBE670021BE6D /* HBAudioController.m */, A9A96BC320CAD60900A39AFB /* Audio.xib */, @@ -1548,11 +1539,10 @@ }; buildConfigurationList = 273F1FE314AD9DA40021BE6D /* Build configuration list for PBXProject "HandBrake" */; compatibilityVersion = "Xcode 6.3"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, - English, Base, de, ); @@ -1579,7 +1569,6 @@ A9A96BC520CAD60A00A39AFB /* Audio.xib in Resources */, A9A96B8220CAD2C200A39AFB /* HBPictureHUDController.xib in Resources */, 1C7776A5202301D5001C31EB /* HBRenamePresetController.xib in Resources */, - A9A96BC220CAD60400A39AFB /* AdvancedView.xib in Resources */, 273F218B14ADDDA10021BE6D /* InfoPlist.strings in Resources */, A94DC2DE20CADA2C00EAC8FD /* MainWindow.xib in Resources */, D86C9DD51C6D372500F06F1B /* Assets.xcassets in Resources */, @@ -1697,7 +1686,6 @@ A9DC6C52196F04F6002AE6B4 /* HBSubtitlesController.m in Sources */, 1C7776A2202300DD001C31EB /* HBRenamePresetController.m in Sources */, A9F472891976B7F30009EC65 /* HBSubtitlesDefaultsController.m in Sources */, - 273F20AD14ADBE670021BE6D /* HBAdvancedController.m in Sources */, A9906B2C1A710920001D82D5 /* HBQueueController.m in Sources */, A9F7102619A475EC00F61301 /* HBDockTile.m in Sources */, A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */, @@ -1829,7 +1817,7 @@ 273F217C14ADDDA10021BE6D /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 273F217D14ADDDA10021BE6D /* English */, + A9A70DB621FB1A980038085A /* en */, ); name = InfoPlist.strings; sourceTree = "<group>"; @@ -1959,15 +1947,6 @@ name = Video.xib; sourceTree = "<group>"; }; - A9A96BC020CAD60300A39AFB /* AdvancedView.xib */ = { - isa = PBXVariantGroup; - children = ( - A9A96BC120CAD60300A39AFB /* Base */, - A9637DA520F7A252001EAE7C /* de */, - ); - name = AdvancedView.xib; - sourceTree = "<group>"; - }; A9A96BC320CAD60900A39AFB /* Audio.xib */ = { isa = PBXVariantGroup; children = ( @@ -2157,6 +2136,7 @@ HBKitLocalizedString, ); MACOSX_DEPLOYMENT_TARGET = 10.11; + OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-filelist", "$(EXTERNAL_BUILD)/macosx/osl.filelist.txt", @@ -2226,6 +2206,7 @@ HBKitLocalizedString, ); MACOSX_DEPLOYMENT_TARGET = 10.11; + OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-filelist", "$(EXTERNAL_BUILD)/macosx/osl.filelist.txt", @@ -2249,6 +2230,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; + GCC_WARN_SHADOW = NO; HEADER_SEARCH_PATHS = ( "\"$(EXTERNAL_BUILD)/libhb\"", "\"$(EXTERNAL_BUILD)/contrib/include\"", @@ -2274,6 +2256,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; + GCC_WARN_SHADOW = NO; HEADER_SEARCH_PATHS = ( "\"$(EXTERNAL_BUILD)/libhb\"", "\"$(EXTERNAL_BUILD)/contrib/include\"", @@ -2679,6 +2662,7 @@ HBKitLocalizedString, ); MACOSX_DEPLOYMENT_TARGET = 10.11; + OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-filelist", "$(EXTERNAL_BUILD)/macosx/osl.filelist.txt", @@ -2711,6 +2695,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; + GCC_WARN_SHADOW = NO; HEADER_SEARCH_PATHS = ( "\"$(EXTERNAL_BUILD)/libhb\"", "\"$(EXTERNAL_BUILD)/contrib/include\"", @@ -2930,6 +2915,7 @@ HBKitLocalizedString, ); MACOSX_DEPLOYMENT_TARGET = 10.11; + OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-filelist", "$(EXTERNAL_BUILD)/macosx/osl.filelist.txt", @@ -2962,6 +2948,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; + GCC_WARN_SHADOW = NO; HEADER_SEARCH_PATHS = ( "\"$(EXTERNAL_BUILD)/libhb\"", "\"$(EXTERNAL_BUILD)/contrib/include\"", diff --git a/macosx/de.lproj/AdvancedView.strings b/macosx/de.lproj/AdvancedView.strings deleted file mode 100644 index 939723dd7..000000000 --- a/macosx/de.lproj/AdvancedView.strings +++ /dev/null @@ -1,216 +0,0 @@ -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "7"; */ -"7.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "8"; */ -"8.title" = "Item1"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "9"; */ -"9.title" = "Item3"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "10"; */ -"10.title" = "Item2"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "14"; */ -"14.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "15"; */ -"15.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "16"; */ -"16.title" = "Item3"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "17"; */ -"17.title" = "Item1"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "19"; */ -"19.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "20"; */ -"20.title" = "Item1"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "21"; */ -"21.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "22"; */ -"22.title" = "Item3"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "33"; */ -"33.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "34"; */ -"34.title" = "Item3"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "35"; */ -"35.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "36"; */ -"36.title" = "Item1"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "40"; */ -"40.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "41"; */ -"41.title" = "Item1"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "42"; */ -"42.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "43"; */ -"43.title" = "Item3"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "51"; */ -"51.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "52"; */ -"52.title" = "Item3"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "53"; */ -"53.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "54"; */ -"54.title" = "Item1"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "57"; */ -"57.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "58"; */ -"58.title" = "Item1"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "59"; */ -"59.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "60"; */ -"60.title" = "Item3"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "62"; */ -"62.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "63"; */ -"63.title" = "Item1"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "64"; */ -"64.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "65"; */ -"65.title" = "Item3"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "75"; */ -"75.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "76"; */ -"76.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "77"; */ -"77.title" = "Item1"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "78"; */ -"78.title" = "Item3"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "82"; */ -"82.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "83"; */ -"83.title" = "Item3"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "84"; */ -"84.title" = "Item1"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "85"; */ -"85.title" = "Item2"; - -/* Class = "NSTextFieldCell"; title = "Reference Frames:"; ObjectID = "343"; */ -"343.title" = "Referenzeinzelbilder:"; - -/* Class = "NSTextFieldCell"; title = "Maximum B-Frames:"; ObjectID = "344"; */ -"344.title" = "Maximale B-Frames:"; - -/* Class = "NSTextFieldCell"; title = "Trellis:"; ObjectID = "347"; */ -"347.title" = "Trellis:"; - -/* Class = "NSTextFieldCell"; title = "No DCT Decimation:"; ObjectID = "348"; */ -"348.title" = "Keine DCT-Dezimierung:"; - -/* Class = "NSTextFieldCell"; title = "Motion Estimation Method:"; ObjectID = "353"; */ -"353.title" = "Methode der Bewegungsabschätzung:"; - -/* Class = "NSTextFieldCell"; title = "Motion Estimation Range:"; ObjectID = "354"; */ -"354.title" = "Bereich der Bewegungsabschätzung:"; - -/* Class = "NSTextFieldCell"; title = "Subpixel ME & Mode Decision:"; ObjectID = "356"; */ -"356.title" = "Modus der Teilbildpunkt-Bewegungsabschätzung:"; - -/* Class = "NSTextFieldCell"; title = "Pyramidal B-Frames:"; ObjectID = "358"; */ -"358.title" = "Pyramidale B-Frames:"; - -/* Class = "NSTextFieldCell"; title = "Adaptive Direct Mode:"; ObjectID = "361"; */ -"361.title" = "Adaptiver Direktmodus:"; - -/* Class = "NSTextFieldCell"; title = "Current x264 Advanced Option String"; ObjectID = "363"; */ -"363.title" = "Erweiterte x264-Optionen"; - -/* Class = "NSTextFieldCell"; title = "Deblocking:"; ObjectID = "366"; */ -"366.title" = "Deblocking:"; - -/* Class = "NSTextFieldCell"; title = "Partition Types:"; ObjectID = "376"; */ -"376.title" = "Partitionstyp:"; - -/* Class = "NSTextFieldCell"; title = "8x8 Transform:"; ObjectID = "378"; */ -"378.title" = "8x8-Transformierung:"; - -/* Class = "NSTextFieldCell"; title = "CABAC Entropy Coding:"; ObjectID = "380"; */ -"380.title" = "CABAC-Entropiekodierung:"; - -/* Class = "NSTextFieldCell"; title = "Psychovisual Rate Distortion:"; ObjectID = "383"; */ -"383.title" = "Psychovisuelle Ratenverzerrung:"; - -/* Class = "NSTextFieldCell"; title = "Psychovisual Trellis:"; ObjectID = "391"; */ -"391.title" = "Psychovisuelles Trellis:"; - -/* Class = "NSTextFieldCell"; title = "Adaptive B-Frames:"; ObjectID = "397"; */ -"397.title" = "Adaptive B-Frames:"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "400"; */ -"400.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "401"; */ -"401.title" = "Item2"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "402"; */ -"402.title" = "Item3"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "403"; */ -"403.title" = "Item1"; - -/* Class = "NSTextFieldCell"; title = "Weighted P-Frames:"; ObjectID = "409"; */ -"409.title" = "Gewichtete P-Frames:"; - -/* Class = "NSTextFieldCell"; title = "Adaptive Quantization:"; ObjectID = "422"; */ -"422.title" = "Adaptive Quantisierung:"; - -/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "429"; */ -"429.title" = "OtherViews"; - -/* Class = "NSMenuItem"; title = "Item1"; ObjectID = "430"; */ -"430.title" = "Item1"; - -/* Class = "NSMenuItem"; title = "Item3"; ObjectID = "431"; */ -"431.title" = "Item3"; - -/* Class = "NSMenuItem"; title = "Item2"; ObjectID = "432"; */ -"432.title" = "Item2"; - -/* Class = "NSTextFieldCell"; title = "Psychovisual"; ObjectID = "439"; */ -"439.title" = "Psychovisuell"; - -/* Class = "NSTextFieldCell"; title = "Encoding"; ObjectID = "441"; */ -"441.title" = "Enkodierung"; - -/* Class = "NSTextFieldCell"; title = "Analysis"; ObjectID = "443"; */ -"443.title" = "Analyse"; - -/* Class = "NSButtonCell"; title = "OK"; ObjectID = "lV4-j0-O2Y"; */ -"lV4-j0-O2Y.title" = "OK"; - -/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "w0T-fl-8Fm"; */ -"w0T-fl-8Fm.title" = "Abbrechen"; - diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/en.lproj/InfoPlist.strings index 2d92facd6..2d92facd6 100644 --- a/macosx/English.lproj/InfoPlist.strings +++ b/macosx/en.lproj/InfoPlist.strings |