[do not merge] skip glog for android v1.6.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

@@ -1,72 +1,123 @@
 # Immersive Video OMAF Sample
 
 ## 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. 
+   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 
+   OMAF sample can be deployed with [Kubernetes](#kubernetes-deployment-steps) or directly with [Docker image](#docker-image-deployment-steps).
 
- - Server OS : CentOS Linux release<br>7.6.1810 (Core)
+## Software Requirements
+
+ - Server OS : CentOS Linux release 7.6.1810 (Core)
  - Client OS : Ubuntu 18.04 LTS
- - Docker version : 1.13.1
+ - Docker version : 19.03.12
 
-## Hardware Tested
+## Test Environment Hardware
 | Platform | Server | Client |
 |:----:|:----:|:----:|
 | CPU SKU | Intel® Xeon® Platinum<br>8280M CPU @ 2.70GHz | Intel® Core™ i7-6770HQ<br>CPU @ 2.60GHz x 8 |
 | Memory | 128G | 16G |
 
-## Installation
+---
+
+## Docker image deployment steps
+
+### Installation
 
 - [Install docker engine in server](https://docs.docker.com/install)
 
 - 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]
+    cd path_to/Immersive-Video-Sample/OMAF-Sample/server
+    mkdir build && cd build
+    cmake .. -DHTTP_PROXY=<proxy> # proxy is optional
+    make build -j $(nproc)
+    docker image ls        # [REPOSITORY:immersive_server, TAG:v1.4]
 ```
-    
+
 - 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)
+### 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 30001:443 -p 30002:8080 -it immersive_server:v1.4 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]
 ```
 
+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 path_to/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 table at bottom.
+    ./render        # Press 'q' button to quit.
+```
+
+---
+
+## Kubernetes deployment steps
 
+### Installation
+
+ - Node set up steps same as [docker image deployment](#docker-image-deployment-steps).
+
+ - Master set up steps:
+    1. Follow the [instructions](https://kubernetes.io/docs/setup) to setup your Kubernetes cluster.
+    2. All cluster nodes must have the same user (uid) and group (gid).
+    3. Setup password-less access from the Kubernetes controller to each worker node:
+    ```bash
+        ssh-keygen
+        ssh-copy-id <worker-node>
+    ```
+
+
+### How To Run
+ - Master start/stop services as follows:
+```
+    cd path_to/Immersive_Video_Sample/OMAF-Sample/server
+    mkdir build && cd build
+    cmake ..
+    make start -j $(nproc) # choose to start or stop
+```
+
+- 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 path_to/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 table at bottom.
+    ./render        # Press 'q' button to quit.
 ```
+
+---
+
 **Config.xml**
-| Parameters | Descriptions | Examples |
-| :----:| :----: | :----: |
-|  windowWidth  | The width of render window | 960 for 4k, 1920 for 8k |
+
+| **Parameters** | **Descriptions** | **examples** |
+| --- | --- | --- |
+| 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 |
+| StreamDumpedOption | dump packet streams or not | 0 for false, 1 for true |
 | 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 |
-
+| minLogLevel | min log level | INFO / WARNING / ERROR / FATAL |
+| maxVideoDecodeWidth | max video decoded width | decoded width that is supported |
+| maxVideoDecodeHeight | max video decoded height | decoded height that is supported |
+| predict | viewport prediction plugin | 0 is disable and 1 is enable |
+| PathOf360SCVPPlugins | path of 360SCVP plugins | needed for planar format rendering |
 
-   - **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:30001/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/CMakeLists.txt

@@ -0,0 +1,11 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+ADD_CUSTOM_TARGET(build ALL
+                  ${CMAKE_CURRENT_SOURCE_DIR}/deploy.sh
+                  ${CMAKE_CURRENT_SOURCE_DIR} ${HTTP_PROXY})
+
+ADD_CUSTOM_TARGET(start ALL
+                  ${CMAKE_CURRENT_SOURCE_DIR}/start.sh)
+
+ADD_CUSTOM_TARGET(stop ALL
+                  ${CMAKE_CURRENT_SOURCE_DIR}/stop.sh)