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

Side by Side Diff: media/formats/mp4/aac.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/formats/mp4/aac.h ('k') | media/formats/mp4/aac_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/formats/mp4/aac.h" 5 #include "media/formats/mp4/aac.h"
6 6
7 #include <stddef.h>
8
7 #include <algorithm> 9 #include <algorithm>
8 10
9 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "build/build_config.h"
10 #include "media/base/bit_reader.h" 13 #include "media/base/bit_reader.h"
11 #include "media/formats/mp4/rcheck.h" 14 #include "media/formats/mp4/rcheck.h"
12 #include "media/formats/mpeg/adts_constants.h" 15 #include "media/formats/mpeg/adts_constants.h"
13 16
14 namespace media { 17 namespace media {
15 namespace mp4 { 18 namespace mp4 {
16 19
17 AAC::AAC() 20 AAC::AAC()
18 : profile_(0), frequency_index_(0), channel_config_(0), frequency_(0), 21 : profile_(0), frequency_index_(0), channel_config_(0), frequency_(0),
19 extension_frequency_(0), channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED) { 22 extension_frequency_(0), channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED) {
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 280
278 RCHECK(bit_reader->ReadBits(1, &dummy)); // extensionFlag3 281 RCHECK(bit_reader->ReadBits(1, &dummy)); // extensionFlag3
279 } 282 }
280 283
281 return true; 284 return true;
282 } 285 }
283 286
284 } // namespace mp4 287 } // namespace mp4
285 288
286 } // namespace media 289 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp4/aac.h ('k') | media/formats/mp4/aac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698