AAudio: Add support for Q8.23 (c59b4c91) · Commits · e / os / android_frameworks_av

media/libaaudio/src/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -224,10 +224,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",

media/libaaudio/src/client/AAudioFlowGraph.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;

media/libaaudio/src/core/AAudioStreamParameters.cpp

+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:

media/libaaudio/src/flowgraph/FlowgraphUtilities.h

+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

media/libaaudio/src/flowgraph/SinkI8_24.cpp

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "FlowGraphNode.h"
		#include "FlowgraphUtilities.h"
		#include "SinkI8_24.h"

		#if FLOWGRAPH_ANDROID_INTERNAL
		#include <audio_utils/primitives.h>
		#endif

		using namespace FLOWGRAPH_OUTER_NAMESPACE::flowgraph;

		SinkI8_24::SinkI8_24(int32_t channelCount)
		: FlowGraphSink(channelCount) {}

		int32_t SinkI8_24::read(void *data, int32_t numFrames) {
		int32_t intData = (int32_t ) data;
		const int32_t channelCount = input.getSamplesPerFrame();

		int32_t framesLeft = numFrames;
		while (framesLeft > 0) {
		// Run the graph and pull data through the input port.
		int32_t framesRead = pullData(framesLeft);
		if (framesRead <= 0) {
		break;
		}
		const float *signal = input.getBuffer();
		int32_t numSamples = framesRead * channelCount;
		#if FLOWGRAPH_ANDROID_INTERNAL
		memcpy_to_q8_23_from_float_with_clamp(intData, signal, numSamples);
		intData += numSamples;
		signal += numSamples;
		#else
		for (int i = 0; i < numSamples; i++) {
		intData++ = FlowgraphUtilities::clamp24FromFloat(signal++);
		}
		#endif
		framesLeft -= framesRead;
		}
		return numFrames - framesLeft;
		}