summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/android/camera_device.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index fabe45ac..1e2a933c 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -705,10 +705,10 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()
{
/*
* \todo Keep this in sync with the actual number of entries.
- * Currently: 53 entries, 846 bytes of static metadata
+ * Currently: 53 entries, 850 bytes of static metadata
*/
uint32_t numEntries = 53;
- uint32_t byteSize = 846;
+ uint32_t byteSize = 850;
/*
* Calculate space occupation in bytes for dynamically built metadata
@@ -1326,6 +1326,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
ANDROID_SCALER_CROP_REGION,
ANDROID_SENSOR_EXPOSURE_TIME,
ANDROID_SENSOR_ROLLING_SHUTTER_SKEW,
+ ANDROID_SENSOR_TEST_PATTERN_MODE,
ANDROID_SENSOR_TIMESTAMP,
ANDROID_STATISTICS_FACE_DETECT_MODE,
ANDROID_STATISTICS_LENS_SHADING_MAP_MODE,
@@ -2010,7 +2011,7 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,
* Total bytes for JPEG metadata: 82
*/
std::unique_ptr<CameraMetadata> resultMetadata =
- std::make_unique<CameraMetadata>(42, 161);
+ std::make_unique<CameraMetadata>(43, 165);
if (!resultMetadata->isValid()) {
LOG(HAL, Error) << "Failed to allocate static metadata";
return nullptr;
@@ -2103,6 +2104,10 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,
resultMetadata->addEntry(ANDROID_LENS_OPTICAL_STABILIZATION_MODE,
&value, 1);
+ value32 = ANDROID_SENSOR_TEST_PATTERN_MODE_OFF;
+ resultMetadata->addEntry(ANDROID_SENSOR_TEST_PATTERN_MODE,
+ &value32, 1);
+
resultMetadata->addEntry(ANDROID_SENSOR_TIMESTAMP, &timestamp, 1);
value = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;
5_dep.found() qcam_enabled = false subdir_done() endif qcam_enabled = true qcam_sources = files([ '../cam/image.cpp', '../cam/options.cpp', '../cam/stream_options.cpp', 'format_converter.cpp', 'main.cpp', 'main_window.cpp', 'message_handler.cpp', 'viewfinder_qt.cpp', ]) qcam_moc_headers = files([ 'main_window.h', 'viewfinder_qt.h', ]) qcam_resources = files([ 'assets/feathericons/feathericons.qrc', ]) qcam_deps = [ libatomic, libcamera_public, qt5_dep, ] qt5_cpp_args = ['-DQT_NO_KEYWORDS'] tiff_dep = dependency('libtiff-4', required : false) if tiff_dep.found() qt5_cpp_args += ['-DHAVE_TIFF'] qcam_deps += [tiff_dep] qcam_sources += files([ 'dng_writer.cpp', ]) endif if cxx.has_header_symbol('QOpenGLWidget', 'QOpenGLWidget', dependencies : qt5_dep, args : '-fPIC') qcam_sources += files([ 'viewfinder_gl.cpp', ]) qcam_moc_headers += files([ 'viewfinder_gl.h', ]) qcam_resources += files([ 'assets/shader/shaders.qrc' ]) endif # gcc 9 introduced a deprecated-copy warning that is triggered by Qt until # Qt 5.13. clang 10 introduced the same warning, but detects more issues # that are not fixed in Qt yet. Disable the warning manually in both cases. if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and qt5_dep.version().version_compare('<5.13')) or (cc.get_id() == 'clang' and cc.version().version_compare('>=10.0'))) qt5_cpp_args += ['-Wno-deprecated-copy'] endif resources = qt5.preprocess(moc_headers: qcam_moc_headers, qresources : qcam_resources, dependencies: qt5_dep) qcam = executable('qcam', qcam_sources, resources, install : true, dependencies : qcam_deps, cpp_args : qt5_cpp_args)