media: Move audio_parameters and audio_point to media/base/

media/base/audio_parameters.h

 // Copyright (c) 2012 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.
 
-#ifndef MEDIA_AUDIO_AUDIO_PARAMETERS_H_
-#define MEDIA_AUDIO_AUDIO_PARAMETERS_H_
+#ifndef MEDIA_BASE_AUDIO_PARAMETERS_H_
+#define MEDIA_BASE_AUDIO_PARAMETERS_H_
 
 #include <stdint.h>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "media/audio/point.h"
 #include "media/base/audio_bus.h"
+#include "media/base/audio_point.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 // Use a struct-in-struct approach to ensure that we can calculate the required
 // size as sizeof(Audio{Input,Output}BufferParameters) + #(bytes in audio
 // buffer) without using packing. Also align Audio{Input,Output}BufferParameters
 // instead of in Audio{Input,Output}Buffer to be able to calculate size like so.
 // Use a macro for the alignment value that's the same as
 // AudioBus::kChannelAlignment, since MSVC doesn't accept the latter to be used.
 #if defined(OS_WIN)
 #pragma warning(push)
-#pragma warning(disable: 4324)  // Disable warning for added padding.
+#pragma warning(disable : 4324)  // Disable warning for added padding.
 #endif
 #define PARAMETERS_ALIGNMENT 16
 static_assert(AudioBus::kChannelAlignment == PARAMETERS_ALIGNMENT,
               "Audio buffer parameters struct alignment not same as AudioBus");
 struct MEDIA_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT) AudioInputBufferParameters {
   double volume;
   uint32_t size;
   uint32_t hardware_delay_bytes;
   uint32_t id;
   bool key_pressed;
@@ skipping 172 matching lines @@
     return a.channels() < b.channels();
   if (a.sample_rate() != b.sample_rate())
     return a.sample_rate() < b.sample_rate();
   if (a.bits_per_sample() != b.bits_per_sample())
     return a.bits_per_sample() < b.bits_per_sample();
   return a.frames_per_buffer() < b.frames_per_buffer();
 }
 
 }  // namespace media
 
-#endif  // MEDIA_AUDIO_AUDIO_PARAMETERS_H_
+#endif  // MEDIA_BASE_AUDIO_PARAMETERS_H_