replace snd_pcm_hw_params_set_* with snd_pcm_set_params.

media/audio/linux/alsa_wrapper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/linux/alsa_wrapper.h"
 
 #include <alsa/asoundlib.h>
 
 namespace media {
 
@@ skipping 53 matching lines @@
 }
 
 int AlsaWrapper::PcmRecover(snd_pcm_t* handle, int err, int silent) {
   return snd_pcm_recover(handle, err, silent);
 }
 
 const char* AlsaWrapper::PcmName(snd_pcm_t* handle) {
   return snd_pcm_name(handle);
 }
 
-int AlsaWrapper::ConfigureHwParams(snd_pcm_t* handle,
-                                   snd_pcm_hw_params_t* hw_params,
-                                   snd_pcm_format_t format,
-                                   snd_pcm_access_t access,
-                                   unsigned int channels,
-                                   unsigned int rate,
-                                   int soft_resample,
-                                   unsigned int latency) {
-  int err = 0;
-  if ((err = snd_pcm_hw_params_any(handle, hw_params)) < 0)
-    return err;
-
-  if ((err = snd_pcm_hw_params_set_rate_resample(handle, hw_params,
-                                                 soft_resample)) < 0) {
-    return err;
-  }
-
-  if ((err = snd_pcm_hw_params_set_format(handle, hw_params, format)) < 0)
-    return err;
-
-  int dir = 0;
-  unsigned new_rate = rate;
-  if ((err = snd_pcm_hw_params_set_rate_near(handle, hw_params,
-                                             &new_rate, &dir)) < 0) {
-    return err;
-  }
-
-  if ((err = snd_pcm_hw_params_set_access(handle, hw_params, access)) < 0)
-    return err;
-
-  if ((err = snd_pcm_hw_params_set_channels(handle, hw_params, channels)) < 0)
-    return err;
-
-  unsigned buffer_time = latency;
-  if (buffer_time == 0) {
-    if ((err = snd_pcm_hw_params_get_buffer_time_max(hw_params,
-                                                      &buffer_time, 0)) < 0) {
-      return err;
-    }
-    if (buffer_time > 500000)
-      buffer_time = 500000;
-  }
-
-  unsigned period_time = buffer_time / 4;
-  if ((err = snd_pcm_hw_params_set_period_time_near(handle, hw_params,
-                                                    &period_time, 0)) < 0) {
-    return err;
-  }
-
-  err = snd_pcm_hw_params_set_buffer_time_near(handle, hw_params,
-                                                &buffer_time, 0);
-  return err;
-}
-
 int AlsaWrapper::PcmSetParams(snd_pcm_t* handle, snd_pcm_format_t format,
                               snd_pcm_access_t access, unsigned int channels,
                               unsigned int rate, int soft_resample,
                               unsigned int latency) {
-  int err = 0;
-  snd_pcm_hw_params_t* hw_params;
-  if ((err = snd_pcm_hw_params_malloc(&hw_params)) < 0)
-    return err;
-
-  if ((err = ConfigureHwParams(handle, hw_params, format, access, channels,
-                               rate, soft_resample, latency)) >= 0) {
-    err = snd_pcm_hw_params(handle, hw_params);
-  }
-
-  snd_pcm_hw_params_free(hw_params);
-  return err;
+  return snd_pcm_set_params(handle, format,
+                            SND_PCM_ACCESS_RW_INTERLEAVED,

[DaleCurtis, 2012/10/01 18:59:16]

What is the difference between SND_PCM_ACCESS_MMAP_INTERLEAVED and this?

[no longer working on chromium, 2012/10/01 19:51:13]

Sorry, it was one of some quick fixes I tried, I should use access instead of
hard coding SND_PCM_ACCESS_RW_INTERLEAVED, though it is the same since we hard
code to SND_PCM_ACCESS_RW_INTERLEAVED in alsa_util:: OpenDevice() anyway.

The difference between them is on the way how to get access to the data.
From Alsa API:
SND_PCM_ACCESS_MMAP_INTERLEAVED:
   mmap access with simple interleaved channels SND_PCM_ACCESS_RW_INTERLEAVED:
  snd_pcm_readi/snd_pcm_writei access

+                            channels,
+                            rate,
+                            soft_resample,
+                            latency);
 }
 
 int AlsaWrapper::PcmGetParams(snd_pcm_t* handle, snd_pcm_uframes_t* buffer_size,
                               snd_pcm_uframes_t* period_size) {
   return snd_pcm_get_params(handle, buffer_size, period_size);
 }
 
 snd_pcm_sframes_t AlsaWrapper::PcmAvailUpdate(snd_pcm_t* handle) {
   return snd_pcm_avail_update(handle);
 }
@@ skipping 69 matching lines @@
 int AlsaWrapper::MixerSelemHasCaptureVolume(snd_mixer_elem_t* elem) {
   return snd_mixer_selem_has_capture_volume(elem);
 }
 
 int AlsaWrapper::MixerSelemGetCaptureVolumeRange(snd_mixer_elem_t* elem,
                                                  long* min, long* max) {
   return snd_mixer_selem_get_capture_volume_range(elem, min, max);
 }
 
 }  // namespace media