| -rw-r--r-- | audio_hw.c | 7 | ||||
| -rw-r--r-- | libTVaudio/audio/audio_amaudio.cpp | 131 |
2 files changed, 127 insertions, 11 deletions
@@ -1705,12 +1705,13 @@ if (!(adev->out_device & AUDIO_DEVICE_OUT_ALL_SCO)) { if (out->is_tv_platform == 1) { int16_t *tmp_buffer = (int16_t *)out->audioeffect_tmp_buffer; memcpy((void *)tmp_buffer, (void *)in_buffer, out_frames * 4); - audio_effect_process(stream, tmp_buffer, out_frames); + ALOGV("Amlogic - disable audio_data_process(), and replace tmp_buffer data with in_buffer data.\n"); + //audio_effect_process(stream, tmp_buffer, out_frames); for (i = 0; i < out_frames; i ++) { out->tmp_buffer_8ch[8 * i] = ((int32_t)(in_buffer[2 * i])) << 16; out->tmp_buffer_8ch[8 * i + 1] = ((int32_t)(in_buffer[2 * i + 1])) << 16; - out->tmp_buffer_8ch[8 * i + 2] = ((int32_t)(tmp_buffer[2 * i])) << 16; - out->tmp_buffer_8ch[8 * i + 3] = ((int32_t)(tmp_buffer[2 * i + 1])) << 16; + out->tmp_buffer_8ch[8 * i + 2] = ((int32_t)(in_buffer[2 * i])) << 16; + out->tmp_buffer_8ch[8 * i + 3] = ((int32_t)(in_buffer[2 * i + 1])) << 16; out->tmp_buffer_8ch[8 * i + 4] = 0; out->tmp_buffer_8ch[8 * i + 5] = 0; out->tmp_buffer_8ch[8 * i + 6] = 0; diff --git a/libTVaudio/audio/audio_amaudio.cpp b/libTVaudio/audio/audio_amaudio.cpp index a2119cb..489c07e 100644 --- a/libTVaudio/audio/audio_amaudio.cpp +++ b/libTVaudio/audio/audio_amaudio.cpp @@ -25,25 +25,43 @@ #include "../audio_amaudio.h" #include "../../audio_virtual_effect.h" +//#define ENABLE_AUDIO int amSetAudioDelay(int delay_ms) { +#ifdef ENABLE_AUDIO return set_audio_delay(delay_ms); +#else + return 0; +#endif } int amGetAudioDelay(void) { +#ifdef ENABLE_AUDIO return get_audio_delay(); +#else + return 0; +#endif } int amAudioOpen(unsigned int sr, int input_device, int output_device) { +#ifdef ENABLE_AUDIO int ret; ret = aml_audio_open(sr, input_device, output_device); return ret; +#else + return 0; +#endif } int amAudioClose(void) { +#ifdef ENABLE_AUDIO return aml_audio_close(); +#else + return 0; +#endif } int amAudioSetInputSr(unsigned int sr, int input_device, int output_device) { +#ifdef ENABLE_AUDIO int tmpRet = 0; if (check_input_stream_sr(sr) < 0) { @@ -55,34 +73,62 @@ int amAudioSetInputSr(unsigned int sr, int input_device, int output_device) { tmpRet |= amAudioOpen(sr, input_device, output_device); return tmpRet; +#else + return 0; +#endif } int amAudioSetDumpDataFlag(int tmp_flag) { +#ifdef ENABLE_AUDIO return SetDumpDataFlag(tmp_flag); +#else + return 0; +#endif } int amAudioGetDumpDataFlag() { +#ifdef ENABLE_AUDIO return GetDumpDataFlag(); +#else + return 0; +#endif } int amAudioSetOutputMode(int mode) { +#ifdef ENABLE_AUDIO return set_output_mode(mode); +#else + return 0; +#endif } int amAudioSetMusicGain(int gain) { +#ifdef ENABLE_AUDIO return set_music_gain(gain); +#else + return 0; +#endif } int amAudioSetLeftGain(int gain) { +#ifdef ENABLE_AUDIO return set_left_gain(gain); +#else + return 0; +#endif } int amAudioSetRightGain(int gain) { +#ifdef ENABLE_AUDIO return set_right_gain(gain); +#else + return 0; +#endif } int eq_gain_buf[5] = {0,0,0,0,0}; int amAudioSetEQGain(int gain_val_buf[], int buf_item_cnt __unused) { +#ifdef ENABLE_AUDIO int i = 0, ret = 0; int tmp_buf[5] = { 0, 0, 0, 0, 0}; @@ -102,9 +148,13 @@ int amAudioSetEQGain(int gain_val_buf[], int buf_item_cnt __unused) { ret = set_parameters(param, parm_key); //ALOGE("EQ param : %s\n", param); return ret; +#else + return 0; +#endif } int amAudioGetEQGain(int gain_val_buf[], int buf_item_cnt __unused) { +#ifdef ENABLE_AUDIO int i = 0; int tmp_buf[5] = { 0, 0, 0, 0, 0}; @@ -114,10 +164,17 @@ int amAudioGetEQGain(int gain_val_buf[], int buf_item_cnt __unused) { gain_val_buf[i] = tmp_buf[i]; } return 0; +#else + return 0; +#endif } int amAudioSetEQEnable(int en_val) { +#ifdef ENABLE_AUDIO return HPEQ_enable(en_val); +#else + return 0; +#endif } int amAudioGetEQEnable() { @@ -135,6 +192,7 @@ int amAudioGetEQEnable() { int srs_param_buf[5] = { 0, 0, 0, 0, 0}; static int amAudioSetSRSParameter(int set_type, int gain_val) { +#ifdef ENABLE_AUDIO int ret = 0; srs_param_buf[set_type] = gain_val; @@ -148,9 +206,13 @@ static int amAudioSetSRSParameter(int set_type, int gain_val) { srs_param_buf[3], srs_param_buf[4]); ret = set_parameters(param, parm_key); return ret; +#else + return 0; +#endif } int amAudioSetSRSGain(int input_gain, int output_gain) { +#ifdef ENABLE_AUDIO int ret = 0; ret = srs_set_gain(input_gain, output_gain); @@ -160,6 +222,9 @@ int amAudioSetSRSGain(int input_gain, int output_gain) { ret = set_parameters(param, parm_key); return ret; +#else + return 0; +#endif } #define CC_SET_SWITCH_SURROUND (0) @@ -168,6 +233,7 @@ int amAudioSetSRSGain(int input_gain, int output_gain) { int srs_switch[3]= {0, 0, 0}; int amAudioSetSRSSurroundSwitch(int switch_val) { +#ifdef ENABLE_AUDIO int ret = 0; ret = srs_surround_enable(switch_val); @@ -178,9 +244,13 @@ int amAudioSetSRSSurroundSwitch(int switch_val) { ret = set_parameters(param, parm_key); return ret; +#else + return 0; +#endif } int amAudioSetSRSDialogClaritySwitch(int switch_val) { +#ifdef ENABLE_AUDIO int ret = 0; ret = srs_dialogclarity_enable(switch_val); @@ -191,9 +261,13 @@ int amAudioSetSRSDialogClaritySwitch(int switch_val) { ret = set_parameters(param, parm_key); return ret; +#else + return 0; +#endif } int amAudioSetSRSTrubassSwitch(int switch_val) { +#ifdef ENABLE_AUDIO int ret = 0; ret = srs_truebass_enable(switch_val); @@ -204,48 +278,86 @@ int amAudioSetSRSTrubassSwitch(int switch_val) { ret = set_parameters(param, parm_key); return ret; +#else + return 0; +#endif } int amAudioSetSRSSurroundGain(int gain_val) { +#ifdef ENABLE_AUDIO return amAudioSetSRSParameter(CC_SET_TYPE_SURROUND_GAIN, gain_val); +#else + return 0; +#endif } int amAudioSetSRSTrubassGain(int gain_val) { +#ifdef ENABLE_AUDIO return amAudioSetSRSParameter(CC_SET_TYPE_TRUBASS_GAIN, gain_val); +#else + return 0; +#endif } int amAudioSetSRSDialogClarityGain(int gain_val) { +#ifdef ENABLE_AUDIO return amAudioSetSRSParameter(CC_SET_TYPE_DIALOGCLARITY_GAIN, gain_val); +#else + return 0; +#endif } int amAudioSetSRSDefinitionGain(int gain_val) { +#ifdef ENABLE_AUDIO return amAudioSetSRSParameter(CC_SET_TYPE_DEFINITION_GAIN, gain_val); +#else + return 0; +#endif } int amAudioSetSRSTrubassSpeakerSize(int tmp_val) { +#ifdef ENABLE_AUDIO return amAudioSetSRSParameter(CC_SET_TYPE_TRUBASS_SPEAKERSIZE, tmp_val); +#else + return 0; +#endif } -int amAudioSetPreGain(float gain) -{ +int amAudioSetPreGain(float gain) { +#ifdef ENABLE_AUDIO return aml_audio_set_pregain(gain); +#else + return 0; +#endif } -int amAudioGetPreGain(float *gain) -{ +int amAudioGetPreGain(float *gain) { +#ifdef ENABLE_AUDIO return aml_audio_get_pregain(gain); +#else + return 0; +#endif } -int amAudioSetPreMute(uint mute) -{ + +int amAudioSetPreMute(uint mute) { +#ifdef ENABLE_AUDIO return aml_audio_set_pre_mute(mute); +#else + return 0; +#endif } -int amAudioGetPreMute(uint *mute) -{ +int amAudioGetPreMute(uint *mute) { +#ifdef ENABLE_AUDIO return aml_audio_get_pre_mute(mute); +#else + return 0; +#endif } + int virtual_para_buf[2] = {0,0}; int amAudioVirtualizer(int enable, int EffectLevel) { +#ifdef ENABLE_AUDIO int ret = 0; char param[10]; virtual_para_buf[0] = enable; @@ -255,4 +367,7 @@ int amAudioVirtualizer(int enable, int EffectLevel) { ret = set_parameters(param, parm_key); Virtualizer_control(enable, EffectLevel); return ret; +#else + return 0; +#endif } |