Index: webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc |
diff --git a/webrtc/sdk/android/src/jni/media_jni.cc b/webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc |
similarity index 28% |
rename from webrtc/sdk/android/src/jni/media_jni.cc |
rename to webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc |
index fdcdc0fcac7551917be83601e4e61ea6fee71468..849cdbbfb47e588419e542a10a27b74de3e5fef7 100644 |
--- a/webrtc/sdk/android/src/jni/media_jni.cc |
+++ b/webrtc/sdk/android/src/jni/pc/mediastreamtrack_jni.cc |
@@ -7,35 +7,40 @@ |
* 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/mediastreaminterface.h" |
+#include "webrtc/sdk/android/src/jni/jni_helpers.h" |
namespace webrtc_jni { |
-webrtc::CallFactoryInterface* CreateCallFactory() { |
- return webrtc::CreateCallFactory().release(); |
+JOW(void, MediaStreamTrack_free)(JNIEnv*, jclass, jlong j_p) { |
+ reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->Release(); |
} |
-webrtc::RtcEventLogFactoryInterface* CreateRtcEventLogFactory() { |
- return webrtc::CreateRtcEventLogFactory().release(); |
+JOW(jstring, MediaStreamTrack_nativeId)(JNIEnv* jni, jclass, jlong j_p) { |
+ return JavaStringFromStdString( |
+ jni, reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->id()); |
} |
-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, MediaStreamTrack_nativeKind)(JNIEnv* jni, jclass, jlong j_p) { |
+ return JavaStringFromStdString( |
+ jni, reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->kind()); |
+} |
+ |
+JOW(jboolean, MediaStreamTrack_nativeEnabled)(JNIEnv* jni, jclass, jlong j_p) { |
+ return reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->enabled(); |
+} |
+ |
+JOW(jobject, MediaStreamTrack_nativeState)(JNIEnv* jni, jclass, jlong j_p) { |
+ return JavaEnumFromIndexAndClassName( |
+ jni, "MediaStreamTrack$State", |
+ reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->state()); |
+} |
+ |
+JOW(jboolean, MediaStreamTrack_nativeSetEnabled) |
+(JNIEnv* jni, jclass, jlong j_p, jboolean enabled) { |
+ return reinterpret_cast<webrtc::MediaStreamTrackInterface*>(j_p)->set_enabled( |
+ enabled); |
} |
} // namespace webrtc_jni |