fixup! [TTVD] Add support for AI zoom during video capture

Backporting fix from M120, which solves buildbreak on products
with disabled `tizen_auto_zoom_enable` functionality.

Check difference between 1st and 3rd patchset of
https://review.tizen.org/gerrit/c/platform/framework/web/chromium-efl/+/316237/1..3
for reference.

Bug: https://jira-eu.sec.samsung.net/browse/VDWASM-1800
Change-Id: I44667985823f9cbe07a68915cf8bff693d7ad852
Signed-off-by: Michal Jurkiewicz <m.jurkiewicz@samsung.com>

diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn
index c2183ffacc8bf17328f3f3bc19235aa2a018c2ba..7da76267cde1648f78f9cc5b3398b0a2ba253cc0 100644 (file)
--- a/media/capture/BUILD.gn
+++ b/media/capture/BUILD.gn
@@ -186,9 +186,7 @@ component("capture_lib") {
   }
 
   if (tizen_tv_upstream_multimedia) {
-    configs += [
-      ":capture_logger_config",
-    ]
+    configs += [ ":capture_logger_config" ]
 
     sources += [
       "video/tizen/gpu_memory_buffer_tracker_tizen.cc",
@@ -199,14 +197,14 @@ component("capture_lib") {
       sources += [
         "video/tizen/ai_zoom_helper.cc",
         "video/tizen/ai_zoom_helper.h",
-        "video/tizen/camera_utils.cc",
-        "video/tizen/camera_utils.h",
         "video/tizen/camera.cc",
         "video/tizen/camera.h",
+        "video/tizen/camera_utils.cc",
+        "video/tizen/camera_utils.h",
         "video/tizen/create_face_detection_library.cc",
         "video/tizen/create_face_detection_library.h",
-        "video/tizen/face_detection_library.h",
         "video/tizen/face_detection.h",
+        "video/tizen/face_detection_library.h",
         "video/tizen/video_capture_device_factory_tizen_tv.cc",
         "video/tizen/video_capture_device_factory_tizen_tv.h",
         "video/tizen/video_capture_device_tizen_tv.cc",
@@ -214,25 +212,25 @@ component("capture_lib") {
       ]
     }
 
-    if (tizen_version >= 70) {
-      sources += [
-        "video/tizen/face_detection_library_object.cc",
-        "video/tizen/face_detection_library_object.h",
-      ]
-      if (!defined(public_configs)) {
-        public_configs = []
+    if (tizen_auto_zoom_enable) {
+      if (tizen_version >= 70) {
+        sources += [
+          "video/tizen/face_detection_library_object.cc",
+          "video/tizen/face_detection_library_object.h",
+        ]
+        public_configs = [
+          # For AIFW
+          "//tizen_src/build:libauto_zoom",
+
+          # For missing shared library from AIFW
+          "//tizen_src/build:aifw_object_detection",
+        ]
+      } else {
+        sources += [
+          "video/tizen/face_detection_library_impl.cc",
+          "video/tizen/face_detection_library_impl.h",
+        ]
       }
-      public_configs += [
-        # For AIFW
-        "//tizen_src/build:libauto_zoom",
-        # For missing shared library from AIFW
-        "//tizen_src/build:aifw_object_detection",
-      ]
-    } else {
-      sources += [
-        "video/tizen/face_detection_library_impl.cc",
-        "video/tizen/face_detection_library_impl.h",
-      ]
     }
   }
 

diff --git a/media/capture/video/tizen/ai_zoom_helper.cc b/media/capture/video/tizen/ai_zoom_helper.cc
index fd165784d05f9c95683e7af0ff98d73b8f894329..4be124084f0b17faf5a9e9732160c9d494fd2f00 100644 (file)
--- a/media/capture/video/tizen/ai_zoom_helper.cc
+++ b/media/capture/video/tizen/ai_zoom_helper.cc
@@ -4,6 +4,9 @@
 
 #include "media/capture/video/tizen/ai_zoom_helper.h"
 
+#include <algorithm>
+#include <utility>
+
 #include "media/base/tizen/logger/media_logger.h"
 #include "media/base/video_frame.h"
 #include "media/capture/video/tizen/create_face_detection_library.h"

diff --git a/media/capture/video/tizen/create_face_detection_library.cc b/media/capture/video/tizen/create_face_detection_library.cc
index aa07d32b6b577242dc9e7f334d3e985e52ba308e..cf32c542b4bc440605b50feaacf64d932054ea66 100644 (file)
--- a/media/capture/video/tizen/create_face_detection_library.cc
+++ b/media/capture/video/tizen/create_face_detection_library.cc
@@ -5,20 +5,26 @@
 #include "media/capture/video/tizen/create_face_detection_library.h"
 #include "build/tizen_version.h"
 
+#if defined(TIZEN_AUTO_ZOOM_ENABLE)
 #if TIZEN_VERSION_AT_LEAST(7, 0, 0)
 #include "media/capture/video/tizen/face_detection_library_object.h"
 #else
 #include "media/capture/video/tizen/face_detection_library_impl.h"
-#endif
+#endif  // TIZEN_VERSION_AT_LEAST(7, 0, 0)
+#endif  // defined(TIZEN_AUTO_ZOOM_ENABLE)
 
 namespace media {
 
 std::unique_ptr<FaceDetectionLibrary> CreateFaceDetectionLibrary() {
+#if defined(TIZEN_AUTO_ZOOM_ENABLE)
 #if TIZEN_VERSION_AT_LEAST(7, 0, 0)
   return FaceDetectionLibraryObject::Create();
 #else
   return FaceDetectionLibraryImpl::Create();
-#endif
+#endif  // TIZEN_VERSION_AT_LEAST(7, 0, 0)
+#else
+  return nullptr;
+#endif  // defined(TIZEN_AUTO_ZOOM_ENABLE)
 }
 
 }  // namespace media

diff --git a/media/capture/video/tizen/face_detection_library_impl.cc b/media/capture/video/tizen/face_detection_library_impl.cc
index 585e20813669ea51f580a66d8152a8fceedcc191..de6b9a8139070a84fe075bbaae9eaad888a121a6 100644 (file)
--- a/media/capture/video/tizen/face_detection_library_impl.cc
+++ b/media/capture/video/tizen/face_detection_library_impl.cc
@@ -4,6 +4,9 @@
 
 #include "media/capture/video/tizen/face_detection_library_impl.h"
 
+#include <string>
+#include <utility>
+
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"

diff --git a/media/capture/video/tizen/face_detection_library_impl.h b/media/capture/video/tizen/face_detection_library_impl.h
index a20a286042441452dcdcffdd915785cc1a1e467f..174b0bff06409befdbc6b8de34f4ef2690a0fb49 100644 (file)
--- a/media/capture/video/tizen/face_detection_library_impl.h
+++ b/media/capture/video/tizen/face_detection_library_impl.h
@@ -6,6 +6,8 @@
 #define MEDIA_CAPTURE_VIDEO_TIZEN_FACE_DETECTION_LIBRARY_IMPL_H_
 
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "base/scoped_native_library.h"
 #include "media/capture/video/tizen/face_detection.h"

diff --git a/media/capture/video/tizen/face_detection_library_object.h b/media/capture/video/tizen/face_detection_library_object.h
index 4dd007dccc66c5f9dbe144212ee705da7b1a9c80..7fd3e3f4343056122ebe8e92ac89a1ca41eb117f 100644 (file)
--- a/media/capture/video/tizen/face_detection_library_object.h
+++ b/media/capture/video/tizen/face_detection_library_object.h
@@ -6,6 +6,7 @@
 #define MEDIA_CAPTURE_VIDEO_TIZEN_FACE_DETECTION_LIBRARY_OBJECT_H_
 
 #include <memory>
+#include <vector>
 
 #include <aifw_core/vision/object_detection.h>