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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef 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
« no previous file with comments | « media/base/channel_mixing_matrix_unittest.cc ('k') | media/base/container_names_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/container_names.h" 5 #include "media/base/container_names.h"
6 6
7 #include <stddef.h>
8
7 #include <cctype> 9 #include <cctype>
8 #include <limits> 10 #include <limits>
9 11
10 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h"
11 #include "media/base/bit_reader.h" 14 #include "media/base/bit_reader.h"
12 15
13 namespace media { 16 namespace media {
14 17
15 namespace container_names { 18 namespace container_names {
16 19
17 #define TAG(a, b, c, d) \ 20 #define TAG(a, b, c, d) \
18 ((static_cast<uint32_t>(static_cast<uint8_t>(a)) << 24) | \ 21 ((static_cast<uint32_t>(static_cast<uint8_t>(a)) << 24) | \
19 (static_cast<uint32_t>(static_cast<uint8_t>(b)) << 16) | \ 22 (static_cast<uint32_t>(static_cast<uint8_t>(b)) << 16) | \
20 (static_cast<uint32_t>(static_cast<uint8_t>(c)) << 8) | \ 23 (static_cast<uint32_t>(static_cast<uint8_t>(c)) << 8) | \
(...skipping 1642 matching lines...) Expand 10 before | Expand all | Expand 10 after
1663 if (CheckEac3(buffer + offset, buffer_size - offset)) 1666 if (CheckEac3(buffer + offset, buffer_size - offset))
1664 return CONTAINER_EAC3; 1667 return CONTAINER_EAC3;
1665 } 1668 }
1666 1669
1667 return CONTAINER_UNKNOWN; 1670 return CONTAINER_UNKNOWN;
1668 } 1671 }
1669 1672
1670 } // namespace container_names 1673 } // namespace container_names
1671 1674
1672 } // namespace media 1675 } // namespace media
OLDNEW
« no previous file with comments | « media/base/channel_mixing_matrix_unittest.cc ('k') | media/base/container_names_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698