In RtpPacket do not keep pointer to RtpHeaderExtensionMap

webrtc/modules/rtp_rtcp/source/rtp_packet.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_RTP_RTCP_SOURCE_RTP_PACKET_H_
@@ skipping 17 matching lines @@
   using ExtensionType = RTPExtensionType;
   using ExtensionManager = RtpHeaderExtensionMap;
   static constexpr size_t kMaxExtensionHeaders = 14;
 
   // Parse and copy given buffer into Packet.
   bool Parse(const uint8_t* buffer, size_t size);
 
   // Parse and move given buffer into Packet.
   bool Parse(rtc::CopyOnWriteBuffer packet);
 
-  // Maps parsed extensions to their types to allow use of GetExtension.
-  // Used after parsing when |extensions| can't be provided until base rtp
-  // header is parsed.
-  void IdentifyExtensions(const ExtensionManager* extensions);
+  // Maps extensions id to their types.
+  void IdentifyExtensions(const ExtensionManager& extensions);
 
   // Header.
   bool Marker() const;
   uint8_t PayloadType() const;
   uint16_t SequenceNumber() const;
   uint32_t Timestamp() const;
   uint32_t Ssrc() const;
   std::vector<uint32_t> Csrcs() const;
 
   // TODO(danilchap): Remove this function when all code update to use RtpPacket
@@ skipping 47 matching lines @@
   // Reserve size_bytes for payload. Returns nullptr on failure.
   uint8_t* AllocatePayload(size_t size_bytes);
   void SetPayloadSize(size_t size_bytes);
   bool SetPadding(uint8_t size_bytes, Random* random);
 
  protected:
   // |extensions| required for SetExtension/ReserveExtension functions during
   // packet creating and used if available in Parse function.
   // Adding and getting extensions will fail until |extensions| is
   // provided via constructor or IdentifyExtensions function.
+  Packet();
   explicit Packet(const ExtensionManager* extensions);
   Packet(const Packet&) = default;
   Packet(const ExtensionManager* extensions, size_t capacity);
   virtual ~Packet();
 
   Packet& operator=(const Packet&) = default;
 
  private:
   struct ExtensionInfo {
     ExtensionType type;
@@ skipping 18 matching lines @@
   // and the offset field will be set, then true is returned. If allocated, the
   // length field will be used for allocation and the offset update to indicate
   // position, the true is returned.
   // If not found and allocations fails, false is returned and parameter remains
   // unchanged.
   bool AllocateExtension(ExtensionType type, uint8_t length, uint16_t* offset);
 
   uint8_t* WriteAt(size_t offset);
   void WriteAt(size_t offset, uint8_t byte);
 
-  const ExtensionManager* extensions_;
-
   // Header.
   bool marker_;
   uint8_t payload_type_;
   uint8_t padding_size_;
   uint16_t sequence_number_;
   uint32_t timestamp_;
   uint32_t ssrc_;
   size_t payload_offset_;  // Match header size with csrcs and extensions.
   size_t payload_size_;
 
-  uint8_t num_extensions_ = 0;
   ExtensionInfo extension_entries_[kMaxExtensionHeaders];
   uint16_t extensions_size_ = 0;  // Unaligned.
   rtc::CopyOnWriteBuffer buffer_;
-
-  Packet() = delete;
 };
 
 template <typename Extension>
 bool Packet::HasExtension() const {
   uint16_t offset = 0;
   return FindExtension(Extension::kId, Extension::kValueSizeBytes, &offset);
 }
 
 template <typename Extension, typename... Values>
 bool Packet::GetExtension(Values... values) const {
@@ skipping 16 matching lines @@
   uint16_t offset = 0;
   if (!AllocateExtension(Extension::kId, Extension::kValueSizeBytes, &offset))
     return false;
   memset(WriteAt(offset), 0, Extension::kValueSizeBytes);
   return true;
 }
 }  // namespace rtp
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_PACKET_H_