52a30e31f1
Reason for revert: Nothing wrong with the original CL, the bug was in rtc::Bind(), which is fixed now (https://codereview.webrtc.org/1403683004/). Original issue's description: > Revert of Android: Put common native VideoFrameBuffer implementation in androidvideocapturer_jni (patchset #1 id:1 of https://codereview.webrtc.org/1391403004/ ) > > Reason for revert: > Crashes on AppRTCDemo disconnect > > Original issue's description: > > Android: Put common native VideoFrameBuffer implementation in native_handle_impl.cc > > > > BUG=webrtc:4993 > > R=perkj@webrtc.org > > > > Committed: https://crrev.com/60472216da0644b49ed5f9fa51c51d4874afafa7 > > Cr-Commit-Position: refs/heads/master@{#10248} > > TBR=perkj@webrtc.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:4993 > > Committed: https://crrev.com/962c26bfd6c3eb3cf7402daaab89404ae38dd534 > Cr-Commit-Position: refs/heads/master@{#10249} TBR=perkj@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4993 Review URL: https://codereview.webrtc.org/1397373002 Cr-Commit-Position: refs/heads/master@{#10254}
65 lines
2.4 KiB
C++
65 lines
2.4 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 NativeHandleImpl {
|
|
NativeHandleImpl(JNIEnv* jni,
|
|
jint j_oes_texture_id,
|
|
jfloatArray j_transform_matrix);
|
|
|
|
const int oes_texture_id;
|
|
float sampling_matrix[16];
|
|
};
|
|
|
|
class AndroidTextureBuffer : public webrtc::NativeHandleBuffer {
|
|
public:
|
|
AndroidTextureBuffer(int width,
|
|
int height,
|
|
const NativeHandleImpl& native_handle,
|
|
const rtc::Callback0<void>& no_longer_used);
|
|
~AndroidTextureBuffer();
|
|
rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override;
|
|
|
|
private:
|
|
NativeHandleImpl native_handle_;
|
|
rtc::Callback0<void> no_longer_used_cb_;
|
|
};
|
|
|
|
} // namespace webrtc_jni
|
|
|
|
#endif // TALK_APP_WEBRTC_JAVA_JNI_NATIVE_HANDLE_IMPL_H_
|