[do not submit] [IM360-166] temp skip safestring and glog lib v1.2.0

.gitignore

@@ -0,0 +1,10 @@
+.vscode
+build
+FFmpeg
+player/360SCVPAPI.h
+player/MediaSource/360SCVPAPI.h
+player/MediaSource/OmafDashAccessApi.h
+player/OmafStructure.h
+player/data_type.h
+player/error.h
+player/ns_def.h

.travis.yml

@@ -0,0 +1,36 @@
+language: generic
+os: linux
+dist: bionic
+
+env:
+  global:
+    - DOCKER_CACHE_FILE=/home/travis/docker/cache.tar.gz
+    - DOCKER_REPOSITORY=immersive
+    - DOCKER_TAG=ci
+
+cache:
+  directories:
+    - /home/travis/docker/
+
+before_install:
+  - | # Load docker image.
+    if [ -f ${DOCKER_CACHE_FILE} ]; then
+        gunzip -c ${DOCKER_CACHE_FILE} | sudo docker load || true
+    fi
+
+install:
+  - | # Build docker image from cache or from scratch.
+    if [ -f ${DOCKER_CACHE_FILE} ]; then
+        sudo docker build --cache-from ${DOCKER_REPOSITORY}:${DOCKER_TAG} -t ${DOCKER_REPOSITORY}:${DOCKER_TAG} -f src/external/dockerfile src/external
+    else
+        sudo docker build -t ${DOCKER_REPOSITORY}:${DOCKER_TAG} -f src/external/dockerfile src/external
+    fi
+
+script:
+  - sudo  docker run -it -v `pwd`:`pwd` -w `pwd` ${DOCKER_REPOSITORY}:${DOCKER_TAG} bash -c 'cd src/external && ./build.sh ci && ./build.sh test && ./run_test.sh'
+  - | # Save built image to Travis cache directory only if not a pull request.
+    if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then
+        mkdir -p $(dirname ${DOCKER_CACHE_FILE})
+        sudo docker save $(docker history -q ${DOCKER_REPOSITORY}:${DOCKER_TAG} | grep -v '<missing>') ${DOCKER_REPOSITORY}:${DOCKER_TAG} | gzip > ${DOCKER_CACHE_FILE}
+        echo "Saved cache successfuly"
+    fi

OMAF-Sample/README.md

@@ -3,9 +3,9 @@
 ## Introduction
    The Immersive Video Delivery OMAF Sample provides a quick trial to setup E2E OMAF-Compliant 360 video streaming. OMAF 360 Video streaming sample can support both VOD and Live streaming for 4K and 8K contents. 
 
-## Software Requirements 
+## Software Requirements
 
- - Server OS : CentOS Linux release<br>7.6.1810 (Core)
+ - Server OS : CentOS Linux release 7.6.1810 (Core)
  - Client OS : Ubuntu 18.04 LTS
  - Docker version : 1.13.1
 
@@ -22,51 +22,53 @@
 - Server :
 ```bash
     cd OMAF-Sample/server && ./deploy.sh <proxy>  # Proxy config is optional.
-    docker image ls                               # Created an image. [REPOSITORY:immersive_server, TAG:v0.1]
+    docker image ls                               # Created an image. [REPOSITORY:immersive_server, TAG:v1]
 ```
-    
+
 - Client :
-
 ```bash
     cd OMAF-Sample/client && ./deploy.sh
-    cd package  # Copy the packages to any client machine to install.
-    sudo dpkg -i immersive-client-1.0.0-1.el7_amd64.deb
 ```
 
 ## How To Run (HTTPS)
 
 - Server :
-
 ```bash
-    docker run -p 5000:443 -p 5001:8080 -it immersive_server:v0.1 bash  # Map the port.
-    /usr/local/nginx/sbin/nginx                                         # Start nginx.
-    cd Sample-Videos && ./run.sh <RES> <TYPE>                           # <RES>:[4k,8k] <TYPE>:[LIVE,VOD]
+    docker run --privileged -p 5000:443 -p 5001:8080 -it immersive_server:v1 bash  # Map the port.
+    cd /usr/local/nginx/conf/
+    ./configure.sh CN Shanghai A B C D [email protected]                                     # './configure.sh -h' for details.
+    /usr/local/nginx/sbin/nginx                                                    # Start nginx.
+    cd /home/immersive/Sample-Videos && ./run.sh <RES> <TYPE>                      # <RES>:[4K,8K] <TYPE>:[LIVE,VOD]
+                                                                                   # Press 'q' button to quit.
 ```
 
-- Client :
+For details in FFmpeg plugins' parameters, refer to the [FFmpeg usage doc](../src/doc/Immersive_Video_Delivery_FFmpeg_usage.md).
 
+- Client :
 ```bash
     sudo su
-    cd /usr/bin/immersive/
-    export LD_LIBRARY_PATH=/usr/lib64/immersive-client:$LD_LIBRARY_PATH
-    vim config.xml  # Set up configuration, details as following table
-    ./render        # Press 's' button to start
+    cd Immersive-Video-Sample/src/build/client/player
+    export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH
+    vim config.xml  # Set up configuration, details in following table.
+    ./render
 ```
 **Config.xml**
-| Parameters | Descriptions | Examples |
+
+   | Parameters | Descriptions | Examples |
 | :----:| :----: | :----: |
-|  windowWidth  | The width of render window | 960 for 4k, 1920 for 8k |
+| windowWidth  | The width of render window | 960 for 4k, 1920 for 8k |
 | windowHeight | The height of render window  | 960 for 4k, 1920 for 8k  |
 | url | The resource URL path | Remote URL |
 | sourceType | Source type | 0 is for Dash Source |
 | decoderType | FFmpeg Decoder type | 0 is for software decoder |
 | contextType | OpenGL context type | 0 is for glfw |
 | useDMABuffer | DMA Buffer flag | 0 means no DMA buffer |
+| enableExtractor | extractor track path or later binding path | 1 is for extractor track and 0 is for later binding |
 | viewportHFOV | Viewport horizon FOV degree | 80 |
 | viewportVFOV | Viewport vertical FOV degree | 80 |
 | viewportWidth | Viewport width | 960 for 4k, 1920 for 8k |
 | viewportHeight | Viewport height | 960 for 4k, 1920 for 8k |
-| cachePath | Cache path | /tmp/cache |
-   
+| cachePath | Cache path | /home/media/cache |
+| predict | viewport prediction plugin | 0 is disable and 1 is enable |
 
-   - **Note** : So far, some parameters settings are limited. URL need to be a remote dash source URL, example : `https://172.18.0.2:5000`. The parameter sourceType must set to 0, which represents dash source. The parameter decoderType must set to 0, which stands for FFmpeg software decoder. The parameter contextType need to be 0, which represents glfw context. And useDMABuffer flag should be set to 0. 
+   - **Note** : So far, some parameters settings are limited. URL need to be a remote dash source URL, choose `./run.sh 8K LIVE` for example : `https://xxx.xxx.xxx.xxx:5000/LIVE8K/Test.mpd`. The parameter sourceType must set to 0, which represents dash source. The parameter decoderType must set to 0, which stands for FFmpeg software decoder. The parameter contextType need to be 0, which represents glfw context. And useDMABuffer flag should be set to 0. 

OMAF-Sample/client/deploy.sh

@@ -1,4 +1,3 @@
 #!/bin/bash -ex
 cd ../../src/external
-./build_client.sh
-./fpm.sh 1.0.0
+./build.sh client y

OMAF-Sample/server/Dockerfile

@@ -1,24 +1,46 @@
 FROM centos:7.6.1810
 
-RUN if [ -n "${HTTP_PROXY}" ] ; then \
-    echo "proxy=${HTTP_PROXY}" >> /etc/yum.conf && \
-    echo "http_proxy=${HTTP_PROXY}" >> /etc/wgetrc && \
-    echo "https_proxy=${HTTP_PROXY}" >> /etc/wgetrc ; \
+RUN if [ -n "${http_proxy}" ] ; then \
+    echo "proxy=${http_proxy}" >> /etc/yum.conf && \
+    echo "http_proxy=${http_proxy}" >> /etc/wgetrc && \
+    echo "https_proxy=${https_proxy}" >> /etc/wgetrc ; \
     fi
 
-RUN yum install -y -q openssl centos-release-scl scl-utils gmp gmp-devel mpfr mpfr-devel libmpc libmpc-devel patch autoconf libtool automake libcurl-devel wget git -y && \
-    rm -rf /var/cache/yum/* && \
-    if [ -n "${HTTP_PROXY}" ]; then \
-    git config --global http.proxy ${HTTP_PROXY} && \
-    git config --global https.proxy ${HTTP_PROXY} ; \
-    fi
-
-RUN yum install -y yum install devtoolset-7-gcc* libevent-devel.x86_64 openssl-devel bc numactl -y && \
-    rm -rf /var/cache/yum/*
-
 WORKDIR /home/immersive
 ARG WORKDIR=/home/immersive
 
+# Install denpendency
+RUN yum install -y centos-release-scl-rh && \
+    yum install -y wget git bzip2 xz sudo devtoolset-7-gcc* && \
+    wget https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-12.noarch.rpm && \
+    rpm -Uvh epel-release*rpm && \
+    yum install -y openssl centos-release-scl scl-utils gmp gmp-devel && \
+    yum install -y mpfr mpfr-devel libmpc libmpc-devel patch autoconf && \
+    yum install -y libtool automake libcurl-devel libxml2-devel && \
+    yum install -y libevent-devel.x86_64 openssl-devel bc redhat-lsb && \
+    yum install -y libXrandr libXrandr-devel libXinerama libXinerama-devel && \
+    yum install -y libXcursor libXcursor-devel libXi libXi-devel glm-devel && \
+    yum install -y mesa-libGL mesa-libGL-devel mesa-libGLU && \
+    yum install -y mesa-libGLU-devel mesa-libGLES-devel mesa-libEGL-devel && \
+    yum install -y SDL2 SDL2-devel libcurl4-openssl-dev libglfw3 && \
+    yum install -y libXv-devel glfw glfw-devel xz-devel lzma -y && \
+    yum install -y uuid.x86_64 uuid-devel.x86_64 popt-devel.x86_64 -y && \
+    yum install -y numactl.x86_64 numactl-devel.x86_64 numactl-libs.x86_64 -y && \
+    rm -rf /var/cache/yum/* && rm -rf * && \
+    if [ -n "${http_proxy}" ]; then \
+    git config --global http.proxy ${http_proxy} && \
+    git config --global https.proxy ${https_proxy} ; \
+    fi
+
+RUN yum -y install rh-ruby23 rh-ruby23-ruby-devel rh-ruby23-rubygem* && \
+    source /opt/rh/rh-ruby23/enable && \
+    yum -y install rpm-build && \
+    if [ -n "${http_proxy}" ]; then \
+    gem install -p ${http_proxy} fpm ; \
+    else \
+    gem install fpm ; \
+    fi
+
 # Build zlib
 ARG ZLIB_VER=1.2.11
 ARG ZILB_REPO=http://zlib.net/zlib-${ZLIB_VER}.tar.gz
@@ -53,20 +75,6 @@ RUN  wget -O - ${YASM_REPO} | tar xz && \
      make install && \
      cd ${WORKDIR} && rm -rf ./*
 
-# Build libxml2
-ARG LIBXML2_VER=2.9.6
-ARG LIBXML2_REPO=http://www.xmlsoft.org/sources/libxml2-${LIBXML2_VER}.tar.gz
-RUN wget -O - ${LIBXML2_REPO} | tar xz && \
-    cd libxml2-${LIBXML2_VER} && \
-    source /opt/rh/devtoolset-7/enable && \
-    ././configure --with-python=no && \
-    make -j$(nproc) && \
-    make install && \
-    cd ${WORKDIR} && rm -rf ./*
-
-RUN yum install -y xz && \
-    rm -rf /var/cache/yum/*
-
 # Build CURL
 ARG CURL_VER=7.66.0
 ARG CURL_REPO=https://curl.haxx.se/download/curl-${CURL_VER}.tar.xz
@@ -78,8 +86,6 @@ RUN wget ${CURL_REPO} && \
     ./configure --with-darwinssl && \
     make -j$(nproc) && \
     make install && \
-    cd /usr/local/include/libxml2 && \
-    mv libxml ../ && \
     cd ${WORKDIR} && rm -rf ./*
 
 # Install BOOST
@@ -113,19 +119,29 @@ RUN git clone https://github.com/google/glog.git && \
     make install && \
     cd ${WORKDIR} && rm -rf ./glog
 
+# Install lttng
+RUN source /opt/rh/devtoolset-7/enable && \
+    wget -c https://lttng.org/files/urcu/userspace-rcu-latest-0.11.tar.bz2 && \
+    tar -xjf userspace-rcu-latest-0.11.tar.bz2 && \
+    cd userspace-rcu-0.11.* && \
+    ./configure && \
+    make -j $(nproc) && \
+    make install && ldconfig && \
+    cd ../ && rm -rf userspace-rcu-0.11.* && \
+    wget -c http://lttng.org/files/lttng-ust/lttng-ust-latest-2.11.tar.bz2 && \
+    tar -xjf lttng-ust-latest-2.11.tar.bz2 && \
+    cd lttng-ust-2.11.* && \
+    ./configure --disable-man-pages && \
+    make -j $(nproc) && \
+    make install && ldconfig && \
+    cd ../ && rm -rf lttng-ust-2.11.*
+
 # Copy source
 COPY ./src ${WORKDIR}
-
-# Install openHEVC
-RUN git clone https://github.com/OpenHEVC/openHEVC.git && \
-    cd openHEVC && \
-    source /opt/rh/devtoolset-7/enable && \
-    git checkout ffmpeg_update && \
-    patch -p1 < ../external/ffmpeg_update_add_circle_list_for_to_free_frame.patch && \
-    ./configure --libdir=/usr/lib64 --disable-sdl2 && \
-    make -j `nproc` && \
-    make install && \
-    cd ${WORKDIR} && rm -rf ./openHEVC
+COPY src/ffmpeg/dependency/*.so /usr/local/lib/
+COPY src/ffmpeg/dependency/*.pc /usr/local/lib/pkgconfig/
+COPY src/ffmpeg/dependency/*.h /usr/local/include/
+COPY src/ffmpeg/dependency/WorkerServer /root
 
 # Install Thrift
 ARG THRIFT_VER=0.12.0
@@ -140,23 +156,6 @@ RUN wget -O - ${THRIFT_REPO} | tar xz && \
     make install && \
     cd ${WORKDIR} && rm -rf ./thrift-${THRIFT_VER}*
 
-# Install OMAF
-RUN git clone https://github.com/nokiatech/omaf.git && \
-    ln -s ${PWD}/omaf/Mp4/srcs ${PWD}/OmafDashAccess/mp4lib && \
-    cd omaf && \
-    source /opt/rh/devtoolset-7/enable && \
-    patch -p1 < ../external/nokia_omaf_patch_for_extrator_reader.diff && \
-    cd Mp4/srcs && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    make -j`nproc` && \
-    cp -r ../api/streamsegmenter ../../../../VROmafPacking/ && \
-    cp lib/libstreamsegmenter_static_fpic.a /usr/local/lib/ && \
-    cp lib/libstreamsegmenter_static.a /usr/local/lib/ && \
-    cp lib/libmp4vr_static_fpic.a /usr/local/lib/ && \
-    cp lib/libmp4vr_static.a /usr/local/lib/
-
 # Install Server FFmpeg Dependency
 RUN git clone https://github.com/FFmpeg/FFmpeg.git && \
     cd FFmpeg && \
@@ -170,6 +169,17 @@ RUN git clone https://github.com/FFmpeg/FFmpeg.git && \
     make install && \
     cd ${WORKDIR} && rm -rf ./external/FFmpeg
 
+# Install openHEVC
+RUN git clone https://github.com/OpenHEVC/openHEVC.git && \
+    cd openHEVC && \
+    source /opt/rh/devtoolset-7/enable && \
+    git checkout ffmpeg_update && \
+    patch -p1 < ../external/ffmpeg_update_add_circle_list_for_to_free_frame.patch && \
+    ./configure --libdir=/usr/lib64 --disable-sdl2 && \
+    make -j `nproc` && \
+    make install && \
+    cd ${WORKDIR} && rm -rf ./openHEVC
+
 # Build Nginx
 ARG NGINX_VER=1.13.1
 ARG NGINX_REPO=http://nginx.org/download/nginx-${NGINX_VER}.tar.gz
@@ -183,21 +193,36 @@ RUN wget -O - ${NGINX_REPO} | tar xz && \
 EXPOSE 443
 EXPOSE 8080
 
+# Build safe string lib
+RUN git clone https://github.com/intel/safestringlib.git && \
+    cd safestringlib && \
+    source /opt/rh/devtoolset-7/enable && \
+    cmake . && \
+    make -j `nproc` -f Makefile && \
+    cp libsafestring_shared.so /usr/local/lib/ && \
+    mkdir -p /usr/local/include/safestringlib/ && \
+    cp ./include/* /usr/local/include/safestringlib/ && \
+    cd ${WORKDIR} && rm -rf ./safestringlib
+
 # Configure And Run Nginx
 COPY nginx_conf /usr/local/nginx/conf
-COPY src/ffmpeg/dependency/*.so /usr/local/lib/
-COPY src/ffmpeg/dependency/*.pc /usr/local/lib/pkgconfig/
-COPY src/ffmpeg/dependency/*.h /usr/local/include/
-COPY src/ffmpeg/dependency/WorkerServer /root
 
 # Build Server
-RUN mkdir build && cd build && \
+RUN mkdir -p build/server && cd build/server && \
     source /opt/rh/devtoolset-7/enable && \
     export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:$PKG_CONFIG_PATH && \
-    cmake -DCMAKE_BUILD_TYPE=Debug -DTARGET=server .. && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DTARGET=server ../.. && \
     make -j `nproc` && \
     make install && \
-    mv ffmpeg/ffmpeg ../Sample-Videos && \
-    cd .. && rm -rf `ls | grep -v Sample-Videos`
+    mv ffmpeg/ffmpeg ../../Sample-Videos && \
+    cd ../.. && rm -rf `ls | grep -v Sample-Videos`
 
 COPY run.sh ${WORKDIR}/Sample-Videos
+
+# Unset proxy if necessary
+RUN if [ -n "${http_proxy}" ]; then \
+    sed -i '$d' /etc/yum.conf && \
+    sed -i '1,$d' /etc/wgetrc && \
+    git config --global --unset http.proxy && \
+    git config --global --unset https.proxy ; \
+    fi

OMAF-Sample/server/deploy.sh

@@ -11,23 +11,25 @@ cd ../..
 cp -r src/360SCVP OMAF-Sample/server/src
 cp -r src/external OMAF-Sample/server/src
 cp -r src/ffmpeg OMAF-Sample/server/src
-cp -r src/OmafDashAccess OMAF-Sample/server/src
 cp -r src/player OMAF-Sample/server/src
 cp -r src/utils OMAF-Sample/server/src
+cp -r src/isolib OMAF-Sample/server/src
+cp -r src/trace OMAF-Sample/server/src
+cp -r src/plugins OMAF-Sample/server/src
 cp -r src/VROmafPacking OMAF-Sample/server/src
+cp -r src/OmafDashAccess OMAF-Sample/server/src
 cp -r src/CMakeLists.txt OMAF-Sample/server/src
 cp -r Sample-Videos OMAF-Sample/server/src
-cd OMAF-Sample/server
 
+cd OMAF-Sample/server
 if [ $# = 0 ] ; then
-    docker build -t immersive_server:v0.1 .
+    docker build -t immersive_server:v1 .
 elif [ $# = 1 ] ; then
     if [ "$1" = "-h" ] ; then
         parameters_usage
     else
         PROXY=$1
-        docker build -t immersive_server:v0.1 --build-arg HTTP_PROXY=${PROXY} --build-arg HTTPS_PROXY=${PROXY} .
-        echo 'case 1'
+        docker build -t immersive_server:v1 --build-arg http_proxy=${PROXY} --build-arg https_proxy=${PROXY} .
         echo "PROXY:${PROXY}"
     fi
 else