OSDN Git Service

usb audio: fix capture channel conversion
authorEric Laurent <elaurent@google.com>
Sat, 28 Jun 2014 01:39:21 +0000 (18:39 -0700)
committerEric Laurent <elaurent@google.com>
Sat, 28 Jun 2014 01:39:21 +0000 (18:39 -0700)
Change-Id: Ibdff053bd6ecc4bf2bc8bb51384098911f52f6ef

modules/usbaudio/audio_hw.c

index b88fa53..3a6c5c9 100644 (file)
@@ -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));
             }
         }
     }