libmedia: move AudioParameter out of AudioSystem (db5cb143) · Commits · e / os / android_frameworks_av

include/media/AudioParameter.h

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008-2011 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.
		*/

		#ifndef ANDROID_AUDIOPARAMETER_H_
		#define ANDROID_AUDIOPARAMETER_H_

		#include <utils/Errors.h>
		#include <utils/KeyedVector.h>
		#include <utils/String8.h>

		namespace android {

		class AudioParameter {

		public:
		AudioParameter() {}
		AudioParameter(const String8& keyValuePairs);
		virtual ~AudioParameter();

		// reserved parameter keys for changing standard parameters with setParameters() function.
		// Using these keys is mandatory for AudioFlinger to properly monitor audio output/input
		// configuration changes and act accordingly.
		// keyRouting: to change audio routing, value is an int in AudioSystem::audio_devices
		// keySamplingRate: to change sampling rate routing, value is an int
		// keyFormat: to change audio format, value is an int in AudioSystem::audio_format
		// keyChannels: to change audio channel configuration, value is an int in AudioSystem::audio_channels
		// keyFrameCount: to change audio output frame count, value is an int
		// keyInputSource: to change audio input source, value is an int in audio_source
		// (defined in media/mediarecorder.h)
		static const char *keyRouting;
		static const char *keySamplingRate;
		static const char *keyFormat;
		static const char *keyChannels;
		static const char *keyFrameCount;
		static const char *keyInputSource;

		String8 toString();

		status_t add(const String8& key, const String8& value);
		status_t addInt(const String8& key, const int value);
		status_t addFloat(const String8& key, const float value);

		status_t remove(const String8& key);

		status_t get(const String8& key, String8& value);
		status_t getInt(const String8& key, int& value);
		status_t getFloat(const String8& key, float& value);
		status_t getAt(size_t index, String8& key, String8& value);

		size_t size() { return mParameters.size(); }

		private:
		String8 mKeyValuePairs;
		KeyedVector <String8, String8> mParameters;
		};

		}; // namespace android

		#endif /ANDROID_AUDIOPARAMETER_H_/

include/media/AudioSystem.h

+3 −44

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@
		#include <utils/threads.h>
		#include <media/IAudioFlinger.h>

		/* XXX: Should be include by all the users instead */
		#include <media/AudioParameter.h>

		namespace android {

		typedef void (*audio_error_callback)(status_t err);
		@@ -473,50 +476,6 @@ private:
		static DefaultKeyedVector<audio_io_handle_t, OutputDescriptor *> gOutputs;
		};

		class AudioParameter {

		public:
		AudioParameter() {}
		AudioParameter(const String8& keyValuePairs);
		virtual ~AudioParameter();

		// reserved parameter keys for changing standard parameters with setParameters() function.
		// Using these keys is mandatory for AudioFlinger to properly monitor audio output/input
		// configuration changes and act accordingly.
		// keyRouting: to change audio routing, value is an int in AudioSystem::audio_devices
		// keySamplingRate: to change sampling rate routing, value is an int
		// keyFormat: to change audio format, value is an int in AudioSystem::audio_format
		// keyChannels: to change audio channel configuration, value is an int in AudioSystem::audio_channels
		// keyFrameCount: to change audio output frame count, value is an int
		// keyInputSource: to change audio input source, value is an int in audio_source
		// (defined in media/mediarecorder.h)
		static const char *keyRouting;
		static const char *keySamplingRate;
		static const char *keyFormat;
		static const char *keyChannels;
		static const char *keyFrameCount;
		static const char *keyInputSource;

		String8 toString();

		status_t add(const String8& key, const String8& value);
		status_t addInt(const String8& key, const int value);
		status_t addFloat(const String8& key, const float value);

		status_t remove(const String8& key);

		status_t get(const String8& key, String8& value);
		status_t getInt(const String8& key, int& value);
		status_t getFloat(const String8& key, float& value);
		status_t getAt(size_t index, String8& key, String8& value);

		size_t size() { return mParameters.size(); }

		private:
		String8 mKeyValuePairs;
		KeyedVector <String8, String8> mParameters;
		};

		}; // namespace android

		#endif /ANDROID_AUDIOSYSTEM_H_/

media/libmedia/Android.mk

+12 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		AudioParameter.cpp
		LOCAL_MODULE:= libmedia_helper
		LOCAL_MODULE_TAGS := optional

		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		@@ -41,6 +51,8 @@ LOCAL_SHARED_LIBRARIES := \
		libcamera_client libstagefright_foundation \
		libgui

		LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper

		LOCAL_MODULE:= libmedia

		ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)

media/libmedia/AudioParameter.cpp

0 → 100644

+179 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2006-2011 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.
		*/

		#define LOG_TAG "AudioParameter"
		//#define LOG_NDEBUG 0

		#include <utils/Log.h>

		#include <media/AudioParameter.h>

		namespace android {

		const char *AudioParameter::keyRouting = "routing";
		const char *AudioParameter::keySamplingRate = "sampling_rate";
		const char *AudioParameter::keyFormat = "format";
		const char *AudioParameter::keyChannels = "channels";
		const char *AudioParameter::keyFrameCount = "frame_count";
		const char *AudioParameter::keyInputSource = "input_source";

		AudioParameter::AudioParameter(const String8& keyValuePairs)
		{
		char *str = new char[keyValuePairs.length()+1];
		mKeyValuePairs = keyValuePairs;

		strcpy(str, keyValuePairs.string());
		char *pair = strtok(str, ";");
		while (pair != NULL) {
		if (strlen(pair) != 0) {
		size_t eqIdx = strcspn(pair, "=");
		String8 key = String8(pair, eqIdx);
		String8 value;
		if (eqIdx == strlen(pair)) {
		value = String8("");
		} else {
		value = String8(pair + eqIdx + 1);
		}
		if (mParameters.indexOfKey(key) < 0) {
		mParameters.add(key, value);
		} else {
		mParameters.replaceValueFor(key, value);
		}
		} else {
		LOGV("AudioParameter() cstor empty key value pair");
		}
		pair = strtok(NULL, ";");
		}

		delete[] str;
		}

		AudioParameter::~AudioParameter()
		{
		mParameters.clear();
		}

		String8 AudioParameter::toString()
		{
		String8 str = String8("");

		size_t size = mParameters.size();
		for (size_t i = 0; i < size; i++) {
		str += mParameters.keyAt(i);
		str += "=";
		str += mParameters.valueAt(i);
		if (i < (size - 1)) str += ";";
		}
		return str;
		}

		status_t AudioParameter::add(const String8& key, const String8& value)
		{
		if (mParameters.indexOfKey(key) < 0) {
		mParameters.add(key, value);
		return NO_ERROR;
		} else {
		mParameters.replaceValueFor(key, value);
		return ALREADY_EXISTS;
		}
		}

		status_t AudioParameter::addInt(const String8& key, const int value)
		{
		char str[12];
		if (snprintf(str, 12, "%d", value) > 0) {
		String8 str8 = String8(str);
		return add(key, str8);
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::addFloat(const String8& key, const float value)
		{
		char str[23];
		if (snprintf(str, 23, "%.10f", value) > 0) {
		String8 str8 = String8(str);
		return add(key, str8);
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::remove(const String8& key)
		{
		if (mParameters.indexOfKey(key) >= 0) {
		mParameters.removeItem(key);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::get(const String8& key, String8& value)
		{
		if (mParameters.indexOfKey(key) >= 0) {
		value = mParameters.valueFor(key);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::getInt(const String8& key, int& value)
		{
		String8 str8;
		status_t result = get(key, str8);
		value = 0;
		if (result == NO_ERROR) {
		int val;
		if (sscanf(str8.string(), "%d", &val) == 1) {
		value = val;
		} else {
		result = INVALID_OPERATION;
		}
		}
		return result;
		}

		status_t AudioParameter::getFloat(const String8& key, float& value)
		{
		String8 str8;
		status_t result = get(key, str8);
		value = 0;
		if (result == NO_ERROR) {
		float val;
		if (sscanf(str8.string(), "%f", &val) == 1) {
		value = val;
		} else {
		result = INVALID_OPERATION;
		}
		}
		return result;
		}

		status_t AudioParameter::getAt(size_t index, String8& key, String8& value)
		{
		if (mParameters.size() > index) {
		key = mParameters.keyAt(index);
		value = mParameters.valueAt(index);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}

		}; // namespace android

media/libmedia/AudioSystem.cpp

+0 −154

Original line number	Diff line number	Diff line
		@@ -834,159 +834,5 @@ bool AudioSystem::isLinearPCM(uint32_t format)
		}
		}

		//------------------------- AudioParameter class implementation ---------------

		const char *AudioParameter::keyRouting = "routing";
		const char *AudioParameter::keySamplingRate = "sampling_rate";
		const char *AudioParameter::keyFormat = "format";
		const char *AudioParameter::keyChannels = "channels";
		const char *AudioParameter::keyFrameCount = "frame_count";
		const char *AudioParameter::keyInputSource = "input_source";

		AudioParameter::AudioParameter(const String8& keyValuePairs)
		{
		char *str = new char[keyValuePairs.length()+1];
		mKeyValuePairs = keyValuePairs;

		strcpy(str, keyValuePairs.string());
		char *pair = strtok(str, ";");
		while (pair != NULL) {
		if (strlen(pair) != 0) {
		size_t eqIdx = strcspn(pair, "=");
		String8 key = String8(pair, eqIdx);
		String8 value;
		if (eqIdx == strlen(pair)) {
		value = String8("");
		} else {
		value = String8(pair + eqIdx + 1);
		}
		if (mParameters.indexOfKey(key) < 0) {
		mParameters.add(key, value);
		} else {
		mParameters.replaceValueFor(key, value);
		}
		} else {
		LOGV("AudioParameter() cstor empty key value pair");
		}
		pair = strtok(NULL, ";");
		}

		delete[] str;
		}

		AudioParameter::~AudioParameter()
		{
		mParameters.clear();
		}

		String8 AudioParameter::toString()
		{
		String8 str = String8("");

		size_t size = mParameters.size();
		for (size_t i = 0; i < size; i++) {
		str += mParameters.keyAt(i);
		str += "=";
		str += mParameters.valueAt(i);
		if (i < (size - 1)) str += ";";
		}
		return str;
		}

		status_t AudioParameter::add(const String8& key, const String8& value)
		{
		if (mParameters.indexOfKey(key) < 0) {
		mParameters.add(key, value);
		return NO_ERROR;
		} else {
		mParameters.replaceValueFor(key, value);
		return ALREADY_EXISTS;
		}
		}

		status_t AudioParameter::addInt(const String8& key, const int value)
		{
		char str[12];
		if (snprintf(str, 12, "%d", value) > 0) {
		String8 str8 = String8(str);
		return add(key, str8);
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::addFloat(const String8& key, const float value)
		{
		char str[23];
		if (snprintf(str, 23, "%.10f", value) > 0) {
		String8 str8 = String8(str);
		return add(key, str8);
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::remove(const String8& key)
		{
		if (mParameters.indexOfKey(key) >= 0) {
		mParameters.removeItem(key);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::get(const String8& key, String8& value)
		{
		if (mParameters.indexOfKey(key) >= 0) {
		value = mParameters.valueFor(key);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}

		status_t AudioParameter::getInt(const String8& key, int& value)
		{
		String8 str8;
		status_t result = get(key, str8);
		value = 0;
		if (result == NO_ERROR) {
		int val;
		if (sscanf(str8.string(), "%d", &val) == 1) {
		value = val;
		} else {
		result = INVALID_OPERATION;
		}
		}
		return result;
		}

		status_t AudioParameter::getFloat(const String8& key, float& value)
		{
		String8 str8;
		status_t result = get(key, str8);
		value = 0;
		if (result == NO_ERROR) {
		float val;
		if (sscanf(str8.string(), "%f", &val) == 1) {
		value = val;
		} else {
		result = INVALID_OPERATION;
		}
		}
		return result;
		}

		status_t AudioParameter::getAt(size_t index, String8& key, String8& value)
		{
		if (mParameters.size() > index) {
		key = mParameters.keyAt(index);
		value = mParameters.valueAt(index);
		return NO_ERROR;
		} else {
		return BAD_VALUE;
		}
		}
		}; // namespace android