Skip to content

Commit 204970e

Browse files
committed
Fix merge?
1 parent 121a038 commit 204970e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/torchcodec/_core/BetaCudaDeviceInterface.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ int BetaCudaDeviceInterface::frameReadyInDisplayOrder(
424424
int BetaCudaDeviceInterface::receiveFrame(UniqueAVFrame& avFrame) {
425425
if (readyFrames_.empty()) {
426426
// No frame found, instruct caller to try again later after sending more
427-
// packets.
428-
return AVERROR(EAGAIN);
427+
// packets, or to stop if EOF was already sent.
428+
return eofSent_ ? AVERROR_EOF : AVERROR(EAGAIN);
429429
}
430430
CUVIDPARSERDISPINFO dispInfo = readyFrames_.front();
431431
readyFrames_.pop();

test/test_decoders.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
SINE_MONO_S32_8000,
4646
TEST_SRC_2_720P,
4747
TEST_SRC_2_720P_H265,
48+
unsplit_device_str,
4849
)
4950

5051

0 commit comments

Comments
 (0)