setMaxResolution for adaptive video

LICENSE

@@ -1,4 +1,4 @@
-                                 Apache License
+                                 Apache License!!!
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 

README.md

@@ -1,4 +1,6 @@
-## Open WebRTC Toolkit Media Server
+## Open WebRTC Toolkit Media Server!!!@@@
+
+remove
 
 The media server for OWT provides an efficient video conference and streaming service that is based on WebRTC. It scales a single WebRTC stream out to many endpoints. At the same time, it enables media analytics capabilities for media streams. It features:
 

scripts/release/daemon-bin.sh

@@ -219,6 +219,14 @@ case $startStop in
     fi
     ;;
 
+  (restart)
+     echo restarting $command
+
+     ${0} stop $command
+     ${0} start $command
+     ;;
+
+
   (status)
     if [ -f $pid ]; then
       if ps -p `cat $pid` > /dev/null 2>&1; then

source/agent/video/videoTranscoder/VideoFrameTranscoder.h

@@ -39,6 +39,7 @@ class VideoFrameTranscoder {
     virtual void removeOutput(int output) = 0;
 
     virtual void requestKeyFrame(int output) = 0;
+    virtual void setMaxResolution(int output, int width, int height) = 0;
 #ifndef BUILD_FOR_ANALYTICS
     virtual void drawText(const std::string& textSpec) = 0;
     virtual void clearText() = 0;

source/agent/video/videoTranscoder/VideoFrameTranscoderImpl.h

@@ -66,6 +66,7 @@ class VideoFrameTranscoderImpl : public VideoFrameTranscoder, public owt_base::F
     void removeOutput(int output);
 
     void requestKeyFrame(int output);
+    void setMaxResolution(int output, int width, int height);
 #ifndef BUILD_FOR_ANALYTICS
     void drawText(const std::string& textSpec);
     void clearText();
@@ -283,6 +284,15 @@ inline void VideoFrameTranscoderImpl::requestKeyFrame(int output)
     if (it != m_outputs.end())
         it->second.encoder->requestKeyFrame(it->second.streamId);
 }
+
+inline void VideoFrameTranscoderImpl::setMaxResolution(int output, int width, int height)
+{
+    boost::shared_lock<boost::shared_mutex> lock(m_outputMutex);
+    auto it = m_outputs.find(output);
+    if (it != m_outputs.end())
+        it->second.encoder->setMaxResolution(it->second.streamId, width, height);
+}
+
 
 #ifndef BUILD_FOR_ANALYTICS
 inline void VideoFrameTranscoderImpl::drawText(const std::string& textSpec)

source/agent/video/videoTranscoder/VideoTranscoder.cpp

@@ -194,6 +194,23 @@ void VideoTranscoder::forceKeyFrame(const std::string& outStreamID)
         m_frameTranscoder->requestKeyFrame(index);
     }
 }
+
+void VideoTranscoder::setMaxResolution(const std::string& outStreamID, int width, int height)
+{
+
+    int32_t index = -1;
+    boost::shared_lock<boost::shared_mutex> lock(m_outputsMutex);
+    auto it = m_outputs.find(outStreamID);
+    if (it != m_outputs.end()) {
+        index = it->second;
+    }
+    lock.unlock();
+
+    if (index != -1) {
+        m_frameTranscoder->setMaxResolution(index, width, height);
+    }
+}    
+
 #ifndef BUILD_FOR_ANALYTICS
 void VideoTranscoder::drawText(const std::string& textSpec)
 {

source/agent/video/videoTranscoder/VideoTranscoder.h

@@ -53,6 +53,7 @@ class VideoTranscoder {
 #endif
     void removeOutput(const std::string& outStreamID);
     void forceKeyFrame(const std::string& outStreamID);
+    void setMaxResolution(const std::string& outStreamID, int width, int height);
 #ifndef BUILD_FOR_ANALYTICS
     void drawText(const std::string& textSpec);
     void clearText();

source/agent/video/videoTranscoder/VideoTranscoderWrapper.cpp

@@ -176,6 +176,26 @@ void VideoTranscoder::forceKeyFrame(const v8::FunctionCallbackInfo<v8::Value>& a
   me->forceKeyFrame(outStreamID);
 }
 
+void VideoTranscoder::setMaxResolution(const v8::FunctionCallbackInfo<v8::Value>& args){
+
+  Isolate* isolate = Isolate::GetCurrent();
+  HandleScope scope(isolate);
+
+  VideoTranscoder* obj = ObjectWrap::Unwrap<VideoTranscoder>(args.Holder());
+  mcu::VideoTranscoder* me = obj->me;
+
+  String::Utf8Value param0(args[0]->ToString());
+  String::Utf8Value param1(args[1]->ToString());
+  String::Utf8Value param2(args[2]->ToString());
+
+  std::string outStreamID = std::string(*param0);
+  int width = std::stoi(std::string(*param1));
+  int height = std::stoi(std::string(*param2));
+
+  me->setMaxResolution(outStreamID, width, height);
+}
+
+
 #ifndef BUILD_FOR_ANALYTICS
 void VideoTranscoder::drawText(const v8::FunctionCallbackInfo<v8::Value>& args) {
   Isolate* isolate = Isolate::GetCurrent();

source/agent/video/videoTranscoder/VideoTranscoderWrapper.h

@@ -33,6 +33,7 @@ class VideoTranscoder : public node::ObjectWrap {
   static void addOutput(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void removeOutput(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void forceKeyFrame(const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void setMaxResolution(const v8::FunctionCallbackInfo<v8::Value>& args);
 #ifndef BUILD_FOR_ANLAYTICS
   static void drawText(const v8::FunctionCallbackInfo<v8::Value>& args);
   static void clearText(const v8::FunctionCallbackInfo<v8::Value>& args);

source/core/owt_base/AVStreamOut.cpp

@@ -163,6 +163,7 @@ void AVStreamOut::onFrame(const owt_base::Frame& frame)
         }
 
         if (!m_videoSourceChanged
+                && frame.additionalInfo.video.width != 0
                 && (m_width != frame.additionalInfo.video.width || m_height != frame.additionalInfo.video.height)) {
 
             ELOG_DEBUG("Video resolution changed %dx%d -> %dx%d",

source/core/owt_base/MediaFramePipeline.h

@@ -302,7 +302,19 @@ class VideoFrameEncoder : public FrameDestination {
     virtual void degenerateStream(int32_t streamId) = 0;
     virtual void setBitrate(unsigned short kbps, int32_t streamId) = 0;
     virtual void requestKeyFrame(int32_t streamId) = 0;
+
+protected:
+    int maxWidth = 0;
+    int maxHeight = 0;        
 };
+
+
+inline void VideoFrameEncoder::setMaxResolution(int output, int width, int height)
+{
+    maxWidth = width;
+    maxHeight = height;
+}    
+
 
 }
 #endif

source/core/owt_base/VCMFrameEncoder.cpp

@@ -384,16 +384,34 @@ void VCMFrameEncoder::encode(boost::shared_ptr<webrtc::VideoFrame> frame)
     }
 
     if (m_width != frame->width() || m_height != frame->height()) {
-        ELOG_DEBUG_T("Update encoder resolution %dx%d->%dx%d", m_width, m_height, frame->width(), frame->height());
 
-        ret = m_encoder->SetResolution(frame->width(), frame->height());
+    	int new_width = 0;
+    	int new_height = 0;
+
+        if(maxWidth > 0 && frame->width() > maxWidth){
+            new_width = maxWidth;
+            new_height = (int) ( static_cast<double>(new_width) /  (static_cast<double>(frame->width()) / static_cast<double>(frame->height())) );
+        }else if(maxHeight > 0 && frame->height() > maxHeight){
+            new_height = maxHeight;
+            new_width = (int) ( static_cast<double>(new_height) *  ( static_cast<double>(frame->width()) / static_cast<double>(frame->height()) ) );
+        }else{
+			new_width = frame->width();
+			new_height = frame->height();
+        }
+
+
+        ELOG_DEBUG_T("Update encoder resolution %dx%d, %dx%d->%dx%d", frame->width(), frame->height(), m_width, m_height, new_width, new_height);
+
+        ret = m_encoder->SetResolution(new_width, new_height);
         if (ret != 0) {
             ELOG_WARN_T("Update Encode size error: %d", ret);
         }
 
         m_width = frame->width();
         m_height = frame->height();
-        m_updateBitrateKbps = calcBitrate(m_width, m_height, m_frameRate);
+
+        m_updateBitrateKbps = calcBitrate(new_width, new_height, m_frameRate);        
+
     }
 
     if (m_updateBitrateKbps) {

source/management_console/public/js/libapi.js

@@ -93,7 +93,7 @@ function calculateSignature (toSign, key) {
 function ManagementApi (spec) {
     this.id = spec.id;
     this.key = spec.key;
-    this.url = spec.url || '/';
+    this.url = spec.url || window.location.pathname.replace(/\/console.*/g, "/");
     this.send = function (method, body, url, callback) { // callback (err, resp)
         var service = this.id;
         var key = this.key;