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

Side by Side Diff: media/filters/audio_file_reader.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/ffmpeg/ffmpeg_common.cc ('k') | media/filters/audio_renderer_algorithm.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/filters/audio_file_reader.h" 5 #include "media/filters/audio_file_reader.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "media/base/audio_bus.h" 11 #include "media/base/audio_bus.h"
12 #include "media/ffmpeg/ffmpeg_common.h" 12 #include "media/ffmpeg/ffmpeg_common.h"
13 #include "media/filters/ffmpeg_glue.h"
14 13
15 namespace media { 14 namespace media {
16 15
17 AudioFileReader::AudioFileReader(FFmpegURLProtocol* protocol) 16 AudioFileReader::AudioFileReader(FFmpegURLProtocol* protocol)
18 : codec_context_(NULL), 17 : codec_context_(NULL),
19 stream_index_(0), 18 stream_index_(0),
20 protocol_(protocol), 19 protocol_(protocol),
21 channels_(0), 20 channels_(0),
22 sample_rate_(0), 21 sample_rate_(0),
23 av_sample_format_(0) { 22 av_sample_format_(0) {
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 stream_index_, 274 stream_index_,
276 ConvertToTimeBase(codec_context_->time_base, seek_time), 275 ConvertToTimeBase(codec_context_->time_base, seek_time),
277 AVSEEK_FLAG_BACKWARD) >= 0; 276 AVSEEK_FLAG_BACKWARD) >= 0;
278 } 277 }
279 278
280 const AVStream* AudioFileReader::GetAVStreamForTesting() const { 279 const AVStream* AudioFileReader::GetAVStreamForTesting() const {
281 return glue_->format_context()->streams[stream_index_]; 280 return glue_->format_context()->streams[stream_index_];
282 } 281 }
283 282
284 } // namespace media 283 } // namespace media
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/audio_renderer_algorithm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698