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

Side by Side Diff: media/filters/audio_file_reader.cc

Issue 10796074: Move VideoRenderer out of Filter heirarchy. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
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 <string> 7 #include <string>
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "media/audio/audio_util.h" 11 #include "media/audio/audio_util.h"
12 #include "media/base/filters.h"
13 #include "media/ffmpeg/ffmpeg_common.h" 12 #include "media/ffmpeg/ffmpeg_common.h"
14 #include "media/filters/ffmpeg_glue.h" 13 #include "media/filters/ffmpeg_glue.h"
15 14
16 namespace media { 15 namespace media {
17 16
18 AudioFileReader::AudioFileReader(FFmpegURLProtocol* protocol) 17 AudioFileReader::AudioFileReader(FFmpegURLProtocol* protocol)
19 : protocol_(protocol), 18 : protocol_(protocol),
20 format_context_(NULL), 19 format_context_(NULL),
21 codec_context_(NULL), 20 codec_context_(NULL),
22 codec_(NULL) { 21 codec_(NULL) {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 178 }
180 } 179 }
181 180
182 current_frame += frames_read; 181 current_frame += frames_read;
183 } 182 }
184 183
185 return true; 184 return true;
186 } 185 }
187 186
188 } // namespace media 187 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698