Просмотр исходного кода

Add option to control H.264 loop filtering (close #8814)

Felix Paul Kühne 12 лет назад
Родитель
Сommit
12e9905a7c

+ 1 - 1
AspenProject/VLCAppDelegate.m

@@ -37,7 +37,7 @@
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
-    NSDictionary *appDefaults = @{kVLCSettingPasscodeKey : @"", kVLCSettingPasscodeOnKey : @(NO), kVLCSettingContinueAudioInBackgroundKey : @(YES), kVLCSettingStretchAudio : @(NO), kVLCSettingTextEncoding : kVLCSettingTextEncodingDefaultValue};
+    NSDictionary *appDefaults = @{kVLCSettingPasscodeKey : @"", kVLCSettingPasscodeOnKey : @(NO), kVLCSettingContinueAudioInBackgroundKey : @(YES), kVLCSettingStretchAudio : @(NO), kVLCSettingTextEncoding : kVLCSettingTextEncodingDefaultValue, kVLCSettingSkipLoopFilter : @(3)};
 
     [defaults registerDefaults:appDefaults];
 }

+ 6 - 0
AspenProject/VLCConstants.h

@@ -18,6 +18,12 @@
 #define kVLCSettingStretchAudioOffValue @"0"
 #define kVLCSettingTextEncoding @"subsdec-encoding"
 #define kVLCSettingTextEncodingDefaultValue @"Windows-1252"
+#define kVLCSettingSkipLoopFilter @"avcodec-skiploopfilter"
+#define kVLCSettingSkipLoopFilterNone @(0)
+#define kVLCSettingSkipLoopFilterNonRef @(1)
+#define kVLCSettingSkipLoopFilterBidir @(2)
+#define kVLCSettingSkipLoopFilterNonKey @(3)
+#define kVLCSettingSkipLoopFilterAll @(4)
 
 #define kVLCShowRemainingTime @"show-remaining-time"
 #define kVLCRecentURLs @"recent-urls"

+ 1 - 2
AspenProject/VLCMovieViewController.m

@@ -209,8 +209,7 @@
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     [media addOptions:
      @{kVLCSettingStretchAudio :
-           [[defaults objectForKey:kVLCSettingStretchAudio] boolValue] ? kVLCSettingStretchAudioOnValue : kVLCSettingStretchAudioOffValue,
-        kVLCSettingTextEncoding : [defaults objectForKey:kVLCSettingTextEncoding]}];
+           [[defaults objectForKey:kVLCSettingStretchAudio] boolValue] ? kVLCSettingStretchAudioOnValue : kVLCSettingStretchAudioOffValue, kVLCSettingTextEncoding : [defaults objectForKey:kVLCSettingTextEncoding], kVLCSettingSkipLoopFilter : [defaults objectForKey:kVLCSettingSkipLoopFilter]}];
 
     [NSTimeZone resetSystemTimeZone];
     NSString *tzName = [[NSTimeZone systemTimeZone] name];

+ 26 - 0
Resources/Settings.bundle/Root.inApp.plist

@@ -29,6 +29,32 @@
 		<dict>
 			<key>Type</key>
 			<string>PSMultiValueSpecifier</string>
+			<key>Title</key>
+			<string>SETTINGS_SKIP_LOOP_FILTER</string>
+			<key>Key</key>
+			<string>avcodec-skiploopfilter</string>
+			<key>DefaultValue</key>
+			<string>3</string>
+			<key>Titles</key>
+			<array>
+				<string>None</string>
+				<string>Non-ref</string>
+				<string>Bidir</string>
+				<string>Non-key</string>
+				<string>All</string>
+			</array>
+			<key>Values</key>
+			<array>
+				<integer>0</integer>
+				<integer>1</integer>
+				<integer>2</integer>
+				<integer>3</integer>
+				<integer>4</integer>
+			</array>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
 			<key>Titles</key>
 			<array>
 				<string>Universal (UTF-8)</string>

+ 26 - 0
Resources/Settings.bundle/Root.plist

@@ -13,6 +13,32 @@
 		<dict>
 			<key>Type</key>
 			<string>PSMultiValueSpecifier</string>
+			<key>Title</key>
+			<string>SETTINGS_SKIP_LOOP_FILTER</string>
+			<key>Key</key>
+			<string>avcodec-skiploopfilter</string>
+			<key>DefaultValue</key>
+			<string>3</string>
+			<key>Titles</key>
+			<array>
+				<string>None</string>
+				<string>Non-ref</string>
+				<string>Bidir</string>
+				<string>Non-key</string>
+				<string>All</string>
+			</array>
+			<key>Values</key>
+			<array>
+				<integer>0</integer>
+				<integer>1</integer>
+				<integer>2</integer>
+				<integer>3</integer>
+				<integer>4</integer>
+			</array>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
 			<key>Titles</key>
 			<array>
 				<string>Universal (UTF-8)</string>

BIN
Resources/Settings.bundle/de.lproj/Root.strings


BIN
Resources/Settings.bundle/en.lproj/Root.strings


BIN
Resources/Settings.bundle/es.lproj/Root.strings


BIN
Resources/Settings.bundle/fi.lproj/Root.strings


BIN
Resources/Settings.bundle/fr.lproj/Root.strings


BIN
Resources/Settings.bundle/id.lproj/Root.strings


BIN
Resources/Settings.bundle/it.lproj/Root.strings


BIN
Resources/Settings.bundle/ja.lproj/Root.strings


BIN
Resources/Settings.bundle/ru.lproj/Root.strings