Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

Commit

Permalink
Fix travis failure and update getting start documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@U1X6WK @hzhan80
U1X6WK authored and hzhan80 committed Aug 14, 2020
1 parent 7bbbc8c commit 3ff0159
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 44 deletions.
10 changes: 5 additions & 5 deletions src/doc/Immersive_Video_Getting_Started_Guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ cmake >= 3.12.4
## Build Server Components
```bash
# Make sure using gcc >= 6.3.1
git clone https://github.com/OpenVisualCloud/ImmersiveVideo
cd ImmersiveVideo/src/external
git clone https://github.com/OpenVisualCloud/Immersive-Video-Sample.git
cd Immersive-Video-Sample/src/external
./build.sh server y # Install dependency before the first build.
# ./build.sh server n # Build without dependency installation.
```

## Build Client Components
```bash
# Make sure using gcc >= 6.3.1
git clone https://github.com/OpenVisualCloud/ImmersiveVideo
cd ImmersiveVideo/src/external
git clone https://github.com/OpenVisualCloud/Immersive-Video-Sample.git
cd Immersive-Video-Sample/src/external
./build.sh client y # Install dependency before the first build.
# ./build.sh client n # Build without dependency installation.
```
Expand Down Expand Up @@ -127,4 +127,4 @@ vim config.xml # Set up configuration, details in following table.
| 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, for example : `http://xxx.xxx.xxx.xxx:8080/OMAFLive_4k/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.
- **Note** : So far, some parameters settings are limited. URL need to be a remote dash source URL, for example : `http://xxx.xxx.xxx.xxx:8080/OMAFLive_4k/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.
44 changes: 24 additions & 20 deletions src/external/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,30 +67,34 @@ build_ci(){
cd ${EX_PATH} && build_server
fi

cd ${EX_PATH}/../build/external && mkdir -p ffmpeg_server_so
sudo cp /usr/local/lib/libavcodec.so ffmpeg_server_so/libavcodec.so.58
sudo cp /usr/local/lib/libavutil.so ffmpeg_server_so/libavutil.so.56
sudo cp /usr/local/lib/libavformat.so ffmpeg_server_so/libavformat.so.58
sudo cp /usr/local/lib/libavfilter.so ffmpeg_server_so/libavfilter.so.7
sudo cp /usr/local/lib/libswresample.so ffmpeg_server_so/libswresample.so.3
sudo cp /usr/local/lib/libpostproc.so ffmpeg_server_so/libpostproc.so.55
sudo cp /usr/local/lib/libswscale.so ffmpeg_server_so/libswscale.so.5
cd ${EX_PATH} && ./fpm.sh server ${GIT_SHORT_HEAD}
if [ "$1" == "oss" ] ; then
cd ${EX_PATH}/../build/external && mkdir -p ffmpeg_server_so
sudo cp /usr/local/lib/libavcodec.so ffmpeg_server_so/libavcodec.so.58
sudo cp /usr/local/lib/libavutil.so ffmpeg_server_so/libavutil.so.56
sudo cp /usr/local/lib/libavformat.so ffmpeg_server_so/libavformat.so.58
sudo cp /usr/local/lib/libavfilter.so ffmpeg_server_so/libavfilter.so.7
sudo cp /usr/local/lib/libswresample.so ffmpeg_server_so/libswresample.so.3
sudo cp /usr/local/lib/libpostproc.so ffmpeg_server_so/libpostproc.so.55
sudo cp /usr/local/lib/libswscale.so ffmpeg_server_so/libswscale.so.5
cd ${EX_PATH} && ./fpm.sh server ${GIT_SHORT_HEAD}
fi

# Build client
./install_FFmpeg.sh client
cd ${EX_PATH} && ./install_FFmpeg.sh client
cd ${EX_PATH} && build_client

cd ${EX_PATH}/../build/external && mkdir -p ffmpeg_client_so
sudo cp ffmpeg_client/libavcodec/libavcodec.so.58 ffmpeg_client_so/libavcodec.so.58
sudo cp ffmpeg_client/libavutil/libavutil.so.56 ffmpeg_client_so/libavutil.so.56
sudo cp ffmpeg_client/libavformat/libavformat.so.58 ffmpeg_client_so/libavformat.so.58
sudo cp ffmpeg_client/libavfilter/libavfilter.so.7 ffmpeg_client_so/libavfilter.so.7
sudo cp ffmpeg_client/libavdevice/libavdevice.so.58 ffmpeg_client_so/libavdevice.so.58
sudo cp ffmpeg_client/libswscale/libswscale.so.5 ffmpeg_client_so/libswscale.so.5
sudo cp ffmpeg_client/libswresample/libswresample.so.3 ffmpeg_client_so/libswresample.so.3
sudo cp /usr/local/lib/libpostproc.so.55 ffmpeg_client_so/libpostproc.so.55
cd ${EX_PATH} && ./fpm.sh client ${GIT_SHORT_HEAD}
if [ "$1" == "oss" ] ; then
cd ${EX_PATH}/../build/external && mkdir -p ffmpeg_client_so
sudo cp ffmpeg_client/libavcodec/libavcodec.so.58 ffmpeg_client_so/libavcodec.so.58
sudo cp ffmpeg_client/libavutil/libavutil.so.56 ffmpeg_client_so/libavutil.so.56
sudo cp ffmpeg_client/libavformat/libavformat.so.58 ffmpeg_client_so/libavformat.so.58
sudo cp ffmpeg_client/libavfilter/libavfilter.so.7 ffmpeg_client_so/libavfilter.so.7
sudo cp ffmpeg_client/libavdevice/libavdevice.so.58 ffmpeg_client_so/libavdevice.so.58
sudo cp ffmpeg_client/libswscale/libswscale.so.5 ffmpeg_client_so/libswscale.so.5
sudo cp ffmpeg_client/libswresample/libswresample.so.3 ffmpeg_client_so/libswresample.so.3
sudo cp /usr/local/lib/libpostproc.so.55 ffmpeg_client_so/libpostproc.so.55
cd ${EX_PATH} && ./fpm.sh client ${GIT_SHORT_HEAD}
fi
}

build_test(){
Expand Down
25 changes: 6 additions & 19 deletions src/external/run_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,12 @@ cd -

destroy_worker()
{
STATUS=$(lsof -i:9090 | tail -n 1 | awk {'print $NF'})

while [ "${STATUS}" != "EMPTY" ]
do
if [ "${STATUS}" == "(LISTEN)" ] ; then
echo "LISTEN"
PID=$(lsof -i:9090 | tail -n 1 | awk {'print $2'})
echo ${PID}
if [ ! -z "${PID}" ] ; then
kill -9 ${PID}
STATUS="EMPTY"
fi
sleep 2s
else
echo "EMPTY"
STATUS="EMPTY"
fi
done
PID=$(pidof WorkerServer_9090) || true
echo ${PID}
if [ ! -z "${PID}" ] ; then
kill -9 ${PID}
fi
sleep 2s
}

if [ "${REPO}" = "oss" ] ; then
Expand Down Expand Up @@ -75,7 +63,6 @@ if [ "${REPO}" = "oss" ] ; then

# distributed_encoder test
################################
sudo yum install lsof -y

cd distributed_encoder
cp ../../../distributed_encoder/test/*265 .
Expand Down

0 comments on commit 3ff0159

Please sign in to comment.