commit a370556270f15dc4443bffe52729c6a5356a03c7
author Johannes Kron <kron@webrtc.org> Mon Aug 26 14:37:11 2019
committer Commit Bot <commit-bot@chromium.org> Wed Aug 28 08:07:32 2019
tree abfb3b904bc644d49864edf64d197f4dd454778a
parent caef51e25a4d88b9bc2b791009b5cc39a678a567

Refactor to free up PacketBuffer as soon as possible

The packets belonging to a frame were kept in PacketBuffer
until the frame was decoded. This CL clears the dependencies
of an existing RtpFrameObject to PacketBuffer so that we can
free up PacketBuffer as soon as the RtpFrameObject is created.

Bug: none
Change-Id: Ic939be91815519ae1d1c67ada82006417b2d26a3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/149818
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Johannes Kron <kron@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28977}

modules/video_coding/rtp_frame_reference_finder.cc

diff --git a/modules/video_coding/rtp_frame_reference_finder.cc b/modules/video_coding/rtp_frame_reference_finder.cc
index 62f8d7d..0f79218 100644
--- a/modules/video_coding/rtp_frame_reference_finder.cc
+++ b/modules/video_coding/rtp_frame_reference_finder.cc
@@ -99,10 +99,10 @@
       return ManageFrameH264(frame);
     default: {
       // Use 15 first bits of frame ID as picture ID if available.
-      absl::optional<RTPVideoHeader> video_header = frame->GetRtpVideoHeader();
+      const RTPVideoHeader& video_header = frame->GetRtpVideoHeader();
       int picture_id = kNoPictureId;
-      if (video_header && video_header->generic)
-        picture_id = video_header->generic->frame_id & 0x7fff;
+      if (video_header.generic)
+        picture_id = video_header.generic->frame_id & 0x7fff;
 
       return ManageFramePidOrSeqNum(frame, picture_id);
     }
@@ -265,13 +265,8 @@
 
 RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
     RtpFrameObject* frame) {
-  absl::optional<RTPVideoHeader> video_header = frame->GetRtpVideoHeader();
-  if (!video_header) {
-    RTC_LOG(LS_WARNING)
-        << "Failed to get codec header from frame, dropping frame.";
-    return kDrop;
-  }
-  RTPVideoTypeHeader rtp_codec_header = video_header->video_type_header;
+  const RTPVideoHeader& video_header = frame->GetRtpVideoHeader();
+  RTPVideoTypeHeader rtp_codec_header = video_header.video_type_header;
 
   const RTPVideoHeaderVP8& codec_header =
       absl::get<RTPVideoHeaderVP8>(rtp_codec_header);
@@ -415,13 +410,8 @@
 
 RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
     RtpFrameObject* frame) {
-  absl::optional<RTPVideoHeader> video_header = frame->GetRtpVideoHeader();
-  if (!video_header) {
-    RTC_LOG(LS_WARNING)
-        << "Failed to get codec header from frame, dropping frame.";
-    return kDrop;
-  }
-  RTPVideoTypeHeader rtp_codec_header = video_header->video_type_header;
+  const RTPVideoHeader& video_header = frame->GetRtpVideoHeader();
+  RTPVideoTypeHeader rtp_codec_header = video_header.video_type_header;
 
   const RTPVideoHeaderVP9& codec_header =
       absl::get<RTPVideoHeaderVP9>(rtp_codec_header);
@@ -675,13 +665,10 @@
 
 RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameH264(
     RtpFrameObject* frame) {
-  absl::optional<FrameMarking> rtp_frame_marking = frame->GetFrameMarking();
-  if (!rtp_frame_marking) {
-    return ManageFramePidOrSeqNum(std::move(frame), kNoPictureId);
-  }
+  const FrameMarking& rtp_frame_marking = frame->GetFrameMarking();
 
-  uint8_t tid = rtp_frame_marking->temporal_id;
-  bool blSync = rtp_frame_marking->base_layer_sync;
+  uint8_t tid = rtp_frame_marking.temporal_id;
+  bool blSync = rtp_frame_marking.base_layer_sync;
 
   if (tid == kNoTemporalIdx)
     return ManageFramePidOrSeqNum(std::move(frame), kNoPictureId);
@@ -712,7 +699,7 @@
     }
   }
 
-  int64_t unwrapped_tl0 = tl0_unwrapper_.Unwrap(rtp_frame_marking->tl0_pic_idx);
+  int64_t unwrapped_tl0 = tl0_unwrapper_.Unwrap(rtp_frame_marking.tl0_pic_idx);
 
   // Clean up info for base layers that are too old.
   int64_t old_tl0_pic_idx = unwrapped_tl0 - kMaxLayerInfo;