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

Unified Diff: webrtc/sdk/android/src/jni/video_jni.cc

Issue 2992103002: Relanding: Break peerconnection_jni.cc into multiple files, in "pc" directory. (Closed)
Patch Set: Add jni/androidnetworkmonitor_jni.h include for backwards comaptibility. Created 3 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/sdk/android/src/jni/video_jni.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/android/src/jni/video_jni.cc
diff --git a/webrtc/sdk/android/src/jni/video_jni.cc b/webrtc/sdk/android/src/jni/video_jni.cc
deleted file mode 100644
index 5bf9f34155e8dc6ab5ea1ff7c0b8c714f36e3b60..0000000000000000000000000000000000000000
--- a/webrtc/sdk/android/src/jni/video_jni.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2017 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <jni.h>
-
-#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
-#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
-#include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
-#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h"
-#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
-#include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
-
-namespace webrtc_jni {
-
-// TODO(sakal): Remove this once MediaCodecVideoDecoder/Encoder are no longer
-// used and all applications inject their own codecs.
-// This is semi broken if someone wants to create multiple peerconnection
-// factories.
-static bool use_media_codec_decoder_factory;
-
-cricket::WebRtcVideoEncoderFactory* CreateVideoEncoderFactory(
- JNIEnv* jni,
- jobject j_encoder_factory) {
- RTC_DCHECK(j_encoder_factory == nullptr)
- << "Injectable video encoders are not supported yet.";
- return new MediaCodecVideoEncoderFactory();
-}
-
-cricket::WebRtcVideoDecoderFactory* CreateVideoDecoderFactory(
- JNIEnv* jni,
- jobject j_decoder_factory) {
- use_media_codec_decoder_factory = j_decoder_factory == nullptr;
-
- if (use_media_codec_decoder_factory) {
- return new MediaCodecVideoDecoderFactory();
- } else {
- return new VideoDecoderFactoryWrapper(jni, j_decoder_factory);
- }
-}
-
-jobject GetJavaSurfaceTextureHelper(
- const rtc::scoped_refptr<SurfaceTextureHelper>& surface_texture_helper) {
- return surface_texture_helper
- ? surface_texture_helper->GetJavaSurfaceTextureHelper()
- : nullptr;
-}
-
-JOW(jlong, PeerConnectionFactory_nativeCreateVideoSource)
-(JNIEnv* jni,
- jclass,
- jlong native_factory,
- jobject j_surface_texture_helper,
- jboolean is_screencast) {
- OwnedFactoryAndThreads* factory =
- reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
-
- rtc::scoped_refptr<webrtc::AndroidVideoTrackSource> source(
- new rtc::RefCountedObject<webrtc::AndroidVideoTrackSource>(
- factory->signaling_thread(), jni, j_surface_texture_helper,
- is_screencast));
- rtc::scoped_refptr<webrtc::VideoTrackSourceProxy> proxy_source =
- webrtc::VideoTrackSourceProxy::Create(factory->signaling_thread(),
- factory->worker_thread(), source);
-
- return (jlong)proxy_source.release();
-}
-
-JOW(jlong, PeerConnectionFactory_nativeCreateVideoTrack)
-(JNIEnv* jni, jclass, jlong native_factory, jstring id, jlong native_source) {
- rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
- factoryFromJava(native_factory));
- rtc::scoped_refptr<webrtc::VideoTrackInterface> track(
- factory->CreateVideoTrack(
- JavaToStdString(jni, id),
- reinterpret_cast<webrtc::VideoTrackSourceInterface*>(native_source)));
- return (jlong)track.release();
-}
-
-JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)
-(JNIEnv* jni,
- jclass,
- jlong native_factory,
- jobject local_egl_context,
- jobject remote_egl_context) {
- OwnedFactoryAndThreads* owned_factory =
- reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
-
- jclass j_eglbase14_context_class =
- FindClass(jni, "org/webrtc/EglBase14$Context");
-
- MediaCodecVideoEncoderFactory* encoder_factory =
- static_cast<MediaCodecVideoEncoderFactory*>(
- owned_factory->encoder_factory());
- if (encoder_factory &&
- jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)) {
- LOG(LS_INFO) << "Set EGL context for HW encoding.";
- encoder_factory->SetEGLContext(jni, local_egl_context);
- }
-
- MediaCodecVideoDecoderFactory* decoder_factory =
- static_cast<MediaCodecVideoDecoderFactory*>(
- owned_factory->decoder_factory());
- if (use_media_codec_decoder_factory && decoder_factory) {
- LOG(LS_INFO) << "Set EGL context for HW decoding.";
- decoder_factory->SetEGLContext(jni, remote_egl_context);
- }
-}
-
-} // namespace webrtc_jni
« no previous file with comments | « webrtc/sdk/android/src/jni/video_jni.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698