Relanding: Break peerconnection_jni.cc into multiple files, in "pc" directory.

webrtc/sdk/android/src/jni/pc/mediastream_jni.cc

Index: webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
diff --git a/webrtc/sdk/android/src/jni/media_jni.cc b/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
similarity index 23%
copy from webrtc/sdk/android/src/jni/media_jni.cc
copy to webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
index fdcdc0fcac7551917be83601e4e61ea6fee71468..b80f4e3fbd3daa4f08f8d11c1b8a596bc71cec3d 100644
--- a/webrtc/sdk/android/src/jni/media_jni.cc
+++ b/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc
@@ -7,35 +7,43 @@
  *  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(jboolean, MediaStream_nativeAddAudioTrack)
+(JNIEnv* jni, jclass, jlong pointer, jlong j_audio_track_pointer) {
+  return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->AddTrack(
+      reinterpret_cast<webrtc::AudioTrackInterface*>(j_audio_track_pointer));
 }
 
-webrtc::RtcEventLogFactoryInterface* CreateRtcEventLogFactory() {
-  return webrtc::CreateRtcEventLogFactory().release();
+JOW(jboolean, MediaStream_nativeAddVideoTrack)
+(JNIEnv* jni, jclass, jlong pointer, jlong j_video_track_pointer) {
+  return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->AddTrack(
+      reinterpret_cast<webrtc::VideoTrackInterface*>(j_video_track_pointer));
 }
 
-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(jboolean, MediaStream_nativeRemoveAudioTrack)
+(JNIEnv* jni, jclass, jlong pointer, jlong j_audio_track_pointer) {
+  return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->RemoveTrack(
+      reinterpret_cast<webrtc::AudioTrackInterface*>(j_audio_track_pointer));
+}
+
+JOW(jboolean, MediaStream_nativeRemoveVideoTrack)
+(JNIEnv* jni, jclass, jlong pointer, jlong j_video_track_pointer) {
+  return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->RemoveTrack(
+      reinterpret_cast<webrtc::VideoTrackInterface*>(j_video_track_pointer));
+}
+
+JOW(jstring, MediaStream_nativeLabel)(JNIEnv* jni, jclass, jlong j_p) {
+  return JavaStringFromStdString(
+      jni, reinterpret_cast<webrtc::MediaStreamInterface*>(j_p)->label());
+}
+
+JOW(void, MediaStream_free)(JNIEnv*, jclass, jlong j_p) {
+  CHECK_RELEASE(reinterpret_cast<webrtc::MediaStreamInterface*>(j_p));
 }
 
 }  // namespace webrtc_jni