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

Unified Diff: media/base/channel_layout.h

Issue 1078463003: Align ChannelLayout comments with kChannelOrderings values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | no next file » | 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 b57f1529640fd94db0e911d38f815dc8e15fe95c..d44a746a61f3e85e84fe793eefdf84c52a689ec9 100644
--- a/media/base/channel_layout.h
+++ b/media/base/channel_layout.h
@@ -39,22 +39,22 @@ enum ChannelLayout {
// Front L, Front R, Front C, Side L, Side R
CHANNEL_LAYOUT_5_0 = 9,
- // Front L, Front R, Front C, Side L, Side R, LFE
+ // Front L, Front R, Front C, LFE, Side L, Side R
CHANNEL_LAYOUT_5_1 = 10,
// Front L, Front R, Front C, Back L, Back R
CHANNEL_LAYOUT_5_0_BACK = 11,
- // Front L, Front R, Front C, Back L, Back R, LFE
+ // Front L, Front R, Front C, LFE, Back L, Back R
CHANNEL_LAYOUT_5_1_BACK = 12,
// Front L, Front R, Front C, Side L, Side R, Back L, Back R
CHANNEL_LAYOUT_7_0 = 13,
- // Front L, Front R, Front C, Side L, Side R, LFE, Back L, Back R
+ // Front L, Front R, Front C, LFE, Side L, Side R, Back L, Back R
CHANNEL_LAYOUT_7_1 = 14,
- // Front L, Front R, Front C, Side L, Side R, LFE, Front LofC, Front RofC
+ // Front L, Front R, Front C, LFE, Side L, Side R, Front LofC, Front RofC
CHANNEL_LAYOUT_7_1_WIDE = 15,
// Stereo L, Stereo R
@@ -75,13 +75,13 @@ enum ChannelLayout {
// Stereo L, Stereo R, Side L, Side R, Front LofC, Front RofC
CHANNEL_LAYOUT_6_0_FRONT = 21,
- // Stereo L, Stereo R, Side L, Side R, Front C, Rear C.
+ // Stereo L, Stereo R, Front C, Rear L, Rear R, Rear C
CHANNEL_LAYOUT_HEXAGONAL = 22,
- // Stereo L, Stereo R, Side L, Side R, Front C, Rear Center, LFE
+ // Stereo L, Stereo R, Front C, LFE, Side L, Side R, Rear Center
CHANNEL_LAYOUT_6_1 = 23,
- // Stereo L, Stereo R, Back L, Back R, Front C, Rear Center, LFE
+ // Stereo L, Stereo R, Front C, LFE, Back L, Back R, Rear Center
CHANNEL_LAYOUT_6_1_BACK = 24,
// Stereo L, Stereo R, Side L, Side R, Front LofC, Front RofC, LFE
@@ -90,10 +90,10 @@ enum ChannelLayout {
// Front L, Front R, Front C, Side L, Side R, Front LofC, Front RofC
CHANNEL_LAYOUT_7_0_FRONT = 26,
- // Front L, Front R, Front C, Back L, Back R, LFE, Front LofC, Front RofC
+ // Front L, Front R, Front C, LFE, Back L, Back R, Front LofC, Front RofC
CHANNEL_LAYOUT_7_1_WIDE_BACK = 27,
- // Front L, Front R, Front C, Side L, Side R, Rear C, Back L, Back R.
+ // Front L, Front R, Front C, Side L, Side R, Rear L, Back R, Back C.
CHANNEL_LAYOUT_OCTAGONAL = 28,
// Channels are not explicitly mapped to speakers.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698