commit 61832dd018d9d1a2706ef2e94e1a70e8f09ea153
author Sergey Silkin <ssilkin@webrtc.org> Thu Dec 20 14:32:14 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Dec 20 15:21:22 2018 +0000
tree f647141855bd544314b306c2081510ea82429a54
parent 76fd7b402ed66ec8503de370f8a5d1f8eeb4df1a

Propagate spatial index to EncodedImage.

Set spatial index of assembled VP9 picture equal to spatial index of
its top spatial layer frame.

Bug: webrtc:10151
Change-Id: Iae40505864b14b01cc6787f8da99a9e3fe283956
Reviewed-on: https://webrtc-review.googlesource.com/c/115280
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26075}

modules/video_coding/frame_buffer2_unittest.cc

diff --git a/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc
index 578734c..321281f 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -161,6 +161,7 @@
     std::unique_ptr<FrameObjectFake> frame(new FrameObjectFake());
     frame->id.picture_id = picture_id;
     frame->id.spatial_layer = spatial_layer;
+    frame->SetSpatialIndex(spatial_layer);
     frame->SetTimestamp(ts_ms * 90);
     frame->num_references = references.size();
     frame->inter_layer_predicted = inter_layer_predicted;
@@ -271,7 +272,7 @@
   InsertFrame(pid, 1, ts, true, true);
   ExtractFrame();
 
-  CheckFrame(0, pid, 0);
+  CheckFrame(0, pid, 1);
 }
 
 TEST_F(TestFrameBuffer2, SetPlayoutDelay) {
@@ -599,7 +600,7 @@
   InsertFrame(pid, 1, ts, true, true);
   ExtractFrame(0);
   ExtractFrame(0);
-  CheckFrame(0, pid, 0);
+  CheckFrame(0, pid, 1);
   CheckNoFrame(1);
   // Two frames should be combined and returned together.
   CheckFrameSize(0, kFrameSize * 2);
@@ -613,7 +614,7 @@
   InsertFrame(pid, 1, ts, true, true);
 
   ExtractFrame(0);
-  CheckFrame(0, pid, 0);
+  CheckFrame(0, pid, 1);
 
   InsertFrame(pid + 1, 1, ts + kFps20, false, true, pid);
   InsertFrame(pid + 2, 0, ts + kFps10, false, false, pid);
@@ -627,7 +628,7 @@
   ExtractFrame();
   ExtractFrame();
   CheckFrame(1, pid + 1, 1);
-  CheckFrame(2, pid + 2, 0);
+  CheckFrame(2, pid + 2, 1);
 }
 
 }  // namespace video_coding