From 07e5167652da92b731798c713228d69b59d46e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Sat, 13 Sep 2025 08:53:55 +0000 Subject: [PATCH 1/3] =?UTF-8?q?camera=E4=BB=A3=E7=A0=81=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/test/ut/v4l2/camera_fps_test.cpp | 6 +-- camera/test/ut/v4l2/camera_stabili_test.cpp | 20 ++++----- camera/test/ut/v4l2/camera_video_test.cpp | 42 +++++++++---------- .../buffer_adapter/lite/buffer_adapter.cpp | 8 ++-- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/camera/test/ut/v4l2/camera_fps_test.cpp b/camera/test/ut/v4l2/camera_fps_test.cpp index 4d9145a094..30b2dedf28 100644 --- a/camera/test/ut/v4l2/camera_fps_test.cpp +++ b/camera/test/ut/v4l2/camera_fps_test.cpp @@ -82,10 +82,10 @@ static HWTEST_F(CameraFpsTest, camera_fps_001, TestSize.Level1) cameraBase_->StartStream(cameraBase_->intents); // updateSettings - constexpr uint32_t ITEM_CAPACITY = 100; - constexpr uint32_t DATA_CAPACITY = 2000; + constexpr uint32_t itemCapacity = 100; + constexpr uint32_t dataCapacity = 2000; std::shared_ptr meta = std::make_shared( - ITEM_CAPACITY, DATA_CAPACITY); + itemCapacity, dataCapacity); std::vector fpsRange; fpsRange.push_back(fpsRange_[0]); fpsRange.push_back(fpsRange_[1]); diff --git a/camera/test/ut/v4l2/camera_stabili_test.cpp b/camera/test/ut/v4l2/camera_stabili_test.cpp index 1bf2c26aea..96334131a6 100644 --- a/camera/test/ut/v4l2/camera_stabili_test.cpp +++ b/camera/test/ut/v4l2/camera_stabili_test.cpp @@ -75,13 +75,13 @@ static HWTEST_F(CameraStabiliTest, camera_stabili_001, TestSize.Level1) cameraBase_->StartStream(cameraBase_->intents); // updateSettings - constexpr uint32_t ITEM_CAPACITY = 100; - constexpr uint32_t DATA_CAPACITY = 2000; - constexpr uint32_t DATA_COUNT = 1; + constexpr uint32_t itemCapacity = 100; + constexpr uint32_t dataCapacity = 2000; + constexpr uint32_t dataCount = 1; std::shared_ptr meta = std::make_shared( - ITEM_CAPACITY, DATA_CAPACITY); + itemCapacity, dataCapacity); uint8_t videoStabiliMode = videoStabilizationAvailableModes_[0]; - meta->addEntry(OHOS_CONTROL_VIDEO_STABILIZATION_MODE, &videoStabiliMode, DATA_COUNT); + meta->addEntry(OHOS_CONTROL_VIDEO_STABILIZATION_MODE, &videoStabiliMode, dataCount); const int32_t deviceStreamId = cameraBase_->STREAM_ID_VIDEO; meta->addEntry(OHOS_CAMERA_STREAM_ID, &deviceStreamId, 1); std::vector setting; @@ -133,13 +133,13 @@ static HWTEST_F(CameraStabiliTest, camera_stabili_002, TestSize.Level1) cameraBase_->StartCapture(cameraBase_->STREAM_ID_VIDEO, cameraBase_->CAPTURE_ID_VIDEO, false, true); // updateSettings - constexpr uint32_t ITEM_CAPACITY = 100; - constexpr uint32_t DATA_CAPACITY = 2000; - constexpr uint32_t DATA_COUNT = 1; + constexpr uint32_t itemCapacity = 100; + constexpr uint32_t dataCapacity = 2000; + constexpr uint32_t dataCount = 1; std::shared_ptr meta = std::make_shared( - ITEM_CAPACITY, DATA_CAPACITY); + itemCapacity, dataCapacity); uint8_t videoStabiliMode = videoStabilizationAvailableModes_[0]; - meta->addEntry(OHOS_CONTROL_VIDEO_STABILIZATION_MODE, &videoStabiliMode, DATA_COUNT); + meta->addEntry(OHOS_CONTROL_VIDEO_STABILIZATION_MODE, &videoStabiliMode, dataCount); const int32_t deviceStreamId = cameraBase_->STREAM_ID_VIDEO; meta->addEntry(OHOS_CAMERA_STREAM_ID, &deviceStreamId, 1); std::vector setting; diff --git a/camera/test/ut/v4l2/camera_video_test.cpp b/camera/test/ut/v4l2/camera_video_test.cpp index e10176c8e9..d97f0b77c0 100644 --- a/camera/test/ut/v4l2/camera_video_test.cpp +++ b/camera/test/ut/v4l2/camera_video_test.cpp @@ -35,32 +35,32 @@ void CameraVideoTest::SetStreamInfo(StreamInfo &streamInfo, const std::shared_pt const int streamId, const StreamIntent intent) { sptr producer; - constexpr uint32_t DATA_SPACE = 8; - constexpr uint32_t TUNNEL_MODE = 5; - constexpr uint32_t BUFFER_QUEUE_SIZE = 8; - constexpr uint32_t WIDTH = 1280; - constexpr uint32_t HEIGHT = 960; + constexpr uint32_t dataSpace = 8; + constexpr uint32_t tunnelMode = 5; + constexpr uint32_t bufferQueueSize = 8; + constexpr uint32_t width = 1280; + constexpr uint32_t height = 960; if (intent == PREVIEW) { streamInfo.width_ = PREVIEW_WIDTH; streamInfo.height_ = PREVIEW_HEIGHT; } else if (intent == STILL_CAPTURE) { - streamInfo.width_ = WIDTH; - streamInfo.height_ = HEIGHT; + streamInfo.width_ = width; + streamInfo.height_ = height; streamInfo.encodeType_ = ENCODE_TYPE_JPEG; } else if (intent == VIDEO) { - streamInfo.width_ = WIDTH; - streamInfo.height_ = HEIGHT; + streamInfo.width_ = width; + streamInfo.height_ = height; streamInfo.encodeType_ = ENCODE_TYPE_H264; } streamInfo.format_ = PIXEL_FMT_RGBA_8888; streamInfo.streamId_ = streamId; - streamInfo.dataspace_ = DATA_SPACE; + streamInfo.dataspace_ = dataSpace; streamInfo.intent_ = intent; - streamInfo.tunneledMode_ = TUNNEL_MODE; + streamInfo.tunneledMode_ = tunnelMode; producer = streamCustomer->CreateProducer(); streamInfo.bufferQueue_ = new BufferProducerSequenceable(producer); ASSERT_NE(streamInfo.bufferQueue_, nullptr); - streamInfo.bufferQueue_->producer_->SetQueueSize(BUFFER_QUEUE_SIZE); + streamInfo.bufferQueue_->producer_->SetQueueSize(bufferQueueSize); } void CameraVideoTest::CreateStream(int streamId, StreamIntent intent) @@ -144,9 +144,9 @@ void CameraVideoTest::StartCapture( void CameraVideoTest::StopStream(std::vector &captureIds, std::vector &streamIds) { - constexpr uint32_t TIME_FOR_RECEIVE_FRAME_OFF = 1; - constexpr uint32_t TIME_FOR_WAIT_IMAGE_PREVIEW = 2; - sleep(TIME_FOR_WAIT_IMAGE_PREVIEW); + constexpr uint32_t timeForReceiveFrameOff = 1; + constexpr uint32_t timeForWaitImagePreview = 2; + sleep(timeForWaitImagePreview); if (captureIds.size() > 0) { for (const auto &captureId : captureIds) { if (captureId == cameraBase_->CAPTURE_ID_PREVIEW) { @@ -155,7 +155,7 @@ void CameraVideoTest::StopStream(std::vector &captureIds, std::vector streamCustomerSnapshot_->ReceiveFrameOff(); } else if (captureId == cameraBase_->CAPTURE_ID_VIDEO) { streamCustomerVideo_->ReceiveFrameOff(); - sleep(TIME_FOR_RECEIVE_FRAME_OFF); + sleep(timeForReceiveFrameOff); } else { CAMERA_LOGE("StopStream ignore command."); } @@ -163,7 +163,7 @@ void CameraVideoTest::StopStream(std::vector &captureIds, std::vector for (auto &captureId : captureIds) { CamRetCode result = (CamRetCode)cameraBase_->streamOperator->CancelCapture(captureId); - sleep(TIME_FOR_WAIT_IMAGE_PREVIEW); + sleep(timeForWaitImagePreview); EXPECT_EQ(true, result == HDI::Camera::V1_0::NO_ERROR); if (result == HDI::Camera::V1_0::NO_ERROR) { CAMERA_LOGI("check Capture: CancelCapture success, captureId = %{public}d", captureId); @@ -173,7 +173,7 @@ void CameraVideoTest::StopStream(std::vector &captureIds, std::vector } } } - sleep(TIME_FOR_RECEIVE_FRAME_OFF); + sleep(timeForReceiveFrameOff); } /** * @tc.name: Video @@ -186,8 +186,8 @@ HWTEST_F(CameraVideoTest, camera_video_001, TestSize.Level1) { CAMERA_LOGD("Preview + video, commit together, success."); // Create and get streamOperator information - EXPECT_NE(cameraBase_, nullptr); cameraBase_->AchieveStreamOperator(); + EXPECT_NE(cameraBase_, nullptr); // start stream cameraBase_->intents = {PREVIEW, VIDEO}; cameraBase_->StartStream(cameraBase_->intents); @@ -604,8 +604,8 @@ HWTEST_F(CameraVideoTest, camera_video_031, TestSize.Level1) captureInfo.enableShutterCallback_ = false; StartCapture(cameraBase_->STREAM_ID_CAPTURE, cameraBase_->CAPTURE_ID_CAPTURE, false, true, captureInfo); - constexpr uint32_t TIME_FOR_WAIT_INIT_CAPTUREIDS = 5; - sleep(TIME_FOR_WAIT_INIT_CAPTUREIDS); + constexpr uint32_t timeForWaitInitCaptureIds = 5; + sleep(timeForWaitInitCaptureIds); std::vector captureIds = {cameraBase_->CAPTURE_ID_PREVIEW, cameraBase_->CAPTURE_ID_VIDEO, cameraBase_->CAPTURE_ID_CAPTURE}; std::vector streamIds = {cameraBase_->STREAM_ID_PREVIEW, cameraBase_->STREAM_ID_VIDEO, diff --git a/camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.cpp b/camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.cpp index 66c5091cc0..3ff3f7b09a 100644 --- a/camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.cpp +++ b/camera/vdi_base/common/buffer_manager/src/buffer_adapter/lite/buffer_adapter.cpp @@ -123,8 +123,8 @@ uint64_t BufferAdapter::CameraUsageToGrallocUsage(const uint64_t cameraUsage) { uint64_t grallocUsage = 0; uint64_t test = 1; - const uint32_t BYTE = 8; // 8 bits per byte - for (uint32_t i = 0; i < sizeof(cameraUsage) * BYTE; i++) { + const uint32_t bitsPerByte = 8; // 8 bits per byte + for (uint32_t i = 0; i < sizeof(cameraUsage) * bitsPerByte; i++) { switch (cameraUsage & (test << i)) { case CAMERA_USAGE_MEM_SHARE: grallocUsage |= BUFFER_CONSUMER_USAGE_SORTWARE; @@ -147,8 +147,8 @@ uint64_t BufferAdapter::GrallocUsageToCameraUsage(const uint64_t usage) { uint64_t cameraUsage = 0; uint64_t test = 1; - const uint32_t BYTE = 8; // 8 bits per byte - for (uint32_t i = 0; i < sizeof(usage) * BYTE; i++) { + const uint32_t bitsPerByte = 8; // 8 bits per byte + for (uint32_t i = 0; i < sizeof(usage) * bitsPerByte; i++) { switch (usage & (test << i)) { case BUFFER_CONSUMER_USAGE_SORTWARE: cameraUsage |= CAMERA_USAGE_MEM_SHARE; -- Gitee From 7e17cfb6522cd4616b019ffc3a0cb75ba96cb611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Sat, 13 Sep 2025 08:54:05 +0000 Subject: [PATCH 2/3] d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/test/ut/v4l2/double_preview_test.cpp | 28 ++++---- camera/test/ut/v4l2/meta_data_test.cpp | 12 ++-- .../pipeline_core/src/node/face_node.cpp | 70 +++++++++---------- .../pipeline_core/src/node/node_utils.cpp | 10 +-- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/camera/test/ut/v4l2/double_preview_test.cpp b/camera/test/ut/v4l2/double_preview_test.cpp index a6d04f3b33..26b60ef7d6 100644 --- a/camera/test/ut/v4l2/double_preview_test.cpp +++ b/camera/test/ut/v4l2/double_preview_test.cpp @@ -38,22 +38,22 @@ void DoublePreviewTest::SetStreamInfo(StreamInfo &streamInfo, const int streamId, const StreamIntent intent) { sptr producer; - constexpr uint32_t DATA_SPACE = 8; // picture dataspace - constexpr uint32_t TUNNEL_MODE = 5; // tunnel mode - constexpr uint32_t BUFFER_QUEUE_SIZE = 8; // set bufferQueue size + constexpr uint32_t dataSpace = 8; // picture dataspace + constexpr uint32_t tunnelMode = 5; // tunnel mode + constexpr uint32_t bufferQueueSize = 8; // set bufferQueue size if (intent == PREVIEW) { streamInfo.width_ = PREVIEW_WIDTH; streamInfo.height_ = PREVIEW_HEIGHT; streamInfo.format_ = PIXEL_FMT_RGBA_8888; } streamInfo.streamId_ = streamId; - streamInfo.dataspace_ = DATA_SPACE; + streamInfo.dataspace_ = dataSpace; streamInfo.intent_ = intent; - streamInfo.tunneledMode_ = TUNNEL_MODE; + streamInfo.tunneledMode_ = tunnelMode; producer = streamCustomer->CreateProducer(); streamInfo.bufferQueue_ = new BufferProducerSequenceable(producer); ASSERT_NE(streamInfo.bufferQueue_, nullptr); - streamInfo.bufferQueue_->producer_->SetQueueSize(BUFFER_QUEUE_SIZE); + streamInfo.bufferQueue_->producer_->SetQueueSize(bufferQueueSize); } void DoublePreviewTest::CreateStream(int streamId, StreamIntent intent) @@ -102,7 +102,7 @@ void DoublePreviewTest::StartCapture(int streamId, int captureId, bool shutterCa captureInfo_.streamIds_ = {streamId}; captureInfo_.captureSetting_ = cameraBase_->ability_; captureInfo_.enableShutterCallback_ = shutterCallback; - constexpr uint32_t TIME_FOR_WAIT_IMAGE_PREVIEW = 2; // sleep two second + constexpr uint32_t timeForWaitImagePreview = 2; // sleep two second result_ = (CamRetCode)cameraBase_->streamOperator->Capture(captureId, captureInfo_, isStreaming); EXPECT_EQ(result_, HDI::Camera::V1_0::NO_ERROR); if (result_ == HDI::Camera::V1_0::NO_ERROR) { @@ -121,7 +121,7 @@ void DoublePreviewTest::StartCapture(int streamId, int captureId, bool shutterCa } else { CAMERA_LOGE("StartCapture ignore command"); } - sleep(TIME_FOR_WAIT_IMAGE_PREVIEW); + sleep(timeForWaitImagePreview); } void DoublePreviewTest::StopStream(std::vector &captureIds, std::vector &streamIds) @@ -181,8 +181,8 @@ static HWTEST_F(DoublePreviewTest, double_preview_001, TestSize.Level1) StartCapture(cameraBase_->STREAM_ID_PREVIEW, cameraBase_->CAPTURE_ID_PREVIEW, false, true); StartCapture(STREAMID_PREVIEW_DOUBLE, CAPTUREID_PREVIEW_DOUBLE, false, true); - constexpr uint32_t TIME_FOR_WAIT_IMAGE_PREVIEW = 10; // sleep ten second - sleep(TIME_FOR_WAIT_IMAGE_PREVIEW); + constexpr uint32_t timeForWaitImagePreview = 10; // sleep ten second + sleep(timeForWaitImagePreview); std::vector captureIds = {cameraBase_->CAPTURE_ID_PREVIEW, CAPTUREID_PREVIEW_DOUBLE}; std::vector streamIds = {cameraBase_->STREAM_ID_PREVIEW, STREAMID_PREVIEW_DOUBLE}; @@ -243,8 +243,8 @@ static HWTEST_F(DoublePreviewTest, double_preview_002, TestSize.Level1) cameraBase_->StoreImage(addr, size); }); - constexpr uint32_t TIME_FOR_WAIT_IMAGE_PREVIEW = 5; // sleep five second - sleep(TIME_FOR_WAIT_IMAGE_PREVIEW); + constexpr uint32_t timeForWaitImagePreview = 5; // sleep five second + sleep(timeForWaitImagePreview); std::vector captureIds = {cameraBase_->CAPTURE_ID_PREVIEW, CAPTUREID_PREVIEW_DOUBLE, cameraBase_->CAPTURE_ID_CAPTURE}; @@ -276,8 +276,8 @@ static HWTEST_F(DoublePreviewTest, double_preview_003, TestSize.Level1) StartCapture(STREAMID_PREVIEW_DOUBLE, CAPTUREID_PREVIEW_DOUBLE, false, true); cameraBase_->StartCapture(cameraBase_->STREAM_ID_VIDEO, cameraBase_->CAPTURE_ID_VIDEO, false, true); - constexpr uint32_t TIME_FOR_WAIT_IMAGE_PREVIEW = 5; // sleep five second - sleep(TIME_FOR_WAIT_IMAGE_PREVIEW); + constexpr uint32_t timeForWaitImagePreview = 5; // sleep five second + sleep(timeForWaitImagePreview); std::vector captureIds = {cameraBase_->CAPTURE_ID_PREVIEW, CAPTUREID_PREVIEW_DOUBLE, cameraBase_->CAPTURE_ID_VIDEO}; diff --git a/camera/test/ut/v4l2/meta_data_test.cpp b/camera/test/ut/v4l2/meta_data_test.cpp index f05bd3fa72..02165a3689 100644 --- a/camera/test/ut/v4l2/meta_data_test.cpp +++ b/camera/test/ut/v4l2/meta_data_test.cpp @@ -60,9 +60,9 @@ void MetaDataTest::SetStreamInfo(StreamInfo &streamInfo, const std::shared_ptr producer; - constexpr uint32_t DATA_SPACE = 8; - constexpr uint32_t TUNNEL_MODE = 5; - constexpr uint32_t BUFFER_QUEUE_SIZE = 8; + constexpr uint32_t dataSpace = 8; + constexpr uint32_t tunnelMode = 5; + constexpr uint32_t bufferQueueSize = 8; if (intent == STILL_CAPTURE) { streamInfo.encodeType_ = ENCODE_TYPE_JPEG; } else if (intent == VIDEO) { @@ -72,13 +72,13 @@ void MetaDataTest::SetStreamInfo(StreamInfo &streamInfo, const std::shared_ptrCreateProducer(); streamInfo.bufferQueue_ = new BufferProducerSequenceable(producer); CHECK_IF_PTR_NULL_RETURN_VOID(streamInfo.bufferQueue_); - streamInfo.bufferQueue_->producer_->SetQueueSize(BUFFER_QUEUE_SIZE); + streamInfo.bufferQueue_->producer_->SetQueueSize(bufferQueueSize); } void MetaDataTest::CreateStream(int streamId, StreamIntent intent) diff --git a/camera/vdi_base/usb_camera/pipeline_core/src/node/face_node.cpp b/camera/vdi_base/usb_camera/pipeline_core/src/node/face_node.cpp index 30946c8d19..6e82d34d52 100644 --- a/camera/vdi_base/usb_camera/pipeline_core/src/node/face_node.cpp +++ b/camera/vdi_base/usb_camera/pipeline_core/src/node/face_node.cpp @@ -108,36 +108,36 @@ RetCode FaceNode::GetCameraFaceRectangles(std::shared_ptr &metad { constexpr int32_t row = 3; constexpr int32_t col = 4; - constexpr float rect_one_x = 0.0; // dummy data: faceRectangles data - constexpr float rect_one_y = 0.0; - constexpr float rect_one_width = 0.2; - constexpr float rect_one_height = 0.3; + constexpr float rectOneX = 0.0; // dummy data: faceRectangles data + constexpr float rectOneY = 0.0; + constexpr float rectOneWidth = 0.2; + constexpr float rectOneHeight = 0.3; - constexpr float rect_two_x = 0.3; // dummy data: faceRectangles data - constexpr float rect_two_y = 0.3; - constexpr float rect_two_width = 0.2; - constexpr float rect_two_height = 0.3; + constexpr float rectTwoX = 0.3; // dummy data: faceRectangles data + constexpr float rectTwoY = 0.3; + constexpr float rectTwoWidth = 0.2; + constexpr float rectTwoHeight = 0.3; - constexpr float rect_three_x = 0.6; // dummy data: faceRectangles data - constexpr float rect_three_y = 0.6; - constexpr float rect_three_width = 0.2; - constexpr float rect_three_height = 0.3; + constexpr float rectThreeX = 0.6; // dummy data: faceRectangles data + constexpr float rectThreeY = 0.6; + constexpr float rectThreeWidth = 0.2; + constexpr float rectThreeHeight = 0.3; float faceRectangles[row][col]; - faceRectangles[INDEX_0][INDEX_0] = rect_one_x; - faceRectangles[INDEX_0][INDEX_1] = rect_one_y; - faceRectangles[INDEX_0][INDEX_2] = rect_one_width; - faceRectangles[INDEX_0][INDEX_3] = rect_one_height; - - faceRectangles[INDEX_1][INDEX_0] = rect_two_x; - faceRectangles[INDEX_1][INDEX_1] = rect_two_y; - faceRectangles[INDEX_1][INDEX_2] = rect_two_width; - faceRectangles[INDEX_1][INDEX_3] = rect_two_height; - - faceRectangles[INDEX_2][INDEX_0] = rect_three_x; - faceRectangles[INDEX_2][INDEX_1] = rect_three_y; - faceRectangles[INDEX_2][INDEX_2] = rect_three_width; - faceRectangles[INDEX_2][INDEX_3] = rect_three_height; + faceRectangles[INDEX_0][INDEX_0] = rectOneX; + faceRectangles[INDEX_0][INDEX_1] = rectOneY; + faceRectangles[INDEX_0][INDEX_2] = rectOneWidth; + faceRectangles[INDEX_0][INDEX_3] = rectOneHeight; + + faceRectangles[INDEX_1][INDEX_0] = rectTwoX; + faceRectangles[INDEX_1][INDEX_1] = rectTwoY; + faceRectangles[INDEX_1][INDEX_2] = rectTwoWidth; + faceRectangles[INDEX_1][INDEX_3] = rectTwoHeight; + + faceRectangles[INDEX_2][INDEX_0] = rectThreeX; + faceRectangles[INDEX_2][INDEX_1] = rectThreeY; + faceRectangles[INDEX_2][INDEX_2] = rectThreeWidth; + faceRectangles[INDEX_2][INDEX_3] = rectThreeHeight; metadata->addEntry(OHOS_STATISTICS_FACE_RECTANGLES, static_cast(&faceRectangles[0]), row * col); return RC_OK; @@ -146,12 +146,12 @@ RetCode FaceNode::GetCameraFaceRectangles(std::shared_ptr &metad RetCode FaceNode::GetCameraFaceIds(std::shared_ptr &metadata) { std::vector vFaceIds; - constexpr int32_t id_zero = 0; - constexpr int32_t id_one = 1; - constexpr int32_t id_two = 2; - vFaceIds.push_back(id_zero); - vFaceIds.push_back(id_one); - vFaceIds.push_back(id_two); + constexpr int32_t idZero = 0; + constexpr int32_t idOne = 1; + constexpr int32_t idTwo = 2; + vFaceIds.push_back(idZero); + vFaceIds.push_back(idOne); + vFaceIds.push_back(idTwo); metadata->addEntry(OHOS_STATISTICS_FACE_IDS, vFaceIds.data(), vFaceIds.size()); return RC_OK; } @@ -195,10 +195,10 @@ RetCode FaceNode::CopyBuffer(uint8_t *sourceBuffer, std::shared_ptr& ou RetCode FaceNode::CreateMetadataInfo() { - const int ENTRY_CAPACITY = 30; // 30:entry capacity - const int DATA_CAPACITY = 2000; // 2000:data capacity + const int entryCapacity = 30; // 30:entry capacity + const int dataCapacity = 2000; // 2000:data capacity std::unique_lock lock(mLock_); - metaData_ = std::make_shared(ENTRY_CAPACITY, DATA_CAPACITY); + metaData_ = std::make_shared(entryCapacity, dataCapacity); RetCode result = GetFaceDetectMetaData(metaData_); if (result != RC_OK) { CAMERA_LOGE("GetFaceDetectMetaData failed\n"); diff --git a/camera/vdi_base/usb_camera/pipeline_core/src/node/node_utils.cpp b/camera/vdi_base/usb_camera/pipeline_core/src/node/node_utils.cpp index f7e8c815f1..b88d976c60 100644 --- a/camera/vdi_base/usb_camera/pipeline_core/src/node/node_utils.cpp +++ b/camera/vdi_base/usb_camera/pipeline_core/src/node/node_utils.cpp @@ -145,7 +145,7 @@ void NodeUtils::BufferScaleFormatTransform(std::shared_ptr& buffer, voi } } -static void AddStrideToNV21(uint8_t* buffer, uint8_t* bufferMax, int width, int height, int newStride) +static void AddStrideToNV21(uint8_t* buffer, uint8_t* bufferMAX, int width, int height, int newStride) { const int yPlaneSize = width * height; const int uvPlaneSize = yPlaneSize / 2; @@ -160,12 +160,12 @@ static void AddStrideToNV21(uint8_t* buffer, uint8_t* bufferMax, int width, int for (int y = (height / 2) - 1; y >= 0; --y) { uint8_t* src = buffer + yPlaneSize + y * width; uint8_t* dst = buffer + newYPlaneSize + y * newStride; - if (memmove_s(dst, bufferMax - dst, src, width) != 0) { + if (memmove_s(dst, bufferMAX - dst, src, width) != 0) { CAMERA_LOGE("AddStrideToNV21 memmove_s Fail 1"); return; } if (newStride > width) { - if (memset_s(dst + width, bufferMax - (dst + width), 0, newStride - width)) { + if (memset_s(dst + width, bufferMAX - (dst + width), 0, newStride - width)) { CAMERA_LOGE("AddStrideToNV21 memset_s Fail 1"); return; } @@ -176,12 +176,12 @@ static void AddStrideToNV21(uint8_t* buffer, uint8_t* bufferMax, int width, int for (int y = height - 1; y >= 0; --y) { uint8_t* src = buffer + y * width; uint8_t* dst = buffer + y * newStride; - if (memmove_s(dst, bufferMax - dst, src, width) != 0) { + if (memmove_s(dst, bufferMAX - dst, src, width) != 0) { CAMERA_LOGE("AddStrideToNV21 memmove_s Fail 2"); return; } if (newStride > width) { - if (memset_s(dst + width, bufferMax - (dst + width), 0, newStride - width)) { + if (memset_s(dst + width, bufferMAX - (dst + width), 0, newStride - width)) { CAMERA_LOGE("AddStrideToNV21 memset_s Fail 2"); return; } -- Gitee From 4873fa6536b0ab3cc5a8294826b654e4fe05cb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Sat, 13 Sep 2025 08:54:12 +0000 Subject: [PATCH 3/3] d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/test/ut/v4l2/usb_camera_test.cpp | 24 ++++++++++---------- camera/test/ut/v4l2/usb_camera_test_mult.cpp | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/camera/test/ut/v4l2/usb_camera_test.cpp b/camera/test/ut/v4l2/usb_camera_test.cpp index 6293059850..54409e208b 100644 --- a/camera/test/ut/v4l2/usb_camera_test.cpp +++ b/camera/test/ut/v4l2/usb_camera_test.cpp @@ -565,14 +565,14 @@ TEST_F(UtestUSBCameraTest, camera_usb_0020) cameraBase_->StartStream(cameraBase_->intents); // updateSettings - const uint32_t ITEM_CAPACITY = 100; - const uint32_t DATA_CAPACITY = 2000; - const int32_t FPS_VALUE = 10; + const uint32_t itemCapacity = 100; + const uint32_t dataCapacity = 2000; + const int32_t fpsValue = 10; std::shared_ptr meta = std::make_shared( - ITEM_CAPACITY, DATA_CAPACITY); + itemCapacity, dataCapacity); std::vector fpsRange; - fpsRange.push_back(FPS_VALUE); - fpsRange.push_back(FPS_VALUE); + fpsRange.push_back(fpsValue); + fpsRange.push_back(fpsValue); meta->addEntry(OHOS_CONTROL_FPS_RANGES, fpsRange.data(), fpsRange.size()); const int32_t DEVICE_STREAM_ID = 0; meta->addEntry(OHOS_CAMERA_STREAM_ID, &DEVICE_STREAM_ID, 1); @@ -889,14 +889,14 @@ TEST_F(UtestUSBCameraTest, camera_usb_0028) cameraBase_->StartStream(cameraBase_->intents); // updateSettings - const uint32_t ITEM_CAPACITY = 100; - const uint32_t DATA_CAPACITY = 2000; - const int32_t FPS_VALUE = 10; + const uint32_t itemCapacity = 100; + const uint32_t dataCapacity = 2000; + const int32_t fpsValue = 10; std::shared_ptr meta = std::make_shared( - ITEM_CAPACITY, DATA_CAPACITY); + itemCapacity, dataCapacity); std::vector fpsRange; - fpsRange.push_back(FPS_VALUE); - fpsRange.push_back(FPS_VALUE); + fpsRange.push_back(fpsValue); + fpsRange.push_back(fpsValue); meta->addEntry(OHOS_CONTROL_FPS_RANGES, fpsRange.data(), fpsRange.size()); const int32_t DEVICE_STREAM_ID = 0; meta->addEntry(OHOS_CAMERA_STREAM_ID, &DEVICE_STREAM_ID, 1); diff --git a/camera/test/ut/v4l2/usb_camera_test_mult.cpp b/camera/test/ut/v4l2/usb_camera_test_mult.cpp index b56236791a..aad966dc57 100644 --- a/camera/test/ut/v4l2/usb_camera_test_mult.cpp +++ b/camera/test/ut/v4l2/usb_camera_test_mult.cpp @@ -249,8 +249,8 @@ void UtestUSBCameraTestMult::StartCapture(int streamId, int captureId, bool shut void UtestUSBCameraTestMult::StopStream(std::vector& captureIds, std::vector& streamIds) { - constexpr uint32_t TIME_FOR_WAIT_CANCEL_CAPTURE = 2; - sleep(TIME_FOR_WAIT_CANCEL_CAPTURE); + constexpr uint32_t timeForWaitCancelCapture = 2; + sleep(timeForWaitCancelCapture); if (captureIds.size() > 0) { for (auto &captureId : captureIds) { if (captureId == CAPTURE_ID_PREVIEW_DOUBLE) { @@ -266,7 +266,7 @@ void UtestUSBCameraTestMult::StopStream(std::vector& captureIds, std::vecto for (const auto &captureId : captureIds) { std::cout << "check Capture: CancelCapture success, captureId = " << captureId << std::endl; cameraBase_->rc = (CamRetCode)streamOperator_->CancelCapture(captureId); - sleep(TIME_FOR_WAIT_CANCEL_CAPTURE); + sleep(timeForWaitCancelCapture); EXPECT_EQ(true, cameraBase_->rc == HDI::Camera::V1_0::NO_ERROR); if (cameraBase_->rc == HDI::Camera::V1_0::NO_ERROR) { std::cout << "check Capture: CancelCapture success, captureId = " << captureId << std::endl; -- Gitee