Snap for 11192287 from 748952f9ac44ffe96eeb9a7c6baab16215d1de23 to 24Q1-release (aac54ea8) · Commits · e / os / android_frameworks_av

camera/aidl/android/hardware/camera2/ICameraDeviceUser.aidl

+9 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,15 @@ interface ICameraDeviceUser
		*/
		boolean isSessionConfigurationSupported(in SessionConfiguration sessionConfiguration);

		/**
		* Get the camera characteristics for a particular session configuration
		*
		* @param sessionConfiguration Specific session configuration for which the characteristics
		* are fetched.
		* @return - characteristics associated with the given session.
		*/
		CameraMetadataNative getSessionCharacteristics(in SessionConfiguration sessionConfiguration);

		void deleteStream(int streamId);

		/**

+4 −2

Original line number	Diff line number	Diff line
		@@ -41,10 +41,10 @@ tidy_errors = [
		"modernize-use-emplace",
		"modernize-use-equals-default",
		"modernize-use-equals-delete",
		// "modernize-use-nodiscard", // found in aidl generated files
		"modernize-use-nodiscard",
		"modernize-use-noexcept",
		"modernize-use-nullptr",
		// "modernize-use-override", // found in aidl generated files
		"modernize-use-override",
		// "modernize-use-trailing-return-type", // not necessarily more readable
		"modernize-use-transparent-functors",
		"modernize-use-uncaught-exceptions",
		@@ -225,10 +225,12 @@ cc_library {
		"flowgraph/SinkI16.cpp",
		"flowgraph/SinkI24.cpp",
		"flowgraph/SinkI32.cpp",
		"flowgraph/SinkI8_24.cpp",
		"flowgraph/SourceFloat.cpp",
		"flowgraph/SourceI16.cpp",
		"flowgraph/SourceI24.cpp",
		"flowgraph/SourceI32.cpp",
		"flowgraph/SourceI8_24.cpp",
		"flowgraph/resampler/IntegerRatio.cpp",
		"flowgraph/resampler/LinearResampler.cpp",
		"flowgraph/resampler/MultiChannelResampler.cpp",

+8 −0

Original line number	Diff line number	Diff line
		@@ -30,10 +30,12 @@
		#include <flowgraph/SinkI16.h>
		#include <flowgraph/SinkI24.h>
		#include <flowgraph/SinkI32.h>
		#include <flowgraph/SinkI8_24.h>
		#include <flowgraph/SourceFloat.h>
		#include <flowgraph/SourceI16.h>
		#include <flowgraph/SourceI24.h>
		#include <flowgraph/SourceI32.h>
		#include <flowgraph/SourceI8_24.h>

		using namespace FLOWGRAPH_OUTER_NAMESPACE::flowgraph;

		@@ -68,6 +70,9 @@ aaudio_result_t AAudioFlowGraph::configure(audio_format_t sourceFormat,
		case AUDIO_FORMAT_PCM_32_BIT:
		mSource = std::make_unique<SourceI32>(sourceChannelCount);
		break;
		case AUDIO_FORMAT_PCM_8_24_BIT:
		mSource = std::make_unique<SourceI8_24>(sourceChannelCount);
		break;
		default:
		ALOGE("%s() Unsupported source format = %d", __func__, sourceFormat);
		return AAUDIO_ERROR_UNIMPLEMENTED;
		@@ -139,6 +144,9 @@ aaudio_result_t AAudioFlowGraph::configure(audio_format_t sourceFormat,
		case AUDIO_FORMAT_PCM_32_BIT:
		mSink = std::make_unique<SinkI32>(sinkChannelCount);
		break;
		case AUDIO_FORMAT_PCM_8_24_BIT:
		mSink = std::make_unique<SinkI8_24>(sinkChannelCount);
		break;
		default:
		ALOGE("%s() Unsupported sink format = %d", __func__, sinkFormat);
		return AAUDIO_ERROR_UNIMPLEMENTED;

+1 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ static aaudio_result_t isFormatValid(audio_format_t format) {
		case AUDIO_FORMAT_PCM_32_BIT:
		case AUDIO_FORMAT_PCM_FLOAT:
		case AUDIO_FORMAT_PCM_24_BIT_PACKED:
		case AUDIO_FORMAT_PCM_8_24_BIT:
		case AUDIO_FORMAT_IEC61937:
		break; // valid
		default:

+15 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#ifndef FLOWGRAPH_UTILITIES_H
		#define FLOWGRAPH_UTILITIES_H

		#include <math.h>
		#include <unistd.h>

		using namespace FLOWGRAPH_OUTER_NAMESPACE::flowgraph;
		@@ -50,6 +51,20 @@ static int32_t clamp32FromFloat(float f)
		return f > 0 ? f + 0.5 : f - 0.5;
		}

		/**
		* Convert a single-precision floating point value to a Q0.23 integer value, stored in a
		* 32 bit signed integer (technically stored as Q8.23, but clamped to Q0.23).
		*
		* Values outside the range [-1.0, 1.0) are properly clamped to -8388608 and 8388607,
		* including -Inf and +Inf. NaN values are considered undefined, and behavior may change
		* depending on hardware and future implementation of this function.
		*/
		static int32_t clamp24FromFloat(float f)
		{
		static const float scale = 1 << 23;
		return (int32_t) lroundf(fmaxf(fminf(f * scale, scale - 1.f), -scale));
		}

		};

		#endif // FLOWGRAPH_UTILITIES_H