543b6ca30a
The code that depends on the reverted CL is disabled but not removed. NativeHandleImpl is reverted to the previous implementation, and the new implementation is renamed to NativeTextureHandleImpl. Texture capture can not be used anymore, because it will crash in peerconnection_jni.cc. Reason for revert: Increased HW decoder latency and crashes related to that. Also suspected cause of video tearing. Original issue's description: > This CL should be the last one in a series to finally > unblock camera texture capture. > > The SurfaceTexture.updateTexImage() calls are moved from > the video renderers into MediaCodecVideoDecoder, and the > destructor of the texture frames will signal > MediaCodecVideoDecoder that the frame has returned. This > CL also removes the SurfaceTexture from the native handle > and only exposes the texture matrix instead, because only > the video source should access the SurfaceTexture. > > BUG=webrtc:4993 > R=glaznev@webrtc.org, perkj@webrtc.org > > Committed: https://crrev.com/91b348c7029d843e06868ed12b728a809c53176c > Cr-Commit-Position: refs/heads/master@{#10203} TBR=glaznev BUG=webrtc:4993 Review URL: https://codereview.webrtc.org/1394103005 Cr-Commit-Position: refs/heads/master@{#10288}
90 lines
3.1 KiB
C++
90 lines
3.1 KiB
C++
/*
|
|
* 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,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
*/
|
|
|
|
#ifndef TALK_APP_WEBRTC_JAVA_JNI_NATIVE_HANDLE_IMPL_H_
|
|
#define TALK_APP_WEBRTC_JAVA_JNI_NATIVE_HANDLE_IMPL_H_
|
|
|
|
#include <jni.h>
|
|
|
|
#include "webrtc/common_video/interface/video_frame_buffer.h"
|
|
|
|
namespace webrtc_jni {
|
|
|
|
// Wrapper for texture object.
|
|
struct NativeTextureHandleImpl {
|
|
NativeTextureHandleImpl(JNIEnv* jni,
|
|
jint j_oes_texture_id,
|
|
jfloatArray j_transform_matrix);
|
|
|
|
const int oes_texture_id;
|
|
float sampling_matrix[16];
|
|
};
|
|
|
|
// Native handle for SurfaceTexture + texture id.
|
|
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.
|
|
|
|
private:
|
|
rtc::scoped_refptr<webrtc::VideoFrameBuffer> NativeToI420Buffer() override;
|
|
};
|
|
|
|
class AndroidTextureBuffer : public webrtc::NativeHandleBuffer {
|
|
public:
|
|
AndroidTextureBuffer(int width,
|
|
int height,
|
|
const NativeTextureHandleImpl& native_handle,
|
|
const rtc::Callback0<void>& no_longer_used);
|
|
~AndroidTextureBuffer();
|
|
rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override;
|
|
|
|
private:
|
|
NativeTextureHandleImpl native_handle_;
|
|
rtc::Callback0<void> no_longer_used_cb_;
|
|
};
|
|
|
|
} // namespace webrtc_jni
|
|
|
|
#endif // TALK_APP_WEBRTC_JAVA_JNI_NATIVE_HANDLE_IMPL_H_
|