Motown: Change media type (stream type) representation

examples/audio_play_test/play_wav.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 <memory>
 
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_runner.h"
@@ skipping 253 matching lines @@
                                     LocalDuration::period::den);
   LinearTransform::Ratio tmp;
   bool success = LinearTransform::Ratio::Compose(audio_rate, local_rate, &tmp);
   MOJO_DCHECK(success);
 
   AudioTrackConfigurationPtr cfg;
   cfg = AudioTrackConfiguration::New();
   cfg->audio_frame_ratio = tmp.numerator;
   cfg->media_time_ratio  = tmp.denominator;
 
-  LpcmMediaTypeDetailsPtr pcm_cfg = LpcmMediaTypeDetails::New();
+  AudioMediaTypeDetailsPtr pcm_cfg = AudioMediaTypeDetails::New();
   pcm_cfg->sample_format = (wav_info_.bits_per_sample == 8)
-                         ? LpcmSampleFormat::UNSIGNED_8
-                         : LpcmSampleFormat::SIGNED_16;
+                         ? AudioSampleFormat::UNSIGNED_8
+                         : AudioSampleFormat::SIGNED_16;
   pcm_cfg->channels = wav_info_.channel_count;
   pcm_cfg->frames_per_second = wav_info_.frame_rate;
 
   cfg->media_type = MediaType::New();
-  cfg->media_type->scheme = MediaTypeScheme::LPCM;
+  cfg->media_type->medium = MediaTypeMedium::AUDIO;
   cfg->media_type->details = MediaTypeDetails::New();
-  cfg->media_type->details->set_lpcm(pcm_cfg.Pass());
+  cfg->media_type->details->set_audio(pcm_cfg.Pass());
+  cfg->media_type->encoding = MediaType::kAudioEncodingLpcm;
 
   // Configure the track based on the WAV header information.
   MediaConsumerPtr media_pipe;
   audio_track_->Configure(cfg.Pass(), GetProxy(&media_pipe));
 
   // Grab the rate control interface for our audio renderer.
   audio_track_->GetRateControl(GetProxy(&rate_control_));
   rate_control_.set_connection_error_handler([this]() {
     OnConnectionError("rate_control");
   });
@@ skipping 255 matching lines @@
 }  // namespace audio
 }  // namespace media
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle app_request) {
   mojo::ApplicationRunner runner(
       std::unique_ptr<mojo::media::audio::examples::PlayWAVApp>(
           new mojo::media::audio::examples::PlayWAVApp()));
   return runner.Run(app_request);
 }