| Index: webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
|
| diff --git a/webrtc/sdk/android/src/jni/media_jni.cc b/webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
|
| similarity index 25%
|
| copy from webrtc/sdk/android/src/jni/media_jni.cc
|
| copy to webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
|
| index fdcdc0fcac7551917be83601e4e61ea6fee71468..1b4a2978334b9e37ab08e9aa1591a916acc0db92 100644
|
| --- a/webrtc/sdk/android/src/jni/media_jni.cc
|
| +++ b/webrtc/sdk/android/src/jni/pc/dtmfsender_jni.cc
|
| @@ -7,35 +7,52 @@
|
| * in the file PATENTS. All contributing project authors may
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
| -#include "webrtc/sdk/android/src/jni/media_jni.h"
|
|
|
| -#include "webrtc/call/callfactoryinterface.h"
|
| -#include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h"
|
| -#include "webrtc/media/engine/webrtcmediaengine.h"
|
| -#include "webrtc/modules/audio_processing/include/audio_processing.h"
|
| +#include "webrtc/api/dtmfsenderinterface.h"
|
| +#include "webrtc/sdk/android/src/jni/jni_helpers.h"
|
|
|
| namespace webrtc_jni {
|
|
|
| -webrtc::CallFactoryInterface* CreateCallFactory() {
|
| - return webrtc::CreateCallFactory().release();
|
| +JOW(jboolean, DtmfSender_nativeCanInsertDtmf)
|
| +(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
|
| + return reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
|
| + ->CanInsertDtmf();
|
| }
|
|
|
| -webrtc::RtcEventLogFactoryInterface* CreateRtcEventLogFactory() {
|
| - return webrtc::CreateRtcEventLogFactory().release();
|
| +JOW(jboolean, DtmfSender_nativeInsertDtmf)
|
| +(JNIEnv* jni,
|
| + jclass,
|
| + jlong j_dtmf_sender_pointer,
|
| + jstring tones,
|
| + jint duration,
|
| + jint inter_tone_gap) {
|
| + return reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
|
| + ->InsertDtmf(JavaToStdString(jni, tones), duration, inter_tone_gap);
|
| }
|
|
|
| -cricket::MediaEngineInterface* CreateMediaEngine(
|
| - webrtc::AudioDeviceModule* adm,
|
| - const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
|
| - audio_encoder_factory,
|
| - const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
|
| - audio_decoder_factory,
|
| - cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
|
| - cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
|
| - rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer) {
|
| - return cricket::WebRtcMediaEngineFactory::Create(
|
| - adm, audio_encoder_factory, audio_decoder_factory, video_encoder_factory,
|
| - video_decoder_factory, audio_mixer, webrtc::AudioProcessing::Create());
|
| +JOW(jstring, DtmfSender_nativeTones)
|
| +(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
|
| + return JavaStringFromStdString(
|
| + jni, reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
|
| + ->tones());
|
| +}
|
| +
|
| +JOW(jint, DtmfSender_nativeDuration)
|
| +(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
|
| + return reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
|
| + ->duration();
|
| +}
|
| +
|
| +JOW(jint, DtmfSender_nativeInterToneGap)
|
| +(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
|
| + return reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
|
| + ->inter_tone_gap();
|
| +}
|
| +
|
| +JOW(void, DtmfSender_free)
|
| +(JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
|
| + reinterpret_cast<webrtc::DtmfSenderInterface*>(j_dtmf_sender_pointer)
|
| + ->Release();
|
| }
|
|
|
| } // namespace webrtc_jni
|
|
|