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

Side by Side Diff: media/base/channel_layout.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/channel_layout.h" 5 #include "media/base/channel_layout.h"
6 6
7 #include "base/basictypes.h"
8 #include "base/logging.h" 7 #include "base/logging.h"
9 8
10 namespace media { 9 namespace media {
11 10
12 static const int kLayoutToChannels[] = { 11 static const int kLayoutToChannels[] = {
13 0, // CHANNEL_LAYOUT_NONE 12 0, // CHANNEL_LAYOUT_NONE
14 0, // CHANNEL_LAYOUT_UNSUPPORTED 13 0, // CHANNEL_LAYOUT_UNSUPPORTED
15 1, // CHANNEL_LAYOUT_MONO 14 1, // CHANNEL_LAYOUT_MONO
16 2, // CHANNEL_LAYOUT_STEREO 15 2, // CHANNEL_LAYOUT_STEREO
17 3, // CHANNEL_LAYOUT_2_1 16 3, // CHANNEL_LAYOUT_2_1
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 case CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC: 256 case CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC:
258 return "STEREO_AND_KEYBOARD_MIC"; 257 return "STEREO_AND_KEYBOARD_MIC";
259 case CHANNEL_LAYOUT_4_1_QUAD_SIDE: 258 case CHANNEL_LAYOUT_4_1_QUAD_SIDE:
260 return "4.1_QUAD_SIDE"; 259 return "4.1_QUAD_SIDE";
261 } 260 }
262 NOTREACHED() << "Invalid channel layout provided: " << layout; 261 NOTREACHED() << "Invalid channel layout provided: " << layout;
263 return ""; 262 return "";
264 } 263 }
265 264
266 } // namespace media 265 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698