Change VCMFrameBuffer and VCMEncodedFrame to use rotation from base class EncodedImage.

webrtc/modules/video_coding/encoded_frame.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
 #include "webrtc/modules/video_coding/encoded_frame.h"
 #include "webrtc/modules/video_coding/generic_encoder.h"
 #include "webrtc/modules/video_coding/jitter_buffer_common.h"
 
 namespace webrtc {
 
 VCMEncodedFrame::VCMEncodedFrame()
     : webrtc::EncodedImage(),
       _renderTimeMs(-1),
       _payloadType(0),
       _missingFrame(false),
       _codec(kVideoCodecUnknown),
       _fragmentation(),
-      _rotation(kVideoRotation_0),
       _rotation_set(false) {
   _codecSpecificInfo.codecType = kVideoCodecUnknown;
 }
 
 VCMEncodedFrame::VCMEncodedFrame(const webrtc::EncodedImage& rhs)
     : webrtc::EncodedImage(rhs),
       _renderTimeMs(-1),
       _payloadType(0),
       _missingFrame(false),
       _codec(kVideoCodecUnknown),
       _fragmentation(),
-      _rotation(kVideoRotation_0),
       _rotation_set(false) {
   _codecSpecificInfo.codecType = kVideoCodecUnknown;
   _buffer = NULL;
   _size = 0;
   _length = 0;
   if (rhs._buffer != NULL) {
     VerifyAndAllocate(rhs._length +
                       EncodedImage::GetBufferPaddingBytes(_codec));
     memcpy(_buffer, rhs._buffer, rhs._length);
   }
 }
 
 VCMEncodedFrame::VCMEncodedFrame(const VCMEncodedFrame& rhs)
     : webrtc::EncodedImage(rhs),
       _renderTimeMs(rhs._renderTimeMs),
       _payloadType(rhs._payloadType),
       _missingFrame(rhs._missingFrame),
       _codecSpecificInfo(rhs._codecSpecificInfo),
       _codec(rhs._codec),
       _fragmentation(),
-      _rotation(rhs._rotation),
       _rotation_set(rhs._rotation_set) {
   _buffer = NULL;
   _size = 0;
   _length = 0;
   if (rhs._buffer != NULL) {
     VerifyAndAllocate(rhs._length +
                       EncodedImage::GetBufferPaddingBytes(_codec));
     memcpy(_buffer, rhs._buffer, rhs._length);
     _length = rhs._length;
   }
@@ skipping 17 matching lines @@
   _timeStamp = 0;
   _payloadType = 0;
   _frameType = kVideoFrameDelta;
   _encodedWidth = 0;
   _encodedHeight = 0;
   _completeFrame = false;
   _missingFrame = false;
   _length = 0;
   _codecSpecificInfo.codecType = kVideoCodecUnknown;
   _codec = kVideoCodecUnknown;
-  _rotation = kVideoRotation_0;
+  rotation_ = kVideoRotation_0;
   _rotation_set = false;
 }
 
 void VCMEncodedFrame::CopyCodecSpecific(const RTPVideoHeader* header) {
   if (header) {
     switch (header->codec) {
       case kRtpVideoVp8: {
         if (_codecSpecificInfo.codecType != kVideoCodecVP8) {
           // This is the first packet for this frame.
           _codecSpecificInfo.codecSpecific.VP8.pictureId = -1;
@@ skipping 111 matching lines @@
       // copy old data
       memcpy(newBuffer, _buffer, _size);
       delete[] _buffer;
     }
     _buffer = newBuffer;
     _size = minimumSize;
   }
 }
 
 }  // namespace webrtc