Re-enable the tvOS's HEVC option (defaulted to enabled)

Fixes #481
This commit is contained in:
Cameron Gutman 2022-08-01 20:01:41 -05:00
parent 6678488edc
commit ac801e9bfb
3 changed files with 2 additions and 4 deletions

View File

@ -36,7 +36,7 @@
assert([self.framerate intValue] != 0); assert([self.framerate intValue] != 0);
self.audioConfig = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"audioConfig"]]; self.audioConfig = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"audioConfig"]];
assert([self.audioConfig intValue] != 0); assert([self.audioConfig intValue] != 0);
self.useHevc = [[NSUserDefaults standardUserDefaults] boolForKey:@"useHevc"]; self.useHevc = [[NSUserDefaults standardUserDefaults] boolForKey:@"useHevc2"];
self.useFramePacing = [[NSUserDefaults standardUserDefaults] integerForKey:@"useFramePacing"] != 0; self.useFramePacing = [[NSUserDefaults standardUserDefaults] integerForKey:@"useFramePacing"] != 0;
self.playAudioOnPC = [[NSUserDefaults standardUserDefaults] boolForKey:@"audioOnPC"]; self.playAudioOnPC = [[NSUserDefaults standardUserDefaults] boolForKey:@"audioOnPC"];
self.enableHdr = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableHdr"]; self.enableHdr = [[NSUserDefaults standardUserDefaults] boolForKey:@"enableHdr"];

View File

@ -414,9 +414,7 @@ void ClSetHdrMode(bool enabled)
// As a result, we will only use HEVC on iOS 11.3 or later. // As a result, we will only use HEVC on iOS 11.3 or later.
if (@available(iOS 11.3, tvOS 11.3, *)) { if (@available(iOS 11.3, tvOS 11.3, *)) {
_streamConfig.supportsHevc = _streamConfig.supportsHevc =
#if !TARGET_OS_TV
config.allowHevc && config.allowHevc &&
#endif
VTIsHardwareDecodeSupported(kCMVideoCodecType_HEVC); VTIsHardwareDecodeSupported(kCMVideoCodecType_HEVC);
} }

View File

@ -186,7 +186,7 @@
<key>Title</key> <key>Title</key>
<string>Use HEVC Codec</string> <string>Use HEVC Codec</string>
<key>Key</key> <key>Key</key>
<string>useHevc</string> <string>useHevc2</string>
<key>DefaultValue</key> <key>DefaultValue</key>
<true/> <true/>
</dict> </dict>