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

Unified Diff: media/base/channel_layout.h

Issue 9655018: Make AudioParameters a class instead of a struct (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright years Created 8 years, 9 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_renderer_sink.h ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/channel_layout.h
diff --git a/media/base/channel_layout.h b/media/base/channel_layout.h
index 7dd1ec8bf4faafc470a1a50b706f0f948a483f02..6a7d1ad6f55037bd4432b127e0f539c05624244a 100644
--- a/media/base/channel_layout.h
+++ b/media/base/channel_layout.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -24,7 +24,7 @@ enum ChannelLayout {
CHANNEL_LAYOUT_SURROUND,
// Front L, Front R, Front C, Back C
- CHANNEL_LAYOUT_4POINT0,
+ CHANNEL_LAYOUT_4_0,
// Front L, Front R, Side L, Side R
CHANNEL_LAYOUT_2_2,
@@ -33,25 +33,25 @@ enum ChannelLayout {
CHANNEL_LAYOUT_QUAD,
// Front L, Front R, Front C, Side L, Side R
- CHANNEL_LAYOUT_5POINT0,
+ CHANNEL_LAYOUT_5_0,
// Front L, Front R, Front C, Side L, Side R, LFE
- CHANNEL_LAYOUT_5POINT1,
+ CHANNEL_LAYOUT_5_1,
// Front L, Front R, Front C, Back L, Back R
- CHANNEL_LAYOUT_5POINT0_BACK,
+ CHANNEL_LAYOUT_5_0_BACK,
// Front L, Front R, Front C, Back L, Back R, LFE
- CHANNEL_LAYOUT_5POINT1_BACK,
+ CHANNEL_LAYOUT_5_1_BACK,
// Front L, Front R, Front C, Side L, Side R, Back L, Back R
- CHANNEL_LAYOUT_7POINT0,
+ CHANNEL_LAYOUT_7_0,
// Front L, Front R, Front C, Side L, Side R, LFE, Back L, Back R
- CHANNEL_LAYOUT_7POINT1,
+ CHANNEL_LAYOUT_7_1,
// Front L, Front R, Front C, Back L, Back R, LFE, Front LofC, Front RofC
- CHANNEL_LAYOUT_7POINT1_WIDE,
+ CHANNEL_LAYOUT_7_1_WIDE,
// Stereo L, Stereo R
CHANNEL_LAYOUT_STEREO_DOWNMIX,
« no previous file with comments | « media/base/audio_renderer_sink.h ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698