author | Zhe Wang <zhe.wang@amlogic.com> | 2016-05-12 10:43:59 (GMT) |
---|---|---|
committer | Zhe Wang <zhe.wang@amlogic.com> | 2016-05-12 10:43:59 (GMT) |
commit | b0f0295dfcecb530f00fd5e4b70b03a7f2d6b13b (patch) | |
tree | f47e5eedfade2223f7ab4f42bb2bb1f17875ed94 | |
parent | b792f96e76d331329b2f647b04725fde4fe14b8c (diff) | |
download | audio-b0f0295dfcecb530f00fd5e4b70b03a7f2d6b13b.zip audio-b0f0295dfcecb530f00fd5e4b70b03a7f2d6b13b.tar.gz audio-b0f0295dfcecb530f00fd5e4b70b03a7f2d6b13b.tar.bz2 |
PD#125186: fix commit error of bug[124235] on TV platform
Change-Id: I1049d358630572f346b21ac27c83c2ed4af39a0f
-rw-r--r--[-rwxr-xr-x] | audio_hw.c | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | audio_hwsync.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | audio_policy.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | audio_resampler.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | audio_resampler.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | hdmi_audio_hw.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | hdmi_audio_hw.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | usb_audio_hw.c | 0 |
8 files changed, 1 insertions, 2 deletions
diff --git a/audio_hw.c b/audio_hw.c index a0251f9..3412d29 100755..100644 --- a/audio_hw.c +++ b/audio_hw.c @@ -550,7 +550,6 @@ static int start_output_stream(struct aml_stream_out *out) out->config = pcm_config_bt; } else { port = PORT_MM; - out->config = pcm_config_out; } LOGFUNC("*%s, open card(%d) port(%d)", __FUNCTION__, card, port); @@ -2364,7 +2363,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev, out->hw_sync_mode = false; out->first_apts_flag = false; - if (flags & AUDIO_OUTPUT_FLAG_HW_AV_SYNC) { + if (0/*flags & AUDIO_OUTPUT_FLAG_HW_AV_SYNC*/) { out->hw_sync_mode = true; ALOGI("Output stream open with AUDIO_OUTPUT_FLAG_HW_AV_SYNC"); } diff --git a/audio_hwsync.h b/audio_hwsync.h index f17144d..f17144d 100755..100644 --- a/audio_hwsync.h +++ b/audio_hwsync.h diff --git a/audio_policy.c b/audio_policy.c index 0f623b0..0f623b0 100755..100644 --- a/audio_policy.c +++ b/audio_policy.c diff --git a/audio_resampler.c b/audio_resampler.c index 7886824..7886824 100755..100644 --- a/audio_resampler.c +++ b/audio_resampler.c diff --git a/audio_resampler.h b/audio_resampler.h index e43dfae..e43dfae 100755..100644 --- a/audio_resampler.h +++ b/audio_resampler.h diff --git a/hdmi_audio_hw.c b/hdmi_audio_hw.c index 3e5030f..3e5030f 100755..100644 --- a/hdmi_audio_hw.c +++ b/hdmi_audio_hw.c diff --git a/hdmi_audio_hw.h b/hdmi_audio_hw.h index 58e0167..58e0167 100755..100644 --- a/hdmi_audio_hw.h +++ b/hdmi_audio_hw.h diff --git a/usb_audio_hw.c b/usb_audio_hw.c index 65ebbe4..65ebbe4 100755..100644 --- a/usb_audio_hw.c +++ b/usb_audio_hw.c |