From 83060670cac673ecbdf9501779e1607fcafeaae6 Mon Sep 17 00:00:00 2001 From: kingslay Date: Tue, 21 Nov 2023 20:53:53 +0800 Subject: [PATCH] add log --- Demo/SwiftUI/TracyPlayer.entitlements | 2 -- Demo/demo-iOS/demo-iOS/demo-iOS.entitlements | 2 -- FFmpegKit | 2 +- Sources/KSPlayer/AVPlayer/KSAVPlayer.swift | 3 +-- Sources/KSPlayer/MEPlayer/MEPlayerItem.swift | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Demo/SwiftUI/TracyPlayer.entitlements b/Demo/SwiftUI/TracyPlayer.entitlements index a8149f44b..667239027 100644 --- a/Demo/SwiftUI/TracyPlayer.entitlements +++ b/Demo/SwiftUI/TracyPlayer.entitlements @@ -28,8 +28,6 @@ com.apple.security.network.client - com.apple.security.network.server - inter-app-audio diff --git a/Demo/demo-iOS/demo-iOS/demo-iOS.entitlements b/Demo/demo-iOS/demo-iOS/demo-iOS.entitlements index 44d19c224..a945ba841 100644 --- a/Demo/demo-iOS/demo-iOS/demo-iOS.entitlements +++ b/Demo/demo-iOS/demo-iOS/demo-iOS.entitlements @@ -14,7 +14,5 @@ com.apple.security.network.client - com.apple.security.network.server - diff --git a/FFmpegKit b/FFmpegKit index 748dd561f..8823ec794 160000 --- a/FFmpegKit +++ b/FFmpegKit @@ -1 +1 @@ -Subproject commit 748dd561f4faea3db21aaefc48ad5484b88f15dc +Subproject commit 8823ec79438a0abbee26e844563af35908f6de8d diff --git a/Sources/KSPlayer/AVPlayer/KSAVPlayer.swift b/Sources/KSPlayer/AVPlayer/KSAVPlayer.swift index fabe7576f..0a45dc7ee 100644 --- a/Sources/KSPlayer/AVPlayer/KSAVPlayer.swift +++ b/Sources/KSPlayer/AVPlayer/KSAVPlayer.swift @@ -541,17 +541,16 @@ class AVMediaPlayerTrack: MediaPlayerTrack { nominalFrameRate = track.assetTrack?.nominalFrameRate ?? 24.0 bitRate = Int64(track.assetTrack?.estimatedDataRate ?? 0) isPlayable = false - formatDescription = track.assetTrack?.formatDescriptions.first as? CMFormatDescription #else name = track.assetTrack?.languageCode ?? "" language = track.assetTrack?.extendedLanguageTag nominalFrameRate = track.assetTrack?.nominalFrameRate ?? 24.0 bitRate = Int64(track.assetTrack?.estimatedDataRate ?? 0) isPlayable = track.assetTrack?.isPlayable ?? false + #endif // swiftlint:disable force_cast formatDescription = (track.assetTrack?.formatDescriptions.first as! CMFormatDescription) // swiftlint:enable force_cast - #endif description = (formatDescription?.mediaSubType ?? .boxed).rawValue.string #if os(xrOS) Task { diff --git a/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift b/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift index 3d11a2244..f7068a5a3 100644 --- a/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift +++ b/Sources/KSPlayer/MEPlayer/MEPlayerItem.swift @@ -455,6 +455,7 @@ extension MEPlayerItem { // try again without the backwards flag to make it seek to the // beginning. if result < 0, options.seekFlags & AVSEEK_FLAG_BACKWARD == AVSEEK_FLAG_BACKWARD { + KSLog("seek to \(time) failed. seekFlags remove BACKWARD") options.seekFlags &= ~AVSEEK_FLAG_BACKWARD result = av_seek_frame(formatCtx, -1, timeStamp, options.seekFlags) } @@ -475,7 +476,6 @@ extension MEPlayerItem { audioClock.positionTime = time videoClock.positionTime = time state = .reading - } else if state == .reading { autoreleasepool { reading()