Skip to content

Fix infinite GIF reader loop on zero-frame streams #2315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XXcipherX wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −1
Open

Fix infinite GIF reader loop on zero-frame streams #2315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion ...odules/TelegramUI/Components/BatchVideoRendering/Sources/BatchVideoRenderingContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ public protocol BatchVideoRenderingContextTarget: AnyObject {
}

public final class BatchVideoRenderingContext {
struct ReaderLoopState {
private var hasProducedFrame: Bool = false

var shouldRestartReaderAtEndOfStream: Bool {
return self.hasProducedFrame
}

mutating func didProduceFrame() {
self.hasProducedFrame = true
}
}

public typealias Target = BatchVideoRenderingContextTarget

public final class TargetHandle {
Expand Down Expand Up @@ -92,6 +104,7 @@ public final class BatchVideoRenderingContext {

var isFailed: Bool = false
var reader: FFMpegFileReader?
var readerLoopState = ReaderLoopState()

init(dataPath: String) {
self.dataPath = dataPath
Expand All @@ -115,6 +128,7 @@ public final class BatchVideoRenderingContext {
break outer
}
self.reader = reader
self.readerLoopState = ReaderLoopState()
}

guard let reader = self.reader else {
Expand All @@ -123,12 +137,18 @@ public final class BatchVideoRenderingContext {

switch reader.readFrame() {
case let .frame(frame):
self.readerLoopState.didProduceFrame()
return createSampleBuffer(fromSampleBuffer: frame.sampleBuffer, withTimeOffset: .zero, duration: nil, displayImmediately: true)
case .error:
self.isFailed = true
break outer
case .endOfStream:
self.reader = nil
if self.readerLoopState.shouldRestartReaderAtEndOfStream {
self.reader = nil
} else {
self.isFailed = true
break outer
}
case .waitingForMoreData:
// Invariant: the reader is only constructed once the consumer's
// `data.isComplete == true` (see `BatchVideoRenderingContext.update`),
Expand Down