mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-16 15:20:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed unused _rotation_set variable from EncodedFrame.

Browse source 
Bug: none
Change-Id: I398417541fb66e58b0ad90c4b17c5d36eb61a004
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154520
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29316}
This commit is contained in:
philipel 2019-09-26 10:59:41 +02:00 committed by Commit Bot
parent 741bab0f6c
commit 5dacece70c
4 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/video_coding/encoded_frame.cc
View file

@ -25,8 +25,7 @@ VCMEncodedFrame::VCMEncodedFrame()
_renderTimeMs(-1), _renderTimeMs(-1),
_payloadType(0), _payloadType(0),
_missingFrame(false), _missingFrame(false),
_codec(kVideoCodecGeneric), _codec(kVideoCodecGeneric) {
_rotation_set(false) {
_codecSpecificInfo.codecType = kVideoCodecGeneric; _codecSpecificInfo.codecType = kVideoCodecGeneric;
} }
@ -52,7 +51,6 @@ void VCMEncodedFrame::Reset() {
rotation_ = kVideoRotation_0; rotation_ = kVideoRotation_0;
content_type_ = VideoContentType::UNSPECIFIED; content_type_ = VideoContentType::UNSPECIFIED;
timing_.flags = VideoSendTiming::kInvalid; timing_.flags = VideoSendTiming::kInvalid;
_rotation_set = false;
} }
void VCMEncodedFrame::CopyCodecSpecific(const RTPVideoHeader* header) { void VCMEncodedFrame::CopyCodecSpecific(const RTPVideoHeader* header) {

5
modules/video_coding/encoded_frame.h
View file

@ -130,11 +130,6 @@ class VCMEncodedFrame : protected EncodedImage {
bool _missingFrame; bool _missingFrame;
CodecSpecificInfo _codecSpecificInfo; CodecSpecificInfo _codecSpecificInfo;
webrtc::VideoCodecType _codec; webrtc::VideoCodecType _codec;
// Video rotation is only set along with the last packet for each frame
// (same as marker bit). This |_rotation_set| is only for debugging purpose
// to ensure we don't set it twice for a frame.
bool _rotation_set;
}; };
} // namespace webrtc } // namespace webrtc

2
modules/video_coding/frame_buffer.cc
View file

@ -145,9 +145,7 @@ VCMFrameBufferEnum VCMFrameBuffer::InsertPacket(const VCMPacket& packet,
// frame (I-frame or IDR frame in H.264 (AVC), or an IRAP picture in H.265 // frame (I-frame or IDR frame in H.264 (AVC), or an IRAP picture in H.265
// (HEVC)). // (HEVC)).
if (packet.markerBit) { if (packet.markerBit) {
RTC_DCHECK(!_rotation_set);
rotation_ = packet.video_header.rotation; rotation_ = packet.video_header.rotation;
_rotation_set = true;
content_type_ = packet.video_header.content_type; content_type_ = packet.video_header.content_type;
if (packet.video_header.video_timing.flags != VideoSendTiming::kInvalid) { if (packet.video_header.video_timing.flags != VideoSendTiming::kInvalid) {
timing_.encode_start_ms = timing_.encode_start_ms =

2
modules/video_coding/frame_object.cc
View file

@ -79,7 +79,6 @@ RtpFrameObject::RtpFrameObject(
// (HEVC)). // (HEVC)).
rotation_ = last_packet->video_header.rotation; rotation_ = last_packet->video_header.rotation;
SetColorSpace(last_packet->video_header.color_space); SetColorSpace(last_packet->video_header.color_space);
_rotation_set = true;
content_type_ = last_packet->video_header.content_type; content_type_ = last_packet->video_header.content_type;
if (last_packet->video_header.video_timing.flags != if (last_packet->video_header.video_timing.flags !=
VideoSendTiming::kInvalid) { VideoSendTiming::kInvalid) {
@ -161,7 +160,6 @@ RtpFrameObject::RtpFrameObject(
rotation_ = rotation; rotation_ = rotation;
SetColorSpace(color_space); SetColorSpace(color_space);
_rotation_set = true;
content_type_ = content_type; content_type_ = content_type;
if (timing.flags != VideoSendTiming::kInvalid) { if (timing.flags != VideoSendTiming::kInvalid) {
// ntp_time_ms_ may be -1 if not estimated yet. This is not a problem, // ntp_time_ms_ may be -1 if not estimated yet. This is not a problem,