Merge pull request #46 from fkhoshne/update_va_service_gst_plugins_v0…

….4.2 Update gst va plugins in va service to v0.4.2
OpenVisualCloud · Aug 1, 2019 · a2c8d1e · a2c8d1e
2 parents 54de5ce + 7162f6b
commit a2c8d1e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 75 deletions.
diff --git a/ad-insertion/video-analytics-service/platforms/VCAC-A/Dockerfile.2.gst.vcac-a b/ad-insertion/video-analytics-service/platforms/VCAC-A/Dockerfile.2.gst.vcac-a
@@ -613,40 +613,11 @@ RUN if [ "$RDKAFKA_INSTALL" = "true" ] ; then \
 
 #Install va gstreamer plugins
 #Has a dependency on OpenCV, GStreamer
-#ARG VA_GSTREAMER_PLUGINS_VER=0.4
-#ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
-
-#RUN wget -O - ${VA_GSTREAMER_PLUGINS_REPO} | tar xz && \
-#    cd gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER} && \
-#    mkdir build && \
-#    cd build && \
-#    export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \
-#    export CXXFLAGS="-std=c++11 -Wno-missing-field-initializers" && \
-#    cmake \
-#    -DVERSION_PATCH=$(echo "$(git rev-list --count --first-parent HEAD)") \
-#    -DGIT_INFO=$(echo "git_$(git rev-parse --short HEAD)") \
-#    -DCMAKE_BUILD_TYPE=Release \
-#    -DDISABLE_SAMPLES=ON \
-#    -DDISABLE_VAAPI=ON \
-#    -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
-#    make -j4
-#RUN mkdir -p build/usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
-#    cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
-#RUN mkdir -p /usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
-#    cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
+ARG VA_GSTREAMER_PLUGINS_VER=0.4.2
+ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
 
-#Install va gstreamer plugins
-#Has a dependency on OpenCV, GStreamer
-#ARG VA_GSTREAMER_PLUGINS_VER=0.4
-#ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
-
-ARG VA_GSTREAMER_PLUGINS_VER=21976c5769851bb4e4f2f92dcf9d94518fdc87f5
-ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/fkhoshne/gst-video-analytics.git
-
-RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
-    cd gst-video-analytics && \
-    git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
-    git submodule init && git submodule update && \
+RUN wget -O - ${VA_GSTREAMER_PLUGINS_REPO} | tar xz && \
+    cd gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER} && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \
@@ -656,15 +627,15 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     -DGIT_INFO=$(echo "git_$(git rev-parse --short HEAD)") \
     -DCMAKE_BUILD_TYPE=Release \
     -DDISABLE_SAMPLES=ON \
-    -DMQTT=ON \
-    -DKAFKA=ON \
-    -DDISABLE_VAAPI=ON -DENABLE_AVX2=ON -DENABLE_SSE42=ON \ 
+    -DMQTT=1 \
+    -DKAFKA=1 \
+    -DDISABLE_VAAPI=ON -DENABLE_AVX2=ON -DENABLE_SSE42=ON \
     -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
     make -j4
 RUN mkdir -p build/usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
-    cp -r gst-video-analytics/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
+    cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
 RUN mkdir -p /usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
-    cp -r gst-video-analytics/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
+    cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
 
 # Clean up after build
 RUN rm -rf /home/build/usr/include && \

diff --git a/ad-insertion/video-analytics-service/platforms/Xeon/Dockerfile.2.gst.xeon b/ad-insertion/video-analytics-service/platforms/Xeon/Dockerfile.2.gst.xeon
@@ -498,40 +498,11 @@ RUN if [ "$RDKAFKA_INSTALL" = "true" ] ; then \
 
 #Install va gstreamer plugins
 #Has a dependency on OpenCV, GStreamer
-#ARG VA_GSTREAMER_PLUGINS_VER=0.4
-#ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
-
-#RUN wget -O - ${VA_GSTREAMER_PLUGINS_REPO} | tar xz && \
-#    cd gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER} && \
-#    mkdir build && \
-#    cd build && \
-#    export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \
-#    export CXXFLAGS="-std=c++11 -Wno-missing-field-initializers" && \
-#    cmake \
-#    -DVERSION_PATCH=$(echo "$(git rev-list --count --first-parent HEAD)") \
-#    -DGIT_INFO=$(echo "git_$(git rev-parse --short HEAD)") \
-#    -DCMAKE_BUILD_TYPE=Release \
-#    -DDISABLE_SAMPLES=ON \
-#    -DDISABLE_VAAPI=ON \
-#    -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
-#    make -j4
-#RUN mkdir -p build/usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
-#    cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
-#RUN mkdir -p /usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
-#    cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
+ARG VA_GSTREAMER_PLUGINS_VER=0.4.2
+ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
 
-#Install va gstreamer plugins
-#Has a dependency on OpenCV, GStreamer
-#ARG VA_GSTREAMER_PLUGINS_VER=0.4
-#ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
-
-ARG VA_GSTREAMER_PLUGINS_VER=21976c5769851bb4e4f2f92dcf9d94518fdc87f5
-ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/fkhoshne/gst-video-analytics.git
-
-RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
-    cd gst-video-analytics && \
-    git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
-    git submodule init && git submodule update && \
+RUN wget -O - ${VA_GSTREAMER_PLUGINS_REPO} | tar xz && \
+    cd gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER} && \
     mkdir build && \
     cd build && \
     export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \
@@ -541,15 +512,15 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
     -DGIT_INFO=$(echo "git_$(git rev-parse --short HEAD)") \
     -DCMAKE_BUILD_TYPE=Release \
     -DDISABLE_SAMPLES=ON \
-    -DMQTT=ON \
-    -DKAFKA=ON \
     -DDISABLE_VAAPI=ON \
+    -DMQTT=1 \
+    -DKAFKA=1 \
     -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
     make -j4
 RUN mkdir -p build/usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
-    cp -r gst-video-analytics/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
+    cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
 RUN mkdir -p /usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
-    cp -r gst-video-analytics/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
+    cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
 
 # Clean up after build
 RUN rm -rf /home/build/usr/include && \