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

Side by Side Diff: webrtc/sdk/android/src/jni/pc/video_jni.cc

Issue 3003873002: Bindings for injectable Java video encoders. (Closed)
Patch Set: Fix tests Created 3 years, 3 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 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <jni.h> 11 #include <jni.h>
12 12
13 #include "webrtc/api/videosourceproxy.h" 13 #include "webrtc/api/videosourceproxy.h"
14 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" 14 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
15 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 15 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
16 #include "webrtc/rtc_base/logging.h" 16 #include "webrtc/rtc_base/logging.h"
17 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h" 17 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
18 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h" 18 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
19 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h" 19 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
20 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 20 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
21 #include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h" 21 #include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h"
22 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h" 22 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
23 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h" 23 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
24 #include "webrtc/sdk/android/src/jni/videoencoderfactorywrapper.h"
24 25
25 namespace webrtc { 26 namespace webrtc {
26 namespace jni { 27 namespace jni {
27 28
28 // TODO(sakal): Remove this once MediaCodecVideoDecoder/Encoder are no longer 29 // TODO(sakal): Remove this once MediaCodecVideoDecoder/Encoder are no longer
29 // used and all applications inject their own codecs. 30 // used and all applications inject their own codecs.
30 // This is semi broken if someone wants to create multiple peerconnection 31 // This is semi broken if someone wants to create multiple peerconnection
31 // factories. 32 // factories.
33 static bool use_media_codec_encoder_factory;
32 static bool use_media_codec_decoder_factory; 34 static bool use_media_codec_decoder_factory;
33 35
34 cricket::WebRtcVideoEncoderFactory* CreateVideoEncoderFactory( 36 cricket::WebRtcVideoEncoderFactory* CreateVideoEncoderFactory(
35 JNIEnv* jni, 37 JNIEnv* jni,
36 jobject j_encoder_factory) { 38 jobject j_encoder_factory) {
37 RTC_DCHECK(j_encoder_factory == nullptr) 39 use_media_codec_encoder_factory = j_encoder_factory == nullptr;
38 << "Injectable video encoders are not supported yet."; 40
39 return new MediaCodecVideoEncoderFactory(); 41 if (use_media_codec_encoder_factory) {
42 return new MediaCodecVideoEncoderFactory();
43 } else {
44 return new VideoEncoderFactoryWrapper(jni, j_encoder_factory);
45 }
40 } 46 }
41 47
42 cricket::WebRtcVideoDecoderFactory* CreateVideoDecoderFactory( 48 cricket::WebRtcVideoDecoderFactory* CreateVideoDecoderFactory(
43 JNIEnv* jni, 49 JNIEnv* jni,
44 jobject j_decoder_factory) { 50 jobject j_decoder_factory) {
45 use_media_codec_decoder_factory = j_decoder_factory == nullptr; 51 use_media_codec_decoder_factory = j_decoder_factory == nullptr;
46 52
47 if (use_media_codec_decoder_factory) { 53 if (use_media_codec_decoder_factory) {
48 return new MediaCodecVideoDecoderFactory(); 54 return new MediaCodecVideoDecoderFactory();
49 } else { 55 } else {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 jobject remote_egl_context) { 110 jobject remote_egl_context) {
105 OwnedFactoryAndThreads* owned_factory = 111 OwnedFactoryAndThreads* owned_factory =
106 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory); 112 reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
107 113
108 jclass j_eglbase14_context_class = 114 jclass j_eglbase14_context_class =
109 FindClass(jni, "org/webrtc/EglBase14$Context"); 115 FindClass(jni, "org/webrtc/EglBase14$Context");
110 116
111 MediaCodecVideoEncoderFactory* encoder_factory = 117 MediaCodecVideoEncoderFactory* encoder_factory =
112 static_cast<MediaCodecVideoEncoderFactory*>( 118 static_cast<MediaCodecVideoEncoderFactory*>(
113 owned_factory->encoder_factory()); 119 owned_factory->encoder_factory());
114 if (encoder_factory && 120 if (use_media_codec_encoder_factory && encoder_factory &&
115 jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)) { 121 jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)) {
116 LOG(LS_INFO) << "Set EGL context for HW encoding."; 122 LOG(LS_INFO) << "Set EGL context for HW encoding.";
117 encoder_factory->SetEGLContext(jni, local_egl_context); 123 encoder_factory->SetEGLContext(jni, local_egl_context);
118 } 124 }
119 125
120 MediaCodecVideoDecoderFactory* decoder_factory = 126 MediaCodecVideoDecoderFactory* decoder_factory =
121 static_cast<MediaCodecVideoDecoderFactory*>( 127 static_cast<MediaCodecVideoDecoderFactory*>(
122 owned_factory->decoder_factory()); 128 owned_factory->decoder_factory());
123 if (use_media_codec_decoder_factory && decoder_factory) { 129 if (use_media_codec_decoder_factory && decoder_factory) {
124 LOG(LS_INFO) << "Set EGL context for HW decoding."; 130 LOG(LS_INFO) << "Set EGL context for HW decoding.";
125 decoder_factory->SetEGLContext(jni, remote_egl_context); 131 decoder_factory->SetEGLContext(jni, remote_egl_context);
126 } 132 }
127 } 133 }
128 134
129 } // namespace jni 135 } // namespace jni
130 } // namespace webrtc 136 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/jni_helpers.cc ('k') | webrtc/sdk/android/src/jni/videoencoderfactorywrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698