Skip to content

Commit

Permalink
fix #644
Browse files Browse the repository at this point in the history
  • Loading branch information
@kingslay
kingslay committed Nov 18, 2023
1 parent 0ffb5a1 commit 50a5853
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Demo/demo-iOS/demo-iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
AC3E54AC24B9E815002B6B1B /* Localized.strings in Resources */ = {isa = PBXBuildFile; fileRef = AC3E491D24B98CEB002B6B1B /* Localized.strings */; };
AC458DE621DF830F00BD4CF9 /* AudioViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC458DE521DF830F00BD4CF9 /* AudioViewController.swift */; };
AC68AA322AD3FA320061A4CA /* MEPlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC68AA312AD3FA310061A4CA /* MEPlayerViewController.swift */; };
ACCB7FF32B05F7C700273BAA /* test.m3u in Resources */ = {isa = PBXBuildFile; fileRef = ACCB7FF22B05F7C700273BAA /* test.m3u */; };
AC78D5DA2B09056B00A28998 /* test.m3u in Resources */ = {isa = PBXBuildFile; fileRef = AC78D5D92B09056B00A28998 /* test.m3u */; };
ACE8052D2A83B92800690A9B /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACE8052C2A83B92800690A9B /* RootViewController.swift */; };
/* End PBXBuildFile section */

Expand All @@ -36,8 +36,8 @@
AC3E498E24B9CB5E002B6B1B /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
AC458DE521DF830F00BD4CF9 /* AudioViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioViewController.swift; sourceTree = "<group>"; };
AC68AA312AD3FA310061A4CA /* MEPlayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MEPlayerViewController.swift; sourceTree = "<group>"; };
AC78D5D92B09056B00A28998 /* test.m3u */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = test.m3u; path = ../../../Tests/KSPlayerTests/Resources/test.m3u; sourceTree = "<group>"; };
AC7E04DB2414DA5E00B0F540 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/lib/libxml2.tbd; sourceTree = DEVELOPER_DIR; };
ACCB7FF22B05F7C700273BAA /* test.m3u */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = test.m3u; path = ../../../Tests/KSPlayerTests/test.m3u; sourceTree = "<group>"; };
ACE8052C2A83B92800690A9B /* RootViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RootViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -90,7 +90,7 @@
AC08619420B69AB400D801FC /* DetailViewController.swift */,
AC08619520B69AB400D801FC /* MasterViewController.swift */,
AC458DE521DF830F00BD4CF9 /* AudioViewController.swift */,
ACCB7FF22B05F7C700273BAA /* test.m3u */,
AC78D5D92B09056B00A28998 /* test.m3u */,
AC3E498E24B9CB5E002B6B1B /* LaunchScreen.storyboard */,
AC08615520B69A4500D801FC /* Assets.xcassets */,
AC08615A20B69A4500D801FC /* Info.plist */,
Expand Down Expand Up @@ -176,7 +176,7 @@
AC3E54AC24B9E815002B6B1B /* Localized.strings in Resources */,
AC3E54AB24B9E810002B6B1B /* LaunchScreen.storyboard in Resources */,
AC08615620B69A4500D801FC /* Assets.xcassets in Resources */,
ACCB7FF32B05F7C700273BAA /* test.m3u in Resources */,
AC78D5DA2B09056B00A28998 /* test.m3u in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
8 changes: 4 additions & 4 deletions Demo/demo-tvOS/demo-tvOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
AC3A420323D32DFE00B666A4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC3A41FF23D32DFE00B666A4 /* AppDelegate.swift */; };
AC3A420423D32DFE00B666A4 /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC3A420023D32DFE00B666A4 /* DetailViewController.swift */; };
AC3A420523D32DFE00B666A4 /* AudioViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC3A420123D32DFE00B666A4 /* AudioViewController.swift */; };
AC78D5DC2B09057900A28998 /* test.m3u in Resources */ = {isa = PBXBuildFile; fileRef = AC78D5DB2B09057900A28998 /* test.m3u */; };
AC80333224BA1B54002B3D40 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AC80333124BA1B54002B3D40 /* Main.storyboard */; };
ACBBA9802A8503F400D262FC /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACBBA97F2A8503F400D262FC /* RootViewController.swift */; };
ACCB7FF52B05F7E300273BAA /* test.m3u in Resources */ = {isa = PBXBuildFile; fileRef = ACCB7FF42B05F7E300273BAA /* test.m3u */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -29,9 +29,9 @@
AC3A41FF23D32DFE00B666A4 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = "../../demo-iOS/demo-iOS/AppDelegate.swift"; sourceTree = "<group>"; };
AC3A420023D32DFE00B666A4 /* DetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DetailViewController.swift; path = "../../demo-iOS/demo-iOS/DetailViewController.swift"; sourceTree = "<group>"; };
AC3A420123D32DFE00B666A4 /* AudioViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioViewController.swift; path = "../../demo-iOS/demo-iOS/AudioViewController.swift"; sourceTree = "<group>"; };
AC78D5DB2B09057900A28998 /* test.m3u */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = test.m3u; path = ../../../Tests/KSPlayerTests/Resources/test.m3u; sourceTree = "<group>"; };
AC80333124BA1B54002B3D40 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
ACBBA97F2A8503F400D262FC /* RootViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RootViewController.swift; path = "../../demo-iOS/demo-iOS/RootViewController.swift"; sourceTree = "<group>"; };
ACCB7FF42B05F7E300273BAA /* test.m3u */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = test.m3u; path = ../../../Tests/KSPlayerTests/test.m3u; sourceTree = "<group>"; };
D4B47B55C1204959E7C6D995 /* Pods-demo-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo-tvOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-demo-tvOS/Pods-demo-tvOS.release.xcconfig"; sourceTree = "<group>"; };
F227C20AECAAE8524D2F0F1D /* Pods_demo_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_demo_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -74,7 +74,7 @@
AC3A420123D32DFE00B666A4 /* AudioViewController.swift */,
AC3A420023D32DFE00B666A4 /* DetailViewController.swift */,
AC3A41FE23D32DFD00B666A4 /* MasterViewController.swift */,
ACCB7FF42B05F7E300273BAA /* test.m3u */,
AC78D5DB2B09057900A28998 /* test.m3u */,
AC08611E20B69A1C00D801FC /* Assets.xcassets */,
AC80333124BA1B54002B3D40 /* Main.storyboard */,
AC08612020B69A1C00D801FC /* Info.plist */,
Expand Down Expand Up @@ -164,7 +164,7 @@
buildActionMask = 2147483647;
files = (
AC80333224BA1B54002B3D40 /* Main.storyboard in Resources */,
ACCB7FF52B05F7E300273BAA /* test.m3u in Resources */,
AC78D5DC2B09057900A28998 /* test.m3u in Resources */,
AC08611F20B69A1C00D801FC /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion Sources/KSPlayer/AVPlayer/KSOptions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ open class KSOptions {
if KSOptions.displayCriteriaFormatDescriptionEnabled, #available(tvOS 17.0, *) {
displayManager.preferredDisplayCriteria = AVDisplayCriteria(refreshRate: refreshRate, formatDescription: formatDescription)
} else {
let dynamicRange = isDovi ? .dolbyVision : formatDescription.dynamicRange
// let dynamicRange = isDovi ? .dolbyVision : formatDescription.dynamicRange
// displayManager.preferredDisplayCriteria = AVDisplayCriteria(refreshRate: refreshRate, videoDynamicRange: dynamicRange.rawValue)
}
}
Expand Down
8 changes: 4 additions & 4 deletions Sources/KSPlayer/MEPlayer/AudioEnginePlayer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,10 @@ public class AudioEnginePlayer: AudioOutput {
engine.connect(nodes: nodes, format: audioFormat)
engine.prepare()
if isRunning {
do {
try engine.start()
} catch {
KSLog(error)
try? engine.start()
// 从多声道切换到2声道马上调用start会不生效。需要异步主线程才可以
DispatchQueue.main.async { [weak self] in
self?.play(time: 0)
}
}
}
Expand Down
0 Tests/KSPlayerTests/test.m3u → Tests/KSPlayerTests/Resources/test.m3u
View file
File renamed without changes.

0 comments on commit 50a5853

Please sign in to comment.