openharmony/multimedia_camera_standard
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_camera_standard.git synced 2026-06-30 20:48:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

change camera_standard to camera_framework

Browse Source 
Signed-off-by: duanqinghe <duanqinghe@huawei.com>
This commit is contained in:
duanqinghe
2022-08-15 14:53:33 +08:00
parent ae24996943
commit 40e76b9481
11 changed files with 133 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -39,7 +39,7 @@ The **camera\_standard** repository enables your application to provide camera
The structure of the repository directory is as follows:
```
/foundation/multimedia/camera_standard # Camera code
/foundation/multimedia/camera_framework # Camera code
├── frameworks # Framework code
│   ├── native # Internal Native API Implementation
│   │   ├── camera # Camera Framework Implementation
@@ -501,5 +501,5 @@ Flash mode can be configured on the Camera Input before capturing a photo or rec
## Repositories Involved<a name="section16511040154318"></a>
[multimedia\_camera\_standard](https://gitee.com/openharmony/multimedia_camera_standard/README.md)
[multimedia\_camera\_standard](https://gitee.com/openharmony/multimedia_camera_framework/README.md)
README_zh.md
+2 -2
View File
@@ -39,7 +39,7 @@
仓目录结构如下：
```
/foundation/multimedia/camera_standard # 相机组件业务代码
/foundation/multimedia/camera_framework # 相机组件业务代码
├── frameworks # 框架代码
│ ├── native # 内部接口实现
│ │ ├── camera # 相机框架实现
@@ -500,5 +500,5 @@
## 相关仓<a name="section16511040154318"></a>
[multimedia\_camera\_standard](https://gitee.com/openharmony/multimedia_camera_standard/README_zh.md)
[multimedia\_camera\_standard](https://gitee.com/openharmony/multimedia_camera_framework/README_zh.md)
bundle.json
+24 -24
View File
@@ -1,23 +1,23 @@
{
"name": "@ohos/camera_standard",
"name": "@ohos/camera_framework",
"description": "Camera standard provides managers and provides the camera resources to application to capture photo/preview/videos",
"version": "3.1",
"license": "Apache License 2.0",
"publishAs": "code-segment",
"segment": {
"destPath": "foundation/multimedia/camera_standard"
"destPath": "foundation/multimedia/camera_framework"
},
"dirs": {},
"scripts": {},
"component": {
"name": "multimedia_camera_standard",
"name": "multimedia_camera_framework",
"subsystem": "multimedia",
"syscap": ["SystemCapability.Multimedia.Camera.Core"],
"features": [],
"adapted_system_type": [ "standard" ],
"rom": "",
"ram": "",
"hisysevent_config": [ "//foundation/multimedia/camera_standard/hisysevent.yaml" ],
"hisysevent_config": [ "//foundation/multimedia/camera_framework/hisysevent.yaml" ],
"deps": {
"components": [
"libhilog",
@@ -34,22 +34,22 @@
},
"build": {
"sub_component": [
"//foundation/multimedia/camera_standard/sa_profile:camera_service_sa_profile",
"//foundation/multimedia/camera_standard/services/etc:camera_service.rc",
"//foundation/multimedia/camera_standard/services/camera_service:camera_service",
"//foundation/multimedia/camera_standard/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_standard/interfaces/kits/js/camera_napi:camera_napi",
"//foundation/multimedia/camera_standard/interfaces/kits/js/camera_napi:camera_js"
"//foundation/multimedia/camera_framework/sa_profile:camera_service_sa_profile",
"//foundation/multimedia/camera_framework/services/etc:camera_service.rc",
"//foundation/multimedia/camera_framework/services/camera_service:camera_service",
"//foundation/multimedia/camera_framework/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_framework/interfaces/kits/js/camera_napi:camera_napi",
"//foundation/multimedia/camera_framework/interfaces/kits/js/camera_napi:camera_js"
],
"inner_kits": [
{
"type": "none",
"name": "//foundation/multimedia/camera_standard/frameworks/native/camera:camera_framework",
"name": "//foundation/multimedia/camera_framework/frameworks/native/camera:camera_framework",
"header": {
"header_base": [
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include/input",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include/output",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include/session"
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/input",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/output",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/session"
],
"header_files": [
"camera_info.h",
@@ -67,13 +67,13 @@
},
{
"type": "none",
"name": "//foundation/multimedia/camera_standard/interfaces/kits/js/camera_napi:camera_napi",
"name": "//foundation/multimedia/camera_framework/interfaces/kits/js/camera_napi:camera_napi",
"header": {
"header_base": [
"//foundation/multimedia/camera_standard/interfaces/kits/js/camera_napi/include",
"//foundation/multimedia/camera_standard/interfaces/kits/js/camera_napi/include/input",
"//foundation/multimedia/camera_standard/interfaces/kits/js/camera_napi/include/output",
"//foundation/multimedia/camera_standard/interfaces/kits/js/camera_napi/include/session"
"//foundation/multimedia/camera_framework/interfaces/kits/js/camera_napi/include",
"//foundation/multimedia/camera_framework/interfaces/kits/js/camera_napi/include/input",
"//foundation/multimedia/camera_framework/interfaces/kits/js/camera_napi/include/output",
"//foundation/multimedia/camera_framework/interfaces/kits/js/camera_napi/include/session"
],
"header_files": [
"camera_info_napi.h",
@@ -95,11 +95,11 @@
}
],
"test": [
"//foundation/multimedia/camera_standard/frameworks/native/camera/test/moduletest:camera_framework_moduletest",
"//foundation/multimedia/camera_standard/frameworks/native/camera/test/unittest:camera_framework_unittest",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/test:camera_video",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/test:camera_capture",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/test:camera_capture_video"
"//foundation/multimedia/camera_framework/frameworks/native/camera/test/moduletest:camera_framework_moduletest",
"//foundation/multimedia/camera_framework/frameworks/native/camera/test/unittest:camera_framework_unittest",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/test:camera_video",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/test:camera_capture",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/test:camera_capture_video"
]
}
}
frameworks/native/camera/BUILD.gn
+42 -20
View File
@@ -13,15 +13,43 @@
import("//build/ohos.gni")
config("camera_framework_public_config") {
include_dirs = [
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/input",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/output",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/session",
]
}
config("camera_framework_local_config") {
include_dirs = [
"//foundation/multimedia/camera_framework/services/camera_service/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/include",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include",
]
}
config("camera_framework_drivers_config") {
include_dirs = [
"//drivers/peripheral/camera/interfaces/include",
"//drivers/peripheral/camera/interfaces/hdi_ipc",
"//drivers/peripheral/camera/interfaces/hdi_ipc/server",
"//drivers/peripheral/camera/interfaces/metadata/include",
]
}
ohos_shared_library("camera_framework") {
install_enable = true
sources = [
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/src/hcamera_device_proxy.cpp",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/src/hcamera_service_proxy.cpp",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/src/hcapture_session_proxy.cpp",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/src/hstream_capture_proxy.cpp",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/src/hstream_metadata_proxy.cpp",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/src/hstream_repeat_proxy.cpp",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/src/hcamera_device_proxy.cpp",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/src/hcamera_service_proxy.cpp",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/src/hcapture_session_proxy.cpp",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/src/hstream_capture_proxy.cpp",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/src/hstream_metadata_proxy.cpp",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/src/hstream_repeat_proxy.cpp",
"src/input/camera_info.cpp",
"src/input/camera_input.cpp",
"src/input/camera_manager.cpp",
@@ -42,12 +70,13 @@ ohos_shared_library("camera_framework") {
cflags += [ "-DBINDER_IPC_32BIT" ]
}
public_configs = [
":camera_framework_public_config",
":camera_framework_local_config",
":camera_framework_drivers_config",
]
include_dirs = [
"//foundation/multimedia/camera_standard/services/camera_service/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/server/include",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//utils/system/safwk/native/include",
]
@@ -56,7 +85,7 @@ ohos_shared_library("camera_framework") {
"//drivers/interface/camera/v1_0:libcamera_proxy_1.0",
"//drivers/peripheral/camera/interfaces/metadata:metadata",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/multimedia/camera_standard/services/camera_service:camera_service",
"//foundation/multimedia/camera_framework/services/camera_service:camera_service",
]
external_deps = [
@@ -71,13 +100,6 @@ ohos_shared_library("camera_framework") {
"samgr:samgr_proxy",
]
include_dirs += [
"//drivers/peripheral/camera/interfaces/include",
"//drivers/peripheral/camera/interfaces/hdi_ipc",
"//drivers/peripheral/camera/interfaces/hdi_ipc/server",
"//drivers/peripheral/camera/interfaces/metadata/include",
]
if ("${product_name}" == "m40") {
cflags += [ "-DPRODUCT_M40" ]
} else {
@@ -87,6 +109,6 @@ ohos_shared_library("camera_framework") {
}
cflags_cc = cflags
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
subsystem_name = "multimedia"
}
frameworks/native/camera/test/moduletest/BUILD.gn
+10 -10
View File
@@ -13,26 +13,26 @@
import("//build/test.gni")
module_output_path = "multimedia_camera_standard/camera_framework_moduletest"
module_output_path = "multimedia_camera_framework/camera_framework_moduletest"
ohos_moduletest("camera_framework_moduletest") {
module_out_path = module_output_path
include_dirs = [
"./include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//foundation/multimedia/camera_standard/services/camera_service/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/server/include",
"//foundation/multimedia/camera_framework/services/camera_service/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/include",
"//drivers/peripheral/camera/interfaces/metadata/include",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/test",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/test",
"//base/security/access_token/interfaces/innerkits/accesstoken/include",
"//base/security/access_token/interfaces/innerkits/token_setproc/include",
]
sources = [
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/test/test_common.cpp",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/test/test_common.cpp",
"src/camera_framework_moduletest.cpp",
]
@@ -40,8 +40,8 @@ ohos_moduletest("camera_framework_moduletest") {
"//drivers/interface/camera/v1_0:libcamera_proxy_1.0",
"//drivers/peripheral/camera/interfaces/metadata:metadata",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/multimedia/camera_standard/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_standard/services/camera_service:camera_service",
"//foundation/multimedia/camera_framework/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_framework/services/camera_service:camera_service",
]
external_deps = [
frameworks/native/camera/test/unittest/BUILD.gn
+10 -10
View File
@@ -13,26 +13,26 @@
import("//build/test.gni")
module_output_path = "multimedia_camera_standard/camera_framework_unittest"
module_output_path = "multimedia_camera_framework/camera_framework_unittest"
ohos_unittest("camera_framework_unittest") {
module_out_path = module_output_path
include_dirs = [
"./include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//foundation/multimedia/camera_standard/services/camera_service/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/server/include",
"//foundation/multimedia/camera_framework/services/camera_service/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/include",
"//drivers/peripheral/camera/interfaces/metadata/include",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/test",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/test",
"//base/security/access_token/interfaces/innerkits/accesstoken/include",
"//base/security/access_token/interfaces/innerkits/token_setproc/include",
]
sources = [
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/test/test_common.cpp",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/test/test_common.cpp",
"src/camera_framework_unittest.cpp",
]
@@ -41,8 +41,8 @@ ohos_unittest("camera_framework_unittest") {
"//drivers/interface/camera/v1_0:libcamera_proxy_1.0",
"//drivers/peripheral/camera/interfaces/metadata:metadata",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/multimedia/camera_standard/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_standard/services/camera_service:camera_service",
"//foundation/multimedia/camera_framework/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_framework/services/camera_service:camera_service",
"//third_party/googletest:gmock_main",
]
interfaces/inner_api/native/test/BUILD.gn
+12 -12
View File
@@ -15,12 +15,12 @@ import("//build/ohos.gni")
config("camera_config") {
include_dirs = [
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/test",
"//foundation/multimedia/camera_standard/services/camera_service/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/server/include",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/test",
"//foundation/multimedia/camera_framework/services/camera_service/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//drivers/peripheral/camera/interfaces/metadata/include",
"//utils/system/safwk/native/include",
@@ -55,7 +55,7 @@ ohos_executable("camera_video") {
"//drivers/interface/camera/v1_0:libcamera_proxy_1.0",
"//drivers/peripheral/camera/interfaces/metadata:metadata",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/multimedia/camera_standard/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_framework/frameworks/native/camera:camera_framework",
]
external_deps = [
@@ -69,7 +69,7 @@ ohos_executable("camera_video") {
"ipc:ipc_single",
"multimedia_player_framework:media_client",
]
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
subsystem_name = "multimedia"
}
@@ -89,7 +89,7 @@ ohos_executable("camera_capture") {
"//drivers/interface/camera/v1_0:libcamera_proxy_1.0",
"//drivers/peripheral/camera/interfaces/metadata:metadata",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/multimedia/camera_standard/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_framework/frameworks/native/camera:camera_framework",
]
external_deps = [
@@ -101,7 +101,7 @@ ohos_executable("camera_capture") {
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
]
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
subsystem_name = "multimedia"
}
@@ -121,7 +121,7 @@ ohos_executable("camera_capture_video") {
"//drivers/interface/camera/v1_0:libcamera_proxy_1.0",
"//drivers/peripheral/camera/interfaces/metadata:metadata",
"//foundation/graphic/graphic_2d:libsurface",
"//foundation/multimedia/camera_standard/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_framework/frameworks/native/camera:camera_framework",
]
external_deps = [
@@ -133,6 +133,6 @@ ohos_executable("camera_capture_video") {
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
]
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
subsystem_name = "multimedia"
}
interfaces/kits/js/camera_napi/BUILD.gn
+23 -23
View File
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
import("//build/ohos/ace/ace.gni")
js_declaration("camera_js") {
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
sources = [ "./@ohos.multimedia.camera.d.ts" ]
}
@@ -29,34 +29,34 @@ ohos_copy("camera_declaration") {
ohos_shared_library("camera_napi") {
include_dirs = [
"//drivers/peripheral/camera/interfaces/metadata/include",
"//foundation/multimedia/camera_standard/interfaces/kits/js/camera_napi/include",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_standard/services/camera_service/include",
"//foundation/multimedia/camera_standard/frameworks/native/camera/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/base/include/",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/server/include",
"//foundation/multimedia/camera_framework/interfaces/kits/js/camera_napi/include",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_framework/services/camera_service/include",
"//foundation/multimedia/camera_framework/frameworks/native/camera/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/base/include/",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/include",
"//foundation/multimedia/graphic/graphic_2d/interfaces/inner_api/surface",
]
sources = [
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/input/camera_info_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/input/camera_input_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/input/camera_manager_callback_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/input/camera_manager_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/input/camera_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/input/camera_size_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/native_module_ohos_camera.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/output/metadata_object_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/output/metadata_output_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/output/photo_output_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/output/preview_output_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/output/video_output_napi.cpp",
"//foundation/multimedia/camera_standard/frameworks/js/camera_napi/src/session/camera_session_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/input/camera_info_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/input/camera_input_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/input/camera_manager_callback_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/input/camera_manager_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/input/camera_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/input/camera_size_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/native_module_ohos_camera.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/output/metadata_object_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/output/metadata_output_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/output/photo_output_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/output/preview_output_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/output/video_output_napi.cpp",
"//foundation/multimedia/camera_framework/frameworks/js/camera_napi/src/session/camera_session_napi.cpp",
]
deps = [
"//foundation/arkui/napi:ace_napi",
"//foundation/graphic/graphic_2d/frameworks/surface:surface",
"//foundation/multimedia/camera_standard/frameworks/native/camera:camera_framework",
"//foundation/multimedia/camera_framework/frameworks/native/camera:camera_framework",
"//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
]
external_deps = [
@@ -74,6 +74,6 @@ ohos_shared_library("camera_napi") {
}
cflags_cc = cflags
relative_install_dir = "module/multimedia"
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
subsystem_name = "multimedia"
}
sa_profile/BUILD.gn
+1 -1
View File
@@ -16,5 +16,5 @@ import("//build/ohos/sa_profile/sa_profile.gni")
ohos_sa_profile("camera_service_sa_profile") {
sources = [ "3008.xml" ]
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
}
services/camera_service/BUILD.gn
+6 -6
View File
@@ -53,11 +53,11 @@ ohos_shared_library("camera_service") {
"//drivers/peripheral/camera/interfaces/metadata/include",
"//drivers/peripheral/display/interfaces/include",
"//foundation/graphic/graphic_2d/frameworks/surface/include",
"//foundation/multimedia/camera_standard/services/camera_service/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_standard/services/camera_service/binder/server/include",
"//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include",
"//foundation/multimedia/camera_framework/services/camera_service/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/base/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/client/include",
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/include",
"//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//base/security/access_token/interfaces/innerkits/accesstoken/include",
]
@@ -105,6 +105,6 @@ ohos_shared_library("camera_service") {
}
cflags_cc = cflags
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
subsystem_name = "multimedia"
}
services/etc/BUILD.gn
+1 -1
View File
@@ -16,6 +16,6 @@ import("//build/ohos.gni")
ohos_prebuilt_etc("camera_service.rc") {
source = "camera_service.cfg"
relative_install_dir = "init"
part_name = "multimedia_camera_standard"
part_name = "multimedia_camera_framework"
subsystem_name = "multimedia"
}