Mojom updates for Motown.

services/media/audio/platform/generic/mixers/point_sampler.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 "base/logging.h"
 #include "services/media/audio/audio_track_impl.h"
 #include "services/media/audio/platform/generic/mixers/mixer_utils.h"
 #include "services/media/audio/platform/generic/mixers/point_sampler.h"
 
 namespace mojo {
@@ skipping 106 matching lines @@
 static inline MixerPtr SelectPSM(const LpcmMediaTypeDetailsPtr& src_format,
                                  const LpcmMediaTypeDetailsPtr& dst_format) {
   return MixerPtr(new PointSamplerImpl<DType, DChCount, SType, SChCount>());
 }
 
 template <typename DType,
           size_t   DChCount,
           typename SType>
 static inline MixerPtr SelectPSM(const LpcmMediaTypeDetailsPtr& src_format,
                                  const LpcmMediaTypeDetailsPtr& dst_format) {
-  switch (src_format->samples_per_frame) {
+  switch (src_format->channels) {
   case 1:
     return SelectPSM<DType, DChCount, SType, 1>(src_format, dst_format);
   case 2:
     return SelectPSM<DType, DChCount, SType, 2>(src_format, dst_format);
   default:
     return nullptr;
   }
 }
 
 template <typename DType,
           size_t   DChCount>
 static inline MixerPtr SelectPSM(const LpcmMediaTypeDetailsPtr& src_format,
                                  const LpcmMediaTypeDetailsPtr& dst_format) {
   switch (src_format->sample_format) {
   case LpcmSampleFormat::UNSIGNED_8:
     return SelectPSM<DType, DChCount, uint8_t>(src_format, dst_format);
   case LpcmSampleFormat::SIGNED_16:
     return SelectPSM<DType, DChCount, int16_t>(src_format, dst_format);
   default:
     return nullptr;
   }
 }
 
 template <typename DType>
 static inline MixerPtr SelectPSM(const LpcmMediaTypeDetailsPtr& src_format,
                                  const LpcmMediaTypeDetailsPtr& dst_format) {
-  switch (dst_format->samples_per_frame) {
+  switch (dst_format->channels) {
   case 1:
     return SelectPSM<DType, 1>(src_format, dst_format);
   case 2:
     return SelectPSM<DType, 2>(src_format, dst_format);
   default:
     return nullptr;
   }
 }
 
 MixerPtr PointSampler::Select(const LpcmMediaTypeDetailsPtr& src_format,
                               const LpcmMediaTypeDetailsPtr& dst_format) {
   switch (dst_format->sample_format) {
   case LpcmSampleFormat::UNSIGNED_8:
     return SelectPSM<uint8_t>(src_format, dst_format);
   case LpcmSampleFormat::SIGNED_16:
     return SelectPSM<int16_t>(src_format, dst_format);
   default:
     return nullptr;
   }
 }
 
 }  // namespace mixers
 }  // namespace audio
 }  // namespace media
 }  // namespace mojo