openharmony/xts_hats
1
0
Fork 0
mirror of https://gitee.com/openharmony/xts_hats synced 2025-02-21 10:53:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modifited camera suites

Browse Source 
Signed-off-by: zwx981672 <zhangxiaofei37@huawei.com>
Change-Id: I5ed70e9f4d63001af794fe8c858cd9fc10232f4e
This commit is contained in:
zwx981672 2024-01-05 15:36:05 +08:00
parent 07a3d51dd4
commit 89cb3e9f2e
5 changed files with 27 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hdf/camera/cameraBenchmarkTest/BUILD.gn
View File

@ -21,10 +21,14 @@ group("HatsHdfCamerabenchmarkTest") {
testonly = true
}
if (is_standard_system) {
deps = [
"v1_0:HatsHdfCamerabenchmarkTestV0",
"v1_1:HatsHdfCamerabenchmarkTestV1",
]
if (hats_rich == false) {
deps = [ "v1_0:HatsHdfCamerabenchmarkTestV0" ]
} else {
deps = [
"v1_0:HatsHdfCamerabenchmarkTestV0",
"v1_1:HatsHdfCamerabenchmarkTestV1",
]
}
}
}
###############################################################################

6
hdf/camera/cameraBenchmarkTest/v1_1/src/benchmark_common.cpp
View File

@ -93,7 +93,7 @@ void Test::Init()
service->SetCallback(hostCallback);
}
void Test::GetCameraMetadata()
void Test::GetCameraMetadata(int cameraId)
{
rc = service->GetCameraAbility(cameraIds.front(), abilityVec);
if (rc != HDI::Camera::V1_0::NO_ERROR) {
@ -109,7 +109,7 @@ void Test::GetCameraMetadata()
}
}
void Test::Open()
void Test::Open(int cameraId)
{
if (cameraDevice == nullptr) {
service->GetCameraIds(cameraIds);
@ -117,7 +117,7 @@ void Test::Open()
CAMERA_LOGE("camera device list empty");
}
ASSERT_TRUE(cameraIds.size() != 0);
GetCameraMetadata();
GetCameraMetadata(cameraId);
deviceCallback = new OHOS::Camera::Test::DemoCameraDeviceCallback();
ASSERT_TRUE(serviceV1_1 != nullptr);

6
hdf/camera/cameraBenchmarkTest/v1_1/src/camera_benchmark_test.cpp
View File

@ -44,7 +44,6 @@ void CameraBenchmarkTest::TearDown(const ::benchmark::State &state)
BENCHMARK_F(CameraBenchmarkTest, SUB_Prelaunch_benchmark_001)(
benchmark::State &st)
{
cameraTest->Open();
EXPECT_EQ(false, cameraTest->serviceV1_1 == nullptr);
cameraTest->prelaunchConfig = std::make_shared<OHOS::HDI::Camera::V1_1::PrelaunchConfig>();
cameraTest->prelaunchConfig->cameraId = "device/0";
@ -53,6 +52,7 @@ BENCHMARK_F(CameraBenchmarkTest, SUB_Prelaunch_benchmark_001)(
for (auto _ : st) {
cameraTest->rc = cameraTest->serviceV1_1->Prelaunch(*cameraTest->prelaunchConfig);
}
cameraTest->Open(DEVICE_0);
}
BENCHMARK_REGISTER_F(CameraBenchmarkTest, SUB_Prelaunch_benchmark_001)->Iterations(ITERATION_FREQUENCY)->
Repetitions(REPETITION_FREQUENCY)->ReportAggregatesOnly();
@ -67,7 +67,7 @@ BENCHMARK_REGISTER_F(CameraBenchmarkTest, SUB_Prelaunch_benchmark_001)->Iteratio
BENCHMARK_F(CameraBenchmarkTest, SUB_GetStreamOperator_V1_1_benchmark_002)(
benchmark::State &st)
{
cameraTest->Open();
cameraTest->Open(DEVICE_0);
cameraTest->streamOperatorCallback = new OHOS::Camera::Test::TestStreamOperatorCallback();
for (auto _ : st) {
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetStreamOperator_V1_1(cameraTest->streamOperatorCallback,
@ -87,7 +87,7 @@ BENCHMARK_REGISTER_F(CameraBenchmarkTest, SUB_GetStreamOperator_V1_1_benchmark_0
BENCHMARK_F(CameraBenchmarkTest, SUB_GetDefaultSettings_benchmark_003)(
benchmark::State &st)
{
cameraTest->Open();
cameraTest->Open(DEVICE_0);
cameraTest->streamOperatorCallback = new OHOS::Camera::Test::TestStreamOperatorCallback();
for (auto _ : st) {
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetDefaultSettings(cameraTest->abilityVec);

12
hdf/camera/cameraMg/BUILD.gn
View File

@ -21,10 +21,14 @@ group("HatsHdfCameraMgTest") {
testonly = true
}
if (is_standard_system) {
deps = [
"v1_0:HatsHdfCameraMgTestv0",
"v1_1:HatsHdfCameraMgTestv1",
]
if (hats_rich == false) {
deps = [ "v1_0:HatsHdfCameraMgTestv0" ]
} else {
deps = [
"v1_0:HatsHdfCameraMgTestv0",
"v1_1:HatsHdfCameraMgTestv1",
]
}
}
}
###############################################################################

114
hdf/camera/cameraMg/v1_1/src/camera_hdi_uttest_v1_1.cpp
View File

@ -24,6 +24,7 @@ void CameraHdiTestV1_1::TearDownTestCase(void) {}
void CameraHdiTestV1_1::SetUp(void)
{
cameraTest = std::make_shared<OHOS::Camera::Test>();
cameraTest->Init();
}
void CameraHdiTestV1_1::TearDown(void)
@ -39,14 +40,6 @@ void CameraHdiTestV1_1::TearDown(void)
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0100, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->prelaunchConfig = std::make_shared<OHOS::HDI::Camera::V1_1::PrelaunchConfig>();
cameraTest->prelaunchConfig->cameraId = "device/0";
cameraTest->prelaunchConfig->streamInfos_V1_1 = {};
@ -54,6 +47,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0100, TestSize.Level1)
cameraTest->rc = cameraTest->serviceV1_1->Prelaunch(*cameraTest->prelaunchConfig);
EXPECT_EQ(cameraTest->rc, HDI::Camera::V1_0::NO_ERROR);
cameraTest->Open();
}
/**
@ -64,14 +58,6 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0100, TestSize.Level1)
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0200, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->prelaunchConfig = std::make_shared<OHOS::HDI::Camera::V1_1::PrelaunchConfig>();
cameraTest->prelaunchConfig->cameraId = {};
cameraTest->prelaunchConfig->streamInfos_V1_1 = {};
@ -79,6 +65,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0200, TestSize.Level1)
cameraTest->rc = cameraTest->serviceV1_1->Prelaunch(*cameraTest->prelaunchConfig);
EXPECT_EQ(true, cameraTest->rc == INVALID_ARGUMENT);
cameraTest->Open();
}
/**
@ -89,14 +76,6 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0200, TestSize.Level1)
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0300, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->prelaunchConfig = std::make_shared<OHOS::HDI::Camera::V1_1::PrelaunchConfig>();
cameraTest->prelaunchConfig->cameraId = "device/10";
cameraTest->prelaunchConfig->streamInfos_V1_1 = {};
@ -104,6 +83,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0300, TestSize.Level1)
cameraTest->rc = cameraTest->serviceV1_1->Prelaunch(*cameraTest->prelaunchConfig);
EXPECT_EQ(true, cameraTest->rc == INVALID_ARGUMENT);
cameraTest->Open();
}
/**
@ -114,14 +94,6 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0300, TestSize.Level1)
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0400, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->prelaunchConfig = std::make_shared<OHOS::HDI::Camera::V1_1::PrelaunchConfig>();
cameraTest->prelaunchConfig->cameraId = "ABC123";
cameraTest->prelaunchConfig->streamInfos_V1_1 = {};
@ -129,6 +101,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0400, TestSize.Level1)
cameraTest->rc = cameraTest->serviceV1_1->Prelaunch(*cameraTest->prelaunchConfig);
EXPECT_EQ(true, cameraTest->rc == INVALID_ARGUMENT);
cameraTest->Open();
}
/**
@ -139,14 +112,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0400, TestSize.Level1)
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0500, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
EXPECT_NE(cameraTest->ability, nullptr);
common_metadata_header_t* data = cameraTest->ability->get();
EXPECT_NE(data, nullptr);
@ -164,14 +130,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_Prelaunch_0500, TestSize.Level1)
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_GetDefaultSettings_0100, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
EXPECT_EQ(true, cameraTest->cameraDevice != nullptr);
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetDefaultSettings(cameraTest->abilityVec);
EXPECT_EQ(cameraTest->rc, HDI::Camera::V1_0::NO_ERROR);
@ -185,14 +144,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_GetDefaultSettings_0100, TestSize.
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_GetDefaultSettings_0200, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
std::shared_ptr<CameraAbility> ability;
std::shared_ptr<CameraAbility> abilitys;
EXPECT_EQ(true, cameraTest->cameraDevice != nullptr);
@ -231,14 +183,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_GetDefaultSettings_0200, TestSize.
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_DelayStream_0100, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->streamOperatorCallback = new OHOS::Camera::Test::TestStreamOperatorCallback();
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetStreamOperator_V1_1(cameraTest->streamOperatorCallback,
cameraTest->streamOperator_V1_1);
@ -290,14 +235,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_DelayStream_0100, TestSize.Level1)
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0100, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
EXPECT_NE(cameraTest->ability, nullptr);
common_metadata_header_t* data = cameraTest->ability->get();
EXPECT_NE(data, nullptr);
@ -316,15 +254,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0200, TestSize.Leve
{
int64_t timeStampCapture = 0;
int64_t timeStampThumbnail = 0;
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->streamOperatorCallback = new OHOS::Camera::Test::TestStreamOperatorCallback();
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetStreamOperator_V1_1(
cameraTest->streamOperatorCallback, cameraTest->streamOperator_V1_1);
@ -382,17 +312,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0200, TestSize.Leve
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0300, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->streamOperatorCallback = new OHOS::Camera::Test::TestStreamOperatorCallback();
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetStreamOperator_V1_1(
cameraTest->streamOperatorCallback, cameraTest->streamOperator_V1_1);
@ -449,15 +369,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0300, TestSize.Leve
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0400, TestSize.Level1)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->streamOperatorCallback = new OHOS::Camera::Test::TestStreamOperatorCallback();
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetStreamOperator_V1_1(
cameraTest->streamOperatorCallback, cameraTest->streamOperator_V1_1);
@ -512,15 +424,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0400, TestSize.Leve
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0500, TestSize.Level3)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->streamOperatorCallback = new OHOS::Camera::Test::TestStreamOperatorCallback();
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetStreamOperator_V1_1(
cameraTest->streamOperatorCallback, cameraTest->streamOperator_V1_1);
@ -584,15 +488,7 @@ HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0500, TestSize.Leve
*/
HWTEST_F(CameraHdiTestV1_1, SUB_Driver_Camera_QuickThumbnail_0600, TestSize.Level3)
{
cameraTest->Init();
if (cameraTest->serviceV1_1 == nullptr) {
return;
}
cameraTest->Open();
if (cameraTest->cameraDeviceV1_1 == nullptr) {
return;
}
cameraTest->streamOperatorCallback = new OHOS::Camera::Test::TestStreamOperatorCallback();
cameraTest->rc = cameraTest->cameraDeviceV1_1->GetStreamOperator_V1_1(
cameraTest->streamOperatorCallback, cameraTest->streamOperator_V1_1);