openharmony/drivers_peripheral
1
0
Fork 0
mirror of https://github.com/openharmony/drivers_peripheral.git synced 2026-08-25 13:19:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependy to display.

Browse Source 
Signed-off-by: liudimin <liudimin1@huawei.com>
This commit is contained in:
liudimin
2023-09-01 16:06:55 +08:00
parent fe9026ff72
commit e7327a0bb6
28 changed files with 129 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camera/interfaces/include/display_format.h
+113
View File
@@ -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 <cstdint>
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
camera/test/benchmarktest/v1_0/BUILD.gn
-1
View File
@@ -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",
]
camera/test/benchmarktest/v1_1/BUILD.gn
-1
View File
@@ -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",
]
camera/test/demo/BUILD.gn
-2
View File
@@ -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",
camera/test/demo/stream_customer.h
+1 -2
View File
@@ -22,7 +22,7 @@
#include <map>
#include <hdf_log.h>
#include <iconsumer_surface.h>
#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();
camera/test/fuzztest/camera_device/BUILD.gn
-1
View File
@@ -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",
]
camera/test/fuzztest/camera_host/BUILD.gn
-1
View File
@@ -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",
]
camera/test/fuzztest/stream_operator/BUILD.gn
-1
View File
@@ -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",
]
camera/test/hdi/v1_0/BUILD.gn
-2
View File
@@ -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",
]
camera/test/hdi/v1_0/include/ut_common.h
+1 -2
View File
@@ -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();
camera/test/hdi/v1_1/BUILD.gn
-1
View File
@@ -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",
]
camera/test/hdi/v1_1/include/hdi_common_v1_1.h
+1 -2
View File
@@ -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();
camera/test/mpi/BUILD.gn
-2
View File
@@ -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",
camera/test/mpi/include/common.h
+1 -1
View File
@@ -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 <hdf_log.h>
#include <osal_mem.h>
#include "securec.h"
camera/test/ut/buffer_manager/BUILD.gn
-2
View File
@@ -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",
camera/test/ut/buffer_manager/buffer_manager_utest.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include <thread>
#include <vector>
#include <gtest/gtest.h>
#include "v1_0/display_composer_type.h"
#include "display_format.h"
#include "ibuffer.h"
#include "ibuffer_pool.h"
#include "surface.h"
camera/test/ut/usb_camera/BUILD.gn
-1
View File
@@ -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",
camera/test/ut/v4l2/BUILD.gn
-2
View File
@@ -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",
camera/test/ut/v4l2/stream_customer.h
+1 -1
View File
@@ -22,7 +22,7 @@
#include <map>
#include <hdf_log.h>
#include <surface.h>
#include "v1_0/display_composer_type.h"
#include "display_format.h"
#include "camera_metadata_info.h"
#include "ibuffer.h"
#include "iconsumer_surface.h"
camera/test/ut/v4l2/test_camera_base.h
+1 -2
View File
@@ -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 <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
@@ -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
camera/vdi_base/common/buffer_manager/BUILD.gn
+3 -5
View File
@@ -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"
camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.h
+1 -1
View File
@@ -18,7 +18,7 @@
#include <surface_buffer.h>
#include <memory>
#include "v1_0/display_composer_type.h"
#include "display_format.h"
#include "ibuffer.h"
#include "surface.h"
camera/vdi_base/common/buffer_manager/src/buffer_adapter/standard/buffer_adapter.h
+1 -2
View File
@@ -18,11 +18,10 @@
#include <surface_buffer.h>
#include <memory>
#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.
camera/vdi_base/usb_camera/buffer_manager/BUILD.gn
+1 -1
View File
@@ -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",
camera/vdi_base/usb_camera/vdi_impl/BUILD.gn
-2
View File
@@ -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",
camera/vdi_base/v4l2/include/stream_operator/stream_statistics.h
+1 -1
View File
@@ -18,7 +18,7 @@
#include <string>
#include "surface.h"
#include "surface_type.h"
#include "v1_0/display_composer_type.h"
#include "display_format.h"
#include "camera.h"
namespace OHOS::Camera {
camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/lite/stream_tunnel.h
+1 -2
View File
@@ -18,14 +18,13 @@
#include <mutex>
#include <unordered_map>
#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;
camera/vdi_base/v4l2/src/stream_operator/stream_tunnel/standard/stream_tunnel.h
+1 -2
View File
@@ -18,14 +18,13 @@
#include <mutex>
#include <unordered_map>
#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;