PacketBuffer is now ref counted.

webrtc/modules/video_coding/packet_buffer.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
 
 #include <vector>
 
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/video_coding/packet.h"
 #include "webrtc/modules/video_coding/rtp_frame_reference_finder.h"
 #include "webrtc/modules/video_coding/sequence_number_util.h"
 
 namespace webrtc {
 
 class Clock;
 
 namespace video_coding {
 
 class FrameObject;
 class RtpFrameObject;
 
 class OnCompleteFrameCallback {
  public:
   virtual ~OnCompleteFrameCallback() {}
   virtual void OnCompleteFrame(std::unique_ptr<FrameObject> frame) = 0;
 };
 
-class PacketBuffer {
+class PacketBuffer : rtc::RefCountInterface {

[danilchap, 2016/08/02 14:04:45]

Do you need to derive from this interface?
If you plan to use PacketBuffer with scoped_refptr only, then you do not.
But if you have some other plan, make it a public derivation.

[philipel, 2016/08/02 14:39:59]

Removed inheritance.

  public:
+  static rtc::scoped_refptr<PacketBuffer> Create(
+     Clock* clock,
+     size_t start_buffer_size,
+     size_t max_buffer_size,
+     OnCompleteFrameCallback* frame_callback);
+
+  bool InsertPacket(const VCMPacket& packet);
+  void ClearTo(uint16_t seq_num);
+  void Clear();
+
+  int AddRef() const;
+  int Release() const;
+
+ private:
   // Both |start_buffer_size| and |max_buffer_size| must be a power of 2.
   PacketBuffer(Clock* clock,
                size_t start_buffer_size,
                size_t max_buffer_size,
                OnCompleteFrameCallback* frame_callback);
 
-  bool InsertPacket(const VCMPacket& packet);
-  void ClearTo(uint16_t seq_num);
-  void Clear();
-
- private:
   friend RtpFrameObject;
   // Since we want the packet buffer to be as packet type agnostic
   // as possible we extract only the information needed in order
   // to determine whether a sequence of packets is continuous or not.
   struct ContinuityInfo {
     // The sequence number of the packet.
     uint16_t seq_num = 0;
 
     // If this is the first packet of the frame.
     bool frame_begin = false;
@@ skipping 50 matching lines @@
   // Buffer that holds the inserted packets.
   std::vector<VCMPacket> data_buffer_ GUARDED_BY(crit_);
 
   // Buffer that holds the information about which slot that is currently in use
   // and information needed to determine the continuity between packets.
   std::vector<ContinuityInfo> sequence_buffer_ GUARDED_BY(crit_);
 
   // Frames that have received all their packets are handed off to the
   // |reference_finder_| which finds the dependencies between the frames.
   RtpFrameReferenceFinder reference_finder_;
+
+  mutable volatile int ref_count_ = 0;
 };
 
 }  // namespace video_coding
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_