VideoCapturerAndroid, handle cvo correctly

talk/app/webrtc/androidvideocapturer.cc

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 84 matching lines @@
                            : frame.release();
   }
 
   cricket::VideoFrame* CreateAliasedFrame(
       const cricket::CapturedFrame* input_frame,
       int cropped_input_width,
       int cropped_input_height,
       int output_width,
       int output_height) const override {
     if (buffer_->native_handle() != nullptr) {
+      // TODO(perkj) Implement cropping.
+      RTC_CHECK_EQ(cropped_input_width, buffer_->width());
+      RTC_CHECK_EQ(cropped_input_height, buffer_->height());
       rtc::scoped_refptr<webrtc::VideoFrameBuffer> scaled_buffer(
           static_cast<webrtc_jni::AndroidTextureBuffer*>(buffer_.get())
-              ->CropAndScale(cropped_input_width, cropped_input_height,
-                             output_width, output_height));
+              ->ScaleAndRotate(output_width, output_height,
+                               apply_rotation_ ? input_frame->rotation :
+                                   webrtc::kVideoRotation_0));
       return new cricket::WebRtcVideoFrame(
-          scaled_buffer, input_frame->time_stamp, input_frame->rotation);
+          scaled_buffer, input_frame->time_stamp,
+          apply_rotation_ ? webrtc::kVideoRotation_0 : input_frame->rotation);
     }
     return VideoFrameFactory::CreateAliasedFrame(input_frame,
                                                  cropped_input_width,
                                                  cropped_input_height,
                                                  output_width,
                                                  output_height);
   }
 
  private:
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer_;
@@ skipping 115 matching lines @@
 
 bool AndroidVideoCapturer::GetBestCaptureFormat(
     const cricket::VideoFormat& desired,
     cricket::VideoFormat* best_format) {
   // Delegate this choice to VideoCapturerAndroid.startCapture().
   *best_format = desired;
   return true;
 }
 
 }  // namespace webrtc