Debug changes to enable ffmpeg tx side

Signed-off-by: Wilczynski, Andrzej <[email protected]>
OpenVisualCloud · Feb 4, 2025 · fefc31b · fefc31b
1 parent c8acca6
commit fefc31b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -460,6 +460,7 @@ RUN \
 
 VOLUME ["/var/run/imtl", "/var/run/mcm", "/workspace"]
 COPY --chown=tiber --from=build-stage /buildout/ /
+COPY --chown=tiber --chmod=755 --from=build-stage /usr/lib64/libbpf.so.1 /usr/local/lib
 
 RUN ldconfig
 

diff --git a/gRPC/config_serialize_deserialize.hpp b/gRPC/config_serialize_deserialize.hpp
@@ -21,10 +21,14 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Config, senders, receivers, function, multivi
 
 static int serialize_config_json(const Config &input_config, std::string &output_string){
     try {
-        nlohmann::json config_json = input_config;
+        Config new_config = input_config;
+        new_config.receivers[0].payload.type = payload_type::video;
+        new_config.senders[0].payload.type = payload_type::video;
+
+        nlohmann::json config_json = new_config;
         //Dump json to string
         output_string = config_json.dump();
-
+        std::cout << "JSON output string: " << std::endl << output_string << std::endl;
     }
     catch (const nlohmann::json::parse_error &e) {
         std::cout << "JSON parse error: " << e.what() << std::endl;
@@ -44,6 +48,7 @@ static int serialize_config_json(const Config &input_config, std::string &output
 static int deserialize_config_json(Config &output_config, const std::string &input_string){
     try {
         nlohmann::json config_json = nlohmann::json::parse(input_string);
+        std::cout << "JSON input string: " << std::endl << input_string << std::endl;
         // Deserialize from json to Config
         output_config = config_json.get<Config>();
     }

diff --git a/tests/test_docker_launcher_rx.sh b/tests/test_docker_launcher_rx.sh
@@ -17,4 +17,4 @@ docker run -it \
    --ip=192.168.2.5 \
    --expose=20000-20170 \
    --ipc=host -v /dev/shm:/dev/shm \
-      video_production_image 192.168.2.5 50052
+      tiber-broadcast-suite 192.168.2.5 50052
diff --git a/tests/test_docker_launcher_tx.sh b/tests/test_docker_launcher_tx.sh
@@ -17,4 +17,4 @@ docker run -it \
    --ip=192.168.2.4 \
    --expose=20000-20170 \
    --ipc=host -v /dev/shm:/dev/shm \
-      video_production_image 192.168.2.4 50051
+      tiber-broadcast-suite 192.168.2.4 50051
diff --git a/tests/test_docker_nmos_rx.sh b/tests/test_docker_nmos_rx.sh
@@ -13,8 +13,9 @@ docker run -it \
    -v /var/run/imtl:/var/run/imtl \
    -e http_proxy="" \
    -e https_proxy="" \
+   -e VFIO_PORT_RX=0000:31:01.2 \
    --network=my_net_801f0 \
    --ip=192.168.2.3 \
    --expose=20000-20170 \
    --ipc=host -v /dev/shm:/dev/shm \
-      nmos-docker-test:5 config/node2_docker.json
+      tiber-broadcast-suite-nmos-node config/intel-node-rx.json
diff --git a/tests/test_docker_nmos_tx.sh b/tests/test_docker_nmos_tx.sh
@@ -13,8 +13,9 @@ docker run -it \
    -v /var/run/imtl:/var/run/imtl \
    -e http_proxy="" \
    -e https_proxy="" \
+   -e VFIO_PORT_TX=0000:31:01.1 \
    --network=my_net_801f0 \
    --ip=192.168.2.2 \
    --expose=20000-20170 \
    --ipc=host -v /dev/shm:/dev/shm \
-      nmos-docker-test:5 config/node1_docker.json
+      tiber-broadcast-suite-nmos-node config/intel-node-tx.json