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

Unified Diff: media/filters/audio_file_reader.h

Issue 10912080: Switch to AVIO instead of a custom FFmpeg URLProtocol handler. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: AVIO! Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: media/filters/audio_file_reader.h
diff --git a/media/filters/audio_file_reader.h b/media/filters/audio_file_reader.h
index b8f54b6ba5a92804a415e60c9763464fcfd25001..439fd066773703cc099adf7550f6d5d3f40564d2 100644
--- a/media/filters/audio_file_reader.h
+++ b/media/filters/audio_file_reader.h
@@ -5,17 +5,18 @@
#ifndef MEDIA_FILTERS_AUDIO_FILE_READER_H_
#define MEDIA_FILTERS_AUDIO_FILE_READER_H_
-#include <vector>
-#include "media/filters/ffmpeg_glue.h"
+#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
+#include "media/base/media_export.h"
struct AVCodecContext;
-struct AVFormatContext;
namespace base { class TimeDelta; }
namespace media {
class AudioBus;
+class FFmpegGlue;
class FFmpegURLProtocol;
class MEDIA_EXPORT AudioFileReader {
@@ -47,8 +48,7 @@ class MEDIA_EXPORT AudioFileReader {
int64 number_of_frames() const;
private:
- FFmpegURLProtocol* protocol_;
- AVFormatContext* format_context_;
+ scoped_ptr<FFmpegGlue> glue_;
AVCodecContext* codec_context_;
int stream_index_;

Powered by Google App Engine
This is Rietveld 408576698