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

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

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)
Patch Set: Rebase 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 #include "webrtc/sdk/android/src/jni/pc/media_jni.h" 10 #include "webrtc/sdk/android/src/jni/pc/media_jni.h"
11 11
12 #include "webrtc/call/callfactoryinterface.h" 12 #include "webrtc/call/callfactoryinterface.h"
13 #include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h" 13 #include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h"
14 #include "webrtc/media/engine/webrtcmediaengine.h" 14 #include "webrtc/media/engine/webrtcmediaengine.h"
15 #include "webrtc/modules/audio_processing/include/audio_processing.h" 15 #include "webrtc/modules/audio_processing/include/audio_processing.h"
16 16
17 namespace webrtc_jni { 17 namespace webrtc {
18 namespace jni {
18 19
19 webrtc::CallFactoryInterface* CreateCallFactory() { 20 CallFactoryInterface* CreateCallFactory() {
20 return webrtc::CreateCallFactory().release(); 21 return webrtc::CreateCallFactory().release();
21 } 22 }
22 23
23 webrtc::RtcEventLogFactoryInterface* CreateRtcEventLogFactory() { 24 RtcEventLogFactoryInterface* CreateRtcEventLogFactory() {
24 return webrtc::CreateRtcEventLogFactory().release(); 25 return webrtc::CreateRtcEventLogFactory().release();
25 } 26 }
26 27
27 cricket::MediaEngineInterface* CreateMediaEngine( 28 cricket::MediaEngineInterface* CreateMediaEngine(
28 webrtc::AudioDeviceModule* adm, 29 AudioDeviceModule* adm,
29 const rtc::scoped_refptr<webrtc::AudioEncoderFactory>& 30 const rtc::scoped_refptr<AudioEncoderFactory>& audio_encoder_factory,
30 audio_encoder_factory, 31 const rtc::scoped_refptr<AudioDecoderFactory>& audio_decoder_factory,
31 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
32 audio_decoder_factory,
33 cricket::WebRtcVideoEncoderFactory* video_encoder_factory, 32 cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
34 cricket::WebRtcVideoDecoderFactory* video_decoder_factory, 33 cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
35 rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer) { 34 rtc::scoped_refptr<AudioMixer> audio_mixer) {
36 return cricket::WebRtcMediaEngineFactory::Create( 35 return cricket::WebRtcMediaEngineFactory::Create(
37 adm, audio_encoder_factory, audio_decoder_factory, video_encoder_factory, 36 adm, audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
38 video_decoder_factory, audio_mixer, webrtc::AudioProcessing::Create()); 37 video_decoder_factory, audio_mixer, AudioProcessing::Create());
39 } 38 }
40 39
41 } // namespace webrtc_jni 40 } // namespace jni
41 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/pc/media_jni.h ('k') | webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698