Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 1222300

Browse files
authored
Update OpenVINO version to 2021 in gst Dockerfile (#685)
1 parent 0055d84 commit 1222300

File tree

4 files changed

+682
-28
lines changed

4 files changed

+682
-28
lines changed

doc/servermd/AnalyticsGuide.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ docker cp Release-vxxx.tgz gst-analytics:/home/
5656
docker exec -it gst-analytics bash
5757
````
5858

59-
### 2.2 Install on host machine<a name="dependencies2"></a>
59+
### 2.2 Install running dependencies on host machine<a name="dependencies2"></a>
6060

61-
Besides basic OWT dependencies, analytics agent requires OpenVINO and GStreamer to do video analytics. Please refer to [dlstreamer_gst install guide](https://github.com/openvinotoolkit/dlstreamer_gst/wiki/Install-Guide#install-on-host-machine) to install OpenVINO, gst-video-analytics plugins and related dependencies.
61+
Besides basic OWT dependencies, analytics agent requires OpenVINO and GStreamer to do video analytics. Please download OpenVINO 2021.1.110 and dlstreamer_gst 1.2.1 version and refer to option 3 steps in [dlstreamer_gst install guide](https://github.com/openvinotoolkit/dlstreamer_gst/wiki/Install-Guide#install-on-host-machine) to install OpenVINO, gst-video-analytics plugins and related dependencies.
6262

6363
### 2.3 Download models for analytics<a name="dependencies3"></a>
6464

@@ -68,7 +68,10 @@ Download [open model zoo package](https://github.com/opencv/open_model_zoo/relea
6868
#tar zxf 2020.4.tar.gz
6969
#cd open_model_zoo-2020.4/tools/downloader
7070
````
71-
Follow Model Downloader guide (open_model_zoo-2020.4/tools/downloader/README.md) to install dependencies and then download models.
71+
Follow Model Downloader guide (open_model_zoo-2020.4/tools/downloader/README.md) to install dependencies and then download models. To try OWT analytics sample plugins, you can follow steps below to only download the used model:
72+
````
73+
./downloader.py --name face-detection-retail-0004
74+
````
7275

7376
## 3 Test Pipelines Shipped with Open WebRTC Toolkit<a name="test"></a>
7477

@@ -120,13 +123,20 @@ Start up MCU in Docker container:
120123

121124
````
122125
cd Release-vxxx
123-
cp /home/analyticspage/index.js apps/current_app/public/scripts/
124-
cp /home/analyticspage/rest-sample.js apps/current_app/public/scripts/
125-
cp /home/analyticspage/index.html apps/current_app/public/
126126
./bin/init-all.sh --deps
127127
./bin/start-all.sh
128128
````
129129

130+
Start up OWT in host machine:
131+
````
132+
cd Release-vxxx
133+
cp ${OWT_SOURCE_CODE}/docker/analyticspage/index.js apps/current_app/public/scripts/
134+
cp ${OWT_SOURCE_CODE}/docker/analyticspage/rest-sample.js apps/current_app/public/scripts/
135+
cp ${OWT_SOURCE_CODE}/docker/analyticspage/index.html apps/current_app/public/
136+
cp ${OWT_SOURCE_CODE}/docker/analyticspage/samplertcservice.js apps/current_app/public/
137+
./bin/init-all.sh --deps
138+
./bin/start-all.sh
139+
````
130140

131141
### 3.3 Test Media Analytics Pipelines<a name="test3"></a>
132142

docker/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ RUN wget -O - ${NICE_REPO} | tar xz && \
3434

3535
# Build open ssl
3636
ARG OPENSSL_BASE="1.1.1"
37-
ARG OPENSSL_VER="1.1.1g"
37+
ARG OPENSSL_VER="1.1.1h"
3838
ARG OPENSSL_REPO=https://www.openssl.org/source/openssl-${OPENSSL_VER}.tar.gz
3939

4040
RUN wget -O - ${OPENSSL_REPO} | tar xz && \
4141
cd openssl-${OPENSSL_VER} && \
42-
./config no-ssl3 --prefix="/usr/local" -fPIC && \
42+
./config no-ssl3 --prefix=/usr/local/ssl --openssldir=/usr/local/ssl -Wl,-rpath=/usr/local/ssl/lib -fPIC && \
4343
make depend && \
4444
make -s V=0 && \
4545
make install
@@ -82,7 +82,7 @@ RUN curl -o libsrtp-${SRTP2_VER}.tar.gz ${SRTP2_REPO} && \
8282
cd libsrtp-${SRTP2_VER} && \
8383
export PKG_CONFIG_PATH="/usr/local/lib/x86_64-linux-gnu/pkgconfig" && \
8484
export CFLAGS="-fPIC" && \
85-
./configure --enable-openssl --prefix="/usr/local" --with-openssl-dir="/usr/local" && \
85+
./configure --enable-openssl --prefix="/usr/local" --with-openssl-dir="/usr/local/ssl" && \
8686
make -s V=0 && \
8787
make install
8888

@@ -204,6 +204,8 @@ RUN cd /home && git clone --depth=1 -b ${OWT_BRANCH} ${OWT_SDK_REPO} && cd owt-c
204204
export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu && \
205205
cd ${SERVER_PATH}/third_party/quic-lib && wget https://github.com/open-webrtc-toolkit/owt-deps-quic/releases/download/v0.1/dist.tgz && tar xzf dist.tgz && \
206206
#Build and pack owt
207+
sed -i "/lssl/i\'\-L\/usr\/local\/ssl\/lib\'," /home/owt-server/source/agent/webrtc/rtcConn/binding.gyp && \
208+
sed -i "/lssl/i\'\-L\/usr\/local\/ssl\/lib\'," /home/owt-server/source/agent/webrtc/rtcFrame/binding.gyp && \
207209
cd ${SERVER_PATH} && export PKG_CONFIG_PATH=/usr/local/lib/x86_64-linux-gnu/pkgconfig && ./scripts/build.js -t mcu-all -r -c && \
208210
./scripts/pack.js -t all --install-module --no-pseudo --app-path /home/owt-client-javascript/dist/samples/conference
209211

0 commit comments

Comments
 (0)