Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken (cf3fa85c) · Commits · e / os / android_frameworks_base

include/media/AudioCommon.h

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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_AUDIOCOMMON_H_
		#define ANDROID_AUDIOCOMMON_H_

		#if __cplusplus
		extern "C" {
		#endif

		/////////////////////////////////////////////////
		// Common definitions for PCM audio
		/////////////////////////////////////////////////


		// PCM Sample format
		enum audio_format_e {
		PCM_FORMAT_S15 = 1, // PCM signed 16 bits, must be 1 for backward compatibility
		PCM_FORMAT_U8 = 2, // PCM unsigned 8 bits, must be 2 for backward compatibility
		PCM_FORMAT_S7_24 // signed 7.24 fixed point representation
		};

		// Channel mask definitions
		enum audio_channels_e {
		CHANNEL_FRONT_LEFT = 0x4, // front left channel
		CHANNEL_FRONT_RIGHT = 0x8, // front right channel
		CHANNEL_FRONT_CENTER = 0x10, // front center channel
		CHANNEL_LOW_FREQUENCY = 0x20, // low frequency channel
		CHANNEL_BACK_LEFT = 0x40, // back left channel
		CHANNEL_BACK_RIGHT = 0x80, // back right channel
		CHANNEL_FRONT_LEFT_OF_CENTER = 0x100, // front left of center channel
		CHANNEL_FRONT_RIGHT_OF_CENTER = 0x200, // front right of center channel
		CHANNEL_BACK_CENTER = 0x400, // back center channel
		CHANNEL_MONO = CHANNEL_FRONT_LEFT,
		CHANNEL_STEREO = (CHANNEL_FRONT_LEFT \| CHANNEL_FRONT_RIGHT),
		CHANNEL_QUAD = (CHANNEL_FRONT_LEFT \| CHANNEL_FRONT_RIGHT \|
		CHANNEL_BACK_LEFT \| CHANNEL_BACK_RIGHT),
		CHANNEL_SURROUND = (CHANNEL_FRONT_LEFT \| CHANNEL_FRONT_RIGHT \|
		CHANNEL_FRONT_CENTER \| CHANNEL_BACK_CENTER),
		CHANNEL_5POINT1 = (CHANNEL_FRONT_LEFT \| CHANNEL_FRONT_RIGHT \|
		CHANNEL_FRONT_CENTER \| CHANNEL_LOW_FREQUENCY \| CHANNEL_BACK_LEFT \| CHANNEL_BACK_RIGHT),
		CHANNEL_7POINT1 = (CHANNEL_FRONT_LEFT \| CHANNEL_FRONT_RIGHT \|
		CHANNEL_FRONT_CENTER \| CHANNEL_LOW_FREQUENCY \| CHANNEL_BACK_LEFT \| CHANNEL_BACK_RIGHT \|
		CHANNEL_FRONT_LEFT_OF_CENTER \| CHANNEL_FRONT_RIGHT_OF_CENTER),
		};

		// Render device definitions
		enum audio_device_e {
		DEVICE_EARPIECE = 0x1, // earpiece
		DEVICE_SPEAKER = 0x2, // speaker
		DEVICE_WIRED_HEADSET = 0x4, // wired headset, with microphone
		DEVICE_WIRED_HEADPHONE = 0x8, // wired headphone, without microphone
		DEVICE_BLUETOOTH_SCO = 0x10, // generic bluetooth SCO
		DEVICE_BLUETOOTH_SCO_HEADSET = 0x20, // bluetooth SCO headset
		DEVICE_BLUETOOTH_SCO_CARKIT = 0x40, // bluetooth SCO car kit
		DEVICE_BLUETOOTH_A2DP = 0x80, // generic bluetooth A2DP
		DEVICE_BLUETOOTH_A2DP_HEADPHONES = 0x100, // bluetooth A2DP headphones
		DEVICE_BLUETOOTH_A2DP_SPEAKER = 0x200, // bluetooth A2DP speakers
		DEVICE_AUX_DIGITAL = 0x400 // digital output
		};

		#if __cplusplus
		} // extern "C"
		#endif


		#endif /ANDROID_AUDIOCOMMON_H_/

include/media/AudioSystem.h

+29 −33

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <utils/RefBase.h>
		#include <utils/threads.h>
		#include <media/IAudioFlinger.h>
		#include <media/AudioCommon.h>

		namespace android {

		@@ -50,8 +51,8 @@ public:

		// Audio sub formats (see AudioSystem::audio_format).
		enum pcm_sub_format {
		PCM_SUB_16_BIT = 0x1, // must be 1 for backward compatibility
		PCM_SUB_8_BIT = 0x2, // must be 2 for backward compatibility
		PCM_SUB_16_BIT = PCM_FORMAT_S15, // must be 1 for backward compatibility
		PCM_SUB_8_BIT = PCM_FORMAT_U8, // must be 2 for backward compatibility
		};

		// MP3 sub format field definition : can use 11 LSBs in the same way as MP3 frame header to specify
		@@ -103,26 +104,21 @@ public:
		// Channel mask definitions must be kept in sync with JAVA values in /media/java/android/media/AudioFormat.java
		enum audio_channels {
		// output channels
		CHANNEL_OUT_FRONT_LEFT = 0x4,
		CHANNEL_OUT_FRONT_RIGHT = 0x8,
		CHANNEL_OUT_FRONT_CENTER = 0x10,
		CHANNEL_OUT_LOW_FREQUENCY = 0x20,
		CHANNEL_OUT_BACK_LEFT = 0x40,
		CHANNEL_OUT_BACK_RIGHT = 0x80,
		CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 0x100,
		CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x200,
		CHANNEL_OUT_BACK_CENTER = 0x400,
		CHANNEL_OUT_MONO = CHANNEL_OUT_FRONT_LEFT,
		CHANNEL_OUT_STEREO = (CHANNEL_OUT_FRONT_LEFT \| CHANNEL_OUT_FRONT_RIGHT),
		CHANNEL_OUT_QUAD = (CHANNEL_OUT_FRONT_LEFT \| CHANNEL_OUT_FRONT_RIGHT \|
		CHANNEL_OUT_BACK_LEFT \| CHANNEL_OUT_BACK_RIGHT),
		CHANNEL_OUT_SURROUND = (CHANNEL_OUT_FRONT_LEFT \| CHANNEL_OUT_FRONT_RIGHT \|
		CHANNEL_OUT_FRONT_CENTER \| CHANNEL_OUT_BACK_CENTER),
		CHANNEL_OUT_5POINT1 = (CHANNEL_OUT_FRONT_LEFT \| CHANNEL_OUT_FRONT_RIGHT \|
		CHANNEL_OUT_FRONT_CENTER \| CHANNEL_OUT_LOW_FREQUENCY \| CHANNEL_OUT_BACK_LEFT \| CHANNEL_OUT_BACK_RIGHT),
		CHANNEL_OUT_7POINT1 = (CHANNEL_OUT_FRONT_LEFT \| CHANNEL_OUT_FRONT_RIGHT \|
		CHANNEL_OUT_FRONT_CENTER \| CHANNEL_OUT_LOW_FREQUENCY \| CHANNEL_OUT_BACK_LEFT \| CHANNEL_OUT_BACK_RIGHT \|
		CHANNEL_OUT_FRONT_LEFT_OF_CENTER \| CHANNEL_OUT_FRONT_RIGHT_OF_CENTER),
		CHANNEL_OUT_FRONT_LEFT = CHANNEL_FRONT_LEFT,
		CHANNEL_OUT_FRONT_RIGHT = CHANNEL_FRONT_RIGHT,
		CHANNEL_OUT_FRONT_CENTER = CHANNEL_FRONT_CENTER,
		CHANNEL_OUT_LOW_FREQUENCY = CHANNEL_LOW_FREQUENCY,
		CHANNEL_OUT_BACK_LEFT = CHANNEL_BACK_LEFT,
		CHANNEL_OUT_BACK_RIGHT = CHANNEL_BACK_RIGHT,
		CHANNEL_OUT_FRONT_LEFT_OF_CENTER = CHANNEL_FRONT_LEFT_OF_CENTER,
		CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = CHANNEL_FRONT_RIGHT_OF_CENTER,
		CHANNEL_OUT_BACK_CENTER = CHANNEL_BACK_CENTER,
		CHANNEL_OUT_MONO = CHANNEL_MONO,
		CHANNEL_OUT_STEREO = CHANNEL_STEREO,
		CHANNEL_OUT_QUAD = CHANNEL_QUAD,
		CHANNEL_OUT_SURROUND = CHANNEL_SURROUND,
		CHANNEL_OUT_5POINT1 = CHANNEL_5POINT1,
		CHANNEL_OUT_7POINT1 = CHANNEL_7POINT1,
		CHANNEL_OUT_ALL = (CHANNEL_OUT_FRONT_LEFT \| CHANNEL_OUT_FRONT_RIGHT \|
		CHANNEL_OUT_FRONT_CENTER \| CHANNEL_OUT_LOW_FREQUENCY \| CHANNEL_OUT_BACK_LEFT \| CHANNEL_OUT_BACK_RIGHT \|
		CHANNEL_OUT_FRONT_LEFT_OF_CENTER \| CHANNEL_OUT_FRONT_RIGHT_OF_CENTER \| CHANNEL_OUT_BACK_CENTER),
		@@ -240,17 +236,17 @@ public:

		enum audio_devices {
		// output devices
		DEVICE_OUT_EARPIECE = 0x1,
		DEVICE_OUT_SPEAKER = 0x2,
		DEVICE_OUT_WIRED_HEADSET = 0x4,
		DEVICE_OUT_WIRED_HEADPHONE = 0x8,
		DEVICE_OUT_BLUETOOTH_SCO = 0x10,
		DEVICE_OUT_BLUETOOTH_SCO_HEADSET = 0x20,
		DEVICE_OUT_BLUETOOTH_SCO_CARKIT = 0x40,
		DEVICE_OUT_BLUETOOTH_A2DP = 0x80,
		DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES = 0x100,
		DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER = 0x200,
		DEVICE_OUT_AUX_DIGITAL = 0x400,
		DEVICE_OUT_EARPIECE = DEVICE_EARPIECE,
		DEVICE_OUT_SPEAKER = DEVICE_SPEAKER,
		DEVICE_OUT_WIRED_HEADSET = DEVICE_WIRED_HEADSET,
		DEVICE_OUT_WIRED_HEADPHONE = DEVICE_WIRED_HEADPHONE,
		DEVICE_OUT_BLUETOOTH_SCO = DEVICE_BLUETOOTH_SCO,
		DEVICE_OUT_BLUETOOTH_SCO_HEADSET = DEVICE_BLUETOOTH_SCO_HEADSET,
		DEVICE_OUT_BLUETOOTH_SCO_CARKIT = DEVICE_BLUETOOTH_SCO_CARKIT,
		DEVICE_OUT_BLUETOOTH_A2DP = DEVICE_BLUETOOTH_A2DP,
		DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES = DEVICE_BLUETOOTH_A2DP_HEADPHONES,
		DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER = DEVICE_BLUETOOTH_A2DP_SPEAKER,
		DEVICE_OUT_AUX_DIGITAL = DEVICE_AUX_DIGITAL,
		DEVICE_OUT_DEFAULT = 0x8000,
		DEVICE_OUT_ALL = (DEVICE_OUT_EARPIECE \| DEVICE_OUT_SPEAKER \| DEVICE_OUT_WIRED_HEADSET \|
		DEVICE_OUT_WIRED_HEADPHONE \| DEVICE_OUT_BLUETOOTH_SCO \| DEVICE_OUT_BLUETOOTH_SCO_HEADSET \|