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

Side by Side Diff: media/formats/mp4/aac.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/formats/mp2t/mp2t_stream_parser.cc ('k') | media/formats/mp4/avc.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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "media/base/bit_reader.h" 10 #include "media/base/bit_reader.h"
11 #include "media/base/media_log.h"
12 #include "media/formats/mp4/rcheck.h" 11 #include "media/formats/mp4/rcheck.h"
13 #include "media/formats/mpeg/adts_constants.h" 12 #include "media/formats/mpeg/adts_constants.h"
14 13
15 namespace media { 14 namespace media {
16 namespace mp4 { 15 namespace mp4 {
17 16
18 AAC::AAC() 17 AAC::AAC()
19 : profile_(0), frequency_index_(0), channel_config_(0), frequency_(0), 18 : profile_(0), frequency_index_(0), channel_config_(0), frequency_(0),
20 extension_frequency_(0), channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED) { 19 extension_frequency_(0), channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED) {
21 } 20 }
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 240
242 RCHECK(bit_reader->ReadBits(1, &dummy)); // extensionFlag3 241 RCHECK(bit_reader->ReadBits(1, &dummy)); // extensionFlag3
243 } 242 }
244 243
245 return true; 244 return true;
246 } 245 }
247 246
248 } // namespace mp4 247 } // namespace mp4
249 248
250 } // namespace media 249 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp2t/mp2t_stream_parser.cc ('k') | media/formats/mp4/avc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698