From 5470f4030f3f0c6598e3ea91bc3a0cb73339d46f Mon Sep 17 00:00:00 2001
From: philipel <philipel@webrtc.org>
Date: Fri, 7 Sep 2018 13:38:53 +0200
Subject: [PATCH] Renamed GetCodecHeader to GetRtpVideoHeader in
 RtpFrameObject.

Bug: none
Change-Id: I158a19dc85ef12dc86f603ff0f6618b89cb1c242
Reviewed-on: https://webrtc-review.googlesource.com/98863
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24627}
---
 modules/video_coding/frame_object.cc               | 2 +-
 modules/video_coding/frame_object.h                | 2 +-
 modules/video_coding/rtp_frame_reference_finder.cc | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc
index a1b4f58666..0965d7a499 100644
--- a/modules/video_coding/frame_object.cc
+++ b/modules/video_coding/frame_object.cc
@@ -151,7 +151,7 @@ bool RtpFrameObject::delayed_by_retransmission() const {
   return times_nacked() > 0;
 }
 
-absl::optional<RTPVideoHeader> RtpFrameObject::GetCodecHeader() const {
+absl::optional<RTPVideoHeader> RtpFrameObject::GetRtpVideoHeader() const {
   rtc::CritScope lock(&packet_buffer_->crit_);
   VCMPacket* packet = packet_buffer_->GetPacket(first_seq_num_);
   if (!packet)
diff --git a/modules/video_coding/frame_object.h b/modules/video_coding/frame_object.h
index 2c8ba15fb1..08c640432f 100644
--- a/modules/video_coding/frame_object.h
+++ b/modules/video_coding/frame_object.h
@@ -40,7 +40,7 @@ class RtpFrameObject : public EncodedFrame {
   int64_t ReceivedTime() const override;
   int64_t RenderTime() const override;
   bool delayed_by_retransmission() const override;
-  absl::optional<RTPVideoHeader> GetCodecHeader() const;
+  absl::optional<RTPVideoHeader> GetRtpVideoHeader() const;
 
  private:
   rtc::scoped_refptr<PacketBuffer> packet_buffer_;
diff --git a/modules/video_coding/rtp_frame_reference_finder.cc b/modules/video_coding/rtp_frame_reference_finder.cc
index d8fdebd16a..3d0667f213 100644
--- a/modules/video_coding/rtp_frame_reference_finder.cc
+++ b/modules/video_coding/rtp_frame_reference_finder.cc
@@ -92,7 +92,7 @@ RtpFrameReferenceFinder::ManageFrameInternal(RtpFrameObject* frame) {
       return ManageFrameVp9(frame);
     default: {
       // Use 15 first bits of frame ID as picture ID if available.
-      absl::optional<RTPVideoHeader> video_header = frame->GetCodecHeader();
+      absl::optional<RTPVideoHeader> video_header = frame->GetRtpVideoHeader();
       absl::optional<RTPVideoHeader::GenericDescriptorInfo> generic_info =
           video_header ? video_header->generic : absl::nullopt;
       return ManageFrameGeneric(
@@ -237,7 +237,7 @@ RtpFrameReferenceFinder::ManageFrameGeneric(RtpFrameObject* frame,
 
 RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
     RtpFrameObject* frame) {
-  absl::optional<RTPVideoHeader> video_header = frame->GetCodecHeader();
+  absl::optional<RTPVideoHeader> video_header = frame->GetRtpVideoHeader();
   if (!video_header) {
     RTC_LOG(LS_WARNING)
         << "Failed to get codec header from frame, dropping frame.";
@@ -390,7 +390,7 @@ void RtpFrameReferenceFinder::UpdateLayerInfoVp8(RtpFrameObject* frame,
 
 RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
     RtpFrameObject* frame) {
-  absl::optional<RTPVideoHeader> video_header = frame->GetCodecHeader();
+  absl::optional<RTPVideoHeader> video_header = frame->GetRtpVideoHeader();
   if (!video_header) {
     RTC_LOG(LS_WARNING)
         << "Failed to get codec header from frame, dropping frame.";