zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed GetCodecHeader to GetRtpVideoHeader in RtpFrameObject.

Browse Source 
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}
This commit is contained in:
philipel
2018-09-07 13:38:53 +02:00
committed by Commit Bot
parent af7afc6642
commit 5470f4030f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/video_coding/frame_object.cc
View File

@ -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)

2
modules/video_coding/frame_object.h
View File

@ -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_;

6
modules/video_coding/rtp_frame_reference_finder.cc
View File

@ -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.";