commit 0fa82a60e997baa4384e686ef39aa4b7051ae872
author philipel <philipel@webrtc.org> Mon Mar 19 15:34:53 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Mar 19 15:13:11 2018 +0000
tree 5188cfe78a4aa88b7d4f7636a3f3a9a5cb52902d
parent 9c1ee368e071bf31650806289248c644095aa1df

Moved FrameKey to api/video/encoded_frame.h and renamed it to VideoLayerFrameId.

Since we want the VideoStreamDecoder to callback with the last
continuous frame we need to move the FrameKey into the public API.

Bug: webrtc:8909
Change-Id: I39634145d848b8163778e31a1e0d04d91f9bbeb8
Reviewed-on: https://webrtc-review.googlesource.com/60864
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22495}

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 ffc02e8..84682fd 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -160,8 +160,8 @@
         {rtc::checked_cast<uint16_t>(refs)...}};
 
     std::unique_ptr<FrameObjectFake> frame(new FrameObjectFake());
-    frame->picture_id = picture_id;
-    frame->spatial_layer = spatial_layer;
+    frame->id.picture_id = picture_id;
+    frame->id.spatial_layer = spatial_layer;
     frame->timestamp = ts_ms * 90;
     frame->num_references = references.size();
     frame->inter_layer_predicted = inter_layer_predicted;
@@ -193,8 +193,8 @@
     rtc::CritScope lock(&crit_);
     ASSERT_LT(index, frames_.size());
     ASSERT_TRUE(frames_[index]);
-    ASSERT_EQ(picture_id, frames_[index]->picture_id);
-    ASSERT_EQ(spatial_layer, frames_[index]->spatial_layer);
+    ASSERT_EQ(picture_id, frames_[index]->id.picture_id);
+    ASSERT_EQ(spatial_layer, frames_[index]->id.spatial_layer);
   }
 
   void CheckNoFrame(size_t index) {
@@ -269,6 +269,7 @@
 TEST_F(TestFrameBuffer2, SetPlayoutDelay) {
   const PlayoutDelay kPlayoutDelayMs = {123, 321};
   std::unique_ptr<FrameObjectFake> test_frame(new FrameObjectFake());
+  test_frame->id.picture_id = 0;
   test_frame->SetPlayoutDelay(kPlayoutDelayMs);
   buffer_.InsertFrame(std::move(test_frame));
   EXPECT_EQ(kPlayoutDelayMs.min_ms, timing_.min_playout_delay());
@@ -500,8 +501,8 @@
   {
     std::unique_ptr<FrameObjectFake> frame(new FrameObjectFake());
     frame->SetSize(kFrameSize);
-    frame->picture_id = pid;
-    frame->spatial_layer = 0;
+    frame->id.picture_id = pid;
+    frame->id.spatial_layer = 0;
     frame->timestamp = ts;
     frame->num_references = 0;
     frame->inter_layer_predicted = false;