Add rotation to EncodedImage and make sure it is passed through encoders.

webrtc/modules/video_coding/generic_encoder.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.
  */
 
@@ skipping 127 matching lines @@
                                   const CodecSpecificInfo* codecSpecificInfo,
                                   const std::vector<FrameType>& frameTypes) {
   TRACE_EVENT1("webrtc", "VCMGenericEncoder::Encode", "timestamp",
                inputFrame.timestamp());
 
   for (FrameType frame_type : frameTypes)
     RTC_DCHECK(frame_type == kVideoFrameKey || frame_type == kVideoFrameDelta);
 
   rotation_ = inputFrame.rotation();
 
-  // Keep track of the current frame rotation and apply to the output of the
-  // encoder. There might not be exact as the encoder could have one frame delay
-  // but it should be close enough.
-  // TODO(pbos): Map from timestamp, this is racy (even if rotation_ is locked
-  // properly, which it isn't). More than one frame may be in the pipeline.
-  vcm_encoded_frame_callback_->SetRotation(rotation_);
-
   int32_t result = encoder_->Encode(inputFrame, codecSpecificInfo, &frameTypes);
 
   if (vcm_encoded_frame_callback_) {
     vcm_encoded_frame_callback_->SignalLastEncoderImplementationUsed(
         encoder_->ImplementationName());
   }
 
   if (is_screenshare_ &&
       result == WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT) {
     // Target bitrate exceeded, encoder state has been reset - try again.
@@ skipping 61 matching lines @@
 
 /***************************
  * Callback Implementation
  ***************************/
 VCMEncodedFrameCallback::VCMEncodedFrameCallback(
     EncodedImageCallback* post_encode_callback)
     : send_callback_(),
       _mediaOpt(NULL),
       _payloadType(0),
       _internalSource(false),
-      _rotation(kVideoRotation_0),
       post_encode_callback_(post_encode_callback)
 #ifdef DEBUG_ENCODER_BIT_STREAM
       ,
       _bitStreamAfterEncoder(NULL)
 #endif
 {
 #ifdef DEBUG_ENCODER_BIT_STREAM
   _bitStreamAfterEncoder = fopen("encoderBitStream.bit", "wb");
 #endif
 }
@@ skipping 28 matching lines @@
            _bitStreamAfterEncoder);
   }
 #endif
 
   RTPVideoHeader rtpVideoHeader;
   memset(&rtpVideoHeader, 0, sizeof(RTPVideoHeader));
   RTPVideoHeader* rtpVideoHeaderPtr = &rtpVideoHeader;
   if (codecSpecificInfo) {
     CopyCodecSpecific(codecSpecificInfo, rtpVideoHeaderPtr);
   }
-  rtpVideoHeader.rotation = _rotation;
+  rtpVideoHeader.rotation = encoded_image.rotation_;
 
   int32_t callbackReturn = send_callback_->SendData(
       _payloadType, encoded_image, fragmentationHeader, rtpVideoHeaderPtr);
   if (callbackReturn < 0) {
     return callbackReturn;
   }
 
   if (_mediaOpt != NULL) {
     _mediaOpt->UpdateWithEncodedData(encoded_image);
     if (_internalSource)
       return _mediaOpt->DropFrame();  // Signal to encoder to drop next frame.
   }
   return VCM_OK;
 }
 
 void VCMEncodedFrameCallback::SetMediaOpt(
     media_optimization::MediaOptimization* mediaOpt) {
   _mediaOpt = mediaOpt;
 }
 
 void VCMEncodedFrameCallback::SignalLastEncoderImplementationUsed(
     const char* implementation_name) {
   if (send_callback_)
     send_callback_->OnEncoderImplementationName(implementation_name);
 }
 
 }  // namespace webrtc