[Update] docker support.

SighingSnow · Jul 19, 2022 · b9218bd · b9218bd
1 parent 2dfd727
commit b9218bd
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/src/common.h b/src/common.h
@@ -27,7 +27,6 @@ const unsigned int screen_height = 600;
 const unsigned int SCR_WIDTH = screen_width * scale;
 const unsigned int SCR_HEIGHT = screen_height * scale;
 // webrtc
-const std::string DEFAULT_IP_ADDRESS = "127.0.0.1";
 const uint16_t defaultPort = 8000;
 // FFMPEG parameters
 const int inlinesize[2] = {SCR_WIDTH*3,0}; // For sws_scale convert function

diff --git a/src/main.cpp b/src/main.cpp
@@ -16,6 +16,7 @@ void doMain(int argc,char* argv[])
     Streamer* streamer = new Streamer(*scene);
     bool dump_video_opt = false;
     int ors_gpu_id = 0;
+    std::string ip_addr = "127.0.0.1";
     // -h help
     // -d dump local video
     // -gpu number e.g. -gpu 0 is using cpu
@@ -34,16 +35,24 @@ void doMain(int argc,char* argv[])
                 ors_gpu_id = (argv[index+1][0]-'0');
                 std::cout<<"[MAIN] Trying to access "<<gpu_str[ors_gpu_id]<<" for encoding"<<std::endl;
                 index++;
+            } 
+            else if(std::string(argv[index]) == "-docker") {
+                ip_addr = "host.docker.internal";
+            }
+            else if(std::string(argv[index]) == "-ip"){
+                if(index+1 >= argc) {
+                    exit(-1);
+                }
+                ip_addr = std::string(argv[index+1]);
             }
             index++;
         }
         return;
     };
     parseArgv();
-
     SetScene(scene);
     scene->AttachStreamer(streamer);
-    streamer->beginStream(dump_video_opt,ors_gpu_id);
+    streamer->beginStream(dump_video_opt,ors_gpu_id,ip_addr);
     scene->DrawScene();
     streamer->endStream();
     scene->Terminate();

diff --git a/src/rtc_publisher.cpp b/src/rtc_publisher.cpp
@@ -46,6 +46,11 @@ void RtcPublisher::setUp()
     return;
 }
 
+void RtcPublisher::setPubAddr(const std::string addr)
+{
+    DEFAULT_IP_ADDRESS = addr;
+}
+
 void RtcPublisher::publish(uint8_t *buf, int size) {
     //TODO: current buf is raw, no pps and sps data
     int index = 0;

diff --git a/src/rtc_publisher.h b/src/rtc_publisher.h
@@ -27,6 +27,7 @@ class RtcPublisher {
     }
     void setUp();
     void publish(uint8_t *buf, int size);
+    void setPubAddr(const std::string addr);
     ~RtcPublisher(){
         dc->close();
         pc->close();
@@ -36,6 +37,7 @@ class RtcPublisher {
     void setInputCallBack(std::function<void(char)>* func_keyboard,
     std::function<void(double,double)>* func_mouse_move);
 protected:
+    std::string DEFAULT_IP_ADDRESS = "127.0.0.1";
     Configuration rtc_config;
     shared_ptr<WebSocket> ws;
     std::shared_ptr<H264FileParser> video;

diff --git a/src/scene.cpp b/src/scene.cpp
@@ -295,6 +295,7 @@ void Scene::initTrees()
         t.radius = 22;
         initBranch(t);
         initLeaves(t.pos_,t.theight,t.radius,t.leaves_);
+        //std::cout<<"leaves num"<<t.leaves_.size()<<std::endl;
     }
     return;
 }

diff --git a/src/streamer.cpp b/src/streamer.cpp
@@ -19,7 +19,7 @@ void Streamer::initRtmp() {
     rtmp_publisher->setUp();
 }
 
-void Streamer::beginStream(bool dump_video_opt,int ors_gpu_id)
+void Streamer::beginStream(bool dump_video_opt,int ors_gpu_id,std::string ip_addr)
 {
     encoder = new Encoder();
     encoder->dump_video_option = dump_video_opt;
@@ -29,7 +29,7 @@ void Streamer::beginStream(bool dump_video_opt,int ors_gpu_id)
         initRtmp();
     }
     else if(rtc_publish_option){
-        initRtc();
+        initRtc(ip_addr);
     }
 }
 
@@ -63,9 +63,10 @@ void Streamer::endStream()
     encoder->endEncode();
 }
 
-void Streamer::initRtc()
+void Streamer::initRtc(std::string ip_addr)
 {
     rtc_publisher = new RtcPublisher();
+    rtc_publisher->setPubAddr(ip_addr);
     rtc_publisher->setUp();
     // bind callback
     func_keyboard = std::bind(&Scene::clientKeyboardCallback,scene_,std::placeholders::_1);

diff --git a/src/streamer.h b/src/streamer.h
@@ -20,7 +20,7 @@ using json = nlohmann::json;
 class Streamer {
 public:
     Streamer(Scene & scene);
-    void beginStream(bool dump_video_opt = false,int ors_gpu_id = 0);
+    void beginStream(bool dump_video_opt = false,int ors_gpu_id = 0,string ip_addr = "");
     void endStream();
     void encode(uint8_t* buffer);
     void setDumpVideoOpt(bool val);
@@ -31,7 +31,7 @@ class Streamer {
     RtmpPublisher* rtmp_publisher;
     RtcPublisher* rtc_publisher;
 private:
-    void initRtc();
+    void initRtc(std::string ip_addr);
     void initRtmp();
     void rtmpPublish(uint8_t* buf,int size);
     void rtcPublish(uint8_t* buf,int size);