Motown: Change media type (stream type) representation

services/media/audio/platform/generic/mixers/point_sampler.cc

Index: services/media/audio/platform/generic/mixers/point_sampler.cc
diff --git a/services/media/audio/platform/generic/mixers/point_sampler.cc b/services/media/audio/platform/generic/mixers/point_sampler.cc
index 7747241a5bfd42906a12b88c7fd61a3110de8fd4..70a80ef39f6995890cd0366c3ee62d564b960eb9 100644
--- a/services/media/audio/platform/generic/mixers/point_sampler.cc
+++ b/services/media/audio/platform/generic/mixers/point_sampler.cc
@@ -166,15 +166,15 @@ bool PointSamplerImpl<DChCount, SType, SChCount>::Mix(
 template <size_t   DChCount,
           typename SType,
           size_t   SChCount>
-static inline MixerPtr SelectPSM(const LpcmMediaTypeDetailsPtr& src_format,
-                                 const LpcmMediaTypeDetailsPtr& dst_format) {
+static inline MixerPtr SelectPSM(const AudioMediaTypeDetailsPtr& src_format,
+                                 const AudioMediaTypeDetailsPtr& dst_format) {
   return MixerPtr(new PointSamplerImpl<DChCount, SType, SChCount>());
 }
 
 template <size_t   DChCount,
           typename SType>
-static inline MixerPtr SelectPSM(const LpcmMediaTypeDetailsPtr& src_format,
-                                 const LpcmMediaTypeDetailsPtr& dst_format) {
+static inline MixerPtr SelectPSM(const AudioMediaTypeDetailsPtr& src_format,
+                                 const AudioMediaTypeDetailsPtr& dst_format) {
   switch (src_format->channels) {
   case 1:
     return SelectPSM<DChCount, SType, 1>(src_format, dst_format);
@@ -186,20 +186,20 @@ static inline MixerPtr SelectPSM(const LpcmMediaTypeDetailsPtr& src_format,
 }
 
 template <size_t DChCount>
-static inline MixerPtr SelectPSM(const LpcmMediaTypeDetailsPtr& src_format,
-                                 const LpcmMediaTypeDetailsPtr& dst_format) {
+static inline MixerPtr SelectPSM(const AudioMediaTypeDetailsPtr& src_format,
+                                 const AudioMediaTypeDetailsPtr& dst_format) {
   switch (src_format->sample_format) {
-  case LpcmSampleFormat::UNSIGNED_8:
+  case AudioSampleFormat::UNSIGNED_8:
     return SelectPSM<DChCount, uint8_t>(src_format, dst_format);
-  case LpcmSampleFormat::SIGNED_16:
+  case AudioSampleFormat::SIGNED_16:
     return SelectPSM<DChCount, int16_t>(src_format, dst_format);
   default:
     return nullptr;
   }
 }
 
-MixerPtr PointSampler::Select(const LpcmMediaTypeDetailsPtr& src_format,
-                              const LpcmMediaTypeDetailsPtr& dst_format) {
+MixerPtr PointSampler::Select(const AudioMediaTypeDetailsPtr& src_format,
+                              const AudioMediaTypeDetailsPtr& dst_format) {
   switch (dst_format->channels) {
   case 1:
     return SelectPSM<1>(src_format, dst_format);