Fix SDP negotiation for resubscriptions (lynckia#1423)

Dockerfile

@@ -9,7 +9,7 @@ RUN  apt-get update && apt-get install -y git wget curl
 
 COPY .nvmrc package.json /opt/licode/
 
-COPY scripts/installUbuntuDeps.sh scripts/checkNvm.sh /opt/licode/scripts/
+COPY scripts/installUbuntuDeps.sh scripts/checkNvm.sh scripts/libnice-014.patch0 /opt/licode/scripts/
 
 WORKDIR /opt/licode/scripts
 

erizo/conanfile.txt

@@ -0,0 +1,12 @@
+[requires]
+boost/1.69.0@conan/stable
+IncludePathsGenerator/0.1@lynckia/includes
+
+[generators]
+cmake
+cmake_find_package
+cmake_paths
+IncludePathsGenerator
+
+[options]
+

erizo/src/CMakeLists.txt

@@ -60,13 +60,22 @@ set(THIRD_PARTY_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../../build/libdeps/build/lib/"
 
 ## Depencencies
 
+# Add /usr/local/include
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  include_directories("/usr/local/include")
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
 # GLIB
 find_package(Glib REQUIRED)
 include_directories(${GLIB_INCLUDE_DIRS})
 
 # BOOST
+include(${CMAKE_CURRENT_SOURCE_DIR}/../conan_paths.cmake)
 set (BOOST_LIBS thread regex system)
-find_package(Boost COMPONENTS ${BOOST_LIBS} REQUIRED)
+find_package(boost)
+include_directories(${boost_INCLUDE_DIRS})
+
+set(ERIZO_CMAKE_CXX_FLAGS "${ERIZO_CMAKE_CXX_FLAGS} -DBOOST_THREAD_PROVIDES_FUTURE -DBOOST_THREAD_PROVIDES_FUTURE_CONTINUATION -DBOOST_THREAD_PROVIDES_FUTURE_WHEN_ALL_WHEN_ANY")
 
 # GTHREAD
 find_library(GTHREAD gthread-2.0 HINTS "${THIRD_PARTY_LIB}")

erizo/src/erizo/CMakeLists.txt

@@ -24,4 +24,4 @@ add_library(erizo SHARED ${ERIZO_SOURCES})
 
 #message("Libs ${SRTP} ${NICE} ${GTHREAD} ${SSL} ${CRYPTO} ${LIBS} ${LOG}")
 
-target_link_libraries(erizo ${GLIB_LIBRARIES} ${Boost_LIBRARIES} ${SRTP} ${NICE} ${GTHREAD} ${SSL} ${CRYPTO} ${LIBS} ${LOG} webrtc nicer nrappkit)
+target_link_libraries(erizo ${GLIB_LIBRARIES} ${boost_LIBRARIES} ${SRTP} ${NICE} ${GTHREAD} ${SSL} ${CRYPTO} ${LIBS} ${LOG} webrtc nicer nrappkit)

erizo/src/erizo/MediaStream.cpp

@@ -91,6 +91,7 @@ MediaStream::MediaStream(std::shared_ptr<Worker> worker,
 
   rate_control_ = 0;
   sending_ = true;
+  ready_ = false;
 }
 
 MediaStream::~MediaStream() {
@@ -125,6 +126,7 @@ void MediaStream::syncClose() {
     return;
   }
   sending_ = false;
+  ready_ = false;
   video_sink_ = nullptr;
   audio_sink_ = nullptr;
   fb_sink_ = nullptr;
@@ -142,7 +144,10 @@ void MediaStream::close() {
   });
 }
 
-bool MediaStream::init() {
+bool MediaStream::init(bool doNotWaitForRemoteSdp) {
+  if (doNotWaitForRemoteSdp) {
+    ready_ = true;
+  }
   return true;
 }
 
@@ -155,28 +160,48 @@ bool MediaStream::isSinkSSRC(uint32_t ssrc) {
 }
 
 bool MediaStream::setRemoteSdp(std::shared_ptr<SdpInfo> sdp) {
-  ELOG_DEBUG("%s message: setting remote SDP", toLog());
+  ELOG_DEBUG("%s message: setting remote SDP to Stream, sending: %d, initialized: %d",
+    toLog(), sending_, pipeline_initialized_);
   if (!sending_) {
     return true;
   }
-  remote_sdp_ =  std::make_shared<SdpInfo>(*sdp.get());
+
+  std::shared_ptr<SdpInfo> remote_sdp = std::make_shared<SdpInfo>(*sdp.get());
+  auto video_ssrc_list_it = remote_sdp->video_ssrc_map.find(getLabel());
+  auto audio_ssrc_it = remote_sdp->audio_ssrc_map.find(getLabel());
+
+  if (isPublisher() && !ready_) {
+    bool stream_found = false;
+
+    if (video_ssrc_list_it != remote_sdp->video_ssrc_map.end() ||
+        audio_ssrc_it != remote_sdp->audio_ssrc_map.end()) {
+      stream_found = true;
+    }
+
+    if (!stream_found) {
+      return true;
+    }
+  }
+
+  remote_sdp_ = remote_sdp;
+
   if (remote_sdp_->videoBandwidth != 0) {
     ELOG_DEBUG("%s message: Setting remote BW, maxVideoBW: %u", toLog(), remote_sdp_->videoBandwidth);
     this->rtcp_processor_->setMaxVideoBW(remote_sdp_->videoBandwidth*1000);
   }
 
+  ready_ = true;
+
   if (pipeline_initialized_ && pipeline_) {
     pipeline_->notifyUpdate();
     return true;
   }
 
   bundle_ = remote_sdp_->isBundle;
-  auto video_ssrc_list_it = remote_sdp_->video_ssrc_map.find(getLabel());
   if (video_ssrc_list_it != remote_sdp_->video_ssrc_map.end()) {
     setVideoSourceSSRCList(video_ssrc_list_it->second);
   }
 
-  auto audio_ssrc_it = remote_sdp_->audio_ssrc_map.find(getLabel());
   if (audio_ssrc_it != remote_sdp_->audio_ssrc_map.end()) {
     setAudioSourceSSRC(audio_ssrc_it->second);
   }
@@ -204,6 +229,8 @@ bool MediaStream::setRemoteSdp(std::shared_ptr<SdpInfo> sdp) {
 
   initializeStats();
 
+  notifyMediaStreamEvent("ready", "");
+
   return true;
 }
 
@@ -347,6 +374,9 @@ void MediaStream::printStats() {
 }
 
 void MediaStream::initializePipeline() {
+  if (pipeline_initialized_) {
+    return;
+  }
   handler_manager_ = std::make_shared<HandlerManager>(shared_from_this());
   pipeline_->addService(shared_from_this());
   pipeline_->addService(handler_manager_);
@@ -841,13 +871,16 @@ void MediaStream::notifyUpdateToHandlers() {
   });
 }
 
-void MediaStream::asyncTask(std::function<void(std::shared_ptr<MediaStream>)> f) {
+boost::future<void> MediaStream::asyncTask(std::function<void(std::shared_ptr<MediaStream>)> f) {
+  auto task_promise = std::make_shared<boost::promise<void>>();
   std::weak_ptr<MediaStream> weak_this = shared_from_this();
-  worker_->task([weak_this, f] {
+  worker_->task([weak_this, f, task_promise] {
     if (auto this_ptr = weak_this.lock()) {
       f(this_ptr);
     }
+    task_promise->set_value();
   });
+  return task_promise->get_future();
 }
 
 void MediaStream::sendPacket(std::shared_ptr<DataPacket> p) {

erizo/src/erizo/MediaStream.h

@@ -3,6 +3,7 @@
 #define ERIZO_SRC_ERIZO_MEDIASTREAM_H_
 
 #include <boost/thread/mutex.hpp>
+#include <boost/thread/future.hpp>
 
 #include <atomic>
 #include <string>
@@ -68,7 +69,7 @@ class MediaStream: public MediaSink, public MediaSource, public FeedbackSink,
    * Destructor.
    */
   virtual ~MediaStream();
-  bool init();
+  bool init(bool doNotWaitForRemoteSdp);
   void close() override;
   virtual uint32_t getMaxVideoBW();
   virtual uint32_t getBitrateFromMaxQualityLayer() { return bitrate_from_max_quality_layer_; }
@@ -128,7 +129,8 @@ class MediaStream: public MediaSink, public MediaSource, public FeedbackSink,
 
   void notifyToEventSink(MediaEventPtr event);
 
-  void asyncTask(std::function<void(std::shared_ptr<MediaStream>)> f);
+
+  boost::future<void> asyncTask(std::function<void(std::shared_ptr<MediaStream>)> f);
 
   void initializeStats();
   void printStats();
@@ -156,6 +158,7 @@ class MediaStream: public MediaSink, public MediaSource, public FeedbackSink,
 
   bool isPipelineInitialized() { return pipeline_initialized_; }
   bool isRunning() { return pipeline_initialized_ && sending_; }
+  bool isReady() { return ready_; }
   Pipeline::Ptr getPipeline() { return pipeline_; }
   bool isPublisher() { return is_publisher_; }
   void setBitrateFromMaxQualityLayer(uint64_t bitrate) { bitrate_from_max_quality_layer_ = bitrate; }
@@ -188,6 +191,7 @@ class MediaStream: public MediaSink, public MediaSource, public FeedbackSink,
   bool should_send_feedback_;
   bool slide_show_mode_;
   bool sending_;
+  bool ready_;
   int bundle_;
 
   uint32_t rate_control_;  // Target bitrate for hacky rate control in BPS

erizo/src/erizo/NicerConnection.cpp

@@ -162,6 +162,9 @@ void NicerConnection::async(function<void(std::shared_ptr<NicerConnection>)> f)
 }
 
 void NicerConnection::start() {
+  ufrag_ = getNewUfrag();
+  upass_ = getNewPwd();
+
   async([] (std::shared_ptr<NicerConnection> this_ptr) {
     this_ptr->startSync();
   });
@@ -170,8 +173,6 @@ void NicerConnection::start() {
 void NicerConnection::startSync() {
   UINT4 flags = NR_ICE_CTX_FLAGS_AGGRESSIVE_NOMINATION;
 
-  ufrag_ = getNewUfrag();
-  upass_ = getNewPwd();
   if (ufrag_.empty() || upass_.empty()) {
     start_promise_.set_value();
     return;

erizo/src/erizo/SdpInfo.cpp

@@ -54,6 +54,7 @@ namespace erizo {
     isRtcpMux = false;
     isFingerprint = false;
     dtlsRole = ACTPASS;
+    internal_dtls_role = ACTPASS;
     hasAudio = false;
     hasVideo = false;
     profile = SAVPF;
@@ -472,8 +473,12 @@ namespace erizo {
 
   // TODO(pedro): Should provide hints
   void SdpInfo::createOfferSdp(bool videoEnabled, bool audioEnabled, bool bundle) {
-    ELOG_DEBUG("Creating offerSDP: video %d, audio %d, bundle %d", videoEnabled, audioEnabled, bundle);
-    this->payloadVector = internalPayloadVector_;
+    ELOG_DEBUG("Creating offerSDP: video %d, audio %d, bundle %d, payloadVector: %d, extSize: %d",
+      videoEnabled, audioEnabled, bundle, payloadVector.size(), extMapVector.size());
+    if (payloadVector.size() == 0) {
+      payloadVector = internalPayloadVector_;
+    }
+
     this->isBundle = bundle;
     this->profile = SAVPF;
     this->isRtcpMux = true;
@@ -482,8 +487,8 @@ namespace erizo {
     if (audioEnabled)
       this->audioSdpMLine = 0;
 
-    for (unsigned int it = 0; it < internalPayloadVector_.size(); it++) {
-      RtpMap& rtp = internalPayloadVector_[it];
+    for (unsigned int it = 0; it < payloadVector.size(); it++) {
+      RtpMap& rtp = payloadVector[it];
       if (rtp.media_type == VIDEO_TYPE) {
         videoCodecs++;
       } else if (rtp.media_type == AUDIO_TYPE) {
@@ -498,6 +503,17 @@ namespace erizo {
     ELOG_DEBUG("Setting Offer SDP");
   }
 
+  void SdpInfo::copyInfoFromSdp(std::shared_ptr<SdpInfo> offerSdp) {
+    payloadVector = offerSdp->payloadVector;
+    videoCodecs = offerSdp->videoCodecs;
+    audioCodecs = offerSdp->audioCodecs;
+    inOutPTMap = offerSdp->inOutPTMap;
+    outInPTMap = offerSdp->outInPTMap;
+    extMapVector = offerSdp->extMapVector;
+    ELOG_DEBUG("Offer SDP successfully copied, extSize: %d, payloadSize: %d, videoCodecs: %d, audioCodecs: %d",
+      extMapVector.size(), payloadVector.size(), videoCodecs, audioCodecs);
+  }
+
   void SdpInfo::setOfferSdp(std::shared_ptr<SdpInfo> offerSdp) {
     this->videoCodecs = offerSdp->videoCodecs;
     this->audioCodecs = offerSdp->audioCodecs;

erizo/src/erizo/SdpInfo.h

@@ -238,6 +238,8 @@ class SdpInfo {
   bool supportPayloadType(const unsigned int payloadType);
 
   void createOfferSdp(bool videoEnabled, bool audioEnabled, bool bundle);
+
+  void copyInfoFromSdp(std::shared_ptr<SdpInfo> offerSdp);
   /**
    * @brief copies relevant information from the offer sdp for which this will be an answer sdp
    * @param offerSdp The offer SDP as received via signaling and parsed
@@ -295,6 +297,10 @@ class SdpInfo {
   */
   DtlsRole dtlsRole;
   /**
+  * Internal DTLS Role
+  */
+  DtlsRole internal_dtls_role;
+  /**
   * Mapping from internal PT (key) to external PT (value)
   */
   std::map<unsigned int, unsigned int> inOutPTMap;