Delete AndroidVideoCapturer::FrameFactory.

webrtc/api/java/jni/native_handle_impl.h

 /*
  *  Copyright 2015 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.
  */
 
 #ifndef WEBRTC_API_JAVA_JNI_NATIVE_HANDLE_IMPL_H_
 #define WEBRTC_API_JAVA_JNI_NATIVE_HANDLE_IMPL_H_
 
 #include <jni.h>
 
 #include "webrtc/common_video/include/video_frame_buffer.h"
 #include "webrtc/common_video/rotation.h"
 
 namespace webrtc_jni {
 
 // Wrapper for texture object.
 struct NativeHandleImpl {
+  // Open gl textre matrix, in column-major order. Operations are
+  // in-place.
+  struct Matrix {

[magjed_webrtc, 2016/05/18 11:41:59]

struct's are not allowed to have complex methods. So either make Matrix a class,
or make the methods static like Rotate(const float[16] in, float[16] out);

[nisse-webrtc, 2016/05/18 12:17:52]

I'll make it a class, then. Can it still use the name NativeHandleImpl::Matrix,
or webrtc_jni::Matrix, or something else?

+    float elem[16];
+    // Crop arguments are relative to original size.
+    void Crop(float cropped_width,
+              float cropped_height,
+              float crop_x,
+              float crop_y);
+
+    void Rotate(webrtc::VideoRotation rotation);
+    static void Multiply(const Matrix& a, const Matrix& b, Matrix* result);
+  };
+
   NativeHandleImpl(JNIEnv* jni,
                    jint j_oes_texture_id,
                    jfloatArray j_transform_matrix);
 
+  NativeHandleImpl(int id, const Matrix& matrix);
+
   const int oes_texture_id;
-  float sampling_matrix[16];
+  Matrix sampling_matrix;
+
+  NativeHandleImpl Crop(

[magjed_webrtc, 2016/05/18 11:41:59]

Do we really need Crop and Rotate for NativeHandleImpl?

[nisse-webrtc, 2016/05/18 12:17:52]

No, these are leftovers and should be deleted.

+      // Relative to original size.
+      float cropped_width,
+      float cropped_height,
+      float crop_x,
+      float crop_y) const;
+
+  NativeHandleImpl Rotate(webrtc::VideoRotation rotation) const;
 };
 
 class AndroidTextureBuffer : public webrtc::NativeHandleBuffer {
  public:
   AndroidTextureBuffer(int width,
                        int height,
                        const NativeHandleImpl& native_handle,
                        jobject surface_texture_helper,
                        const rtc::Callback0<void>& no_longer_used);
   ~AndroidTextureBuffer();
   rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override;
 
   // First crop, then scale to dst resolution, and then rotate.
   rtc::scoped_refptr<AndroidTextureBuffer> CropScaleAndRotate(
       int cropped_width,
       int cropped_height,
+      int crop_x,
+      int crop_y,
       int dst_width,
       int dst_height,
       webrtc::VideoRotation rotation);
 
  private:
   NativeHandleImpl native_handle_;
   // Raw object pointer, relying on the caller, i.e.,
   // AndroidVideoCapturerJni or the C++ SurfaceTextureHelper, to keep
   // a global reference. TODO(nisse): Make this a reference to the C++
   // SurfaceTextureHelper instead, but that requires some refactoring
   // of AndroidVideoCapturerJni.
   jobject surface_texture_helper_;
   rtc::Callback0<void> no_longer_used_cb_;
 };
 
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_API_JAVA_JNI_NATIVE_HANDLE_IMPL_H_