From ecb261536b31170ff2af38dc2a7f458fe6e3ccca Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 21 May 2024 11:51:19 +0800 Subject: [PATCH] modify preview issue Signed-off-by: chen0088 --- .../distributedcamera/dcamera_sink_callback_proxy_test.cpp | 2 +- .../multimedia_codec/encoder/encode_data_process.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_callback_proxy_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_callback_proxy_test.cpp index c5ed0ccf..b023c358 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_callback_proxy_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_callback_proxy_test.cpp @@ -76,7 +76,7 @@ HWTEST_F(DcameraSinkCallbackProxyTest, dcamera_sink_callback_proxy_test_001, Tes bool isSensitive = 0; bool isSameAccout = 0; int32_t ret = callbackProxy->OnNotifyResourceInfo(type, subtype, networkId, isSensitive, isSameAccout); - EXPECT_EQ(DCAMERA_OK, ret); + EXPECT_EQ(DCAMERA_BAD_VALUE, ret); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file 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 8fe79fd3..71bcdfe2 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 @@ -567,6 +567,7 @@ int32_t EncodeDataProcess::GetProperty(const std::string& propertyName, Property } CHECK_AND_RETURN_RET_LOG(encodeProducerSurface_ == nullptr, DCAMERA_BAD_VALUE, "%{public}s", "EncodeDataProcess::GetProperty: encode dataProcess get property fail, encode surface is nullptr."); + encodeProducerSurface_->SetDefaultUsage(encodeProducerSurface_->GetDefaultUsage() & (~BUFFER_USAGE_VIDEO_ENCODER)); return propertyCarrier.CarrySurfaceProperty(encodeProducerSurface_); } } // namespace DistributedHardware -- Gitee