From 9d04629e77443d89117589d19065942c04c42e2c Mon Sep 17 00:00:00 2001 From: Jian Xu Date: Tue, 30 Jan 2018 10:31:23 +0000 Subject: Merge "Audio: fix trembling sound when playing video or audio on Android 8.1 [2/2]" into o-mr1-amlogic --- diff --git a/audio_hw.c b/audio_hw.c index f2c1ae8..ac30e41 100644 --- a/audio_hw.c +++ b/audio_hw.c @@ -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; -- cgit