Native changes for VideoCapturerAndroid surface texture support

talk/app/webrtc/androidvideocapturer.cc

Index: talk/app/webrtc/androidvideocapturer.cc
diff --git a/talk/app/webrtc/androidvideocapturer.cc b/talk/app/webrtc/androidvideocapturer.cc
index 0ee60c2cf745214b78469cffed873e9f90ff33a1..2d5a1afea9f66b42781099ea4b4621d4df7fc10d 100644
--- a/talk/app/webrtc/androidvideocapturer.cc
+++ b/talk/app/webrtc/androidvideocapturer.cc
@@ -81,6 +81,8 @@ class AndroidVideoCapturer::FrameFactory : public cricket::VideoFrameFactory {
       int dst_height) const override {
     // Check that captured_frame is actually our frame.
     RTC_CHECK(captured_frame == &captured_frame_);
+    RTC_CHECK(buffer_->native_handle() == nullptr);
+
     rtc::scoped_ptr<cricket::VideoFrame> frame(new cricket::WebRtcVideoFrame(
         ShallowCenterCrop(buffer_, dst_width, dst_height),
         captured_frame->time_stamp, captured_frame->GetRotation()));
@@ -90,6 +92,25 @@ class AndroidVideoCapturer::FrameFactory : public cricket::VideoFrameFactory {
                            : 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 CreateAliasedFrame properly for textures.
+      rtc::scoped_ptr<cricket::VideoFrame> frame(new cricket::WebRtcVideoFrame(
+          buffer_, input_frame->time_stamp, input_frame->GetRotation()));
+      return frame.release();
+    }
+    return VideoFrameFactory::CreateAliasedFrame(input_frame,
+                                                 cropped_input_width,
+                                                 cropped_input_height,
+                                                 output_width,
+                                                 output_height);
+  }
+
  private:
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer_;
   cricket::CapturedFrame captured_frame_;