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

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

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 unified diff | Download patch
« no previous file with comments | « media/base/audio_discard_helper.cc ('k') | media/base/data_buffer.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 <cctype> 7 #include <cctype>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/basictypes.h"
11 #include "base/logging.h" 10 #include "base/logging.h"
12 #include "media/base/bit_reader.h" 11 #include "media/base/bit_reader.h"
13 12
14 namespace media { 13 namespace media {
15 14
16 namespace container_names { 15 namespace container_names {
17 16
18 #define TAG(a, b, c, d) \ 17 #define TAG(a, b, c, d) \
19 ((static_cast<uint32>(static_cast<uint8>(a)) << 24) | \ 18 ((static_cast<uint32>(static_cast<uint8>(a)) << 24) | \
20 (static_cast<uint32>(static_cast<uint8>(b)) << 16) | \ 19 (static_cast<uint32>(static_cast<uint8>(b)) << 16) | \
(...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 if (CheckEac3(buffer + offset, buffer_size - offset)) 1663 if (CheckEac3(buffer + offset, buffer_size - offset))
1665 return CONTAINER_EAC3; 1664 return CONTAINER_EAC3;
1666 } 1665 }
1667 1666
1668 return CONTAINER_UNKNOWN; 1667 return CONTAINER_UNKNOWN;
1669 } 1668 }
1670 1669
1671 } // namespace container_names 1670 } // namespace container_names
1672 1671
1673 } // namespace media 1672 } // namespace media
OLDNEW
« no previous file with comments | « media/base/audio_discard_helper.cc ('k') | media/base/data_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698