Fix linux player build failure and update dockerfile

OpenVisualCloud · Feb 8, 2021 · 274fc54 · 274fc54
1 parent 9ce286e
commit 274fc54
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/WebRTC-Sample/README.md b/WebRTC-Sample/README.md
@@ -85,15 +85,13 @@ The OWT-LINIX-PLAYER is an immersive 360 video player on linux, with WebRTC back
 - __Linux* Operating Systems (64-bit):__
 
   - Ubuntu 18.04 LTS
+  - Ubuntu 20.04 LTS
 
 ## Build
 
 ```bash
 cd WebRTC-Sample/owt-linux-player
 
-# Latest stable player version
-git reset --hard 0ac9d30d59ae187efb5c00d6953bcbbc6dda1141
-
 # build owt linux sdk and dependencies
 ./build_webrtc_linux_client_sdk.sh
 
@@ -123,6 +121,7 @@ vi config.xml
 
 ```bash
 cd WebRTC-Sample/owt-linux-player/player
+source ./setupvars.sh
 ./render
 ```
 - **Press "s" key to start playing**

diff --git a/WebRTC-Sample/owt-linux-player/build_player.sh b/WebRTC-Sample/owt-linux-player/build_player.sh
@@ -36,3 +36,6 @@ if [ ! -f ${PLAYER_BUILD}/config.xml ]; then
     sed 's|<server_url>.*</server_url>|<server_url>http://owt-server-ip:3001</server_url>|g' -i ${PLAYER_BUILD}/config.xml
 fi
 
+if [ ! -f ${PLAYER_BUILD}/setupvars.sh ]; then
+    echo "export LD_LIBRARY_PATH=${WEBRTC_LINUX_CLIENT_SDK}/lib:\$LD_LIBRARY_PATH" > ${PLAYER_BUILD}/setupvars.sh
+fi
diff --git a/WebRTC-Sample/owt-server/image/owt-immersive/Dockerfile b/WebRTC-Sample/owt-server/image/owt-immersive/Dockerfile
@@ -208,8 +208,8 @@ ARG LICODE_REPO=https://github.com/lynckia/licode.git
 ARG LICODE_PATCH_REPO=https://github.com/open-webrtc-toolkit/owt-server/tree/master/scripts/patches/licode/
 ARG SAFESTRINGLIB_COMMIT="245c4b8cff1d2e7338b7f3a82828fc8e72b29549"
 ARG SAFESTRINGLIB_REPO=https://github.com/intel/safestringlib.git
-ARG SCVP_VER="1.2.0"
-ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample/archive/v${SCVP_VER}.tar.gz
+ARG SCVP_VER="9ce286edf4d5976802bf488b4dd90a16ecc28c36"
+ARG SCVP_REPO=https://github.com/OpenVisualCloud/Immersive-Video-Sample
 ARG WEBRTC_REPO=https://github.com/open-webrtc-toolkit/owt-deps-webrtc.git
 ARG SERVER_PATH=/home/owt-server
 ARG OWT_SDK_REPO=https://github.com/open-webrtc-toolkit/owt-client-javascript.git
@@ -239,8 +239,9 @@ RUN cd /home && \
     mkdir -p /usr/local/include/safestringlib && \
     cp -rf ../include/* /usr/local/include/safestringlib/
 RUN cd /home && \
-    wget -O - ${SCVP_REPO} | tar xz && mv Immersive-Video-Sample-${SCVP_VER} Immersive-Video-Sample && \
+    git clone ${SCVP_REPO} && \
     cd Immersive-Video-Sample/src/360SCVP && \
+    git reset --hard ${SCVP_VER} && \
     mkdir build && \
     cd build && \
     source /opt/rh/devtoolset-7/enable && \

diff --git a/src/player/app/CMakeLists.txt b/src/player/app/CMakeLists.txt
@@ -33,17 +33,21 @@ AUX_SOURCE_DIRECTORY(. DIR_SRC)
 AUX_SOURCE_DIRECTORY(android ANDROID_SRC)
 AUX_SOURCE_DIRECTORY(linux LINUX_SRC)
 IF(LINUX_OS)
-set(DIR_SRC
-    ${DIR_SRC}
-    ${LINUX_SRC}
-    )
+  SET(DIR_SRC
+      ${DIR_SRC}
+      ${LINUX_SRC}
+      )
+  IF(DEFINED WEBRTC_LINUX_SDK)
+      INCLUDE_DIRECTORIES("${WEBRTC_LINUX_SDK}/include")
+      LINK_DIRECTORIES("${WEBRTC_LINUX_SDK}/lib")
+  ENDIF()
 ENDIF()
 
 IF(ANDROID_OS)
-set(DIR_SRC
-    ${DIR_SRC}
-    ${ANDROID_SRC}
-    )
+  SET(DIR_SRC
+      ${DIR_SRC}
+      ${ANDROID_SRC}
+      )
 ENDIF()
 
 ADD_EXECUTABLE(render ${DIR_SRC})
@@ -52,4 +56,4 @@ IF(LINUX_OS)
   SET(LINK_LIB ${LINK_LIB} MediaPlayer glog glfw GL GLU safestring_shared)
 ENDIF()
 
-TARGET_LINK_LIBRARIES(render ${LINK_LIB})
+TARGET_LINK_LIBRARIES(render ${LINK_LIB})