From c237c73e4e365a230d39351dcb303ba06d58705d Mon Sep 17 00:00:00 2001 From: liudimin Date: Wed, 16 Aug 2023 16:06:11 +0800 Subject: [PATCH] Resolve KLV PC prview black screen problem. Signed-off-by: liudimin --- .../v4l2/src/device_manager/v4l2_device_manager.cpp | 3 +++ .../v4l2/src/device_manager/v4l2_device_manager.cpp | 7 +++++-- .../vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp | 6 ------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/v4l2_device_manager.cpp b/camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/v4l2_device_manager.cpp index 1719bcdae4..3a631f1615 100644 --- a/camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/v4l2_device_manager.cpp +++ b/camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/v4l2_device_manager.cpp @@ -663,6 +663,9 @@ void V4L2DeviceManager::ConvertAbilityStreamAvailableExtendConfigurationsToOhos( formatVector.push_back(it.fmtdesc.width); formatVector.push_back(it.fmtdesc.height); formatVector.push_back(fpsValue); + formatVector.push_back(fpsValue); + formatVector.push_back(fpsValue); + formatVector.push_back(END_SYMBOL); } } formatVector.push_back(END_SYMBOL); diff --git a/camera/vdi_base/usb_camera/adapter/platform/v4l2/src/device_manager/v4l2_device_manager.cpp b/camera/vdi_base/usb_camera/adapter/platform/v4l2/src/device_manager/v4l2_device_manager.cpp index fe47e4b761..966f38bee6 100644 --- a/camera/vdi_base/usb_camera/adapter/platform/v4l2/src/device_manager/v4l2_device_manager.cpp +++ b/camera/vdi_base/usb_camera/adapter/platform/v4l2/src/device_manager/v4l2_device_manager.cpp @@ -624,7 +624,7 @@ void V4L2DeviceManager::ConvertAbilityStreamAvailableExtendConfigurationsToOhos( const int PREVIEW_STREAM = 0; const int CAPTURE_STREAM = 2; const int VIDEO_STREAM = 1; - const int format = 1; + const int FORMAT = 1; std::string name = "YUYV 4:2:2"; std::vector formatVector; int32_t fpsValue = 0; @@ -637,7 +637,10 @@ void V4L2DeviceManager::ConvertAbilityStreamAvailableExtendConfigurationsToOhos( formatVector.push_back(it.fmtdesc.width); formatVector.push_back(it.fmtdesc.height); formatVector.push_back(fpsValue); - formatVector.push_back(format); + formatVector.push_back(fpsValue); + formatVector.push_back(fpsValue); + formatVector.push_back(END_SYMBOL); + formatVector.push_back(FORMAT); } } if (formatVector.size() > 0) { diff --git a/camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp b/camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp index c6f766b242..527dcb21fe 100644 --- a/camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp +++ b/camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp @@ -114,12 +114,6 @@ int32_t CameraHostVdiImpl::GetCameraAbility(const std::string &cameraId, return VDI::Camera::V1_0::INVALID_ARGUMENT; } - common_metadata_header_t *data = ability->get(); - camera_metadata_item_t entry; - if (FindCameraMetadataItem(data, OHOS_ABILITY_STREAM_AVAILABLE_EXTEND_CONFIGURATIONS, &entry) == 0) { - (void)DeleteCameraMetadataItem(data, OHOS_ABILITY_STREAM_AVAILABLE_EXTEND_CONFIGURATIONS); - } - CameraDumper &dumper = CameraDumper::GetInstance(); dumper.DumpMetadata(ability, "cameraAbility"); MetadataUtils::ConvertMetadataToVec(ability, cameraAbility); -- Gitee