diff options
| author | Eric Laurent <elaurent@google.com> | 2015-01-09 18:04:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-09 18:04:14 +0000 |
| commit | c654dc6c1fa1c8ffca132f1392aeb1412e579c17 (patch) | |
| tree | fc16615aee59361c4c1460baa281d56b2a70e51d /modules/usbaudio | |
| parent | c9a9133be66aca67a2386c1b2a1997667f104164 (diff) | |
| parent | 7e9abab1940091b4c4d7589160855870fdda437e (diff) | |
| download | hardware_libhardware-c654dc6c1fa1c8ffca132f1392aeb1412e579c17.zip hardware_libhardware-c654dc6c1fa1c8ffca132f1392aeb1412e579c17.tar.gz hardware_libhardware-c654dc6c1fa1c8ffca132f1392aeb1412e579c17.tar.bz2 | |
am 7e9abab1: am b338957d: Merge "usbaudio: Return 0 bytes on failure in capture"
* commit '7e9abab1940091b4c4d7589160855870fdda437e':
usbaudio: Return 0 bytes on failure in capture
Diffstat (limited to 'modules/usbaudio')
| -rw-r--r-- | modules/usbaudio/audio_hw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c index dec87e7..7953967 100644 --- a/modules/usbaudio/audio_hw.c +++ b/modules/usbaudio/audio_hw.c @@ -842,6 +842,8 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, size_t byte num_read_buff_bytes = convert_32_to_16(read_buff, num_read_buff_bytes / 4, out_buff); } else { + LOG_ALWAYS_FATAL("Unsupported format"); + num_read_buff_bytes = 0; goto err; } } @@ -865,6 +867,8 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, size_t byte /* no need to acquire in->dev->lock to read mic_muted here as we don't change its state */ if (num_read_buff_bytes > 0 && in->dev->mic_muted) memset(buffer, 0, num_read_buff_bytes); + } else { + num_read_buff_bytes = 0; } err: |