commit 9aa9b8dbbe5a250e88a07854891c66508fcd1893
author philipel <philipel@webrtc.org> Mon Feb 15 13:31:29 2021 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Feb 15 14:42:02 2021 +0000
tree ad07363f094f75b898a368c21ff605703c86a969
parent 563fbc1dc573f94a59b66ae09805b812f6b08071

Prepare to replace VideoLayerFrameId with int64_t.

Bug: webrtc:12206
Change-Id: I10bfdefbc95a79e0595956c1a0e688051da6d2b9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/207180
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33265}

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 7ec7895..e179dad 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -164,7 +164,7 @@
         {rtc::checked_cast<uint16_t>(refs)...}};
 
     auto frame = std::make_unique<FrameObjectFake>();
-    frame->id.picture_id = picture_id;
+    frame->SetId(picture_id);
     frame->SetSpatialIndex(spatial_layer);
     frame->SetTimestamp(ts_ms * 90);
     frame->num_references = references.size();
@@ -214,7 +214,7 @@
   void CheckFrame(size_t index, int picture_id, int spatial_layer) {
     ASSERT_LT(index, frames_.size());
     ASSERT_TRUE(frames_[index]);
-    ASSERT_EQ(picture_id, frames_[index]->id.picture_id);
+    ASSERT_EQ(picture_id, frames_[index]->Id());
     ASSERT_EQ(spatial_layer, frames_[index]->SpatialIndex().value_or(0));
   }
 
@@ -278,7 +278,7 @@
       new FrameBuffer(time_controller_.GetClock(), &timing, &stats_callback_));
   const VideoPlayoutDelay kPlayoutDelayMs = {0, 0};
   std::unique_ptr<FrameObjectFake> test_frame(new FrameObjectFake());
-  test_frame->id.picture_id = 0;
+  test_frame->SetId(0);
   test_frame->SetPlayoutDelay(kPlayoutDelayMs);
   buffer_->InsertFrame(std::move(test_frame));
   ExtractFrame(0, false);
@@ -544,7 +544,7 @@
   {
     std::unique_ptr<FrameObjectFake> frame(new FrameObjectFake());
     frame->SetEncodedData(EncodedImageBuffer::Create(kFrameSize));
-    frame->id.picture_id = pid;
+    frame->SetId(pid);
     frame->SetTimestamp(ts);
     frame->num_references = 0;