Fix crash on VD browser new tab with USB camera

Added the enum values used in VideoCaptureApi to allow mojom conversion.

ReadAvailabality() call is introduced in M126, this needs to be checked
and implemented for Tizen Camera, will be enabled during M130 Bringup.

Change-Id: I4d78e49d132e61b4ccc7b92ed937d53510d6ff75
Signed-off-by: Pranay Chauhan <pranay.c1@samsung.com>
Signed-off-by: Suhaspoornachandra <s.poornachan@samsung.com>

diff --git a/media/capture/mojom/BUILD.gn b/media/capture/mojom/BUILD.gn
index 53cf752af39aee8b98ab3204558925b373dabc08..4dd69256c8164213938e4264cf07332093bc5662 100644 (file)
--- a/media/capture/mojom/BUILD.gn
+++ b/media/capture/mojom/BUILD.gn
@@ -17,6 +17,10 @@ if (tizen_tbm_support) {
   enabled_features += [ "tizen_tbm_support" ]
 }
 
+if (tizen_product_tv) {
+  enabled_features += [ "is_tizen_tv" ]
+}
+
 mojom("video_capture") {
   generate_java = true
   sources = [ "video_capture.mojom" ]

diff --git a/media/capture/mojom/video_capture_types.mojom b/media/capture/mojom/video_capture_types.mojom
index f3a457ad6897bc2b1d4f6242ef1a812bc61c14b5..181ca1b1fd08afeb0793bca6dab9695414c83854 100644 (file)
--- a/media/capture/mojom/video_capture_types.mojom
+++ b/media/capture/mojom/video_capture_types.mojom
@@ -92,6 +92,10 @@ enum VideoCaptureApi {
   ANDROID_API2_LIMITED,
   FUCHSIA_CAMERA3,
   VIRTUAL_DEVICE,
+  [EnableIf = is_tizen_tv]
+  TIZEN_CAPI_CAMERA_LOCAL,
+  [EnableIf = is_tizen_tv]
+  TIZEN_CAPI_CAMERA_REMOTE,
   UNKNOWN
 };
 

diff --git a/media/capture/mojom/video_capture_types_mojom_traits.cc b/media/capture/mojom/video_capture_types_mojom_traits.cc
index e4b0f023c40a86bb783c1bf95089a96a00165619..cf10b921bd47a07977b5561dd29c7bb3a4bd0b80 100644 (file)
--- a/media/capture/mojom/video_capture_types_mojom_traits.cc
+++ b/media/capture/mojom/video_capture_types_mojom_traits.cc
@@ -1807,6 +1807,12 @@ EnumTraits<media::mojom::VideoCaptureApi, media::VideoCaptureApi>::ToMojom(
       return media::mojom::VideoCaptureApi::FUCHSIA_CAMERA3;
     case media::VideoCaptureApi::VIRTUAL_DEVICE:
       return media::mojom::VideoCaptureApi::VIRTUAL_DEVICE;
+#if BUILDFLAG(IS_TIZEN_TV)
+    case media::VideoCaptureApi::TIZEN_CAPI_CAMERA_LOCAL:
+      return media::mojom::VideoCaptureApi::TIZEN_CAPI_CAMERA_LOCAL;
+    case media::VideoCaptureApi::TIZEN_CAPI_CAMERA_REMOTE:
+      return media::mojom::VideoCaptureApi::TIZEN_CAPI_CAMERA_REMOTE;
+#endif
     case media::VideoCaptureApi::UNKNOWN:
       return media::mojom::VideoCaptureApi::UNKNOWN;
   }
@@ -1869,6 +1875,14 @@ bool EnumTraits<media::mojom::VideoCaptureApi, media::VideoCaptureApi>::
     case media::mojom::VideoCaptureApi::VIRTUAL_DEVICE:
       *output = media::VideoCaptureApi::VIRTUAL_DEVICE;
       return true;
+#if BUILDFLAG(IS_TIZEN_TV)
+    case media::mojom::VideoCaptureApi::TIZEN_CAPI_CAMERA_LOCAL:
+      *output = media::VideoCaptureApi::TIZEN_CAPI_CAMERA_LOCAL;
+      return true;
+    case media::mojom::VideoCaptureApi::TIZEN_CAPI_CAMERA_REMOTE:
+      *output = media::VideoCaptureApi::TIZEN_CAPI_CAMERA_REMOTE;
+      return true;
+#endif
     case media::mojom::VideoCaptureApi::UNKNOWN:
       *output = media::VideoCaptureApi::UNKNOWN;
       return true;
@@ -1983,9 +1997,11 @@ bool StructTraits<media::mojom::VideoCaptureDeviceDescriptorDataView,
     return false;
   if (!data.ReadFacingMode(&(output->facing)))
     return false;
+#if !defined(EWK_BRINGUP)  // Fixme:M130 Bringup
   if (!data.ReadAvailability(&(output->availability))) {
     return false;
   }
+#endif
   if (!data.ReadCaptureApi(&(output->capture_api)))
     return false;
   media::VideoCaptureControlSupport control_support;