tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Camera VTS: Verify high speed video configurations" into main am: 607f7e7ff7 am: 68d44aa5e2

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2585399

Change-Id: Ia6aa1f2395bbcf7778ea5c6820cf778168df1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-18 09:03:03 +00:00 committed by Automerger Merge Worker
commit 8125e862c3
3 changed files with 90 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
View file

@ -242,6 +242,7 @@ TEST_P(CameraAidlTest, getCameraCharacteristics) {
verifyCameraCharacteristics(chars);
verifyMonochromeCharacteristics(chars);
verifyRecommendedConfigs(chars);
verifyHighSpeedRecordingCharacteristics(name, chars);
verifyLogicalOrUltraHighResCameraMetadata(name, device, chars, cameraDeviceNames);
ASSERT_TRUE(ret.isOk());

84
camera/provider/aidl/vts/camera_aidl_test.cpp
View file

@ -831,6 +831,90 @@ void CameraAidlTest::verifyExtendedSceneModeCharacteristics(const camera_metadat
ASSERT_TRUE(hasBokehStillCaptureMode || hasBokehContinuousMode || hasVendorMode);
}
void CameraAidlTest::verifyHighSpeedRecordingCharacteristics(const std::string& cameraName,
const CameraMetadata& chars) {
const camera_metadata_t* metadata =
reinterpret_cast<const camera_metadata_t*>(chars.metadata.data());
// Check capabilities
bool hasHighSpeedRecordingCapability = false;
bool hasUltraHighResolutionCapability = false;
camera_metadata_ro_entry entry;
int rc =
find_camera_metadata_ro_entry(metadata, ANDROID_REQUEST_AVAILABLE_CAPABILITIES, &entry);
if ((0 == rc) && (entry.count > 0)) {
hasHighSpeedRecordingCapability =
std::find(entry.data.u8, entry.data.u8 + entry.count,
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO) !=
entry.data.u8 + entry.count;
hasUltraHighResolutionCapability =
std::find(entry.data.u8, entry.data.u8 + entry.count,
ANDROID_REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR) !=
entry.data.u8 + entry.count;
}
// Check high speed video configurations
camera_metadata_ro_entry highSpeedEntry;
rc = find_camera_metadata_ro_entry(
metadata, ANDROID_CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS, &highSpeedEntry);
bool hasHighSpeedEntry = (0 == rc && highSpeedEntry.count > 0);
camera_metadata_ro_entry highSpeedMaxResEntry;
rc = find_camera_metadata_ro_entry(
metadata, ANDROID_CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS_MAXIMUM_RESOLUTION,
&highSpeedMaxResEntry);
bool hasHighSpeedMaxResEntry = (0 == rc && highSpeedMaxResEntry.count > 0);
// High speed recording configuration entry must be available based on capabilities
bool noHighSpeedRecording =
!hasHighSpeedRecordingCapability && !hasHighSpeedEntry && !hasHighSpeedMaxResEntry;
if (noHighSpeedRecording) {
return;
}
bool hasHighSpeedRecording = hasHighSpeedRecordingCapability && hasHighSpeedEntry &&
((hasHighSpeedMaxResEntry && hasUltraHighResolutionCapability) ||
!hasHighSpeedMaxResEntry);
ASSERT_TRUE(hasHighSpeedRecording);
std::string version, cameraId;
ASSERT_TRUE(matchDeviceName(cameraName, mProviderType, &version, &cameraId));
bool needBatchSizeCheck = (version != CAMERA_DEVICE_API_VERSION_1);
// Check each entry item
ASSERT_TRUE(highSpeedEntry.count > 0 && highSpeedEntry.count % 5 == 0);
for (auto i = 4; i < highSpeedEntry.count; i += 5) {
int32_t fps_min = highSpeedEntry.data.i32[i - 2];
int32_t fps_max = highSpeedEntry.data.i32[i - 1];
int32_t batch_size_max = highSpeedEntry.data.i32[i];
int32_t allowedMaxBatchSize = fps_max / 30;
ASSERT_GE(fps_max, 120);
ASSERT_TRUE(fps_min % 30 == 0 && fps_max % 30 == 0);
if (needBatchSizeCheck) {
ASSERT_LE(batch_size_max, 32);
ASSERT_TRUE(allowedMaxBatchSize % batch_size_max == 0);
}
}
if (hasHighSpeedMaxResEntry) {
ASSERT_TRUE(highSpeedMaxResEntry.count > 0 && highSpeedMaxResEntry.count % 5 == 0);
for (auto i = 4; i < highSpeedMaxResEntry.count; i += 5) {
int32_t fps_min = highSpeedMaxResEntry.data.i32[i - 2];
int32_t fps_max = highSpeedMaxResEntry.data.i32[i - 1];
int32_t batch_size_max = highSpeedMaxResEntry.data.i32[i];
int32_t allowedMaxBatchSize = fps_max / 30;
ASSERT_GE(fps_max, 120);
ASSERT_TRUE(fps_min % 30 == 0 && fps_max % 30 == 0);
if (needBatchSizeCheck) {
ASSERT_LE(batch_size_max, 32);
ASSERT_TRUE(allowedMaxBatchSize % batch_size_max == 0);
}
}
}
}
Status CameraAidlTest::getAvailableOutputStreams(const camera_metadata_t* staticMeta,
std::vector<AvailableStream>& outputStreams,
const AvailableStream* threshold,

5
camera/provider/aidl/vts/camera_aidl_test.h
View file

@ -253,6 +253,9 @@ class CameraAidlTest : public ::testing::TestWithParam<std::string> {
static void verifyExtendedSceneModeCharacteristics(const camera_metadata_t* metadata);
void verifyHighSpeedRecordingCharacteristics(const std::string& cameraName,
const CameraMetadata& chars);
static void verifyZoomCharacteristics(const camera_metadata_t* metadata);
static void verifyRecommendedConfigs(const CameraMetadata& chars);
@ -610,6 +613,8 @@ class CameraAidlTest : public ::testing::TestWithParam<std::string> {
namespace {
// device@<major>.<minor>/<type>/id
const char* kDeviceNameRE = "device@([0-9]+\\.[0-9]+)/\\s+/(.+)";
const std::string CAMERA_DEVICE_API_VERSION_1 = "1.1";
const int32_t kMaxVideoWidth = 4096;
const int32_t kMaxVideoHeight = 2160;