Implement AndroidVideoBuffer::ToI420.

webrtc/sdk/android/src/jni/native_handle_impl.cc

Index: webrtc/sdk/android/src/jni/native_handle_impl.cc
diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.cc b/webrtc/sdk/android/src/jni/native_handle_impl.cc
index f04a0b82b31565f589d81ceea69b92166a0973eb..bd54c7624f9ef0148c40512f4e20c53befc604f8 100644
--- a/webrtc/sdk/android/src/jni/native_handle_impl.cc
+++ b/webrtc/sdk/android/src/jni/native_handle_impl.cc
@@ -25,6 +25,69 @@
 
 namespace webrtc_jni {
 
+namespace {
+
+class AndroidVideoI420Buffer : public webrtc::I420BufferInterface {
+ public:
+  AndroidVideoI420Buffer(JNIEnv* jni,
+                         jmethodID j_release_id,
+                         const uint8_t* data_y,
+                         const uint8_t* data_u,
+                         const uint8_t* data_v,
+                         int stride_y,
+                         int stride_u,
+                         int stride_v,
+                         int width,
+                         int height,
+                         jobject j_video_frame_buffer);
+
+ private:
+  const uint8_t* DataY() const override { return data_y_; }
+  const uint8_t* DataU() const override { return data_u_; }
+  const uint8_t* DataV() const override { return data_v_; }
+
+  int StrideY() const override { return stride_y_; }
+  int StrideU() const override { return stride_u_; }
+  int StrideV() const override { return stride_v_; }
+
+  int width() const override { return android_video_buffer->width(); }
+  int height() const override { return android_video_buffer->height(); }
+
+  rtc::scoped_refptr<AndroidVideoBuffer> android_video_buffer;
+  const uint8_t* data_y_;
+  const uint8_t* data_u_;
+  const uint8_t* data_v_;
+  const int stride_y_;
+  const int stride_u_;
+  const int stride_v_;
+};
+
+AndroidVideoI420Buffer::AndroidVideoI420Buffer(JNIEnv* jni,
+                                               jmethodID j_release_id,
+                                               const uint8_t* data_y,
+                                               const uint8_t* data_u,
+                                               const uint8_t* data_v,
+                                               int stride_y,
+                                               int stride_u,
+                                               int stride_v,
+                                               int width,
+                                               int height,
+                                               jobject j_video_frame_buffer)
+    : android_video_buffer(
+          new rtc::RefCountedObject<AndroidVideoBuffer>(jni,

[magjed_webrtc, 2017/07/28 09:45:04]

I think it's clearer to duplicate the code you need from AndroidVideoBuffer,
i.e. the global jobject and the call to release in the dtor.

+                                                        j_release_id,
+                                                        width,
+                                                        height,
+                                                        j_video_frame_buffer)),
+      data_y_(data_y),
+      data_u_(data_u),
+      data_v_(data_v),
+      stride_y_(stride_y),
+      stride_u_(stride_u),
+      stride_v_(stride_v) {}
+
+}  // namespace
+
 Matrix::Matrix(JNIEnv* jni, jfloatArray a) {
   RTC_CHECK_EQ(16, jni->GetArrayLength(a));
   jfloat* ptr = jni->GetFloatArrayElements(a, nullptr);
@@ -197,7 +260,6 @@ rtc::scoped_refptr<webrtc::I420BufferInterface> AndroidTextureBuffer::ToI420() {
 }
 
 AndroidVideoBuffer::AndroidVideoBuffer(JNIEnv* jni,
-                                       jmethodID j_retain_id,

[magjed_webrtc, 2017/07/28 09:45:05]

Revert this change in this CL.

[sakal, 2017/07/28 11:08:49]

Done.

                                        jmethodID j_release_id,
                                        int width,
                                        int height,
@@ -205,9 +267,7 @@ AndroidVideoBuffer::AndroidVideoBuffer(JNIEnv* jni,
     : j_release_id_(j_release_id),
       width_(width),
       height_(height),
-      j_video_frame_buffer_(jni, j_video_frame_buffer) {
-  jni->CallVoidMethod(j_video_frame_buffer, j_retain_id);
-}
+      j_video_frame_buffer_(jni, j_video_frame_buffer) {}
 
 AndroidVideoBuffer::~AndroidVideoBuffer() {
   JNIEnv* jni = AttachCurrentThreadIfNeeded();
@@ -231,8 +291,51 @@ int AndroidVideoBuffer::height() const {
 }
 
 rtc::scoped_refptr<webrtc::I420BufferInterface> AndroidVideoBuffer::ToI420() {
-  // TODO(magjed): Implement using Java ToI420.
-  return nullptr;
+  JNIEnv* jni = AttachCurrentThreadIfNeeded();
+  ScopedLocalRefFrame local_ref_frame(jni);
+
+  jclass j_video_frame_buffer_class =
+      FindClass(jni, "org/webrtc/VideoFrame$Buffer");
+  jmethodID j_to_i420_id =
+      jni->GetMethodID(j_video_frame_buffer_class, "toI420",
+                       "()Lorg/webrtc/VideoFrame$I420Buffer;");
+
+  jclass j_video_frame_i420_buffer_class =
+      FindClass(jni, "org/webrtc/VideoFrame$I420Buffer");
+  jmethodID j_get_data_y_id = jni->GetMethodID(
+      j_video_frame_i420_buffer_class, "getDataY", "()Ljava/nio/ByteBuffer;");
+  jmethodID j_get_data_u_id = jni->GetMethodID(
+      j_video_frame_i420_buffer_class, "getDataU", "()Ljava/nio/ByteBuffer;");
+  jmethodID j_get_data_v_id = jni->GetMethodID(
+      j_video_frame_i420_buffer_class, "getDataV", "()Ljava/nio/ByteBuffer;");
+  jmethodID j_get_stride_y_id =
+      jni->GetMethodID(j_video_frame_i420_buffer_class, "getStrideY", "()I");
+  jmethodID j_get_stride_u_id =
+      jni->GetMethodID(j_video_frame_i420_buffer_class, "getStrideU", "()I");
+  jmethodID j_get_stride_v_id =
+      jni->GetMethodID(j_video_frame_i420_buffer_class, "getStrideV", "()I");
+
+  jobject j_i420_buffer =
+      jni->CallObjectMethod(*j_video_frame_buffer_, j_to_i420_id);

[magjed_webrtc, 2017/07/28 09:45:05]

How about extracting j_i420_buffer here and passing it to the 
AndroidVideoI420Buffer ctor. The rest of the code can go inside the ctor.

[sakal, 2017/07/28 11:08:49]

Done.

+
+  jobject j_data_y = jni->CallObjectMethod(j_i420_buffer, j_get_data_y_id);
+  jobject j_data_u = jni->CallObjectMethod(j_i420_buffer, j_get_data_u_id);
+  jobject j_data_v = jni->CallObjectMethod(j_i420_buffer, j_get_data_v_id);
+
+  const uint8_t* data_y =
+      static_cast<const uint8_t*>(jni->GetDirectBufferAddress(j_data_y));
+  const uint8_t* data_u =
+      static_cast<const uint8_t*>(jni->GetDirectBufferAddress(j_data_u));
+  const uint8_t* data_v =
+      static_cast<const uint8_t*>(jni->GetDirectBufferAddress(j_data_v));
+
+  int stride_y = jni->CallIntMethod(j_i420_buffer, j_get_stride_y_id);
+  int stride_u = jni->CallIntMethod(j_i420_buffer, j_get_stride_u_id);
+  int stride_v = jni->CallIntMethod(j_i420_buffer, j_get_stride_v_id);
+
+  return new rtc::RefCountedObject<AndroidVideoI420Buffer>(
+      jni, j_release_id_, data_y, data_u, data_v, stride_y, stride_u, stride_v,
+      width_, height_, j_i420_buffer);
 }
 
 jobject AndroidVideoBuffer::ToJavaI420Frame(JNIEnv* jni,
@@ -292,10 +395,11 @@ webrtc::VideoFrame AndroidVideoBufferFactory::CreateFrame(
 rtc::scoped_refptr<AndroidVideoBuffer> AndroidVideoBufferFactory::CreateBuffer(
     jobject j_video_frame_buffer) const {
   JNIEnv* jni = AttachCurrentThreadIfNeeded();
+  jni->CallVoidMethod(j_video_frame_buffer, j_retain_id_);
   int width = jni->CallIntMethod(j_video_frame_buffer, j_get_width_id_);
   int height = jni->CallIntMethod(j_video_frame_buffer, j_get_height_id_);
   return new rtc::RefCountedObject<AndroidVideoBuffer>(
-      jni, j_retain_id_, j_release_id_, width, height, j_video_frame_buffer);
+      jni, j_release_id_, width, height, j_video_frame_buffer);
 }
 
 }  // namespace webrtc_jni