commit 1bcd827e9b85e82ce13bd7cc27c5a4b90ba9c139
author philipel <philipel@webrtc.org> Tue May 03 15:21:34 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 04 11:29:57 2022 +0000
tree 5ebdf4495e6c63a391c08c67b377242de44a4d53
parent 44be579b4a1166894b7340eb4333f747f5dff52f

Merged FrameBuffer3 {Next,Last}DecodableTemporalUnitRtpTimestamp() function.

Bug: webrtc:13343
Change-Id: Ic21eddd38466e6b5fd8b912b3ee2d9dc47a0ba35
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/260981
Reviewed-by: Evan Shrubsole <eshr@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36756}

modules/video_coding/frame_buffer3.cc

diff --git a/modules/video_coding/frame_buffer3.cc b/modules/video_coding/frame_buffer3.cc
index fab4ca7..3c26380 100644
--- a/modules/video_coding/frame_buffer3.cc
+++ b/modules/video_coding/frame_buffer3.cc
@@ -11,9 +11,6 @@
 #include "modules/video_coding/frame_buffer3.h"
 
 #include <algorithm>
-#include <iterator>
-#include <queue>
-#include <utility>
 
 #include "absl/algorithm/container.h"
 #include "absl/container/inlined_vector.h"
@@ -52,7 +49,7 @@
 }
 
 template <typename FrameIteratorT>
-int64_t GetTimestamp(const FrameIteratorT& it) {
+uint32_t GetTimestamp(const FrameIteratorT& it) {
   return it->second.encoded_frame->Timestamp();
 }
 
@@ -158,17 +155,9 @@
   return last_continuous_temporal_unit_frame_id_;
 }
 
-absl::optional<uint32_t> FrameBuffer::NextDecodableTemporalUnitRtpTimestamp()
-    const {
-  if (!next_decodable_temporal_unit_) {
-    return absl::nullopt;
-  }
-  return GetTimestamp(next_decodable_temporal_unit_->first_frame);
-}
-
-absl::optional<uint32_t> FrameBuffer::LastDecodableTemporalUnitRtpTimestamp()
-    const {
-  return last_decodable_temporal_unit_timestamp_;
+absl::optional<FrameBuffer::DecodabilityInfo>
+FrameBuffer::DecodableTemporalUnitsInfo() const {
+  return decodable_temporal_units_info_;
 }
 
 int FrameBuffer::GetTotalNumberOfContinuousTemporalUnits() const {
@@ -221,7 +210,7 @@
 
 void FrameBuffer::FindNextAndLastDecodableTemporalUnit() {
   next_decodable_temporal_unit_.reset();
-  last_decodable_temporal_unit_timestamp_.reset();
+  decodable_temporal_units_info_.reset();
 
   if (!last_continuous_temporal_unit_frame_id_) {
     return;
@@ -230,6 +219,7 @@
   FrameIterator first_frame_it = frames_.begin();
   FrameIterator last_frame_it = frames_.begin();
   absl::InlinedVector<int64_t, 4> frames_in_temporal_unit;
+  uint32_t last_decodable_temporal_unit_timestamp;
   for (auto frame_it = frames_.begin(); frame_it != frames_.end();) {
     if (GetFrameId(frame_it) > *last_continuous_temporal_unit_frame_id_) {
       break;
@@ -264,16 +254,23 @@
           next_decodable_temporal_unit_ = {first_frame_it, last_frame_it};
         }
 
-        last_decodable_temporal_unit_timestamp_ = GetTimestamp(first_frame_it);
+        last_decodable_temporal_unit_timestamp = GetTimestamp(first_frame_it);
       }
     }
   }
+
+  if (next_decodable_temporal_unit_) {
+    decodable_temporal_units_info_ = {
+        .next_rtp_timestamp =
+            GetTimestamp(next_decodable_temporal_unit_->first_frame),
+        .last_rtp_timestamp = last_decodable_temporal_unit_timestamp};
+  }
 }
 
 void FrameBuffer::Clear() {
   frames_.clear();
   next_decodable_temporal_unit_.reset();
-  last_decodable_temporal_unit_timestamp_.reset();
+  decodable_temporal_units_info_.reset();
   last_continuous_frame_id_.reset();
   last_continuous_temporal_unit_frame_id_.reset();
   decoded_frame_history_.Clear();