Fix video playback in iOS < 17.5

Isaac · Isaac · commit af8276cf2d4c · 2024-12-06T22:17:20.000+08:00
(cherry picked from commit 5c5236c)
diff --git a/submodules/MediaPlayer/Sources/MediaPlayer.swift b/submodules/MediaPlayer/Sources/MediaPlayer.swift
@@ -342,7 +342,7 @@ private final class MediaPlayerContext {
             let _ = self.playerStatusValue.swap(status)
         }
         
-        let frameSource = FFMpegMediaFrameSource(queue: self.queue, postbox: self.postbox, userLocation: self.userLocation, userContentType: self.userContentType, resourceReference: self.resourceReference, tempFilePath: self.tempFilePath, limitedFileRange: self.limitedFileRange, streamable: self.streamable.enabled, isSeekable: self.streamable.isSeekable, video: self.video, preferSoftwareDecoding: self.preferSoftwareDecoding, fetchAutomatically: self.fetchAutomatically, stallDuration: self.streamable.parameters.0, lowWaterDuration: self.streamable.parameters.1, highWaterDuration: self.streamable.parameters.2, storeAfterDownload: self.storeAfterDownload)
+        let frameSource = FFMpegMediaFrameSource(queue: self.queue, postbox: self.postbox, userLocation: self.userLocation, userContentType: self.userContentType, resourceReference: self.resourceReference, tempFilePath: self.tempFilePath, limitedFileRange: self.limitedFileRange, streamable: self.streamable.enabled, isSeekable: self.streamable.isSeekable, video: self.video, preferSoftwareDecoding: self.preferSoftwareDecoding, fetchAutomatically: self.fetchAutomatically, stallDuration: self.streamable.parameters.0, lowWaterDuration: self.streamable.parameters.1, highWaterDuration: self.streamable.parameters.2, storeAfterDownload: self.storeAfterDownload, isAudioVideoMessage: self.isAudioVideoMessage)
         let disposable = MetaDisposable()
         let updatedSeekState: MediaPlayerSeekState?
         if let loadedDuration = loadedDuration {
diff --git a/submodules/MediaPlayer/Sources/MediaPlayerNode.swift b/submodules/MediaPlayer/Sources/MediaPlayerNode.swift
@@ -221,7 +221,10 @@ public final class MediaPlayerNode: ASDisplayNode {
                         videoLayer.enqueue(frame.sampleBuffer)
                         if #available(iOS 17.4, *) {
                         } else {
-                            strongSelf.hasSentFramesToDisplay?()
+                            if !strongSelf.didNotifyVideoLayerReadyForDisplay {
+                                strongSelf.didNotifyVideoLayerReadyForDisplay = true
+                                strongSelf.hasSentFramesToDisplay?()
+                            }
                         }
                     }
                 }
@@ -257,7 +260,10 @@ public final class MediaPlayerNode: ASDisplayNode {
                             return
                         }
                         videoLayer.enqueue(frame.sampleBuffer)
-                        //strongSelf.hasSentFramesToDisplay?()
+                        if !strongSelf.didNotifyVideoLayerReadyForDisplay {
+                            strongSelf.didNotifyVideoLayerReadyForDisplay = true
+                            strongSelf.hasSentFramesToDisplay?()
+                        }
                     }
                     
                     Queue.mainQueue().async {

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ private final class MediaPlayerContext {`
`342`	`342`	`let _ = self.playerStatusValue.swap(status)`
`343`	`343`	`}`
`344`	`344`
`345`		- let frameSource = FFMpegMediaFrameSource(queue: self.queue, postbox: self.postbox, userLocation: self.userLocation, userContentType: self.userContentType, resourceReference: self.resourceReference, tempFilePath: self.tempFilePath, limitedFileRange: self.limitedFileRange, streamable: self.streamable.enabled, isSeekable: self.streamable.isSeekable, video: self.video, preferSoftwareDecoding: self.preferSoftwareDecoding, fetchAutomatically: self.fetchAutomatically, stallDuration: self.streamable.parameters.0, lowWaterDuration: self.streamable.parameters.1, highWaterDuration: self.streamable.parameters.2, storeAfterDownload: self.storeAfterDownload)
	`345`	+ let frameSource = FFMpegMediaFrameSource(queue: self.queue, postbox: self.postbox, userLocation: self.userLocation, userContentType: self.userContentType, resourceReference: self.resourceReference, tempFilePath: self.tempFilePath, limitedFileRange: self.limitedFileRange, streamable: self.streamable.enabled, isSeekable: self.streamable.isSeekable, video: self.video, preferSoftwareDecoding: self.preferSoftwareDecoding, fetchAutomatically: self.fetchAutomatically, stallDuration: self.streamable.parameters.0, lowWaterDuration: self.streamable.parameters.1, highWaterDuration: self.streamable.parameters.2, storeAfterDownload: self.storeAfterDownload, isAudioVideoMessage: self.isAudioVideoMessage)
`346`	`346`	`let disposable = MetaDisposable()`
`347`	`347`	`let updatedSeekState: MediaPlayerSeekState?`
`348`	`348`	`if let loadedDuration = loadedDuration {`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,10 @@ public final class MediaPlayerNode: ASDisplayNode {`
`221`	`221`	`videoLayer.enqueue(frame.sampleBuffer)`
`222`	`222`	`if #available(iOS 17.4, *) {`
`223`	`223`	`} else {`
`224`		`- strongSelf.hasSentFramesToDisplay?()`
	`224`	`+ if !strongSelf.didNotifyVideoLayerReadyForDisplay {`
	`225`	`+ strongSelf.didNotifyVideoLayerReadyForDisplay = true`
	`226`	`+ strongSelf.hasSentFramesToDisplay?()`
	`227`	`+ }`
`225`	`228`	`}`
`226`	`229`	`}`
`227`	`230`	`}`
`@@ -257,7 +260,10 @@ public final class MediaPlayerNode: ASDisplayNode {`
`257`	`260`	`return`
`258`	`261`	`}`
`259`	`262`	`videoLayer.enqueue(frame.sampleBuffer)`
`260`		`- //strongSelf.hasSentFramesToDisplay?()`
	`263`	`+ if !strongSelf.didNotifyVideoLayerReadyForDisplay {`
	`264`	`+ strongSelf.didNotifyVideoLayerReadyForDisplay = true`
	`265`	`+ strongSelf.hasSentFramesToDisplay?()`
	`266`	`+ }`
`261`	`267`	`}`
`262`	`268`
`263`	`269`	`Queue.mainQueue().async {`