From 31bc9658976b4f54d988afd2c27395918d942b7d Mon Sep 17 00:00:00 2001 From: hobbycao Date: Tue, 20 Sep 2022 11:19:13 +0800 Subject: [PATCH] fix: buffer usage modify Signed-off-by: hobbycao --- services/data_process/BUILD.gn | 1 - .../multimedia_codec/encoder/encode_data_process.cpp | 3 +-- .../multimedia_codec/encoder/encode_data_process_common.cpp | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index f5d11b49..dbf7b80d 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -23,7 +23,6 @@ ohos_shared_library("distributed_camera_data_process") { "//utils/system/safwk/native/include", "//foundation/graphic/graphic_2d/interfaces/innerkits/common", "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", - "//drivers/peripheral/display/interfaces/include", "//foundation/multimedia/player_framework/interfaces/innerkits/native/media/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp index c9d0e265..4e1886ea 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp @@ -17,7 +17,6 @@ #include -#include "display_type.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" @@ -415,7 +414,7 @@ sptr EncodeDataProcess::GetEncoderInputSurfaceBuffer() BufferRequestConfig requestConfig; requestConfig.width = sourceConfig_.GetWidth(); requestConfig.height = sourceConfig_.GetHeight(); - requestConfig.usage = HBM_USE_CPU_READ | HBM_USE_CPU_WRITE | HBM_USE_MEM_DMA; + requestConfig.usage = BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE | BUFFER_USAGE_MEM_DMA; requestConfig.timeout = 0; requestConfig.strideAlignment = ENCODER_STRIDE_ALIGNMENT; switch (sourceConfig_.GetVideoformat()) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp index c95f53ca..dc337855 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp @@ -17,7 +17,6 @@ #include -#include "display_type.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" @@ -388,7 +387,7 @@ sptr EncodeDataProcess::GetEncoderInputSurfaceBuffer() BufferRequestConfig requestConfig; requestConfig.width = sourceConfig_.GetWidth(); requestConfig.height = sourceConfig_.GetHeight(); - requestConfig.usage = HBM_USE_CPU_READ | HBM_USE_CPU_WRITE | HBM_USE_MEM_DMA; + requestConfig.usage = BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE | BUFFER_USAGE_MEM_DMA; requestConfig.timeout = 0; requestConfig.strideAlignment = ENCODER_STRIDE_ALIGNMENT; requestConfig.format = PixelFormat::PIXEL_FMT_RGBA_8888; -- Gitee