Fix cutting off end of videos (#11)

Co-authored-by: Álex Román Núñez <[email protected]>
EIRTeam · Dec 4, 2023 · f04b05e · f04b05e
1 parent b445a75
commit f04b05e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/ffmpeg_video_stream.cpp b/ffmpeg_video_stream.cpp
@@ -85,9 +85,9 @@ void FFmpegVideoStreamPlayback::update_internal(double p_delta) {
 		// if at the end of the stream but our playback enters a valid time region again, a seek operation is required to get the decoder back on track.
 		if (playback_position < decoder->get_last_decoded_frame_time()) {
 			seek_into_sync();
+		} else {
+			playing = false;
 		}
-	} else if (decoder->get_decoder_state() == VideoDecoder::DecoderState::END_OF_STREAM) {
-		playing = false;
 	}
 
 	Ref<DecodedFrame> peek_frame = available_frames.size() > 0 ? available_frames[0] : nullptr;

diff --git a/video_decoder.cpp b/video_decoder.cpp
@@ -459,11 +459,7 @@ void VideoDecoder::_read_decoded_frames(AVFrame *p_received_frame) {
 				}
 			}
 			unwrapped_frame.resize(width * height * 4);
-			if (!image.is_valid()) {
-				image = Image::create_from_data(width, height, false, Image::FORMAT_RGBA8, unwrapped_frame);
-			} else {
-				image->set_data(width, height, false, Image::FORMAT_RGBA8, unwrapped_frame);
-			}
+			image = Image::create_from_data(width, height, false, Image::FORMAT_RGBA8, unwrapped_frame);
 		}
 #ifdef FFMPEG_MT_GPU_UPLOAD
 		Ref<ImageTexture> tex;