Add PeerConnectionObserver#onRemoveTrack to android sdk

webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
 #define WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
 
+#include <webrtc/pc/mediastreamobserver.h>
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h"
 
 namespace webrtc_jni {
 
 // Adapter between the C++ PeerConnectionObserver interface and the Java
 // PeerConnection.Observer interface.  Wraps an instance of the Java interface
 // and dispatches C++ callbacks to Java.
-class PeerConnectionObserverJni : public webrtc::PeerConnectionObserver {
+class PeerConnectionObserverJni : public webrtc::PeerConnectionObserver,
+                                  public sigslot::has_slots<> {
  public:
   PeerConnectionObserverJni(JNIEnv* jni, jobject j_observer);
   virtual ~PeerConnectionObserverJni();
 
   // Implementation of PeerConnectionObserver interface, which propagates
   // the callbacks to the Java observer.
   void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
   void OnIceCandidatesRemoved(
       const std::vector<cricket::Candidate>& candidates) override;
   void OnSignalingChange(
@@ skipping 16 matching lines @@
           streams) override;
 
   void SetConstraints(MediaConstraintsJni* constraints);
   const MediaConstraintsJni* constraints() { return constraints_.get(); }
 
  private:
   typedef std::map<webrtc::MediaStreamInterface*, jobject>
       NativeToJavaStreamsMap;
   typedef std::map<webrtc::RtpReceiverInterface*, jobject>
       NativeToJavaRtpReceiverMap;
+  typedef std::map<webrtc::MediaStreamTrackInterface*, jobject>
+      NativeToJavaMediaTrackMap;
+  typedef std::map<webrtc::MediaStreamTrackInterface*,
+                   webrtc::RtpReceiverInterface*>
+      NativeMediaStreamTrackToNativeRtpReceiver;
 
   void DisposeRemoteStream(const NativeToJavaStreamsMap::iterator& it);
   void DisposeRtpReceiver(const NativeToJavaRtpReceiverMap::iterator& it);
+  void DisposeRemoteTrack(const NativeToJavaMediaTrackMap::iterator& it);
 
   // If the NativeToJavaStreamsMap contains the stream, return it.
   // Otherwise, create a new Java MediaStream.
   jobject GetOrCreateJavaStream(
       const rtc::scoped_refptr<webrtc::MediaStreamInterface>& stream);
 
   // Converts array of streams, creating or re-using Java streams as necessary.
   jobjectArray NativeToJavaMediaStreamArray(
       JNIEnv* jni,
       const std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>>&
           streams);
 
+  void OnAudioTrackAdded(webrtc::AudioTrackInterface* track,
+                         webrtc::MediaStreamInterface* stream);
+  void OnVideoTrackAdded(webrtc::VideoTrackInterface* track,
+                         webrtc::MediaStreamInterface* stream);
+  void OnAudioTrackRemoved(webrtc::AudioTrackInterface* track,
+                           webrtc::MediaStreamInterface* stream);
+  void OnVideoTrackRemoved(webrtc::VideoTrackInterface* track,
+                           webrtc::MediaStreamInterface* stream);
+
   const ScopedGlobalRef<jobject> j_observer_global_;
   const ScopedGlobalRef<jclass> j_observer_class_;
   const ScopedGlobalRef<jclass> j_media_stream_class_;
   const jmethodID j_media_stream_ctor_;
   const ScopedGlobalRef<jclass> j_audio_track_class_;
   const jmethodID j_audio_track_ctor_;
   const ScopedGlobalRef<jclass> j_video_track_class_;
   const jmethodID j_video_track_ctor_;
   const ScopedGlobalRef<jclass> j_data_channel_class_;
   const jmethodID j_data_channel_ctor_;
   const ScopedGlobalRef<jclass> j_rtp_receiver_class_;
   const jmethodID j_rtp_receiver_ctor_;
+
   // C++ -> Java remote streams. The stored jobects are global refs and must be
   // manually deleted upon removal. Use DisposeRemoteStream().
   NativeToJavaStreamsMap remote_streams_;
+  std::unique_ptr<MediaConstraintsJni> constraints_;
   NativeToJavaRtpReceiverMap rtp_receivers_;
-  std::unique_ptr<MediaConstraintsJni> constraints_;
+  NativeMediaStreamTrackToNativeRtpReceiver track_to_receiver_;
+  std::vector<std::unique_ptr<webrtc::MediaStreamObserver>> stream_observers_;
+  NativeToJavaMediaTrackMap remote_tracks_;
 };
 
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_