From 54fb32a15ed76baa371ac3171640e705bde8f5e5 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Mon, 25 Jan 2021 12:53:30 +0100 Subject: [PATCH] IvfFileReader: Fix SpatialIndex values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The SpatialIndex value from an EncodedImage is 0-based, but values were off by 1. Bug: none Change-Id: Ie74e6450ddef1cfaee68fa230c441030fa86a64a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203525 Reviewed-by: Erik Språng Commit-Queue: Florent Castelli Cr-Commit-Position: refs/heads/master@{#33067} --- modules/video_coding/utility/ivf_file_reader.cc | 2 +- modules/video_coding/utility/ivf_file_reader_unittest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/video_coding/utility/ivf_file_reader.cc b/modules/video_coding/utility/ivf_file_reader.cc index e3c249947d..f326c8cb53 100644 --- a/modules/video_coding/utility/ivf_file_reader.cc +++ b/modules/video_coding/utility/ivf_file_reader.cc @@ -164,7 +164,7 @@ absl::optional IvfFileReader::NextFrame() { image.SetTimestamp(static_cast(current_timestamp)); } image.SetEncodedData(payload); - image.SetSpatialIndex(static_cast(layer_sizes.size())); + image.SetSpatialIndex(static_cast(layer_sizes.size()) - 1); for (size_t i = 0; i < layer_sizes.size(); ++i) { image.SetSpatialLayerFrameSize(static_cast(i), layer_sizes[i]); } diff --git a/modules/video_coding/utility/ivf_file_reader_unittest.cc b/modules/video_coding/utility/ivf_file_reader_unittest.cc index 58a808840d..c9cf14674b 100644 --- a/modules/video_coding/utility/ivf_file_reader_unittest.cc +++ b/modules/video_coding/utility/ivf_file_reader_unittest.cc @@ -83,7 +83,7 @@ class IvfFileReaderTest : public ::testing::Test { bool use_capture_tims_ms, int spatial_layers_count) { ASSERT_TRUE(frame); - EXPECT_EQ(frame->SpatialIndex(), spatial_layers_count); + EXPECT_EQ(frame->SpatialIndex(), spatial_layers_count - 1); if (use_capture_tims_ms) { EXPECT_EQ(frame->capture_time_ms_, static_cast(frame_index)); EXPECT_EQ(frame->Timestamp(), static_cast(90 * frame_index));