diff options
| author | Eric Laurent <elaurent@google.com> | 2014-06-30 14:45:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-30 14:43:31 +0000 |
| commit | c6c588eecab676048dba793cdc7db54df3e09f6f (patch) | |
| tree | ac1f109d477f77b10fb6c76136adbd7922e53134 | |
| parent | 4d8645547d96a2777b13fff5ee9e9e1fbe85afae (diff) | |
| parent | fbc02dc16ea43f14e7a0c410bfb787ddcf1b89fb (diff) | |
| download | hardware_libhardware-c6c588eecab676048dba793cdc7db54df3e09f6f.zip hardware_libhardware-c6c588eecab676048dba793cdc7db54df3e09f6f.tar.gz hardware_libhardware-c6c588eecab676048dba793cdc7db54df3e09f6f.tar.bz2 | |
Merge "usb audio: fix capture channel conversion"
| -rw-r--r-- | modules/usbaudio/audio_hw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c index b88fa53..3a6c5c9 100644 --- a/modules/usbaudio/audio_hw.c +++ b/modules/usbaudio/audio_hw.c @@ -1188,14 +1188,14 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, size_t byte /* Num Channels conversion */ if (num_device_channels < num_req_channels) { num_read_buff_bytes = - contract_channels_16(read_buff, num_device_channels, - out_buff, num_req_channels, - num_read_buff_bytes / sizeof(short)); - } else { - num_read_buff_bytes = expand_channels_16(read_buff, num_device_channels, out_buff, num_req_channels, num_read_buff_bytes / sizeof(short)); + } else { + num_read_buff_bytes = + contract_channels_16(read_buff, num_device_channels, + out_buff, num_req_channels, + num_read_buff_bytes / sizeof(short)); } } } |