Merge branch 'master' into quic-protocol

Author: taste1981

doc/servermd/AnalyticsGuide.md

@@ -172,10 +172,10 @@ Make sure face detection with cpu pipeline has been installed and model path has
 Check ````analytics_agent/plugin.cfg````， The pipeline ID for face detection with CPU is ````dc51138a8284436f873418a21ba8cfa9````, so on the page, in "pipelineID" input text, input the pipeline ID in "analytics id" 
 edit control, that is,  ````dc51138a8284436f873418a21ba8cfa9```` without any extra spaces, and press "startAnalytics" button. The stream you selected will be analyzed, with annotation on the faces in the stream.
 
-Note: If the sample cpu_pipeline analytics failed, please debug as following:
-a. Check sample cpu_pipeline is successfully compiled and generated libraries are copied to analytics_agent/lib folder
-b. Check ```modelpath``` in analytics_agent/plugin.cfg and make sure it is configured to the correct openmodel zoo model path.
-c. For sample cpu_pipeline, the failure is mostly caused by gvadetect and x264enc elements cannot be found, use ```gst-inspect-1.0 gvadetect``` and ```gst-inspect-1.0 x264enc``` to check if used GStreamer elements are successfully installed or configured. If x264enc element is not found, please make sure gstreamer1-plugins-ugly (for CentOS) and gstreamer1.0-plugins-ugly(for Ubuntu). If gvadetect element is not found, please make sure dlstreamer is successfully compiled. Check environment variable GST_PLUGIN_PATH and add x264 and gvadetect libraries to the GST_PLUGIN_PATH as:
+**Note:** If the sample cpu_pipeline analytics failed, please debug as following:  
+a. Check sample cpu_pipeline is successfully compiled and generated libraries are copied to ```analytics_agent/lib``` folder  
+b. Check ```modelpath``` in ```analytics_agent/plugin.cfg``` and make sure it is configured to the correct openmodel zoo model path.  
+c. For sample cpu_pipeline, the failure is mostly caused by gvadetect and x264enc elements cannot be found, use ```gst-inspect-1.0 gvadetect``` and ```gst-inspect-1.0 x264enc``` to check if used GStreamer elements are successfully installed or configured. If x264enc element is not found, please make sure ```gstreamer1-plugins-ugly``` (for CentOS) and ```gstreamer1.0-plugins-ugly``` (for Ubuntu). If gvadetect element is not found, please make sure dlstreamer is successfully compiled. Check environment variable ```GST_PLUGIN_PATH``` and add x264 and gvadetect libraries to the ```GST_PLUGIN_PATH``` as:  
 ````
 export GST_PLUGIN_PATH=${dl_streamer_lib_path}:/usr/lib/x86_64-linux-gnu/gstreamer-1.0:${GST_PLUGIN_PATH} #for ubuntu18.04
 export GST_PLUGIN_PATH=${dl_streamer_lib_path}:/usr/lib64/gstreamer-1.0::${GST_PLUGIN_PATH} #for centos7.6

doc/servermd/Server.md

@@ -82,7 +82,7 @@ If you want to set up video conference service with SVT-HEVC Encoder on Ubuntu 1
 
 If you want to set up video conference service powered by GPU-accelerated OWT server through Intel® Media SDK, please follow the below instructions to install server side SDK where the video-agents run.
 
-If you are working on the following platforms with the integrated graphics, please install Intel® Media SDK. The current release is fully tested on MediaSDK 2020 Q3(https://github.com/Intel-Media-SDK/MediaSDK/releases/tag/intel-mediasdk-20.3.0).
+If you are working on the following platforms with the integrated graphics, please install Intel® Media SDK. The current release is fully tested on MediaSDK 2020 Q2(https://github.com/Intel-Media-SDK/MediaSDK/releases/tag/intel-mediasdk-20.2.1).
 
  - Intel® Xeon® E3-1200 v4 Family with C226 chipset
  - Intel® Xeon® E3-1200 and E3-1500 v5 Family with C236 chipset

scripts/installWebrtc.sh

@@ -39,6 +39,8 @@ rtc_include_internal_audio_device=false
 use_sysroot=false
 is_clang=false
 treat_warnings_as_errors=false
+rtc_enable_libevent=false
+rtc_build_libevent=false
 is_debug=false
 
 END

scripts/patches/licode/0020-Remove-unused-includes-and-add-checks.patch

@@ -0,0 +1,219 @@
+From f02918e6b4ca54eafacb3da057bb519e62a1b8d1 Mon Sep 17 00:00:00 2001
+From: Chen Li1 <[email protected]>
+Date: Thu, 17 Dec 2020 14:21:31 +0800
+Subject: [PATCH] Remove unused includes and add checks
+
+---
+ erizo/src/erizo/DtlsTransport.cpp      | 30 ++++++++++++++----------------
+ erizo/src/erizo/MediaStream.cpp        | 10 ++++++----
+ erizo/src/erizo/WebRtcConnection.cpp   |  8 ++++----
+ erizo/src/erizo/dtls/DtlsClient.cpp    |  2 +-
+ erizo/src/erizo/rtp/QualityManager.cpp | 10 ++++++++++
+ erizo/src/erizo/thread/Scheduler.cpp   |  2 +-
+ erizo/src/erizo/thread/Worker.cpp      |  4 +++-
+ 7 files changed, 39 insertions(+), 27 deletions(-)
+
+diff --git a/erizo/src/erizo/DtlsTransport.cpp b/erizo/src/erizo/DtlsTransport.cpp
+index 8a6539e..6387ffe 100644
+--- a/erizo/src/erizo/DtlsTransport.cpp
++++ b/erizo/src/erizo/DtlsTransport.cpp
+@@ -49,22 +49,20 @@ void TimeoutChecker::scheduleCheck() {
+ 
+ void TimeoutChecker::scheduleNext() {
+   scheduled_task_ = transport_->getWorker()->scheduleFromNow([this]() {
+-      if (transport_->getTransportState() == TRANSPORT_READY) {
+-        return;
+-      }
+-      if (transport_ != nullptr) {
+-        if (max_checks_-- > 0) {
+-          ELOG_DEBUG("Handling dtls timeout, checks left: %d", max_checks_);
+-          if (socket_context_) {
+-            std::lock_guard<std::mutex> guard(dtls_mutex);
+-            socket_context_->handleTimeout();
+-          }
+-          scheduleNext();
+-        } else {
+-          ELOG_DEBUG("%s message: DTLS timeout", transport_->toLog());
+-          transport_->onHandshakeFailed(socket_context_, "Dtls Timeout on TimeoutChecker");
+-        }
++    if (!transport_ || transport_->getTransportState() == TRANSPORT_READY) {
++      return;
++    }
++    if (max_checks_-- > 0) {
++      ELOG_DEBUG("Handling dtls timeout, checks left: %d", max_checks_);
++      if (socket_context_) {
++        std::lock_guard<std::mutex> guard(dtls_mutex);
++        socket_context_->handleTimeout();
+       }
++      scheduleNext();
++    } else {
++      ELOG_DEBUG("%s message: DTLS timeout", transport_->toLog());
++      transport_->onHandshakeFailed(socket_context_, "Dtls Timeout on TimeoutChecker");
++    }
+   }, std::chrono::seconds(check_seconds_));
+ }
+ 
+@@ -261,7 +259,7 @@ void DtlsTransport::onDtlsPacket(DtlsSocketContext *ctx, const unsigned char* da
+   }
+ 
+   ELOG_DEBUG("%s message: Sending DTLS message, transportName: %s, componentId: %d",
+-             toLog(), transport_name.c_str(), packet->comp);
++             toLog(), transport_name.c_str(), packet ? packet->comp : 0);
+ }
+ 
+ void DtlsTransport::writeDtlsPacket(DtlsSocketContext *ctx, packetPtr packet) {
+diff --git a/erizo/src/erizo/MediaStream.cpp b/erizo/src/erizo/MediaStream.cpp
+index 00e046a..465caa4 100644
+--- a/erizo/src/erizo/MediaStream.cpp
++++ b/erizo/src/erizo/MediaStream.cpp
+@@ -18,7 +18,7 @@
+ #include "rtp/RtpHeaders.h"
+ #include "rtp/RtpVP8Parser.h"
+ #include "rtp/RtcpAggregator.h"
+-#include "rtp/RtcpForwarder.h"
++// #include "rtp/RtcpForwarder.h"
+ // #include "rtp/RtpSlideShowHandler.h"
+ // #include "rtp/RtpTrackMuteHandler.h"
+ // #include "rtp/BandwidthEstimationHandler.h"
+@@ -79,7 +79,7 @@ MediaStream::MediaStream(std::shared_ptr<Worker> worker,
+   audio_sink_ssrc_ = std::rand();
+   video_sink_ssrc_ = std::rand();
+ 
+-  rtcp_processor_ = std::make_shared<RtcpForwarder>(static_cast<MediaSink*>(this), static_cast<MediaSource*>(this));
++  rtcp_processor_ = nullptr;
+ 
+   should_send_feedback_ = true;
+   slide_show_mode_ = false;
+@@ -158,7 +158,7 @@ bool MediaStream::setRemoteSdp(std::shared_ptr<SdpInfo> sdp) {
+   remote_sdp_ =  std::make_shared<SdpInfo>(*sdp.get());
+   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);
++    // this->rtcp_processor_->setMaxVideoBW(remote_sdp_->videoBandwidth*1000);
+   }
+ 
+   auto video_ssrc_list_it = remote_sdp_->video_ssrc_map.find(getLabel());
+@@ -192,10 +192,12 @@ bool MediaStream::setRemoteSdp(std::shared_ptr<SdpInfo> sdp) {
+   audio_enabled_ = remote_sdp_->hasAudio;
+   video_enabled_ = remote_sdp_->hasVideo;
+ 
++  /*
+   rtcp_processor_->addSourceSsrc(getAudioSourceSSRC());
+   std::for_each(video_source_ssrc_list_.begin(), video_source_ssrc_list_.end(), [this] (uint32_t new_ssrc){
+       rtcp_processor_->addSourceSsrc(new_ssrc);
+   });
++  */
+ 
+   if (remote_sdp_->rids().size() > 1) {
+     simulcast_ = true;
+@@ -348,7 +350,7 @@ void MediaStream::initializePipeline() {
+   handler_manager_ = std::make_shared<HandlerManager>(shared_from_this());
+   pipeline_->addService(shared_from_this());
+   pipeline_->addService(handler_manager_);
+-  pipeline_->addService(rtcp_processor_);
++  // pipeline_->addService(rtcp_processor_);
+   pipeline_->addService(stats_);
+   pipeline_->addService(quality_manager_);
+   pipeline_->addService(packet_buffer_);
+diff --git a/erizo/src/erizo/WebRtcConnection.cpp b/erizo/src/erizo/WebRtcConnection.cpp
+index 5ff5156..b143811 100644
+--- a/erizo/src/erizo/WebRtcConnection.cpp
++++ b/erizo/src/erizo/WebRtcConnection.cpp
+@@ -16,14 +16,14 @@
+ // #include "bandwidth/MaxVideoBWDistributor.h"
+ // #include "bandwidth/TargetVideoBWDistributor.h"
+ #include "rtp/RtpHeaders.h"
+-#include "rtp/RtpVP8Parser.h"
+-#include "rtp/RtcpAggregator.h"
+-#include "rtp/RtcpForwarder.h"
++// #include "rtp/RtpVP8Parser.h"
++// #include "rtp/RtcpAggregator.h"
++// #include "rtp/RtcpForwarder.h"
+ // #include "rtp/RtpSlideShowHandler.h"
+ // #include "rtp/RtpTrackMuteHandler.h"
+ // #include "rtp/BandwidthEstimationHandler.h"
+ // #include "rtp/FecReceiverHandler.h"
+-#include "rtp/RtcpProcessorHandler.h"
++// #include "rtp/RtcpProcessorHandler.h"
+ // #include "rtp/RtpRetransmissionHandler.h"
+ // #include "rtp/RtcpFeedbackGenerationHandler.h"
+ // #include "rtp/RtpPaddingRemovalHandler.h"
+diff --git a/erizo/src/erizo/dtls/DtlsClient.cpp b/erizo/src/erizo/dtls/DtlsClient.cpp
+index e77bdd1..8bcc2d5 100644
+--- a/erizo/src/erizo/dtls/DtlsClient.cpp
++++ b/erizo/src/erizo/dtls/DtlsClient.cpp
+@@ -444,7 +444,7 @@ int createCert(const std::string& pAor, int expireDays, int keyLen, X509*& outCe
+           ELOG_DEBUG("SRTP Extension negotiated profile=%s", srtp_profile->name);
+         }
+ 
+-        if (receiver != NULL) {
++        if (receiver != NULL && srtp_profile) {
+           receiver->onHandshakeCompleted(this, clientKey, serverKey, srtp_profile->name);
+         }
+       } else {
+diff --git a/erizo/src/erizo/rtp/QualityManager.cpp b/erizo/src/erizo/rtp/QualityManager.cpp
+index 20fe2d2..60afdee 100644
+--- a/erizo/src/erizo/rtp/QualityManager.cpp
++++ b/erizo/src/erizo/rtp/QualityManager.cpp
+@@ -49,6 +49,10 @@ void QualityManager::notifyQualityUpdate() {
+     return;
+   }
+ 
++  if (!getContext()) {
++    return;
++  }
++
+   if (!initialized_) {
+     auto pipeline = getContext()->getPipelineShared();
+     if (!pipeline) {
+@@ -129,6 +133,9 @@ void QualityManager::selectLayer(bool try_higher_layers) {
+   if (!initialized_  || !stats_->getNode().hasChild("qualityLayers")) {
+     return;
+   }
++  if (!getContext() || !getContext()->getPipelineShared()) {
++    return;
++  }
+   stream_->setSimulcast(true);
+   last_quality_check_ = clock_->now();
+   int min_requested_spatial_layer =
+@@ -301,6 +308,9 @@ void QualityManager::setTemporalLayer(int temporal_layer) {
+ }
+ 
+ void QualityManager::setPadding(bool enabled) {
++  if (!getContext() || !getContext()->getPipelineShared()) {
++    return;
++  }
+   if (padding_enabled_ != enabled) {
+     padding_enabled_ = enabled;
+     HandlerManager *manager = getContext()->getPipelineShared()->getService<HandlerManager>().get();
+diff --git a/erizo/src/erizo/thread/Scheduler.cpp b/erizo/src/erizo/thread/Scheduler.cpp
+index a5fba22..f5e8adb 100644
+--- a/erizo/src/erizo/thread/Scheduler.cpp
++++ b/erizo/src/erizo/thread/Scheduler.cpp
+@@ -7,7 +7,7 @@
+ 
+ 
+ Scheduler::Scheduler(int n_threads_servicing_queue)
+-: n_threads_servicing_queue_(n_threads_servicing_queue), stop_requested_(false), stop_when_empty_(false) {
++  : task_queue_(), n_threads_servicing_queue_(n_threads_servicing_queue), stop_requested_(false), stop_when_empty_(false) {
+   stop_requested_ = false;
+   stop_when_empty_ = false;
+   for (int index = 0; index < n_threads_servicing_queue; index++) {
+diff --git a/erizo/src/erizo/thread/Worker.cpp b/erizo/src/erizo/thread/Worker.cpp
+index 5fc7983..25b3e56 100644
+--- a/erizo/src/erizo/thread/Worker.cpp
++++ b/erizo/src/erizo/thread/Worker.cpp
+@@ -141,7 +141,9 @@ std::shared_ptr<ScheduledTaskReference> SimulatedWorker::scheduleFromNow(Task f,
+ 
+ void SimulatedWorker::executeTasks() {
+   for (Task f : tasks_) {
+-    f();
++    if (f) {
++      f();
++    }
+   }
+   tasks_.clear();
+ }
+-- 
+2.7.4
+

source/agent/addons/quic/test/package-lock.json

@@ -0,0 +1,102 @@
+// Copyright (C) <2019> Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+'use strict';
+
+const { EventEmitter } = require('events');
+const MediaFrameMulticaster = require('../mediaFrameMulticaster/build/Release/mediaFrameMulticaster');
+const { AudioRanker } = require('../audioRanker/build/Release/audioRanker');
+
+const logger = require('../logger').logger;
+const log = logger.getLogger('ActiveAudioSelector');
+
+const DEFAULT_K = 3;
+const DETECT_MUTE = true;
+const CHANGE_INTERVAL = 200;
+
+class ActiveAudioSelector extends EventEmitter {
+
+    constructor(k) {
+        super();
+        k = (k > 0) ? k : DEFAULT_K;
+        // streamId : { owner, codec, conn }
+        this.inputs = new Map();
+        this.ranker = new AudioRanker(
+            this._onRankChange.bind(this), DETECT_MUTE, CHANGE_INTERVAL);
+        this.topK = [];
+        for (let i = 0; i < k; i++) {
+            let multicaster = new MediaFrameMulticaster();
+            this.topK.push(multicaster);
+            this.ranker.addOutput(this.topK[i]);
+        }
+        this.currentRank = Array(k).fill('');
+        log.debug('Init with K:', k);
+    }
+
+    _onRankChange(jsonChanges) {
+        log.debug('_onRankChange:', jsonChanges);
+        let changes = JSON.parse(jsonChanges);
+        // Get rank difference
+        if (changes.length !== this.currentRank.length) {
+            log.warn('Changes number not equal to K');
+            return;
+        }
+
+        let pendingAddIndexes = [];
+        for (let i = 0; i < this.currentRank.length; i++) {
+            if (this.currentRank[i] !== changes[i][0]) {
+                // Remove previous input
+                let streamId = this.currentRank[i];
+                if (this.inputs.has(streamId)) {
+                    let { owner, codec } = this.inputs.get(streamId);
+                    log.debug('Inactive input:', owner, streamId);
+                } else if (streamId !== '') {
+                    log.warn('Unknown stream ID', streamId);
+                }
+                pendingAddIndexes.push(i);
+            }
+        }
+        for (let i of pendingAddIndexes) {
+            // Re-add top K with updated owner/streamId/codec
+            let streamId = changes[i][0];
+            if (this.inputs.has(streamId)) {
+                let { owner, codec } = this.inputs.get(streamId);
+                log.debug('Active input:', owner, streamId, codec, i);
+                this.emit('source-change', i, owner, streamId, codec);
+            } else if (streamId !== '') {
+                log.warn('Unknown stream ID', streamId);
+            }
+        }
+        this.currentRank = changes.map(pair => pair[0]);
+    }
+
+    addInput(owner, streamId, codec, conn) {
+        log.debug('addInput:', owner, streamId, codec);
+        if (!this.inputs.has(streamId)) {
+            this.inputs.set(streamId, { owner, codec, conn });
+            this.ranker.addInput(conn, streamId, owner);
+            return true;
+        } else {
+            log.warn(`Duplicate addInput ${streamId}`);
+            return false;
+        }
+    }
+
+    removeInput(owner, streamId) {
+        log.debug('removeInput:', owner, streamId);
+        if (this.inputs.delete(streamId)) {
+            this.ranker.removeInput(streamId);
+        } else {
+            log.warn(`Remove non-add input ${streamId}`);
+        }
+    }
+
+    removeOutput() {}
+
+    getOutputs() {
+        return this.topK;
+    }
+}
+
+exports.ActiveAudioSelector = ActiveAudioSelector;