Add support for scaling textures in AndroidVideoCapturer.

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,
  *     this list of conditions and the following disclaimer in the documentation
  *     and/or other materials provided with the distribution.
  *  3. The name of the author may not be used to endorse or promote products
  *     derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
  * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "talk/app/webrtc/androidvideocapturer.h"
 
+#include "talk/app/webrtc/java/jni/native_handle_impl.h"
 #include "talk/media/webrtc/webrtcvideoframe.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/json.h"
 #include "webrtc/base/timeutils.h"
 
 namespace webrtc {
 
 // A hack for avoiding deep frame copies in
 // cricket::VideoCapturer.SignalFrameCaptured() using a custom FrameFactory.
 // A frame is injected using UpdateCapturedFrame(), and converted into a
@@ skipping 54 matching lines @@
     return apply_rotation_ ? frame->GetCopyWithRotationApplied()->Copy()
                            : 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 {
+    rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(buffer_);

[magjed_webrtc, 2015/11/25 13:38:28]

Move this inside the if-statement, i.e.
rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer =
    static_cast<webrtc_jni::AndroidTextureBuffer*>(buffer_.get())
        ->CropAndScale(cropped_input_width, cropped_input_height,
                       output_width, output_height);

[perkj_webrtc, 2015/11/25 20:56:20]

Done.

     if (buffer_->native_handle() != nullptr) {
-      // TODO(perkj): Implement CreateAliasedFrame properly for textures.
+      buffer = static_cast<webrtc_jni::AndroidTextureBuffer*>(buffer_.get())
+                   ->CropAndScale(cropped_input_width, cropped_input_height,
+                                  output_width, output_height);
       rtc::scoped_ptr<cricket::VideoFrame> frame(new cricket::WebRtcVideoFrame(
-          buffer_, input_frame->time_stamp, input_frame->rotation));
+          buffer, input_frame->time_stamp, input_frame->rotation));
       return frame.release();
     }
     return VideoFrameFactory::CreateAliasedFrame(input_frame,
                                                  cropped_input_width,
                                                  cropped_input_height,
                                                  output_width,
                                                  output_height);
   }
 
  private:
@@ skipping 116 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