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

Side by Side Diff: talk/app/webrtc/java/jni/native_handle_impl.cc

Issue 1383563003: jni/native_handle_impl.h: Move implementation into .cc file (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 months 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 *
27 */ 26 */
28 27
29 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_ 28 #include "talk/app/webrtc/java/jni/native_handle_impl.h"
30 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
31 29
32 #include "talk/app/webrtc/java/jni/jni_helpers.h" 30 #include "webrtc/base/checks.h"
33 #include "talk/media/webrtc/webrtcvideodecoderfactory.h"
34 31
35 namespace webrtc_jni { 32 namespace webrtc_jni {
36 33
37 // Implementation of Android MediaCodec based decoder factory. 34 NativeHandleImpl::NativeHandleImpl() : texture_object_(NULL), texture_id_(-1) {}
38 class MediaCodecVideoDecoderFactory
39 : public cricket::WebRtcVideoDecoderFactory {
40 public:
41 MediaCodecVideoDecoderFactory();
42 virtual ~MediaCodecVideoDecoderFactory();
43 35
44 void SetEGLContext(JNIEnv* jni, jobject render_egl_context); 36 void* NativeHandleImpl::GetHandle() {
37 return texture_object_;
38 }
45 39
46 // WebRtcVideoDecoderFactory implementation. 40 int NativeHandleImpl::GetTextureId() {
47 webrtc::VideoDecoder* CreateVideoDecoder(webrtc::VideoCodecType type) 41 return texture_id_;
48 override; 42 }
49 43
50 void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override; 44 void NativeHandleImpl::SetTextureObject(void* texture_object, int texture_id) {
45 texture_object_ = reinterpret_cast<jobject>(texture_object);
46 texture_id_ = texture_id;
47 }
51 48
52 private: 49 JniNativeHandleBuffer::JniNativeHandleBuffer(void* native_handle,
53 jobject render_egl_context_; // Render EGL context. 50 int width,
54 std::vector<webrtc::VideoCodecType> supported_codec_types_; 51 int height)
55 }; 52 : NativeHandleBuffer(native_handle, width, height) {}
53
54 rtc::scoped_refptr<webrtc::VideoFrameBuffer>
55 JniNativeHandleBuffer::NativeToI420Buffer() {
56 // TODO(pbos): Implement before using this in the encoder pipeline (or
57 // remove the RTC_CHECK() in VideoCapture).
58 RTC_NOTREACHED();
59 return nullptr;
60 }
56 61
57 } // namespace webrtc_jni 62 } // namespace webrtc_jni
58
59 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698