Merge changes I24640ffb,I5c0ede96 into pi-dev (d42afb97) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/DistortionMapper.cpp

+36 −4

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#define ATRACE_TAG ATRACE_TAG_CAMERA
		//#define LOG_NDEBUG 0

		#include <algorithm>
		#include <cmath>

		#include "device3/DistortionMapper.h"
		@@ -43,13 +44,13 @@ constexpr std::array<uint32_t, 1> DistortionMapper::kRequestRectsToCorrect = {
		};

		// Only for capture result
		constexpr std::array<uint32_t, 2> DistortionMapper::kResultRectsToCorrect = {
		constexpr std::array<uint32_t, 1> DistortionMapper::kResultRectsToCorrect = {
		ANDROID_SCALER_CROP_REGION,
		ANDROID_STATISTICS_FACE_RECTANGLES
		};

		// Only for capture result
		constexpr std::array<uint32_t, 1> DistortionMapper::kResultPointsToCorrect = {
		constexpr std::array<uint32_t, 2> DistortionMapper::kResultPointsToCorrect = {
		ANDROID_STATISTICS_FACE_RECTANGLES, // Says rectangles, is really points
		ANDROID_STATISTICS_FACE_LANDMARKS,
		};

		@@ -81,6 +82,10 @@ status_t DistortionMapper::setupStaticInfo(const CameraMetadata &deviceInfo) {
		mArrayWidth = array.data.i32[2];
		mArrayHeight = array.data.i32[3];

		array = deviceInfo.find(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE);
		mActiveWidth = array.data.i32[2];
		mActiveHeight = array.data.i32[3];

		return updateCalibration(deviceInfo);
		}

		@@ -102,8 +107,21 @@ status_t DistortionMapper::correctCaptureRequest(CameraMetadata *request) {
		for (auto region : kMeteringRegionsToCorrect) {
		e = request->find(region);
		for (size_t j = 0; j < e.count; j += 5) {
		int32_t weight = e.data.i32[j + 4];
		if (weight == 0) {
		continue;
		}
		res = mapCorrectedToRaw(e.data.i32 + j, 2);
		if (res != OK) return res;
		for (size_t k = 0; k < 4; k+=2) {
		int32_t& x = e.data.i32[j + k];
		int32_t& y = e.data.i32[j + k + 1];
		// Clamp to within active array
		x = std::max(0, x);
		x = std::min(mActiveWidth - 1, x);
		y = std::max(0, y);
		y = std::min(mActiveHeight - 1, y);
		}
		}
		}
		for (auto rect : kRequestRectsToCorrect) {
		@@ -134,8 +152,21 @@ status_t DistortionMapper::correctCaptureResult(CameraMetadata *result) {
		for (auto region : kMeteringRegionsToCorrect) {
		e = result->find(region);
		for (size_t j = 0; j < e.count; j += 5) {
		int32_t weight = e.data.i32[j + 4];
		if (weight == 0) {
		continue;
		}
		res = mapRawToCorrected(e.data.i32 + j, 2);
		if (res != OK) return res;
		for (size_t k = 0; k < 4; k+=2) {
		int32_t& x = e.data.i32[j + k];
		int32_t& y = e.data.i32[j + k + 1];
		// Clamp to within active array
		x = std::max(0, x);
		x = std::min(mActiveWidth - 1, x);
		y = std::max(0, y);
		y = std::min(mActiveHeight - 1, y);
		}
		}
		}
		for (auto rect : kResultRectsToCorrect) {
		@@ -212,7 +243,8 @@ status_t DistortionMapper::mapRawToCorrected(int32_t *coordPairs, int coordCount
		for (int i = 0; i < coordCount * 2; i += 2) {
		const GridQuad *quad = findEnclosingQuad(coordPairs + i, mDistortedGrid);
		if (quad == nullptr) {
		ALOGE("Raw to corrected mapping failure: No quad found");
		ALOGE("Raw to corrected mapping failure: No quad found for (%d, %d)",
		(coordPairs + i), (coordPairs + i + 1));
		return INVALID_OPERATION;
		}
		ALOGV("src xy: %d, %d, enclosing quad: (%f, %f), (%f, %f), (%f, %f), (%f, %f)",

services/camera/libcameraservice/device3/DistortionMapper.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -148,10 +148,10 @@ class DistortionMapper {
		static const std::array<uint32_t, 1> kRequestRectsToCorrect;

		// Only capture result
		static const std::array<uint32_t, 2> kResultRectsToCorrect;
		static const std::array<uint32_t, 1> kResultRectsToCorrect;

		// Only for capture results
		static const std::array<uint32_t, 1> kResultPointsToCorrect;
		static const std::array<uint32_t, 2> kResultPointsToCorrect;

		// Utility to create reverse mapping grids
		status_t buildGrids();
		@@ -169,6 +169,8 @@ class DistortionMapper {

		// pre-correction active array dimensions
		int mArrayWidth, mArrayHeight;
		// active array dimensions
		int mActiveWidth, mActiveHeight;

		std::vector<GridQuad> mCorrectedGrid;
		std::vector<GridQuad> mDistortedGrid;