Merge pull request #62 from lynckia/master

Merge lynckia:master to development

Author: MinervaMachine

erizo/src/erizo/rtp/QualityManager.cpp

@@ -109,6 +109,11 @@ void QualityManager::calculateMaxActiveLayer() {
       break;
     }
   }
+  stats_->getNode()["qualityLayers"].insertStat("maxActiveSpatialLayer",
+      CumulativeStat{static_cast<uint64_t>(max_active_spatial_layer_)});
+  stats_->getNode()["qualityLayers"].insertStat("maxActiveTemporalLayer",
+      CumulativeStat{static_cast<uint64_t>(max_active_temporal_layer_)});
+
   max_active_spatial_layer_ = max_active_spatial_layer;
   max_active_temporal_layer_ = max_active_temporal_layer;
 }
@@ -134,6 +139,7 @@ bool QualityManager::isInMaxLayer() {
 
 void QualityManager::forceLayers(int spatial_layer, int temporal_layer) {
   forced_layers_ = true;
+  padding_enabled_ = false;
   spatial_layer_ = spatial_layer;
   temporal_layer_ = temporal_layer;
 }
@@ -142,11 +148,15 @@ void QualityManager::setSpatialLayer(int spatial_layer) {
   if (!forced_layers_) {
     spatial_layer_ = spatial_layer;
   }
+  stats_->getNode()["qualityLayers"].insertStat("selectedSpatialLayer",
+      CumulativeStat{static_cast<uint64_t>(spatial_layer_)});
 }
 void QualityManager::setTemporalLayer(int temporal_layer) {
   if (!forced_layers_) {
     temporal_layer_ = temporal_layer;
   }
+  stats_->getNode()["qualityLayers"].insertStat("selectedTemporalLayer",
+      CumulativeStat{static_cast<uint64_t>(temporal_layer_)});
 }
 
 }  // namespace erizo

erizo/src/erizo/rtp/RtpPaddingGeneratorHandler.cpp

@@ -24,7 +24,6 @@ RtpPaddingGeneratorHandler::RtpPaddingGeneratorHandler(std::shared_ptr<erizo::Cl
   last_rate_calculation_time_{clock_->now()}, started_at_{clock_->now()},
   enabled_{false}, first_packet_received_{false},
   marker_rate_{std::chrono::milliseconds(100), 20, 1., clock_},
-  padding_bitrate_{std::chrono::milliseconds(100), 10, 8., clock_},
   rtp_header_length_{12} {}
 
 
@@ -41,6 +40,8 @@ void RtpPaddingGeneratorHandler::notifyUpdate() {
     video_sink_ssrc_ = connection_->getVideoSinkSSRC();
     audio_source_ssrc_ = connection_->getAudioSinkSSRC();
     stats_ = pipeline->getService<Stats>();
+    stats_->getNode()["total"].insertStat("paddingBitrate",
+        MovingIntervalRateStat{std::chrono::milliseconds(100), 10, 8., clock_});
   }
 
   auto quality_manager = pipeline->getService<QualityManager>();
@@ -91,7 +92,7 @@ void RtpPaddingGeneratorHandler::sendPaddingPacket(std::shared_ptr<dataPacket> p
   RtpHeader *rtp_header = reinterpret_cast<RtpHeader*>(padding_packet->data);
 
   rtp_header->setSeqNumber(sequence_number.output);
-  padding_bitrate_ += padding_packet->length;
+  stats_->getNode()["total"]["paddingBitrate"] += padding_packet->length;
 
   getContext()->fireWrite(padding_packet);
 }
@@ -151,7 +152,7 @@ void RtpPaddingGeneratorHandler::recalculatePaddingRate() {
   last_rate_calculation_time_ = clock_->now();
 
   int64_t total_bitrate = getStat("bitrateCalculated");
-  int64_t padding_bitrate = padding_bitrate_.value();
+  int64_t padding_bitrate = stats_->getNode()["total"]["paddingBitrate"].value();
   int64_t media_bitrate = std::max(total_bitrate - padding_bitrate, int64_t(0));
 
   uint64_t target_bitrate = getTargetBitrate();

erizo/src/erizo/rtp/RtpPaddingGeneratorHandler.h

@@ -61,7 +61,6 @@ class RtpPaddingGeneratorHandler: public Handler {
   bool enabled_;
   bool first_packet_received_;
   MovingIntervalRateStat marker_rate_;
-  MovingIntervalRateStat padding_bitrate_;
   uint32_t rtp_header_length_;
 };
 

erizo/src/erizo/rtp/RtpRetransmissionHandler.cpp

@@ -21,6 +21,7 @@ void RtpRetransmissionHandler::notifyUpdate() {
   auto pipeline = getContext()->getPipelineShared();
   if (pipeline && !connection_) {
     connection_ = pipeline->getService<WebRtcConnection>().get();
+    stats_ = pipeline->getService<Stats>();
   }
 }
 
@@ -63,6 +64,12 @@ void RtpRetransmissionHandler::read(Context *ctx, std::shared_ptr<dataPacket> pa
             if (recovered.get()) {
               RtpHeader *recovered_head = reinterpret_cast<RtpHeader*> (recovered->data);
               if (recovered_head->getSeqNumber() == seq_num) {
+                if (!stats_->getNode()["total"].hasChild("rtxBitrate")) {
+                  stats_->getNode()["total"].insertStat("rtxBitrate",
+                      MovingIntervalRateStat{std::chrono::milliseconds(100),
+                      30, 8.});
+                }
+                stats_->getNode()["total"]["rtxBitrate"] += recovered->length;
                 getContext()->fireWrite(recovered);
                 continue;
               }

erizo/src/erizo/rtp/RtpRetransmissionHandler.h

@@ -35,6 +35,7 @@ class RtpRetransmissionHandler : public Handler {
   WebRtcConnection *connection_;
   std::vector<std::shared_ptr<dataPacket>> audio_;
   std::vector<std::shared_ptr<dataPacket>> video_;
+  std::shared_ptr<Stats> stats_;
 };
 }  // namespace erizo
 

erizo/src/test/rtp/QualityManagerTest.cpp

@@ -158,6 +158,7 @@ TEST_F(QualityManagerTest, shouldNotGoToHigherLayerInEarlierThanInterval) {
   const int kArbitrarySpatialLayer = 1;
   const int kArbitraryTemporalLayer = 1;
 
+  quality_manager->notifyQualityUpdate();
   quality_manager->setSpatialLayer(kBaseSpatialLayer);
   quality_manager->setTemporalLayer(kBaseTemporalLayer);
 
@@ -173,6 +174,7 @@ TEST_F(QualityManagerTest, shouldSwitchLayerImmediatelyWhenLayerIsGone) {
   const int kArbitrarySpatialLayer = 1;
   const int kArbitraryTemporalLayer = 1;
 
+  quality_manager->notifyQualityUpdate();
   quality_manager->setSpatialLayer(kArbitrarySpatialLayer);
   quality_manager->setTemporalLayer(kArbitraryTemporalLayer);
 
@@ -188,6 +190,7 @@ TEST_F(QualityManagerTest, shouldStickToForcedLayer) {
   const int kArbitrarySpatialLayer = 1;
   const int kArbitraryTemporalLayer = 1;
 
+  quality_manager->notifyQualityUpdate();
   quality_manager->forceLayers(kBaseSpatialLayer, kBaseTemporalLayer);
   quality_manager->setSpatialLayer(kArbitrarySpatialLayer);
   quality_manager->setSpatialLayer(kArbitraryTemporalLayer);

erizo_controller/erizoClient/src/Room.js

@@ -204,7 +204,7 @@ Erizo.Room = function (spec) {
 
 
             myStream.pc[arg.peerSocket].oniceconnectionstatechange = function (state) {
-                if (state === 'failed') {
+                if (state === 'failed' || state === 'disconnected') {
                     myStream.pc[arg.peerSocket].close();
                     delete myStream.pc[arg.peerSocket];
                 }

erizo_controller/erizoClient/src/webrtc-stacks/ChromeStableStack.js

@@ -487,6 +487,10 @@ Erizo.ChromeStableStack = function (spec) {
                 } else {
                     obj = JSON.parse(msg.candidate);
                 }
+                if (obj.candidate === 'end') {
+                    // ignore the end candidate for chrome
+                    return;
+                }
                 obj.candidate = obj.candidate.replace(/a=/g, '');
                 obj.sdpMLineIndex = parseInt(obj.sdpMLineIndex);
                 var candidate = new RTCIceCandidate(obj);

extras/basic_example/basicServer.js

@@ -49,32 +49,36 @@ app.use(function(req, res, next) {
 N.API.init(config.nuve.superserviceID, config.nuve.superserviceKey, 'http://localhost:3000/');
 
 var defaultRoom;
-var defaultRoomName = 'basicExampleRoom';
+const defaultRoomName = 'basicExampleRoom';
 
-var getOrCreateRoom = function (roomName, callback) {
+var getOrCreateRoom = function (name, type = 'erizo', callback) {
 
-    if (roomName === defaultRoomName && defaultRoom) {
+    if (name === defaultRoomName && defaultRoom) {
         callback(defaultRoom);
         return;
     }
 
     N.API.getRooms(function (roomlist){
         var theRoom = '';
         var rooms = JSON.parse(roomlist);
-        for (var room in rooms) {
-            if (rooms[room].name === roomName &&
-                rooms[room].data &&
-                rooms[room].data.basicExampleRoom){
+        for (var room of rooms) {
+            if (room.name === name &&
+                room.data &&
+                room.data.basicExampleRoom){
 
-                theRoom = rooms[room]._id;
+                theRoom = room._id;
                 callback(theRoom);
                 return;
             }
         }
-        N.API.createRoom(roomName, function (roomID) {
+
+        let extra = {data: {basicExampleRoom: true}};
+        if (type === 'p2p') extra.p2p = true;
+
+        N.API.createRoom(name, function (roomID) {
             theRoom = roomID._id;
             callback(theRoom);
-        }, function(){}, {data: {basicExampleRoom:true}});
+        }, function(){}, extra);
     });
 };
 
@@ -109,15 +113,16 @@ var deleteRoomsIfEmpty = function (theRooms, callback) {
 };
 
 var cleanExampleRooms = function (callback) {
+    console.log('Cleaning basic example rooms');
     N.API.getRooms(function (roomlist) {
         var rooms = JSON.parse(roomlist);
         var roomsToCheck = [];
-        for (var room in rooms){
-            if (rooms[room].data &&
-                rooms[room].data.basicExampleRoom &&
-                rooms[room].name !== defaultRoomName){
+        for (var room of rooms){
+            if (room.data &&
+                room.data.basicExampleRoom &&
+                room.name !== defaultRoomName){
 
-                roomsToCheck.push(rooms[room]);
+                roomsToCheck.push(room);
             }
         }
         deleteRoomsIfEmpty (roomsToCheck, function () {
@@ -142,21 +147,22 @@ app.get('/getUsers/:room', function(req, res) {
 
 
 app.post('/createToken/', function(req, res) {
-    console.log(req.body);
-    var room = defaultRoomName;
-    if (req.body.room && !isNaN(req.body.room)) {
-        room = req.body.room;
-    }
+    console.log('Creating token. Request body: ',req.body);
+    
+    let username = req.body.username;
+    let role = req.body.role;
+    
+    let room = defaultRoomName, type;
 
-    var username = req.body.username,
-    role = req.body.role;
+    if (req.body.room && !isNaN(req.body.room)) room = req.body.room;
+    if (req.body.type) type = req.body.type;
 
-    getOrCreateRoom(room, function (roomId) {
+    getOrCreateRoom(room, type, function (roomId) {
         N.API.createToken(roomId, username, role, function(token) {
-            console.log(token);
+            console.log('Token created', token);
             res.send(token);
         }, function(error) {
-            console.log(error);
+            console.log('Error creating token', error);
             res.status(401).send('No Erizo Controller found');
         });
     });
@@ -175,7 +181,7 @@ app.use(function(req, res, next) {
 });
 
 cleanExampleRooms(function() {
-    getOrCreateRoom(defaultRoomName, function (roomId) {
+    getOrCreateRoom(defaultRoomName, undefined, function (roomId) {
         defaultRoom = roomId;
         app.listen(3001);
         var server = https.createServer(options, app);

extras/basic_example/public/quality_layers.html

@@ -7,6 +7,5 @@
   </head>
 
   <body>
-    <div id="chart" style="width: calc(100% - 640px); height:700px; float:right;"></div>
   </body>
 </html>