Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1592)

Unified Diff: talk/app/webrtc/java/jni/native_handle_impl.cc

Issue 1471333003: Add support for scaling textures in AndroidVideoCapturer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed magjeds comments Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ed9ad8e8918ad1d6e5adb21c42fbb30c82960802..1ddb0851666f35da01848638300d59f2be8d25bb 100644
--- a/talk/app/webrtc/java/jni/native_handle_impl.cc
+++ b/talk/app/webrtc/java/jni/native_handle_impl.cc
@@ -28,9 +28,17 @@
#include "talk/app/webrtc/java/jni/native_handle_impl.h"
#include "webrtc/base/checks.h"
+#include "webrtc/base/bind.h"
+
+using rtc::scoped_refptr;
+using webrtc::NativeHandleBuffer;
namespace webrtc_jni {
+namespace {
+void ScaledFrameNotInUse(scoped_refptr<NativeHandleBuffer> original) {}
+} // anonymous namespace
+
NativeHandleImpl::NativeHandleImpl(JNIEnv* jni,
jint j_oes_texture_id,
jfloatArray j_transform_matrix)
@@ -64,4 +72,19 @@ AndroidTextureBuffer::NativeToI420Buffer() {
return nullptr;
}
+rtc::scoped_refptr<AndroidTextureBuffer> AndroidTextureBuffer::CropAndScale(
+ int cropped_input_width,
+ int cropped_input_height,
+ int dst_widht,
+ int dst_height) {
+ // TODO(perkj) Implement cropping.
magjed_webrtc 2015/11/26 10:08:33 Add a CHECK_EQ(cropped_input_width, width()) and C
perkj_webrtc 2015/11/26 10:56:14 Done.
+ // Here we use Bind magic to add a reference count to |this| until the newly
+ // created AndroidTextureBuffer is destructed. ScaledFrameNotInUse will be
+ // 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_,
+ rtc::Bind(&ScaledFrameNotInUse, this));
+}
+
} // namespace webrtc_jni

Powered by Google App Engine
This is Rietveld 408576698