Motown: Change media type (stream type) representation

services/media/audio/platform/linux/alsa_output.cc

 // Copyright 2015 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 <limits>
 #include <set>
 
 #include "mojo/services/media/common/cpp/local_time.h"
 #include "services/media/audio/platform/linux/alsa_output.h"
 
@@ skipping 33 matching lines @@
   // output's configuration, and disabling resampling at the ALSA level.
   //
   // If we could own the output entirely and bypass the mixer to achieve lower
   // latency, that would be even better.
   AudioOutputPtr audio_out(audio::AlsaOutput::New(manager));
   if (!audio_out) { return nullptr; }
 
   AlsaOutput* alsa_out = static_cast<AlsaOutput*>(audio_out.get());
   DCHECK(alsa_out);
 
-  LpcmMediaTypeDetailsPtr config(LpcmMediaTypeDetails::New());
+  AudioMediaTypeDetailsPtr config(AudioMediaTypeDetails::New());
   config->frames_per_second = 48000;
   config->channels = 2;
-  config->sample_format = LpcmSampleFormat::SIGNED_16;
+  config->sample_format = AudioSampleFormat::SIGNED_16;
 
   if (alsa_out->Configure(config.Pass()) != MediaResult::OK) {
     return nullptr;
   }
 
   return audio_out;
 }
 
 AlsaOutput::AlsaOutput(AudioOutputManager* manager)
   : StandardOutputBase(manager) {}
 
 AlsaOutput::~AlsaOutput() {
   // We should have been cleaned up already, but in release builds, call cleanup
   // anyway, just in case something got missed.
   DCHECK(!alsa_device_);
   Cleanup();
 }
 
 AudioOutputPtr AlsaOutput::New(AudioOutputManager* manager) {
   return AudioOutputPtr(new AlsaOutput(manager));
 }
 
-MediaResult AlsaOutput::Configure(LpcmMediaTypeDetailsPtr config) {
+MediaResult AlsaOutput::Configure(AudioMediaTypeDetailsPtr config) {
   if (!config) { return MediaResult::INVALID_ARGUMENT; }
   if (output_formatter_) { return MediaResult::BAD_STATE; }
 
   output_formatter_ = OutputFormatter::Select(config);
   if (!output_formatter_) { return MediaResult::UNSUPPORTED_CONFIG; }
 
   MediaResult res = AlsaSelectFormat(config);
   if (res != MediaResult::OK) { return res; }
   DCHECK_GE(alsa_format_, 0);
 
@@ skipping 248 matching lines @@
   if (code == -EPIPE) {
     HandleAsUnderflow();
   } else {
     HandleAsError(code);
   }
 }
 
 }  // namespace audio
 }  // namespace media
 }  // namespace mojo