From 6cfb403791d8e4973159ca948f4626b6d1e0492d Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Wed, 6 Feb 2019 10:56:39 +0100 Subject: [PATCH] Fix test FrameGenerator to work with a single file source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I645779379145c6c7b2d452dc1a15f9d9b97a3ee5 Reviewed-on: https://webrtc-review.googlesource.com/c/121641 Reviewed-by: Erik Språng Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#26567} --- test/frame_generator.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/frame_generator.cc b/test/frame_generator.cc index 8daeb7137c..453270e774 100644 --- a/test/frame_generator.cc +++ b/test/frame_generator.cc @@ -382,7 +382,8 @@ class ScrollingImageFrameGenerator : public FrameGenerator { } void UpdateSourceFrame(size_t frame_num) { - while (current_frame_num_ != frame_num) { + while (current_frame_num_ != frame_num || + current_source_frame_ == nullptr) { current_source_frame_ = file_generator_.NextFrame(); current_frame_num_ = (current_frame_num_ + 1) % num_frames_; }