1 files changed, 6 insertions, 11 deletions
diff --git a/www/iridium/files/sndio_input.cc b/www/iridium/files/sndio_input.cc
index 4a00d8ac1083..3cf19a8a2d6d 100644
--- a/www/iridium/files/sndio_input.cc
+++ b/www/iridium/files/sndio_input.cc
@@ -15,13 +15,11 @@
 
 namespace media {
 
-static const SampleFormat kSampleFormat = kSampleFormatS16;
-
 void sndio_in_onmove(void *arg, int delta) {
   NOTIMPLEMENTED();
   SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
 
-  self->hw_delay_ = delta - self->params_.GetBytesPerFrame(kSampleFormat);
+  self->hw_delay_ = delta - self->params_.GetBytesPerFrame();
 }
 
 void *sndio_in_threadstart(void *arg) {
@@ -38,7 +36,9 @@ SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* audio_manager,
     : audio_manager_(audio_manager),
       device_name_(device_name),
       params_(params),
-      bytes_per_buffer_(params.GetBytesPerBuffer(kSampleFormat)),
+      bytes_per_buffer_(params.frames_per_buffer() *
+                        (params.channels() * params.bits_per_sample()) /
+                        8),
       buffer_duration_(base::TimeDelta::FromMicroseconds(
           params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
           static_cast<float>(params.sample_rate()))),
@@ -66,7 +66,7 @@ bool SndioAudioInputStream::Open() {
   sio_initpar(&par);
   par.rate = params_.sample_rate();
   par.pchan = params_.channels();
-  par.bits = SampleFormatToBytesPerChannel(kSampleFormat);
+  par.bits = params_.bits_per_sample();
   par.bps = par.bits / 8;
   par.sig = sig = par.bits != 8 ? 1 : 0;
   par.le = SIO_LE_NATIVE;
@@ -88,7 +88,7 @@ bool SndioAudioInputStream::Open() {
 
   if (par.rate  != (unsigned int)params_.sample_rate() ||
       par.pchan != (unsigned int)params_.channels() ||
-      par.bits  != (unsigned int)SampleFormatToBytesPerChannel(kSampleFormat) ||
+      par.bits  != (unsigned int)params_.bits_per_sample() ||
       par.sig   != (unsigned int)sig ||
       (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
       (par.bits != par.bps * 8)) {
@@ -162,9 +162,4 @@ bool SndioAudioInputStream::IsMuted() {
   return false;
 }
 
-void SndioAudioInputStream::SetOutputDeviceForAec(
-    const std::string& output_device_id) {
-// Not supported. Do nothing.
-}
-
 }  // namespace media