Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: media/base/audio_parameters.h

Issue 1907973003: media: Move audio_parameters and audio_point to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/audio_hardware_config_unittest.cc ('k') | media/base/audio_parameters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_parameters.h
diff --git a/media/audio/audio_parameters.h b/media/base/audio_parameters.h
similarity index 97%
rename from media/audio/audio_parameters.h
rename to media/base/audio_parameters.h
index d7d730b91497b1a6bd145961c5ce7b6e0ec6f2c1..e41267d533ae7aa762873dcc2a34221c25d7252f 100644
--- a/media/audio/audio_parameters.h
+++ b/media/base/audio_parameters.h
@@ -2,8 +2,8 @@
// 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>
@@ -11,8 +11,8 @@
#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"
@@ -26,7 +26,7 @@ namespace media {
// 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,
@@ -219,4 +219,4 @@ inline bool operator<(const AudioParameters& a, const AudioParameters& b) {
} // namespace media
-#endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_
+#endif // MEDIA_BASE_AUDIO_PARAMETERS_H_
« no previous file with comments | « media/base/audio_hardware_config_unittest.cc ('k') | media/base/audio_parameters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698