WIP: Wire up media streams

dom/media/PeerConnection.js

@@ -833,7 +833,7 @@ RTCPeerConnection.prototype = {
   _addIceCandidate: function(cand) {
     this._impl.addIceCandidate(cand.candidate, cand.sdpMid || "",
                                (cand.sdpMLineIndex === null) ? 0 :
-                                 cand.sdpMLineIndex + 1);
+                                 cand.sdpMLineIndex);
   },
 
   addStream: function(stream) {
@@ -1207,7 +1207,7 @@ PeerConnectionObserver.prototype = {
           {
               candidate: candidate,
               sdpMid: mid,
-              sdpMLineIndex: level - 1
+              sdpMLineIndex: level
           }
       ));
     }

media/mtransport/transportlayerice.cpp

@@ -84,11 +84,32 @@ namespace mozilla {
 
 MOZ_MTLOG_MODULE("mtransport")
 
+TransportLayerIce::TransportLayerIce(const std::string& name)
+    : name_(name), ctx_(nullptr), stream_(nullptr), component_(0) {}
+
 TransportLayerIce::TransportLayerIce(const std::string& name,
-    RefPtr<NrIceCtx> ctx, RefPtr<NrIceMediaStream> stream,
+                                     RefPtr<NrIceCtx> ctx, RefPtr<NrIceMediaStream> stream,
                                      int component)
     : name_(name), ctx_(ctx), stream_(stream), component_(component) {
-  target_ = ctx->thread();
+  PostSetup();
+}
+
+TransportLayerIce::~TransportLayerIce() {
+  // No need to do anything here, since we use smart pointers
+}
+
+void TransportLayerIce::SetParameters(RefPtr<NrIceCtx> ctx,
+                                 RefPtr<NrIceMediaStream> stream,
+                                 int component) {
+  ctx_ = ctx;
+  stream_ = stream;
+  component_ = component;
+
+  PostSetup();
+}
+
+void TransportLayerIce::PostSetup() {
+  target_ = ctx_->thread();
 
   stream_->SignalReady.connect(this, &TransportLayerIce::IceReady);
   stream_->SignalFailed.connect(this, &TransportLayerIce::IceFailed);
@@ -99,10 +120,6 @@ TransportLayerIce::TransportLayerIce(const std::string& name,
   }
 }
 
-TransportLayerIce::~TransportLayerIce() {
-  // No need to do anything here, since we use smart pointers
-}
-
 TransportResult TransportLayerIce::SendPacket(const unsigned char *data,
                                               size_t len) {
   CheckThread();

media/mtransport/transportlayerice.h

@@ -35,8 +35,14 @@ class TransportLayerIce : public TransportLayer {
                     RefPtr<NrIceCtx> ctx,
                     RefPtr<NrIceMediaStream> stream,
                     int component);
+  TransportLayerIce(const std::string& name);
+
   virtual ~TransportLayerIce();
 
+  void SetParameters(RefPtr<NrIceCtx> ctx,
+                                        RefPtr<NrIceMediaStream> stream,
+                                        int component);
+
   // Transport layer overrides.
   virtual TransportResult SendPacket(const unsigned char *data, size_t len);
 
@@ -51,6 +57,7 @@ class TransportLayerIce : public TransportLayer {
 
  private:
   DISALLOW_COPY_ASSIGN(TransportLayerIce);
+  void PostSetup();
 
   const std::string name_;
   RefPtr<NrIceCtx> ctx_;

media/webrtc/moz.build

@@ -65,6 +65,7 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
         'signaling/src/mediapipeline/MediaPipeline.cpp',
         'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
         'signaling/src/mediapipeline/SrtpFlow.cpp',
+        'signaling/src/peerconnection/MediaPipelineFactory.cpp',
         'signaling/src/peerconnection/MediaStreamList.cpp',
         'signaling/src/peerconnection/PeerConnectionCtx.cpp',
         'signaling/src/peerconnection/PeerConnectionImpl.cpp',

media/webrtc/signaling/signaling.gyp

@@ -101,6 +101,8 @@
         './src/common/time_profiling/timecard.c',
         './src/common/time_profiling/timecard.h',
         # PeerConnection
+        './src/peerconnection/MediaPipelineFactory.cpp',
+        './src/peerconnection/MediaPipelineFactory.h',
         './src/peerconnection/MediaStreamList.cpp',
         './src/peerconnection/MediaStreamList.h',
         './src/peerconnection/PeerConnectionCtx.cpp',

media/webrtc/signaling/src/jsep/JsepCodecDescription.h

@@ -5,29 +5,33 @@
 #ifndef _JSEPCODECDESCRIPTION_H_
 #define _JSEPCODECDESCRIPTION_H_
 
+#include <iostream>
 #include <string>
 #include "signaling/src/sdp/SdpMediaSection.h"
 
 namespace mozilla {
 namespace jsep {
 
+#define JSEP_CODEC_CLONE(T) \
+  virtual JsepCodecDescription* clone() { return new T(*this); }
+
 // A single entry in our list of known codecs.
 struct JsepCodecDescription {
   JsepCodecDescription(mozilla::SdpMediaSection::MediaType type,
                        uint8_t default_pt,
                        const std::string& name,
                        uint32_t clock,
                        uint32_t channels,
-                       bool enabled = true) :
+                       bool enabled) :
       mType(type),
       mDefaultPt(default_pt),
       mName(name),
       mClock(clock),
       mChannels(channels),
       mEnabled(enabled) {}
+  virtual ~JsepCodecDescription() {}
 
-  // These should be const except for enabled, but then
-  // I can't assign, which is sad.
+  virtual JsepCodecDescription* clone() = 0;
 
   mozilla::SdpMediaSection::MediaType mType;
   uint8_t mDefaultPt;
@@ -37,6 +41,42 @@ struct JsepCodecDescription {
   bool mEnabled;
 };
 
+
+struct JsepAudioCodecDescription : public JsepCodecDescription {
+  JsepAudioCodecDescription(uint8_t default_pt,
+                            const std::string& name,
+                            uint32_t clock,
+                            uint32_t channels,
+                            uint32_t packet_size = 0, // TODO([email protected]): Remove when I have reasonable defaults.
+                            uint32_t bit_rate = 0,
+                            bool enabled = true) :
+      JsepCodecDescription(mozilla::SdpMediaSection::kAudio,
+                           default_pt, name, clock, channels, enabled),
+      mPacketSize(packet_size),
+      mBitrate(bit_rate) {}
+
+  JSEP_CODEC_CLONE(JsepAudioCodecDescription)
+
+  uint32_t mPacketSize;
+  uint32_t mBitrate;
+};
+
+
+struct JsepVideoCodecDescription : public JsepCodecDescription {
+  JsepVideoCodecDescription(uint8_t default_pt,
+                            const std::string& name,
+                            uint32_t clock,
+                            bool enabled = true) :
+      JsepCodecDescription(mozilla::SdpMediaSection::kVideo,
+                           default_pt, name, clock, 0, enabled) {}
+
+  JSEP_CODEC_CLONE(JsepVideoCodecDescription)
+
+  uint32_t mFbTypes;
+  uint32_t mMaxFs;
+  uint32_t mMaxFr;  // TODO([email protected]): Update for H.264
+};
+
 }  // namespace jsep
 }  // namespace mozilla
 

media/webrtc/signaling/src/jsep/JsepSession.h

@@ -88,6 +88,7 @@ class JsepSession {
   virtual nsresult AddIceCandidate(const std::string& candidate,
                                    const std::string& mid,
                                    uint16_t level) = 0;
+  virtual nsresult Close() = 0;
 
   // ICE controlling or controlled
   virtual bool ice_controlling() const = 0;