From a48a8f53870cae2f94f305132065cbe6e0e449d8 Mon Sep 17 00:00:00 2001 From: liudimin Date: Fri, 1 Sep 2023 16:06:55 +0800 Subject: [PATCH] Remove dependy to display. Signed-off-by: liudimin --- camera/interfaces/include/display_format.h | 113 ++++++++++++++++++ camera/test/benchmarktest/v1_0/BUILD.gn | 1 - camera/test/benchmarktest/v1_1/BUILD.gn | 1 - camera/test/demo/BUILD.gn | 2 - camera/test/demo/stream_customer.h | 3 +- camera/test/fuzztest/camera_device/BUILD.gn | 1 - camera/test/fuzztest/camera_host/BUILD.gn | 1 - camera/test/fuzztest/stream_operator/BUILD.gn | 1 - camera/test/hdi/v1_0/BUILD.gn | 2 - camera/test/hdi/v1_0/include/ut_common.h | 3 +- camera/test/hdi/v1_1/BUILD.gn | 1 - .../test/hdi/v1_1/include/hdi_common_v1_1.h | 3 +- camera/test/mpi/BUILD.gn | 2 - camera/test/mpi/include/common.h | 2 +- camera/test/ut/buffer_manager/BUILD.gn | 2 - .../ut/buffer_manager/buffer_manager_utest.h | 2 +- camera/test/ut/usb_camera/BUILD.gn | 1 - camera/test/ut/v4l2/BUILD.gn | 2 - camera/test/ut/v4l2/stream_customer.h | 2 +- camera/test/ut/v4l2/test_camera_base.h | 3 +- .../vdi_base/common/buffer_manager/BUILD.gn | 8 +- .../src/buffer_adapter/lite/buffer_adapter.h | 2 +- .../buffer_adapter/standard/buffer_adapter.h | 3 +- .../usb_camera/buffer_manager/BUILD.gn | 2 +- camera/vdi_base/usb_camera/vdi_impl/BUILD.gn | 2 - .../stream_operator/stream_statistics.h | 2 +- .../stream_tunnel/lite/stream_tunnel.h | 3 +- .../stream_tunnel/standard/stream_tunnel.h | 3 +- 28 files changed, 129 insertions(+), 44 deletions(-) create mode 100644 camera/interfaces/include/display_format.h diff --git a/camera/interfaces/include/display_format.h b/camera/interfaces/include/display_format.h new file mode 100644 index 0000000000..b8d76e6c73 --- /dev/null +++ b/camera/interfaces/include/display_format.h @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file display_format.h + * + * @brief Declares display format-related enumeration. + * + * @since 1.0 + * @version 1.0 + */ + +#ifndef DISPLAY_FORMAT_H +#define DISPLAY_FORMAT_H + +#include + +namespace OHOS::Camera { + +enum BufferUsage : uint64_t { + HBM_USE_CPU_READ = (1ULL << 0), + HBM_USE_CPU_WRITE = (1ULL << 1), + HBM_USE_MEM_MMZ = (1ULL << 2), + HBM_USE_MEM_DMA = (1ULL << 3), + HBM_USE_MEM_SHARE = (1ULL << 4), + HBM_USE_MEM_MMZ_CACHE = (1ULL << 5), + HBM_USE_MEM_FB = (1ULL << 6), + HBM_USE_ASSIGN_SIZE = (1ULL << 7), + HBM_USE_HW_RENDER = (1ULL << 8), + HBM_USE_HW_TEXTURE = (1ULL << 9), + HBM_USE_HW_COMPOSER = (1ULL << 10), + HBM_USE_PROTECTED = (1ULL << 11), + HBM_USE_CAMERA_READ = (1ULL << 12), + HBM_USE_CAMERA_WRITE = (1ULL << 13), + HBM_USE_VIDEO_ENCODER = (1ULL << 14), + HBM_USE_VIDEO_DECODER = (1ULL << 15), + HBM_USE_CPU_READ_OFTEN = (1ULL << 16), + HBM_USE_VENDOR_PRI0 = (1ULL << 44), + HBM_USE_VENDOR_PRI1 = (1ULL << 45), + HBM_USE_VENDOR_PRI2 = (1ULL << 46), + HBM_USE_VENDOR_PRI3 = (1ULL << 47), + HBM_USE_VENDOR_PRI4 = (1ULL << 48), + HBM_USE_VENDOR_PRI5 = (1ULL << 49), + HBM_USE_VENDOR_PRI6 = (1ULL << 50), + HBM_USE_VENDOR_PRI7 = (1ULL << 51), + HBM_USE_VENDOR_PRI8 = (1ULL << 52), + HBM_USE_VENDOR_PRI9 = (1ULL << 53), + HBM_USE_VENDOR_PRI10 = (1ULL << 54), + HBM_USE_VENDOR_PRI11 = (1ULL << 55), + HBM_USE_VENDOR_PRI12 = (1ULL << 56), + HBM_USE_VENDOR_PRI13 = (1ULL << 57), + HBM_USE_VENDOR_PRI14 = (1ULL << 58), + HBM_USE_VENDOR_PRI15 = (1ULL << 59), + HBM_USE_VENDOR_PRI16 = (1ULL << 60), + HBM_USE_VENDOR_PRI17 = (1ULL << 61), + HBM_USE_VENDOR_PRI18 = (1ULL << 62), + HBM_USE_VENDOR_PRI19 = (1ULL << 63), +}; + +enum PixelFormat : int32_t { + PIXEL_FMT_CLUT8 = 0, + PIXEL_FMT_CLUT1, + PIXEL_FMT_CLUT4, + PIXEL_FMT_RGB_565, + PIXEL_FMT_RGBA_5658, + PIXEL_FMT_RGBX_4444, + PIXEL_FMT_RGBA_4444, + PIXEL_FMT_RGB_444, + PIXEL_FMT_RGBX_5551, + PIXEL_FMT_RGBA_5551, + PIXEL_FMT_RGB_555, + PIXEL_FMT_RGBX_8888, + PIXEL_FMT_RGBA_8888, + PIXEL_FMT_RGB_888, + PIXEL_FMT_BGR_565, + PIXEL_FMT_BGRX_4444, + PIXEL_FMT_BGRA_4444, + PIXEL_FMT_BGRX_5551, + PIXEL_FMT_BGRA_5551, + PIXEL_FMT_BGRX_8888, + PIXEL_FMT_BGRA_8888, + PIXEL_FMT_YUV_422_I, + PIXEL_FMT_YCBCR_422_SP, + PIXEL_FMT_YCRCB_422_SP, + PIXEL_FMT_YCBCR_420_SP, + PIXEL_FMT_YCRCB_420_SP, + PIXEL_FMT_YCBCR_422_P, + PIXEL_FMT_YCRCB_422_P, + PIXEL_FMT_YCBCR_420_P, + PIXEL_FMT_YCRCB_420_P, + PIXEL_FMT_YUYV_422_PKG, + PIXEL_FMT_UYVY_422_PKG, + PIXEL_FMT_YVYU_422_PKG, + PIXEL_FMT_VYUY_422_PKG, + PIXEL_FMT_RGBA_1010102, + PIXEL_FMT_VENDER_MASK = 0X7FFF0000, + PIXEL_FMT_BUTT = 0X7FFFFFFF, +}; + +} // end namespace OHOS::Camera +#endif diff --git a/camera/test/benchmarktest/v1_0/BUILD.gn b/camera/test/benchmarktest/v1_0/BUILD.gn index dbcfee57ec..7f4fe54de9 100644 --- a/camera/test/benchmarktest/v1_0/BUILD.gn +++ b/camera/test/benchmarktest/v1_0/BUILD.gn @@ -67,7 +67,6 @@ ohos_benchmarktest("hdf_camera_benchmark_test") { external_deps += [ "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "samgr:samgr_proxy", ] diff --git a/camera/test/benchmarktest/v1_1/BUILD.gn b/camera/test/benchmarktest/v1_1/BUILD.gn index c9020ace47..4855d8d804 100644 --- a/camera/test/benchmarktest/v1_1/BUILD.gn +++ b/camera/test/benchmarktest/v1_1/BUILD.gn @@ -67,7 +67,6 @@ ohos_benchmarktest("hdf_camera_benchmark_test_v1_1") { external_deps += [ "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "samgr:samgr_proxy", ] diff --git a/camera/test/demo/BUILD.gn b/camera/test/demo/BUILD.gn index 713b9b5521..c7f73cd87f 100644 --- a/camera/test/demo/BUILD.gn +++ b/camera/test/demo/BUILD.gn @@ -77,7 +77,6 @@ if (defined(ohos_lite)) { external_deps = [ "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:libhdf_utils", "hilog_lite:hilog_shared", @@ -156,7 +155,6 @@ if (defined(ohos_lite)) { "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "ipc:ipc_single", "samgr:samgr_proxy", diff --git a/camera/test/demo/stream_customer.h b/camera/test/demo/stream_customer.h index 99cd528d3b..964e0ba72e 100644 --- a/camera/test/demo/stream_customer.h +++ b/camera/test/demo/stream_customer.h @@ -22,7 +22,7 @@ #include #include #include -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "camera_metadata_info.h" #include "ibuffer.h" #include "v1_0/ioffline_stream_operator.h" @@ -33,7 +33,6 @@ #endif namespace OHOS::Camera { -using namespace OHOS::HDI::Display::Composer::V1_0; class StreamCustomer { public: StreamCustomer(); diff --git a/camera/test/fuzztest/camera_device/BUILD.gn b/camera/test/fuzztest/camera_device/BUILD.gn index 9b7deba243..b65d2f1a66 100644 --- a/camera/test/fuzztest/camera_device/BUILD.gn +++ b/camera/test/fuzztest/camera_device/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("camera_device_fuzztest") { "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:libcamera_proxy_1.1", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "samgr:samgr_proxy", ] diff --git a/camera/test/fuzztest/camera_host/BUILD.gn b/camera/test/fuzztest/camera_host/BUILD.gn index a631071ea5..01836a7f2b 100644 --- a/camera/test/fuzztest/camera_host/BUILD.gn +++ b/camera/test/fuzztest/camera_host/BUILD.gn @@ -73,7 +73,6 @@ ohos_fuzztest("camera_host_fuzztest") { "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:libcamera_proxy_1.1", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "samgr:samgr_proxy", ] diff --git a/camera/test/fuzztest/stream_operator/BUILD.gn b/camera/test/fuzztest/stream_operator/BUILD.gn index b4e02cb767..3c0e49778b 100644 --- a/camera/test/fuzztest/stream_operator/BUILD.gn +++ b/camera/test/fuzztest/stream_operator/BUILD.gn @@ -73,7 +73,6 @@ ohos_fuzztest("stream_operator_fuzztest") { "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:libcamera_proxy_1.1", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "samgr:samgr_proxy", ] diff --git a/camera/test/hdi/v1_0/BUILD.gn b/camera/test/hdi/v1_0/BUILD.gn index 130588733c..8414841cef 100644 --- a/camera/test/hdi/v1_0/BUILD.gn +++ b/camera/test/hdi/v1_0/BUILD.gn @@ -75,7 +75,6 @@ if (defined(ohos_lite)) { external_deps = [ "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:hdf_platform", "hdf_core:hdf_posix_osal", @@ -144,7 +143,6 @@ if (defined(ohos_lite)) { "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "samgr:samgr_proxy", ] diff --git a/camera/test/hdi/v1_0/include/ut_common.h b/camera/test/hdi/v1_0/include/ut_common.h index a2d8df78a9..38dddbc0c9 100644 --- a/camera/test/hdi/v1_0/include/ut_common.h +++ b/camera/test/hdi/v1_0/include/ut_common.h @@ -33,7 +33,7 @@ #include "v1_0/istream_operator.h" #include "v1_0/camera_host_proxy.h" #include "v1_0/ioffline_stream_operator.h" -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "iconsumer_surface.h" namespace OHOS::Camera { @@ -49,7 +49,6 @@ enum ImageDataSaveSwitch { SWITCH_ON, }; using namespace OHOS::HDI::Camera::V1_0; -using namespace OHOS::HDI::Display::Composer::V1_0; class Test { public: void Init(); diff --git a/camera/test/hdi/v1_1/BUILD.gn b/camera/test/hdi/v1_1/BUILD.gn index f41cbcc090..b4783b8c27 100644 --- a/camera/test/hdi/v1_1/BUILD.gn +++ b/camera/test/hdi/v1_1/BUILD.gn @@ -72,7 +72,6 @@ ohos_unittest("camera_test_hdi_V1_1") { "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:libcamera_proxy_1.1", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "samgr:samgr_proxy", ] diff --git a/camera/test/hdi/v1_1/include/hdi_common_v1_1.h b/camera/test/hdi/v1_1/include/hdi_common_v1_1.h index 5d37846cf1..38dffa7d56 100644 --- a/camera/test/hdi/v1_1/include/hdi_common_v1_1.h +++ b/camera/test/hdi/v1_1/include/hdi_common_v1_1.h @@ -33,7 +33,7 @@ #include "v1_1/istream_operator.h" #include "v1_1/camera_host_proxy.h" #include "v1_0/ioffline_stream_operator.h" -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "iconsumer_surface.h" namespace OHOS::Camera { @@ -50,7 +50,6 @@ enum ImageDataSaveSwitch { SWITCH_ON, }; using namespace OHOS::HDI::Camera::V1_0; -using namespace OHOS::HDI::Display::Composer::V1_0; class Test { public: void Init(); diff --git a/camera/test/mpi/BUILD.gn b/camera/test/mpi/BUILD.gn index b6842624cb..6a3e97dce1 100644 --- a/camera/test/mpi/BUILD.gn +++ b/camera/test/mpi/BUILD.gn @@ -93,7 +93,6 @@ if (defined(ohos_lite)) { external_deps = [ "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:hdf_posix_osal", "hilog_lite:hilog_shared", @@ -200,7 +199,6 @@ if (defined(ohos_lite)) { "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "init:libbegetutil", "ipc:ipc_single", diff --git a/camera/test/mpi/include/common.h b/camera/test/mpi/include/common.h index d5ed9a71c8..d80b644d33 100644 --- a/camera/test/mpi/include/common.h +++ b/camera/test/mpi/include/common.h @@ -38,7 +38,7 @@ #include "idevice_manager.h" #include "camera_metadata_info.h" #include "ibuffer.h" -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include #include #include "securec.h" diff --git a/camera/test/ut/buffer_manager/BUILD.gn b/camera/test/ut/buffer_manager/BUILD.gn index 4265f83d3f..8afed2cef5 100644 --- a/camera/test/ut/buffer_manager/BUILD.gn +++ b/camera/test/ut/buffer_manager/BUILD.gn @@ -76,7 +76,6 @@ if (defined(ohos_lite)) { "../../../../hdf_core/adapter/uhdf/manager:hdf_core", "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:hdf_posix_osal", ] @@ -183,7 +182,6 @@ if (defined(ohos_lite)) { external_deps += [ "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "ipc:ipc_single", "samgr:samgr_proxy", diff --git a/camera/test/ut/buffer_manager/buffer_manager_utest.h b/camera/test/ut/buffer_manager/buffer_manager_utest.h index 0659740625..ba414a9920 100644 --- a/camera/test/ut/buffer_manager/buffer_manager_utest.h +++ b/camera/test/ut/buffer_manager/buffer_manager_utest.h @@ -23,7 +23,7 @@ #include #include #include -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "ibuffer.h" #include "ibuffer_pool.h" #include "surface.h" diff --git a/camera/test/ut/usb_camera/BUILD.gn b/camera/test/ut/usb_camera/BUILD.gn index b02940314f..5154bc2032 100644 --- a/camera/test/ut/usb_camera/BUILD.gn +++ b/camera/test/ut/usb_camera/BUILD.gn @@ -109,7 +109,6 @@ ohos_unittest("camera_usb_test_ut") { "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_camera:libcamera_stub_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:libhdf_utils", "hilog:libhilog", diff --git a/camera/test/ut/v4l2/BUILD.gn b/camera/test/ut/v4l2/BUILD.gn index f59219cc58..9a9ee3f541 100644 --- a/camera/test/ut/v4l2/BUILD.gn +++ b/camera/test/ut/v4l2/BUILD.gn @@ -76,7 +76,6 @@ if (defined(ohos_lite)) { "../../../../hdf_core/adapter/uhdf/manager:hdf_core", "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:hdf_posix_osal", ] @@ -195,7 +194,6 @@ if (defined(ohos_lite)) { external_deps += [ "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "ipc:ipc_single", "samgr:samgr_proxy", diff --git a/camera/test/ut/v4l2/stream_customer.h b/camera/test/ut/v4l2/stream_customer.h index eb7f113121..488f2fdc0a 100644 --- a/camera/test/ut/v4l2/stream_customer.h +++ b/camera/test/ut/v4l2/stream_customer.h @@ -22,7 +22,7 @@ #include #include #include -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "camera_metadata_info.h" #include "ibuffer.h" #include "iconsumer_surface.h" diff --git a/camera/test/ut/v4l2/test_camera_base.h b/camera/test/ut/v4l2/test_camera_base.h index 76989b4cdd..efddce042a 100644 --- a/camera/test/ut/v4l2/test_camera_base.h +++ b/camera/test/ut/v4l2/test_camera_base.h @@ -29,7 +29,7 @@ #include "idevice_manager.h" #include "camera_metadata_info.h" #include "metadata_utils.h" -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include #include #include @@ -82,7 +82,6 @@ constexpr int INVALID_VALUE_TEST = 2147483647; using namespace OHOS::HDI::Camera::V1_0; using namespace OHOS::Camera; -using namespace OHOS::HDI::Display::Composer::V1_0; class TestCameraBase { public: // This should get the size setting according to the bottom layer diff --git a/camera/vdi_base/common/buffer_manager/BUILD.gn b/camera/vdi_base/common/buffer_manager/BUILD.gn index 9cacd871e5..c787d7793d 100644 --- a/camera/vdi_base/common/buffer_manager/BUILD.gn +++ b/camera/vdi_base/common/buffer_manager/BUILD.gn @@ -47,13 +47,13 @@ if (defined(ohos_lite)) { "./src/buffer_adapter/lite", "$camera_path/../../display/interfaces/include", "$camera_path/../../base", + "$camera_path/../../interfaces/include", ] libs = [] defines = [] deps = [] external_deps = [ - "drivers_interface_display:libdisplay_composer_proxy_1.0", "drivers_peripheral_display:hdi_display", "graphic_chipsetsdk:surface", "hdf_core:libhdf_utils", @@ -104,6 +104,7 @@ if (defined(ohos_lite)) { "./include", "./src/buffer_adapter/standard", "$camera_path/include", + "$camera_path/../../interfaces/include", ] libs = [] @@ -124,10 +125,7 @@ if (defined(ohos_lite)) { } else { external_deps = [ "hilog:libhilog" ] } - external_deps += [ - "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", - ] + external_deps += [ "drivers_interface_camera:metadata" ] public_configs = [ ":buffer_manager_config" ] install_images = [ chipset_base_dir ] subsystem_name = "hdf" diff --git a/camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.h b/camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.h index 01f2479450..5e0cd5dbe8 100644 --- a/camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.h +++ b/camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.h @@ -18,7 +18,7 @@ #include #include -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "ibuffer.h" #include "surface.h" diff --git a/camera/vdi_base/common/buffer_manager/src/buffer_adapter/standard/buffer_adapter.h b/camera/vdi_base/common/buffer_manager/src/buffer_adapter/standard/buffer_adapter.h index dcdc1d1b18..f856a30542 100644 --- a/camera/vdi_base/common/buffer_manager/src/buffer_adapter/standard/buffer_adapter.h +++ b/camera/vdi_base/common/buffer_manager/src/buffer_adapter/standard/buffer_adapter.h @@ -18,11 +18,10 @@ #include #include -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "ibuffer.h" namespace OHOS::Camera { -using namespace OHOS::HDI::Display::Composer::V1_0; class BufferAdapter { public: // convert surfae buffer to camera ibuffer, only for external buffer. diff --git a/camera/vdi_base/usb_camera/buffer_manager/BUILD.gn b/camera/vdi_base/usb_camera/buffer_manager/BUILD.gn index 1e811471c7..7efc0e400f 100644 --- a/camera/vdi_base/usb_camera/buffer_manager/BUILD.gn +++ b/camera/vdi_base/usb_camera/buffer_manager/BUILD.gn @@ -52,6 +52,7 @@ ohos_shared_library("usb_camera_buffer_manager") { "$camera_path_vdi/buffer_manager/include", "$camera_path_vdi/buffer_manager/src/buffer_adapter/standard", "$camera_path_vdi/include", + "$camera_path_vdi/../../interfaces/include", ] libs = [] @@ -65,7 +66,6 @@ ohos_shared_library("usb_camera_buffer_manager") { external_deps = [ "c_utils:utils", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:libhdf_utils", "hilog:libhilog", diff --git a/camera/vdi_base/usb_camera/vdi_impl/BUILD.gn b/camera/vdi_base/usb_camera/vdi_impl/BUILD.gn index 879b459ee0..cf35e95f49 100644 --- a/camera/vdi_base/usb_camera/vdi_impl/BUILD.gn +++ b/camera/vdi_base/usb_camera/vdi_impl/BUILD.gn @@ -113,7 +113,6 @@ ohos_shared_library("camera_daemon") { "c_utils:utils", "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", @@ -158,7 +157,6 @@ ohos_static_library("camera_daemon_static") { "c_utils:utils", "drivers_interface_camera:libbuffer_producer_sequenceable_1.0", "drivers_interface_camera:metadata", - "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_chipsetsdk:surface", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", diff --git a/camera/vdi_base/v4l2/include/stream_operator/stream_statistics.h b/camera/vdi_base/v4l2/include/stream_operator/stream_statistics.h index 6369d69aea..d2e84674fd 100644 --- a/camera/vdi_base/v4l2/include/stream_operator/stream_statistics.h +++ b/camera/vdi_base/v4l2/include/stream_operator/stream_statistics.h @@ -18,7 +18,7 @@ #include #include "surface.h" #include "surface_type.h" -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "camera.h" namespace OHOS::Camera { diff --git a/camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/lite/stream_tunnel.h b/camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/lite/stream_tunnel.h index db1ef9f9e2..e610f5f4ba 100644 --- a/camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/lite/stream_tunnel.h +++ b/camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/lite/stream_tunnel.h @@ -18,14 +18,13 @@ #include #include -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "ibuffer.h" #include "surface.h" #include "surface_type.h" #include "stream_statistics.h" namespace OHOS::Camera { -using namespace OHOS::HDI::Display::Composer::V1_0; struct TunnelConfig { uint32_t width; uint32_t height; diff --git a/camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/standard/stream_tunnel.h b/camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/standard/stream_tunnel.h index 0aa0146021..cd19fd707e 100644 --- a/camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/standard/stream_tunnel.h +++ b/camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/standard/stream_tunnel.h @@ -18,14 +18,13 @@ #include #include -#include "v1_0/display_composer_type.h" +#include "display_format.h" #include "ibuffer.h" #include "surface.h" #include "surface_type.h" #include "stream_statistics.h" namespace OHOS::Camera { -using namespace OHOS::HDI::Display::Composer::V1_0; struct TunnelConfig { uint32_t width; uint32_t height; -- Gitee