PacketBuffer is now ref counted.

webrtc/modules/video_coding/packet_buffer.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/video_coding/packet_buffer.h"
 
 #include <algorithm>
 #include <limits>
+#include <utility>
 
+#include "webrtc/base/atomicops.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/video_coding/frame_object.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
 namespace video_coding {
 
+rtc::scoped_refptr<PacketBuffer> PacketBuffer::Create(
+    Clock* clock,
+    size_t start_buffer_size,
+    size_t max_buffer_size,
+    OnReceivedFrameCallback* received_frame_callback) {
+  return rtc::scoped_refptr<PacketBuffer>(new PacketBuffer(
+      clock, start_buffer_size, max_buffer_size, received_frame_callback));
+}
+
 PacketBuffer::PacketBuffer(Clock* clock,
                            size_t start_buffer_size,
                            size_t max_buffer_size,
-                           OnCompleteFrameCallback* frame_callback)
+                           OnReceivedFrameCallback* received_frame_callback)
     : clock_(clock),
       size_(start_buffer_size),
       max_size_(max_buffer_size),
       first_seq_num_(0),
       last_seq_num_(0),
       first_packet_received_(false),
       data_buffer_(start_buffer_size),
       sequence_buffer_(start_buffer_size),
-      reference_finder_(frame_callback) {
+      received_frame_callback_(received_frame_callback) {
   RTC_DCHECK_LE(start_buffer_size, max_buffer_size);
   // Buffer size must always be a power of 2.
   RTC_DCHECK((start_buffer_size & (start_buffer_size - 1)) == 0);
   RTC_DCHECK((max_buffer_size & (max_buffer_size - 1)) == 0);
 }
 
+PacketBuffer::~PacketBuffer() {}
+
 bool PacketBuffer::InsertPacket(const VCMPacket& packet) {
   rtc::CritScope lock(&crit_);
   uint16_t seq_num = packet.seqNum;
   size_t index = seq_num % size_;
 
   if (!first_packet_received_) {
     first_seq_num_ = seq_num - 1;
     last_seq_num_ = seq_num;
     first_packet_received_ = true;
   }
 
   if (sequence_buffer_[index].used) {
     // Duplicate packet, do nothing.
     if (data_buffer_[index].seqNum == packet.seqNum)
       return true;
 
     // The packet buffer is full, try to expand the buffer.
     while (ExpandBufferSize() && sequence_buffer_[seq_num % size_].used) {
     }
     index = seq_num % size_;
 
     // Packet buffer is still full.
     if (sequence_buffer_[index].used)
       return false;
   }
 
   if (AheadOf(seq_num, last_seq_num_))
     last_seq_num_ = seq_num;
 
-  // If this is a padding or FEC packet, don't insert it.
-  if (packet.sizeBytes == 0) {
-    reference_finder_.PaddingReceived(packet.seqNum);
-    return true;
-  }
-
   sequence_buffer_[index].frame_begin = packet.isFirstPacket;
   sequence_buffer_[index].frame_end = packet.markerBit;
   sequence_buffer_[index].seq_num = packet.seqNum;
   sequence_buffer_[index].continuous = false;
   sequence_buffer_[index].frame_created = false;
   sequence_buffer_[index].used = true;
   data_buffer_[index] = packet;
 
   FindFrames(seq_num);
   return true;
@@ skipping 74 matching lines @@
         if (sequence_buffer_[start_index].frame_begin)
           break;
 
         start_index = start_index > 0 ? start_index - 1 : size_ - 1;
         start_seq_num--;
       }
 
       std::unique_ptr<RtpFrameObject> frame(
           new RtpFrameObject(this, start_seq_num, seq_num, frame_size,
                              max_nack_count, clock_->TimeInMilliseconds()));
-      reference_finder_.ManageFrame(std::move(frame));
+
+      received_frame_callback_->OnReceivedFrame(std::move(frame));
     }
 
     index = (index + 1) % size_;
     ++seq_num;
   }
 }
 
 void PacketBuffer::ReturnFrame(RtpFrameObject* frame) {
   rtc::CritScope lock(&crit_);
   size_t index = frame->first_seq_num() % size_;
@@ skipping 49 matching lines @@
 }
 
 void PacketBuffer::Clear() {
   rtc::CritScope lock(&crit_);
   for (size_t i = 0; i < size_; ++i)
     sequence_buffer_[i].used = false;
 
   first_packet_received_ = false;
 }
 
+int PacketBuffer::AddRef() const {
+  return rtc::AtomicOps::Increment(&ref_count_);
+}
+
+int PacketBuffer::Release() const {
+  int count = rtc::AtomicOps::Decrement(&ref_count_);
+  if (!count) {
+    delete this;
+  }
+  return count;
+}
+
 }  // namespace video_coding
 }  // namespace webrtc