Reland of Android: Put common native VideoFrameBuffer implementation in androidvideocapturer_jni

talk/app/webrtc/java/jni/androidvideocapturer_jni.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,
@@ skipping 16 matching lines @@
  */
 
 #include "talk/app/webrtc/java/jni/androidvideocapturer_jni.h"
 #include "talk/app/webrtc/java/jni/classreferenceholder.h"
 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc_jni {
 
-namespace {
-
-class CameraTextureBuffer : public webrtc::NativeHandleBuffer {
- public:
-  CameraTextureBuffer(int width, int height,
-      const NativeHandleImpl& native_handle,
-      const rtc::Callback0<void>& no_longer_used)
-      : webrtc::NativeHandleBuffer(&native_handle_, width, height),
-        native_handle_(native_handle),
-        no_longer_used_cb_(no_longer_used) {}
-
-  ~CameraTextureBuffer() {
-    no_longer_used_cb_();
-  }
-
-  rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override {
-    RTC_NOTREACHED()
-        << "CameraTextureBuffer::NativeToI420Buffer not implemented.";
-    return nullptr;
-  }
-
- private:
-  NativeHandleImpl native_handle_;
-  rtc::Callback0<void> no_longer_used_cb_;
-};
-
-}  // anonymous namespace
-
 jobject AndroidVideoCapturerJni::application_context_ = nullptr;
 
 // static
 int AndroidVideoCapturerJni::SetAndroidObjects(JNIEnv* jni,
                                                jobject appliction_context) {
   if (application_context_) {
     jni->DeleteGlobalRef(application_context_);
   }
   application_context_ = NewGlobalRef(jni, appliction_context);
 
@@ skipping 131 matching lines @@
   AsyncCapturerInvoke("OnIncomingFrame",
                       &webrtc::AndroidVideoCapturer::OnIncomingFrame,
                       buffer, rotation, timestamp_ns);
 }
 
 void AndroidVideoCapturerJni::OnTextureFrame(int width,
                                              int height,
                                              int64_t timestamp_ns,
                                              const NativeHandleImpl& handle) {
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
-      new rtc::RefCountedObject<CameraTextureBuffer>(
+      new rtc::RefCountedObject<AndroidTextureBuffer>(
           width, height, handle,
           rtc::Bind(&AndroidVideoCapturerJni::ReturnBuffer, this,
                     timestamp_ns)));
   AsyncCapturerInvoke("OnIncomingFrame",
                       &webrtc::AndroidVideoCapturer::OnIncomingFrame,
                       buffer, 0, timestamp_ns);
 }
 
 void AndroidVideoCapturerJni::OnOutputFormatRequest(int width,
                                                     int height,
@@ skipping 52 matching lines @@
     (JNIEnv* jni, jclass, jobject j_video_capturer) {
   rtc::scoped_refptr<webrtc::AndroidVideoCapturerDelegate> delegate =
       new rtc::RefCountedObject<AndroidVideoCapturerJni>(jni, j_video_capturer);
   rtc::scoped_ptr<cricket::VideoCapturer> capturer(
       new webrtc::AndroidVideoCapturer(delegate));
   // Caller takes ownership of the cricket::VideoCapturer* pointer.
   return jlongFromPointer(capturer.release());
 }
 
 }  // namespace webrtc_jni