Camera API1: don't pick wrong preview fps value am: 49aac43b4a am: 73952713b5 (3b5fa818) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/client2/Parameters.cpp

+26 −7

Original line number	Diff line number	Diff line
		@@ -958,21 +958,40 @@ status_t Parameters::buildFastInfo() {
		return NO_INIT;
		}

		// Get supported preview fps ranges.
		Vector<Size> supportedPreviewSizes;
		Vector<FpsRange> supportedPreviewFpsRanges;
		const Size PREVIEW_SIZE_BOUND = { MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT };
		status_t res = getFilteredSizes(PREVIEW_SIZE_BOUND, &supportedPreviewSizes);
		if (res != OK) return res;
		for (size_t i=0; i < availableFpsRanges.count; i += 2) {
		if (!isFpsSupported(supportedPreviewSizes,
		HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, availableFpsRanges.data.i32[i+1])) {
		continue;
		}
		FpsRange fpsRange = {availableFpsRanges.data.i32[i], availableFpsRanges.data.i32[i+1]};
		supportedPreviewFpsRanges.add(fpsRange);
		}
		if (supportedPreviewFpsRanges.size() == 0) {
		ALOGE("Supported preview fps range is empty");
		return NO_INIT;
		}

		int32_t bestStillCaptureFpsRange[2] = {
		availableFpsRanges.data.i32[0], availableFpsRanges.data.i32[1]
		supportedPreviewFpsRanges[0].low, supportedPreviewFpsRanges[0].high
		};
		int32_t curRange =
		bestStillCaptureFpsRange[1] - bestStillCaptureFpsRange[0];
		for (size_t i = 2; i < availableFpsRanges.count; i += 2) {
		for (size_t i = 1; i < supportedPreviewFpsRanges.size(); i ++) {
		int32_t nextRange =
		availableFpsRanges.data.i32[i + 1] -
		availableFpsRanges.data.i32[i];
		supportedPreviewFpsRanges[i].high -
		supportedPreviewFpsRanges[i].low;
		if ( (nextRange > curRange) \|\| // Maximize size of FPS range first
		(nextRange == curRange && // Then minimize low-end FPS
		bestStillCaptureFpsRange[0] > availableFpsRanges.data.i32[i])) {
		bestStillCaptureFpsRange[0] > supportedPreviewFpsRanges[i].low)) {

		bestStillCaptureFpsRange[0] = availableFpsRanges.data.i32[i];
		bestStillCaptureFpsRange[1] = availableFpsRanges.data.i32[i + 1];
		bestStillCaptureFpsRange[0] = supportedPreviewFpsRanges[i].low;
		bestStillCaptureFpsRange[1] = supportedPreviewFpsRanges[i].high;
		curRange = nextRange;
		}
		}

services/camera/libcameraservice/api1/client2/Parameters.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,11 @@ struct Parameters {
		int32_t height;
		};

		struct FpsRange {
		int32_t low;
		int32_t high;
		};

		int32_t exposureCompensation;
		bool autoExposureLock;
		bool autoWhiteBalanceLock;