| Index: talk/app/webrtc/java/jni/native_handle_impl.h
|
| diff --git a/talk/app/webrtc/java/jni/native_handle_impl.h b/talk/app/webrtc/java/jni/native_handle_impl.h
|
| index 2ce2b73b13e552af59004656ae0b4bab79263989..370039e50ef8d188f8957fdebef97f7a06ce5781 100644
|
| --- a/talk/app/webrtc/java/jni/native_handle_impl.h
|
| +++ b/talk/app/webrtc/java/jni/native_handle_impl.h
|
| @@ -31,33 +31,16 @@
|
|
|
| #include <jni.h>
|
|
|
| -#include "webrtc/common_video/interface/video_frame_buffer.h"
|
| -
|
| namespace webrtc_jni {
|
|
|
| // Wrapper for texture object.
|
| -class NativeHandleImpl {
|
| - public:
|
| - NativeHandleImpl();
|
| -
|
| - void* GetHandle();
|
| - int GetTextureId();
|
| - void SetTextureObject(void* texture_object, int texture_id);
|
| -
|
| - private:
|
| - jobject texture_object_;
|
| - int32_t texture_id_;
|
| -};
|
| -
|
| -class JniNativeHandleBuffer : public webrtc::NativeHandleBuffer {
|
| - public:
|
| - JniNativeHandleBuffer(void* native_handle, int width, int height);
|
| -
|
| - // TODO(pbos): Override destructor to release native handle, at the moment the
|
| - // native handle is not released based on refcount.
|
| +struct NativeHandleImpl {
|
| + NativeHandleImpl(JNIEnv* jni,
|
| + jint j_oes_texture_id,
|
| + jfloatArray j_transform_matrix);
|
|
|
| - private:
|
| - rtc::scoped_refptr<webrtc::VideoFrameBuffer> NativeToI420Buffer() override;
|
| + const int oes_texture_id;
|
| + float sampling_matrix[16];
|
| };
|
|
|
| } // namespace webrtc_jni
|
|
|