[v21.6] Fix test config for vmaf (#771)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* [master] Fix Opencv 4.5.2 build with Toolset on Centos 7 (#746)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix opencv 4.5.2 build with toolset

Co-authored-by: jhou5 <[email protected]>

* [master] Upgrade Meson for Ubuntu-20.04 (#748)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* meson version fix

Co-authored-by: jhou5 <[email protected]>

* [master] Test fixes for Release v21.6 - part 1 (#750)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* v216 tests update - part 1

Co-authored-by: jhou5 <[email protected]>

* [master] Test fixes for Release v21.6 - part 2 (#755)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* v216 tests update - part 1

* Test fixes for Release v21.6 - part 2

Co-authored-by: jhou5 <[email protected]>

* [master] Bug fixes for Release v21.6 (#757)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* Bug fixes for v21.6. See details

- QAT Engine build param fix
- revert scvp change for owt360
- test name change for proper injection of tests
- devoolset opencv fix
- nginx conf sw_fallback off

* revert accidental fdkaac change

Co-authored-by: jhou5 <[email protected]>

* [master] Owt boost revert (#759)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* revert boost for owt on centos7

Co-authored-by: jhou5 <[email protected]>

* [master] Fix Ipsec caused u2004 bug (#762)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix ipsecmb caused system fault in u2004

Co-authored-by: jhou5 <[email protected]>

* [master] Dldt Video Analytics test fix (#764)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix dldt gva tests broken by links

Co-authored-by: jhou5 <[email protected]>

* Ubuntu 20.04 fix for vaapi failures (#766)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* fix u2004 images for vaapi due to lib change

Co-authored-by: jhou5 <[email protected]>

* [master] License Triggered changes from PDT feedback (#768)

* Update Docker image README (#704)

* update README

* Update dockerfiles

* ffmpeg/openssl/libvmaf license related changes

* ffmpeg-nonfree change

* restructure gpl flag

* gpl changes for 264/265 properly

* re-add the components needed for 264/265 building & test changes

Co-authored-by: jhou5 <[email protected]>

* vmaf test config fix

Co-authored-by: jhou5 <[email protected]>

script/dldt-gst-tests.cmake

@@ -6,6 +6,7 @@ foreach(test ${tests})
     elseif(("${image}" MATCHES "vcaca") AND NOT (${name} MATCHES "vcaca"))
     #Do not add non-vcaca video analytics test to vcaca
     elseif("${image}" MATCHES "dev" AND ${name} MATCHES "video_analytics")
+    #Do not add analytics test case with 264 in dev images
     else()
     add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}")
     endif()

script/ffmpeg-tests.cmake

@@ -5,8 +5,10 @@ foreach(test ${tests})
     #Do not add svt test for VCACA DEV image
     elseif(${image} MATCHES "analytics" AND ${name} STREQUAL "ffmpeg_vmaf")
     #Do not add vmaf test for analytics image
+    elseif(NOT ${image} MATCHES "vmaf" AND ${name} STREQUAL "ffmpeg_vmaf")
+    #Do not add vmaf test to non vmaf images
     elseif(${image} MATCHES "dev" AND ${name} MATCHES "(1dns|x265|x264?)")
-    #Do not add vmaf test for analytics image
+    #Do not add GPL component tests for dev image
     else()
     add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}")
     endif()

script/gst-tests.cmake

@@ -6,7 +6,7 @@ foreach(test ${tests})
     elseif(${image} MATCHES "vcaca" AND ${name} MATCHES "(svt|hevc|av1?)")
     #Do not add svt test for VCACA DEV image
     elseif(${image} MATCHES "dev" AND ${name} MATCHES "(x264|x265?)")
-    #Do not add svt test for VCACA DEV image
+    #Do not add GPL component test for DEV images
     else()
     add_test(test_${image}_${name} "${CMAKE_CURRENT_SOURCE_DIR}/shell.sh" "/mnt/${name}.sh" "${image}")
     endif()