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

Commit a2c8d1e

Browse files
author
QuPengfei
authored
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
2 parents 54de5ce + 7162f6b commit a2c8d1e

File tree

2 files changed

+17
-75
lines changed

2 files changed

+17
-75
lines changed

‎ad-insertion/video-analytics-service/platforms/VCAC-A/Dockerfile.2.gst.vcac-a‎

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -613,40 +613,11 @@ RUN if [ "$RDKAFKA_INSTALL" = "true" ] ; then \
613613

614614
#Install va gstreamer plugins
615615
#Has a dependency on OpenCV, GStreamer
616-
#ARG VA_GSTREAMER_PLUGINS_VER=0.4
617-
#ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
618-
619-
#RUN wget -O - ${VA_GSTREAMER_PLUGINS_REPO} | tar xz && \
620-
# cd gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER} && \
621-
# mkdir build && \
622-
# cd build && \
623-
# export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \
624-
# export CXXFLAGS="-std=c++11 -Wno-missing-field-initializers" && \
625-
# cmake \
626-
# -DVERSION_PATCH=$(echo "$(git rev-list --count --first-parent HEAD)") \
627-
# -DGIT_INFO=$(echo "git_$(git rev-parse --short HEAD)") \
628-
# -DCMAKE_BUILD_TYPE=Release \
629-
# -DDISABLE_SAMPLES=ON \
630-
# -DDISABLE_VAAPI=ON \
631-
# -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
632-
# make -j4
633-
#RUN mkdir -p build/usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
634-
# cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
635-
#RUN mkdir -p /usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
636-
# cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
616+
ARG VA_GSTREAMER_PLUGINS_VER=0.4.2
617+
ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
637618

638-
#Install va gstreamer plugins
639-
#Has a dependency on OpenCV, GStreamer
640-
#ARG VA_GSTREAMER_PLUGINS_VER=0.4
641-
#ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
642-
643-
ARG VA_GSTREAMER_PLUGINS_VER=21976c5769851bb4e4f2f92dcf9d94518fdc87f5
644-
ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/fkhoshne/gst-video-analytics.git
645-
646-
RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
647-
cd gst-video-analytics && \
648-
git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
649-
git submodule init && git submodule update && \
619+
RUN wget -O - ${VA_GSTREAMER_PLUGINS_REPO} | tar xz && \
620+
cd gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER} && \
650621
mkdir build && \
651622
cd build && \
652623
export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \
@@ -656,15 +627,15 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
656627
-DGIT_INFO=$(echo "git_$(git rev-parse --short HEAD)") \
657628
-DCMAKE_BUILD_TYPE=Release \
658629
-DDISABLE_SAMPLES=ON \
659-
-DMQTT=ON \
660-
-DKAFKA=ON \
661-
-DDISABLE_VAAPI=ON -DENABLE_AVX2=ON -DENABLE_SSE42=ON \
630+
-DMQTT=1 \
631+
-DKAFKA=1 \
632+
-DDISABLE_VAAPI=ON -DENABLE_AVX2=ON -DENABLE_SSE42=ON \
662633
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
663634
make -j4
664635
RUN mkdir -p build/usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
665-
cp -r gst-video-analytics/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
636+
cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
666637
RUN mkdir -p /usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
667-
cp -r gst-video-analytics/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
638+
cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
668639

669640
# Clean up after build
670641
RUN rm -rf /home/build/usr/include && \

‎ad-insertion/video-analytics-service/platforms/Xeon/Dockerfile.2.gst.xeon‎

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -498,40 +498,11 @@ RUN if [ "$RDKAFKA_INSTALL" = "true" ] ; then \
498498

499499
#Install va gstreamer plugins
500500
#Has a dependency on OpenCV, GStreamer
501-
#ARG VA_GSTREAMER_PLUGINS_VER=0.4
502-
#ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
503-
504-
#RUN wget -O - ${VA_GSTREAMER_PLUGINS_REPO} | tar xz && \
505-
# cd gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER} && \
506-
# mkdir build && \
507-
# cd build && \
508-
# export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \
509-
# export CXXFLAGS="-std=c++11 -Wno-missing-field-initializers" && \
510-
# cmake \
511-
# -DVERSION_PATCH=$(echo "$(git rev-list --count --first-parent HEAD)") \
512-
# -DGIT_INFO=$(echo "git_$(git rev-parse --short HEAD)") \
513-
# -DCMAKE_BUILD_TYPE=Release \
514-
# -DDISABLE_SAMPLES=ON \
515-
# -DDISABLE_VAAPI=ON \
516-
# -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
517-
# make -j4
518-
#RUN mkdir -p build/usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
519-
# cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
520-
#RUN mkdir -p /usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
521-
# cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
501+
ARG VA_GSTREAMER_PLUGINS_VER=0.4.2
502+
ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
522503

523-
#Install va gstreamer plugins
524-
#Has a dependency on OpenCV, GStreamer
525-
#ARG VA_GSTREAMER_PLUGINS_VER=0.4
526-
#ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/opencv/gst-video-analytics/archive/v${VA_GSTREAMER_PLUGINS_VER}.tar.gz
527-
528-
ARG VA_GSTREAMER_PLUGINS_VER=21976c5769851bb4e4f2f92dcf9d94518fdc87f5
529-
ARG VA_GSTREAMER_PLUGINS_REPO=https://github.com/fkhoshne/gst-video-analytics.git
530-
531-
RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
532-
cd gst-video-analytics && \
533-
git checkout ${VA_GSTREAMER_PLUGINS_VER} && \
534-
git submodule init && git submodule update && \
504+
RUN wget -O - ${VA_GSTREAMER_PLUGINS_REPO} | tar xz && \
505+
cd gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER} && \
535506
mkdir build && \
536507
cd build && \
537508
export CFLAGS="-std=gnu99 -Wno-missing-field-initializers" && \
@@ -541,15 +512,15 @@ RUN git clone ${VA_GSTREAMER_PLUGINS_REPO} && \
541512
-DGIT_INFO=$(echo "git_$(git rev-parse --short HEAD)") \
542513
-DCMAKE_BUILD_TYPE=Release \
543514
-DDISABLE_SAMPLES=ON \
544-
-DMQTT=ON \
545-
-DKAFKA=ON \
546515
-DDISABLE_VAAPI=ON \
516+
-DMQTT=1 \
517+
-DKAFKA=1 \
547518
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
548519
make -j4
549520
RUN mkdir -p build/usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
550-
cp -r gst-video-analytics/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
521+
cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* build/usr/lib/x86_64-linux-gnu/gstreamer-1.0
551522
RUN mkdir -p /usr/lib/x86_64-linux-gnu/gstreamer-1.0 && \
552-
cp -r gst-video-analytics/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
523+
cp -r gst-video-analytics-${VA_GSTREAMER_PLUGINS_VER}/build/intel64/Release/lib/* /usr/lib/x86_64-linux-gnu/gstreamer-1.0
553524

554525
# Clean up after build
555526
RUN rm -rf /home/build/usr/include && \

0 commit comments

Comments
 (0)