Motown: Change media type (stream type) representation

services/media/framework/lpcm_util.cc

 // Copyright 2016 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/framework/formatting.h"
 #include "services/media/framework/lpcm_util.h"
 
 namespace mojo {
 namespace media {
 
 // LpcmUtil implementation that processes samples of type T.
 template <typename T>
 class LpcmUtilImpl : public LpcmUtil {
  public:
   ~LpcmUtilImpl();
 
   void Silence(void* buffer, size_t frame_count) const override;
 
   void Copy(const void* in, void* out, size_t frame_count) const override;
 
   void Mix(const void* in, void* out, size_t frame_count) const override;
 
   void Interleave(const void* in,
                   size_t in_byte_count,
                   void* out,
                   size_t frame_count) const override;
 
  private:
-  LpcmUtilImpl(const LpcmStreamType& stream_type);
+  LpcmUtilImpl(const AudioStreamType& stream_type);
 
-  LpcmStreamType stream_type_;
+  AudioStreamType stream_type_;
 
   friend class LpcmUtil;
 };
 
-std::unique_ptr<LpcmUtil> LpcmUtil::Create(const LpcmStreamType& stream_type) {
+std::unique_ptr<LpcmUtil> LpcmUtil::Create(const AudioStreamType& stream_type) {
   LpcmUtil* result;
   switch (stream_type.sample_format()) {
-    case LpcmStreamType::SampleFormat::kUnsigned8:
-    case LpcmStreamType::SampleFormat::kAny:
+    case AudioStreamType::SampleFormat::kUnsigned8:
       result = new LpcmUtilImpl<uint8_t>(stream_type);
       break;
-    case LpcmStreamType::SampleFormat::kSigned16:
+    case AudioStreamType::SampleFormat::kSigned16:
       result = new LpcmUtilImpl<int16_t>(stream_type);
       break;
-    case LpcmStreamType::SampleFormat::kSigned24In32:
+    case AudioStreamType::SampleFormat::kSigned24In32:
       result = new LpcmUtilImpl<int32_t>(stream_type);
       break;
-    case LpcmStreamType::SampleFormat::kFloat:
+    case AudioStreamType::SampleFormat::kFloat:
       result = new LpcmUtilImpl<float>(stream_type);
       break;
     default:
       NOTREACHED() << "unsupported sample format "
                    << stream_type.sample_format();
       result = nullptr;
       break;
   }
 
   return std::unique_ptr<LpcmUtil>(result);
 }
 
 template <typename T>
-LpcmUtilImpl<T>::LpcmUtilImpl(const LpcmStreamType& stream_type)
+LpcmUtilImpl<T>::LpcmUtilImpl(const AudioStreamType& stream_type)
     : stream_type_(stream_type) {}
 
 template <typename T>
 LpcmUtilImpl<T>::~LpcmUtilImpl() {}
 
 template <typename T>
 void LpcmUtilImpl<T>::Silence(void* buffer, size_t frame_count) const {
   T* sample = reinterpret_cast<T*>(buffer);
   for (size_t sample_countdown = frame_count * stream_type_.channels();
        sample_countdown != 0; --sample_countdown) {
@@ skipping 78 matching lines @@
       ++in_sample;
       out_sample += channels;
     }
     in_channel += in_channel_stride;
     ++out_channel;
   }
 }
 
 }  // namespace media
 }  // namespace mojo