Implement AndroidTextureBuffer::NativeToI420.

talk/app/webrtc/java/jni/native_handle_impl.cc

Index: talk/app/webrtc/java/jni/native_handle_impl.cc
diff --git a/talk/app/webrtc/java/jni/native_handle_impl.cc b/talk/app/webrtc/java/jni/native_handle_impl.cc
index 583a0380263659096660934cae8699babd5c7511..2afaf9b36e8b11baa4260eccd68d020a5a77bbd6 100644
--- a/talk/app/webrtc/java/jni/native_handle_impl.cc
+++ b/talk/app/webrtc/java/jni/native_handle_impl.cc
@@ -25,23 +25,33 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <android/log.h>

[perkj_webrtc, 2015/12/07 12:53:50]

remove this include.

[nisse-webrtc, 2015/12/08 11:44:51]

Done. And removed corresponding logging.

 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
 
+#include "talk/app/webrtc/java/jni/jni_helpers.h"
+#include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/keep_ref_until_done.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 
 using webrtc::NativeHandleBuffer;
 
 namespace webrtc_jni {
 
+// Aligning pointer to 64 bytes for improved performance, e.g. use SIMD.
+static const int kBufferAlignment = 64;
+
 NativeHandleImpl::NativeHandleImpl(JNIEnv* jni,
                                    jint j_oes_texture_id,
                                    jfloatArray j_transform_matrix)
-    : oes_texture_id(j_oes_texture_id) {
+  : oes_texture_id(j_oes_texture_id) {
   RTC_CHECK_EQ(16, jni->GetArrayLength(j_transform_matrix));
   jfloat* transform_matrix_ptr =
       jni->GetFloatArrayElements(j_transform_matrix, nullptr);
+  // TODO(nisse): Hold on to java float array instead, since it is
+  // used only for callbacks into java.
   for (int i = 0; i < 16; ++i) {
     sampling_matrix[i] = transform_matrix_ptr[i];
   }
@@ -52,20 +62,77 @@ AndroidTextureBuffer::AndroidTextureBuffer(
     int width,
     int height,
     const NativeHandleImpl& native_handle,
+    jobject surface_texture_helper,
     const rtc::Callback0<void>& no_longer_used)
     : webrtc::NativeHandleBuffer(&native_handle_, width, height),
       native_handle_(native_handle),
+      surface_texture_helper_(surface_texture_helper),
       no_longer_used_cb_(no_longer_used) {}
 
 AndroidTextureBuffer::~AndroidTextureBuffer() {
   no_longer_used_cb_();
 }
 
+#define TAG "AndroidTextureBuffer"

[perkj_webrtc, 2015/12/07 12:53:50]

remove

+// Alternatively: #define AT_LOG LOG(LS_ERROR)
+#define ALOGE LOG_TAG(rtc::LS_ERROR, TAG)
+
 rtc::scoped_refptr<webrtc::VideoFrameBuffer>
 AndroidTextureBuffer::NativeToI420Buffer() {
-  RTC_NOTREACHED()
-      << "AndroidTextureBuffer::NativeToI420Buffer not implemented.";
-  return nullptr;
+  ALOGE << "NativeToI420Buffer called";
+  int y_width = (width()+3) / 4;
+  int uv_width = (width()+7) / 8;
+  int stride = 8 * uv_width;
+  int uv_height = (height()+1)/2;
+  size_t size = stride * (height() + uv_height);
+  // The data is owned by the frame, and the normal case is that the
+  // data is deleted by the frame's destructor callback.
+  rtc::scoped_ptr<uint8_t, webrtc::AlignedFreeDeleter> yuv_data(

[perkj_webrtc, 2015/12/07 12:53:50]

Should we have AndroidTextureBuffer take pointer to a  I420BufferPool as well so
that we don' have to allocate each frame? 

[nisse-webrtc, 2015/12/08 11:44:51]

Note that we use WrappedI420Buffer. To use a plain I420Buffer requires changes
to support the special layout with the same stride for Y, U and v.

To avoid a large allocation for eac frame, I think it might be cleanest to have
a pool of java ByteBuffer which are reused, and let java own the storage.
Creating a new WrappedI420Buffer per frame should be cheap.

Can we have more than one frame alive at a time? We only have one texture
anyway, right?

In case allocation/gc overhead matters, I guess that a cache of at most one free
buffer should be simple and quite effective.

[perkj_webrtc, 2015/12/09 09:28:28]

Yes, we can have memory backed frames active at the same time. But, yes, there
can only be one texture buffer used outside the camera at once. 

+      static_cast<uint8_t*>(webrtc::AlignedMalloc(size, kBufferAlignment)));
+  uint8_t *y_data = yuv_data.get();
+  uint8_t *u_data = y_data + height() * stride;
+  uint8_t *v_data = u_data + stride/2;
+
+  rtc::scoped_refptr<webrtc::VideoFrameBuffer> copy =
+    new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
+        width(), height(),
+        y_data, stride,
+        u_data, stride,
+        v_data, stride,
+        rtc::Bind(&webrtc::AlignedFree, yuv_data.release()));
+
+  ALOGE << "width: " << width() << " height: " << height() <<
+      " stride: " << stride;
+
+  JNIEnv* jni = AttachCurrentThreadIfNeeded();
+  ScopedLocalRefFrame local_ref_frame(jni);
+
+  ALOGE << "Looking up textureToYUV mid";
+  jmethodID transform_mid = GetMethodID(
+      jni,
+      GetObjectClass(jni, surface_texture_helper_),
+      "textureToYUV",
+      "(Ljava/nio/ByteBuffer;IIII[F)V");
+
+  ALOGE << "Creating byte buffer";
+  jobject byte_buffer = jni->NewDirectByteBuffer(y_data, size);
+
+  /* Set u = v = 0. */
+  memset(u_data, 0x80, stride * uv_height);
+
+  // TODO(nisse): Keep java transform matrix around.
+  jfloatArray sampling_matrix = jni->NewFloatArray(16);
+  jni->SetFloatArrayRegion(sampling_matrix, 0, 16,
+                           native_handle_.sampling_matrix);
+
+  ALOGE << "Calling java textureToYUV";
+  jni->CallVoidMethod(surface_texture_helper_,
+                      transform_mid,
+                      byte_buffer, width(), height(), stride,
+                      native_handle_.oes_texture_id, sampling_matrix);
+  CHECK_EXCEPTION(jni) << "textureToYUV throwed an exception";
+
+  return copy;
 }
 
 rtc::scoped_refptr<AndroidTextureBuffer> AndroidTextureBuffer::CropAndScale(
@@ -82,7 +149,7 @@ rtc::scoped_refptr<AndroidTextureBuffer> AndroidTextureBuffer::CropAndScale(
   // called that happens and when it finishes, the reference count to |this|
   // will be decreased by one.
   return new rtc::RefCountedObject<AndroidTextureBuffer>(
-      dst_widht, dst_height, native_handle_,
+      dst_widht, dst_height, native_handle_, surface_texture_helper_,
       rtc::KeepRefUntilDone(this));
 }