代码拉取完成,页面将自动刷新
同步操作将从 OpenHarmony/multimedia_camera_framework 强制同步,此操作会覆盖自 Fork 仓库以来所做的任何修改,且无法恢复!!!
确定后同步将在后台操作,完成时将刷新页面,请耐心等待。
# 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.
graphic_2d_path = "//foundation/graphic/graphic_2d"
multimedia_camera_framework_path = "//foundation/multimedia/camera_framework"
multimedia_image_framework_path = "//foundation/multimedia/image_framework"
driver_camera_path = "//drivers/interface/camera"
third_party_path = "//third_party/googletest"
driver_peripheral_path = "//drivers/peripheral/camera"
base_security_path = "//base/security/access_token"
driver_disply_path = "//drivers/peripheral/display"
window_manager_path = "//foundation/window/window_manager"
system_safwk_path = "//utils/system/safwk"
memmgr_root = "//foundation/resourceschedule/memmgr"
memmgr_plugin_root = "//foundation/resourceschedule/memmgr_plugin"
use_memmgr_plugin = false
if (defined(global_parts_info.resourceschedule_memmgr_plugin)) {
use_memmgr_plugin = true
}
use_memmgr = false
if (defined(global_parts_info.resourceschedule_memmgr)) {
use_memmgr = true
}
use_ace_engine = true
1111111
#avc: denied { get } for service=camera_image_process_service pid=1392 scontext=u:r:camera_service:s0 tcontext=u:object_r:hdf_camera_image_process_service:s0 tclass=hdf_devmgr_class permissive=1
allow camera_service hdf_camera_image_process_service:hdf_devmgr_class { get };
#avc: denied { use } for pid=3966 comm="OS_FFRT_2_1" path="/dev/ashmem" dev="tmpfs" ino=630 scontext=u:r:camera_service:s0 tcontext=u:r:cameradaemon:s0 tclass=fd permissive=1
#avc: denied { use } for pid=3966 comm="OS_FFRT_2_1" path="/dmabuf:" dev="dmabuf" ino=35644 scontext=u:r:camera_service:s0 tcontext=u:r:cameradaemon:s0 tclass=fd permissive=1
allow camera_service cameradaemon:fd { use };
allow camera_service foundation:binder { transfer };
#avc: denied { get } for service=3303 pid=1767 scontext=u:r:camera_service:s0 tcontext=u:object_r:sa_foundation_thermal_service:s0 tclass=samgr_class permissive=0
allow camera_service sa_foundation_thermal_service:samgr_class { get };
#avc: denied { get } for service=3299 pid=1767 scontext=u:r:camera_service:s0 tcontext=u:object_r:sa_foundation_cesfwk_service:s0 tclass=samgr_class permissive=0
allow camera_service sa_foundation_cesfwk_service:samgr_class { get };
2222222
type hdf_camera_image_process_service, hdf_service_attr;
3333333
camera_image_process_service u:object_r:hdf_camera_image_process_service:s0
#avc: denied { use } for pid=1525 comm="Worker_0" path="/dmabuf:" dev="dmabuf" ino=44370 scontext=u:r:medialibrary_hap:s0 tcontext=u:r:cameradaemon:s0 tclass=fd permissive=1
allow medialibrary_hap cameradaemon:fd use;
diff --git a/frameworks/native/camera/BUILD.gn b/frameworks/native/camera/BUILD.gn
index 5cc95db0..8081486f 100755
--- a/frameworks/native/camera/BUILD.gn
+++ b/frameworks/native/camera/BUILD.gn
@@ -20,8 +20,8 @@ config("camera_framework_public_config") {
"//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",
- "//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/deferred_proc_session",
- "//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/utils",
+ "${multimedia_camera_framework_path}/interfaces/inner_api/native/camera/include/deferred_proc_session",
+ "${multimedia_camera_framework_path}/interfaces/inner_api/native/camera/include/utils",
"../interfaces/inner_api/native/camera/include/mode",
"../../../interfaces/inner_api/native/camera/include/utils",
]
@@ -34,14 +34,14 @@ config("camera_framework_local_config") {
"//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/multimedia/camera_framework/services/deferred_processing_service/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/utils",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/base/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/client/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/server/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/session",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/session/photo_session",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/utils",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/base/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/client/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/server/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/session",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/session/photo_session",
]
}
@@ -70,10 +70,10 @@ ohos_shared_library("camera_framework") {
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/src/hcapture_session_callback_stub.cpp",
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/src/hstream_capture_callback_stub.cpp",
"//foundation/multimedia/camera_framework/services/camera_service/binder/server/src/hstream_repeat_callback_stub.cpp",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/client/src/deferred_photo_processing_session_proxy.cpp",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/client/src/deferred_photo_processing_session_callback_proxy.cpp",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/server/src/deferred_photo_processing_session_stub.cpp",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/server/src/deferred_photo_processing_session_callback_stub.cpp",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/client/src/deferred_photo_processing_session_proxy.cpp",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/client/src/deferred_photo_processing_session_callback_proxy.cpp",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/server/src/deferred_photo_processing_session_stub.cpp",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/server/src/deferred_photo_processing_session_callback_stub.cpp",
"src/input/camera_device.cpp",
"src/input/camera_input.cpp",
"src/input/camera_manager.cpp",
diff --git a/services/camera_service/BUILD.gn b/services/camera_service/BUILD.gn
index 36340148..00307bbf 100755
--- a/services/camera_service/BUILD.gn
+++ b/services/camera_service/BUILD.gn
@@ -68,27 +68,26 @@ ohos_shared_library("camera_service") {
"//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",
-
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/base/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/client/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/server/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/buffer_manager",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/task_manager",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/task_manager/task_group",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/timer",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/timer/core",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/dfx",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/event_monitor",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/post_processor",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/schedule",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/schedule/photo_processor",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/schedule/photo_processor/photo_job_repository",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/schedule/photo_processor/strategy",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/session",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/session/photo_session",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/utils",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/base/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/client/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/server/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/buffer_manager",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/task_manager",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/task_manager/task_group",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/timer",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/timer/core",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/dfx",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/event_monitor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/post_processor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor/photo_job_repository",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor/strategy",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/session",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/session/photo_session",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/utils",
]
if (target_cpu == "arm") {
@@ -96,7 +95,7 @@ ohos_shared_library("camera_service") {
}
deps = [
- "//foundation/multimedia/camera_framework/services/deferred_processing_service:deferred_processing_service",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service:deferred_processing_service",
]
external_deps = [
diff --git a/services/deferred_processing_service/BUILD.gn b/services/deferred_processing_service/BUILD.gn
index 906626ca..c6a9b7be 100755
--- a/services/deferred_processing_service/BUILD.gn
+++ b/services/deferred_processing_service/BUILD.gn
@@ -50,7 +50,7 @@ ohos_shared_library("deferred_processing_service") {
"src/session/session_manager.cpp",
"src/utils/dp_utils.cpp",
"src/deferred_processing_service.cpp",
- "//foundation/multimedia/camera_framework/frameworks/native/camera/src/utils/dps_metadata_info.cpp",
+ "${multimedia_camera_framework_path}/frameworks/native/camera/src/utils/dps_metadata_info.cpp",
]
cflags = [
"-fPIC",
@@ -64,27 +64,27 @@ ohos_shared_library("deferred_processing_service") {
}
include_dirs = [
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/base/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/client/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/binder/server/include",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/buffer_manager",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/task_manager",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/task_manager/task_group",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/timer",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/base/timer/core",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/dfx",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/event_monitor",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/post_processor",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/schedule",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/schedule/photo_processor",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/schedule/photo_processor/photo_job_repository",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/schedule/photo_processor/strategy",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/session",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/session/photo_session",
- "//foundation/multimedia/camera_framework/services/deferred_processing_service/include/utils",
- "//foundation/multimedia/camera_framework/interfaces/inner_api/native/camera/include/utils",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/base/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/client/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/server/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/buffer_manager",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/task_manager",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/task_manager/task_group",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/timer",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/timer/core",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/dfx",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/event_monitor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/post_processor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor/photo_job_repository",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor/strategy",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/session",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/session/photo_session",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/utils",
+ "${multimedia_camera_framework_path}/interfaces/inner_api/native/camera/include/utils",
]
if (target_cpu == "arm") {
@@ -118,12 +118,12 @@ ohos_shared_library("deferred_processing_service") {
]
include_dirs += [
- "//drivers/peripheral/camera/interfaces/include",
- "//drivers/peripheral/camera/interfaces/hdi_ipc",
- "//drivers/peripheral/camera/interfaces/hdi_ipc/utils/include",
- "//drivers/peripheral/camera/interfaces/hdi_ipc/callback/device/include",
- "//drivers/peripheral/camera/interfaces/hdi_ipc/callback/operator/include",
- "//drivers/peripheral/camera/interfaces/hdi_ipc/callback/host/include",
+ "${driver_peripheral_path}/interfaces/include",
+ "${driver_peripheral_path}/interfaces/hdi_ipc",
+ "${driver_peripheral_path}/interfaces/hdi_ipc/utils/include",
+ "${driver_peripheral_path}/interfaces/hdi_ipc/callback/device/include",
+ "${driver_peripheral_path}/interfaces/hdi_ipc/callback/operator/include",
+ "${driver_peripheral_path}/interfaces/hdi_ipc/callback/host/include",
]
if (use_musl) {
diff --git a/test/fuzztest/cameradevice_fuzzer/BUILD.gn b/test/fuzztest/cameradevice_fuzzer/BUILD.gn
old mode 100644
new mode 100755
index 1f5a7566..1391160f
--- a/test/fuzztest/cameradevice_fuzzer/BUILD.gn
+++ b/test/fuzztest/cameradevice_fuzzer/BUILD.gn
@@ -27,6 +27,26 @@ ohos_fuzztest("CameraDeviceFuzzTest") {
"${multimedia_camera_framework_path}/services/camera_service/binder/client/include",
"${multimedia_camera_framework_path}/services/camera_service/binder/server/include",
"${multimedia_camera_framework_path}/interfaces/inner_api/native/camera/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/base/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/client/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/binder/server/include",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/buffer_manager",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/task_manager",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/task_manager/task_group",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/timer",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/base/timer/core",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/dfx",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/event_monitor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/post_processor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor/photo_job_repository",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/schedule/photo_processor/strategy",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/session",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/session/photo_session",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service/include/utils",
"${window_manager_path}/interfaces/innerkits/dm",
"${base_security_path}/interfaces/innerkits/accesstoken/include",
"${driver_peripheral_path}/interfaces/include",
@@ -49,7 +69,10 @@ ohos_fuzztest("CameraDeviceFuzzTest") {
sources = [ "camera_device_fuzzer.cpp" ]
- deps = [ "../../../services/camera_service:camera_service" ]
+ deps = [
+ "${multimedia_camera_framework_path}/services/camera_service:camera_service",
+ "${multimedia_camera_framework_path}/services/deferred_processing_service:deferred_processing_service",
+ ]
external_deps = [
"ability_base:want",
"access_token:libaccesstoken_sdk",
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。