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

Side by Side Diff: media/base/audio_decoder_config.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/android/media_source_player.cc ('k') | media/base/audio_discard_helper.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) 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/audio_decoder_config.h" 5 #include "media/base/audio_decoder_config.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/time/time.h"
10 #include "media/audio/sample_rates.h" 9 #include "media/audio/sample_rates.h"
11 #include "media/base/limits.h" 10 #include "media/base/limits.h"
12 #include "media/base/sample_format.h"
13 11
14 namespace media { 12 namespace media {
15 13
16 AudioDecoderConfig::AudioDecoderConfig() 14 AudioDecoderConfig::AudioDecoderConfig()
17 : codec_(kUnknownAudioCodec), 15 : codec_(kUnknownAudioCodec),
18 sample_format_(kUnknownSampleFormat), 16 sample_format_(kUnknownSampleFormat),
19 bytes_per_channel_(0), 17 bytes_per_channel_(0),
20 channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED), 18 channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED),
21 samples_per_second_(0), 19 samples_per_second_(0),
22 bytes_per_frame_(0), 20 bytes_per_frame_(0),
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 case kCodecOpus: 149 case kCodecOpus:
152 return "opus"; 150 return "opus";
153 case kCodecALAC: 151 case kCodecALAC:
154 return "alac"; 152 return "alac";
155 } 153 }
156 NOTREACHED(); 154 NOTREACHED();
157 return ""; 155 return "";
158 } 156 }
159 157
160 } // namespace media 158 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_source_player.cc ('k') | media/base/audio_discard_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698