RtpFrameObject::GetCodecHeader now return rtc::Optional<RTPVideoTypeHeader>

webrtc/modules/video_coding/frame_object.cc

Index: webrtc/modules/video_coding/frame_object.cc
diff --git a/webrtc/modules/video_coding/frame_object.cc b/webrtc/modules/video_coding/frame_object.cc
index acfb25d28d3594e4a0d2047091f20c2238ff8a3a..b8031796d972d3cab7db979a1969344b2b5edf80 100644
--- a/webrtc/modules/video_coding/frame_object.cc
+++ b/webrtc/modules/video_coding/frame_object.cc
@@ -9,7 +9,6 @@
  */
 
 #include "webrtc/modules/video_coding/frame_object.h"
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/video_coding/packet_buffer.h"
 
 namespace webrtc {
@@ -97,11 +96,12 @@ int64_t RtpFrameObject::RenderTime() const {
   return _renderTimeMs;
 }
 
-RTPVideoTypeHeader* RtpFrameObject::GetCodecHeader() const {
+rtc::Optional<RTPVideoTypeHeader> RtpFrameObject::GetCodecHeader() const {
+  rtc::CritScope lock(&packet_buffer_->crit_);
   VCMPacket* packet = packet_buffer_->GetPacket(first_seq_num_);
   if (!packet)
-    return nullptr;
-  return &packet->video_header.codecHeader;
+    return rtc::Optional<RTPVideoTypeHeader>();
+  return rtc::Optional<RTPVideoTypeHeader>(packet->video_header.codecHeader);
 }
 
 }  // namespace video_coding