PD#123182: On TV path, apply android stream volume only for speaker

Change-Id: I3fba484f7ff30a86bc833b6e592398f4aa95a3e8

1 files changed, 4 insertions, 4 deletions

diff --git a/libTVaudio/audio/aml_audio.c b/libTVaudio/audio/aml_audio.c
index 7737df4..181caac 100644
--- a/libTVaudio/audio/aml_audio.c
+++ b/libTVaudio/audio/aml_audio.c
@@ -217,6 +217,8 @@ struct circle_buffer DD_out_buffer = {
 static void *start_temp_buffer = NULL;
 static struct aml_dev *gpAmlDevice = NULL;
 static pthread_mutex_t amaudio_dev_op_mutex = PTHREAD_MUTEX_INITIALIZER;
+static unsigned int gUSBCheckLastFlag = 0;
+static unsigned int gUSBCheckFlag = 0;
 
 extern int omx_codec_init(void);
 extern void omx_codec_close(void);
@@ -706,7 +708,8 @@ static int alsa_in_read(struct aml_stream_in *in, void* buffer, size_t bytes) {
             return ret;
         }
 
-        if (GetOutputdevice() != 2) {
+        if (GetOutputdevice() != 2 &&
+                (gUSBCheckFlag & AUDIO_DEVICE_OUT_SPEAKER) != 0) {
             float vol = get_android_stream_volume();
             apply_stream_volume(vol,buffer,bytes);
         }
@@ -1276,9 +1279,6 @@ static int aml_device_close(struct aml_dev *device) {
     return 0;
 }
 
-static unsigned int gUSBCheckLastFlag = 0;
-static unsigned int gUSBCheckFlag = 0;
-
 static void USB_check(struct aml_stream_out *out) {
 
     gUSBCheckFlag = GetUsbAudioCheckFlag();