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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 155469: Splitting media filter's Initialize() into Create() + callback and Seek() + callback. (Closed)
Patch Set: Fixed valgrind errors Created 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decoder_base.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 9d68e35823318369a507871a847bab57d3894d00..20b77e40d199b9e62e8f3cac94b549a3fed33955 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -120,10 +120,10 @@ class FFmpegDemuxer : public Demuxer {
// MediaFilter implementation.
virtual void Stop();
- virtual void Seek(base::TimeDelta time);
+ virtual void Seek(base::TimeDelta time, FilterCallback* callback);
// Demuxer implementation.
- virtual bool Initialize(DataSource* data_source);
+ virtual void Initialize(DataSource* data_source, FilterCallback* callback);
virtual size_t GetNumberOfStreams();
virtual scoped_refptr<DemuxerStream> GetStream(int stream_id);
@@ -134,10 +134,10 @@ class FFmpegDemuxer : public Demuxer {
virtual ~FFmpegDemuxer();
// Carries out initialization on the demuxer thread.
- void InititalizeTask(DataSource* data_source);
+ void InititalizeTask(DataSource* data_source, FilterCallback* callback);
// Carries out a seek on the demuxer thread.
- void SeekTask(base::TimeDelta time);
+ void SeekTask(base::TimeDelta time, FilterCallback* callback);
// Carries out demuxing and satisfying stream reads on the demuxer thread.
void DemuxTask();
« no previous file with comments | « media/filters/decoder_base.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698