diff --git a/webrtc/modules/video_coding/encoded_frame.cc b/webrtc/modules/video_coding/encoded_frame.cc index cc3a91eeac..23e681d9ae 100644 --- a/webrtc/modules/video_coding/encoded_frame.cc +++ b/webrtc/modules/video_coding/encoded_frame.cc @@ -22,7 +22,6 @@ VCMEncodedFrame::VCMEncodedFrame() _missingFrame(false), _codec(kVideoCodecUnknown), _fragmentation(), - _rotation(kVideoRotation_0), _rotation_set(false) { _codecSpecificInfo.codecType = kVideoCodecUnknown; } @@ -34,7 +33,6 @@ VCMEncodedFrame::VCMEncodedFrame(const webrtc::EncodedImage& rhs) _missingFrame(false), _codec(kVideoCodecUnknown), _fragmentation(), - _rotation(kVideoRotation_0), _rotation_set(false) { _codecSpecificInfo.codecType = kVideoCodecUnknown; _buffer = NULL; @@ -55,7 +53,6 @@ VCMEncodedFrame::VCMEncodedFrame(const VCMEncodedFrame& rhs) _codecSpecificInfo(rhs._codecSpecificInfo), _codec(rhs._codec), _fragmentation(), - _rotation(rhs._rotation), _rotation_set(rhs._rotation_set) { _buffer = NULL; _size = 0; @@ -93,7 +90,7 @@ void VCMEncodedFrame::Reset() { _length = 0; _codecSpecificInfo.codecType = kVideoCodecUnknown; _codec = kVideoCodecUnknown; - _rotation = kVideoRotation_0; + rotation_ = kVideoRotation_0; _rotation_set = false; } diff --git a/webrtc/modules/video_coding/encoded_frame.h b/webrtc/modules/video_coding/encoded_frame.h index 9034200980..953ab361b3 100644 --- a/webrtc/modules/video_coding/encoded_frame.h +++ b/webrtc/modules/video_coding/encoded_frame.h @@ -75,7 +75,7 @@ class VCMEncodedFrame : protected EncodedImage { /** * Get frame rotation */ - VideoRotation rotation() const { return _rotation; } + VideoRotation rotation() const { return rotation_; } /** * True if this frame is complete, false otherwise */ @@ -119,7 +119,6 @@ class VCMEncodedFrame : protected EncodedImage { CodecSpecificInfo _codecSpecificInfo; webrtc::VideoCodecType _codec; RTPFragmentationHeader _fragmentation; - VideoRotation _rotation; // 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 diff --git a/webrtc/modules/video_coding/frame_buffer.cc b/webrtc/modules/video_coding/frame_buffer.cc index 61db0d1232..1c7301f933 100644 --- a/webrtc/modules/video_coding/frame_buffer.cc +++ b/webrtc/modules/video_coding/frame_buffer.cc @@ -153,7 +153,7 @@ VCMFrameBufferEnum VCMFrameBuffer::InsertPacket( // (HEVC)). if (packet.markerBit) { RTC_DCHECK(!_rotation_set); - _rotation = packet.video_header.rotation; + rotation_ = packet.video_header.rotation; _rotation_set = true; }