Reland of Don't reinit encoder when rotation changes.

webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.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 65 matching lines @@
     encoded_frame_->_buffer = frame_buffer_.get();
     encoded_frame_->_size = encoded_frame._length;
   }
   memcpy(encoded_frame_->_buffer, encoded_frame._buffer, encoded_frame._length);
   encoded_frame_->_length = encoded_frame._length;
   encoded_frame_->_encodedWidth = encoded_frame._encodedWidth;
   encoded_frame_->_encodedHeight = encoded_frame._encodedHeight;
   encoded_frame_->_timeStamp = encoded_frame._timeStamp;
   encoded_frame_->_frameType = encoded_frame._frameType;
   encoded_frame_->_completeFrame = encoded_frame._completeFrame;
+  encoded_frame_->rotation_ = encoded_frame.rotation_;
   encoded_frame_->qp_ = encoded_frame.qp_;
   codec_specific_info_->codecType = codec_specific_info->codecType;
   // Skip |codec_name|, to avoid allocating.
   codec_specific_info_->codecSpecific = codec_specific_info->codecSpecific;
   encode_complete_ = true;
   return Result(Result::OK, 0);
 }
 
 bool Vp8UnitTestEncodeCompleteCallback::EncodeComplete() {
   if (encode_complete_) {
@@ skipping 170 matching lines @@
 
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             encoder_->InitEncode(&codec_settings_, 1, 1440));
 
   // Decoder parameter tests.
   // Calls before InitDecode().
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, decoder_->Release());
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, decoder_->InitDecode(&codec_settings_, 1));
 }
 
+// We only test the encoder here, since the decoded frame rotation is set based
+// on the CVO RTP header extension in VCMDecodedFrameCallback::Decoded.
+// TODO(brandtr): Consider passing through the rotation flag through the decoder
+// in the same way as done in the encoder.
+TEST_F(TestVp8Impl, EncodedRotationEqualsInputRotation) {
+  SetUpEncodeDecode();
+
+  input_frame_->set_rotation(kVideoRotation_0);
+  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
+            encoder_->Encode(*input_frame_, nullptr, nullptr));
+  WaitForEncodedFrame();
+  EXPECT_EQ(kVideoRotation_0, encoded_frame_.rotation_);
+
+  input_frame_->set_rotation(kVideoRotation_90);
+  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
+            encoder_->Encode(*input_frame_, nullptr, nullptr));
+  WaitForEncodedFrame();
+  EXPECT_EQ(kVideoRotation_90, encoded_frame_.rotation_);
+}
+
 TEST_F(TestVp8Impl, DecodedQpEqualsEncodedQp) {
   SetUpEncodeDecode();
   encoder_->Encode(*input_frame_, nullptr, nullptr);
   EXPECT_GT(WaitForEncodedFrame(), 0u);
   // First frame should be a key frame.
   encoded_frame_._frameType = kVideoFrameKey;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             decoder_->Decode(encoded_frame_, false, nullptr));
   EXPECT_GT(WaitForDecodedFrame(), 0u);
   ASSERT_TRUE(decoded_frame_);
@@ skipping 120 matching lines @@
   // Temporal layer 1.
   input_frame_->set_timestamp(input_frame_->timestamp() +
                               kTimestampIncrementPerFrame);
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             encoder_->Encode(*input_frame_, nullptr, nullptr));
   ExpectFrameWith((picture_id + 7) % (1 << 15), (tl0_pic_idx + 3) % (1 << 8),
                   1);
 }
 
 }  // namespace webrtc