Merge branch 'Integration' into feat/frame_pacing_metal
# Conflicts: # VoidLink.xcodeproj/project.pbxproj # VoidLink/Base.lproj/iPad.storyboard # VoidLink/Database/DataManager.m # VoidLink/Database/TemporarySettings.m # VoidLink/SceneDelegate.h # VoidLink/Stream/StreamManager.m # VoidLink/Stream/VideoDecoderRenderer.h # VoidLink/Stream/VideoDecoderRenderer.m # VoidLink/ViewControllers/MainFrameViewController.m # VoidLink/ViewControllers/SettingsViewController.m
This commit is contained in:
commit
47a590e92a
34 files changed
+542
-168
No files matched your search
@@ -75,6 +75,7 @@ typedef NS_ENUM(NSInteger, SettingsMenuMode) {
|
||||
audioOnPC:(BOOL)audioOnPC
|
||||
preferredCodec:(uint32_t)preferredCodec
|
||||
enableYUV444:(BOOL)enableYUV444
|
||||
enablePIP:(BOOL)enablePIP
|
||||
useFramePacing:(BOOL)useFramePacing
|
||||
enableHdr:(BOOL)enableHdr
|
||||
btMouseSupport:(BOOL)btMouseSupport
|
||||
|
||||
Reference in new issue
Block a user