Merge "Moved and renamed effect API header files" (9b186a44) · Commits · e / os / android_frameworks_av

include/media/EffectBassBoostApi.h

deleted100644 → 0

+0 −43

Original line number	Original line	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_EFFECTBASSBOOSTAPI_H_
	#define ANDROID_EFFECTBASSBOOSTAPI_H_

	#include <hardware/audio_effect.h>

	#if __cplusplus
	extern "C" {
	#endif

	#ifndef OPENSL_ES_H_
	static const effect_uuid_t SL_IID_BASSBOOST_ = { 0x0634f220, 0xddd4, 0x11db, 0xa0fc, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };
	const effect_uuid_t * const SL_IID_BASSBOOST = &SL_IID_BASSBOOST_;
	#endif //OPENSL_ES_H_

	/* enumerated parameter settings for BassBoost effect */
	typedef enum
	{
	BASSBOOST_PARAM_STRENGTH_SUPPORTED,
	BASSBOOST_PARAM_STRENGTH
	} t_bassboost_params;

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


	#endif /ANDROID_EFFECTBASSBOOSTAPI_H_/

include/media/EffectEnvironmentalReverbApi.h

deleted100644 → 0

+0 −69

Original line number	Original line	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_EFFECTENVIRONMENTALREVERBAPI_H_
	#define ANDROID_EFFECTENVIRONMENTALREVERBAPI_H_

	#include <hardware/audio_effect.h>

	#if __cplusplus
	extern "C" {
	#endif

	#ifndef OPENSL_ES_H_
	static const effect_uuid_t SL_IID_ENVIRONMENTALREVERB_ = { 0xc2e5d5f0, 0x94bd, 0x4763, 0x9cac, { 0x4e, 0x23, 0x4d, 0x6, 0x83, 0x9e } };
	const effect_uuid_t * const SL_IID_ENVIRONMENTALREVERB = &SL_IID_ENVIRONMENTALREVERB_;
	#endif //OPENSL_ES_H_

	/* enumerated parameter settings for environmental reverb effect */
	typedef enum
	{
	// Parameters below are as defined in OpenSL ES specification for environmental reverb interface
	REVERB_PARAM_ROOM_LEVEL, // in millibels, range -6000 to 0
	REVERB_PARAM_ROOM_HF_LEVEL, // in millibels, range -4000 to 0
	REVERB_PARAM_DECAY_TIME, // in milliseconds, range 100 to 20000
	REVERB_PARAM_DECAY_HF_RATIO, // in permilles, range 100 to 1000
	REVERB_PARAM_REFLECTIONS_LEVEL, // in millibels, range -6000 to 0
	REVERB_PARAM_REFLECTIONS_DELAY, // in milliseconds, range 0 to 65
	REVERB_PARAM_REVERB_LEVEL, // in millibels, range -6000 to 0
	REVERB_PARAM_REVERB_DELAY, // in milliseconds, range 0 to 65
	REVERB_PARAM_DIFFUSION, // in permilles, range 0 to 1000
	REVERB_PARAM_DENSITY, // in permilles, range 0 to 1000
	REVERB_PARAM_PROPERTIES,
	REVERB_PARAM_BYPASS
	} t_env_reverb_params;

	//t_reverb_settings is equal to SLEnvironmentalReverbSettings defined in OpenSL ES specification.
	typedef struct s_reverb_settings {
	int16_t roomLevel;
	int16_t roomHFLevel;
	uint32_t decayTime;
	int16_t decayHFRatio;
	int16_t reflectionsLevel;
	uint32_t reflectionsDelay;
	int16_t reverbLevel;
	uint32_t reverbDelay;
	int16_t diffusion;
	int16_t density;
	} __attribute__((packed)) t_reverb_settings;


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


	#endif /ANDROID_EFFECTENVIRONMENTALREVERBAPI_H_/

include/media/EffectEqualizerApi.h

deleted100644 → 0

+0 −58

Original line number	Original line	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_EFFECTEQUALIZERAPI_H_
	#define ANDROID_EFFECTEQUALIZERAPI_H_

	#include <hardware/audio_effect.h>

	#ifndef OPENSL_ES_H_
	static const effect_uuid_t SL_IID_EQUALIZER_ = { 0x0bed4300, 0xddd6, 0x11db, 0x8f34, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };
	const effect_uuid_t * const SL_IID_EQUALIZER = &SL_IID_EQUALIZER_;
	#endif //OPENSL_ES_H_

	#if __cplusplus
	extern "C" {
	#endif

	/* enumerated parameters for Equalizer effect */
	typedef enum
	{
	EQ_PARAM_NUM_BANDS, // Gets the number of frequency bands that the equalizer supports.
	EQ_PARAM_LEVEL_RANGE, // Returns the minimum and maximum band levels supported.
	EQ_PARAM_BAND_LEVEL, // Gets/Sets the gain set for the given equalizer band.
	EQ_PARAM_CENTER_FREQ, // Gets the center frequency of the given band.
	EQ_PARAM_BAND_FREQ_RANGE, // Gets the frequency range of the given frequency band.
	EQ_PARAM_GET_BAND, // Gets the band that has the most effect on the given frequency.
	EQ_PARAM_CUR_PRESET, // Gets/Sets the current preset.
	EQ_PARAM_GET_NUM_OF_PRESETS, // Gets the total number of presets the equalizer supports.
	EQ_PARAM_GET_PRESET_NAME, // Gets the preset name based on the index.
	EQ_PARAM_PROPERTIES // Gets/Sets all parameters at a time.
	} t_equalizer_params;

	//t_equalizer_settings groups all current equalizer setting for backup and restore.
	typedef struct s_equalizer_settings {
	uint16_t curPreset;
	uint16_t numBands;
	uint16_t bandLevels[];
	} t_equalizer_settings;

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


	#endif /ANDROID_EFFECTEQUALIZERAPI_H_/

include/media/EffectPresetReverbApi.h

deleted100644 → 0

+0 −55

Original line number	Original line	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_EFFECTPRESETREVERBAPI_H_
	#define ANDROID_EFFECTPRESETREVERBAPI_H_

	#include <hardware/audio_effect.h>

	#if __cplusplus
	extern "C" {
	#endif

	#ifndef OPENSL_ES_H_
	static const effect_uuid_t SL_IID_PRESETREVERB_ = { 0x47382d60, 0xddd8, 0x11db, 0xbf3a, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };
	const effect_uuid_t * const SL_IID_PRESETREVERB = &SL_IID_PRESETREVERB_;
	#endif //OPENSL_ES_H_

	/* enumerated parameter settings for preset reverb effect */
	typedef enum
	{
	REVERB_PARAM_PRESET
	} t_preset_reverb_params;


	typedef enum
	{
	REVERB_PRESET_NONE,
	REVERB_PRESET_SMALLROOM,
	REVERB_PRESET_MEDIUMROOM,
	REVERB_PRESET_LARGEROOM,
	REVERB_PRESET_MEDIUMHALL,
	REVERB_PRESET_LARGEHALL,
	REVERB_PRESET_PLATE,
	REVERB_PRESET_LAST = REVERB_PRESET_PLATE
	} t_reverb_presets;

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


	#endif /ANDROID_EFFECTPRESETREVERBAPI_H_/

include/media/EffectVirtualizerApi.h

deleted100644 → 0

+0 −43

Original line number	Original line	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_EFFECTVIRTUALIZERAPI_H_
	#define ANDROID_EFFECTVIRTUALIZERAPI_H_

	#include <hardware/audio_effect.h>

	#if __cplusplus
	extern "C" {
	#endif

	#ifndef OPENSL_ES_H_
	static const effect_uuid_t SL_IID_VIRTUALIZER_ = { 0x37cc2c00, 0xdddd, 0x11db, 0x8577, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };
	const effect_uuid_t * const SL_IID_VIRTUALIZER = &SL_IID_VIRTUALIZER_;
	#endif //OPENSL_ES_H_

	/* enumerated parameter settings for virtualizer effect */
	typedef enum
	{
	VIRTUALIZER_PARAM_STRENGTH_SUPPORTED,
	VIRTUALIZER_PARAM_STRENGTH
	} t_virtualizer_params;

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


	#endif /ANDROID_EFFECTVIRTUALIZERAPI_H_/