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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 9968117: Move Demuxer::set_host() to Initialize(). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fixes Created 8 years, 9 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/dummy_demuxer.cc ('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 6a6bc647a8e65065fb5fe2408f4ae13df480fe2f..0fbe2c012656b678e75551644d112762d444ad13 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -139,8 +139,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer, public FFmpegURLProtocol {
virtual void PostDemuxTask();
// Demuxer implementation.
- virtual void set_host(DemuxerHost* demuxer_host) OVERRIDE;
- virtual void Initialize(const PipelineStatusCB& status_cb) OVERRIDE;
+ virtual void Initialize(DemuxerHost* host,
+ const PipelineStatusCB& status_cb) OVERRIDE;
virtual void Stop(const base::Closure& callback) OVERRIDE;
virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
virtual void OnAudioRendererDisabled() OVERRIDE;
@@ -171,7 +171,7 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer, public FFmpegURLProtocol {
FRIEND_TEST_ALL_PREFIXES(FFmpegDemuxerTest, ProtocolRead);
// Carries out initialization on the demuxer thread.
- void InitializeTask(const PipelineStatusCB& status_cb);
+ void InitializeTask(DemuxerHost* host, const PipelineStatusCB& status_cb);
// Carries out a seek on the demuxer thread.
void SeekTask(base::TimeDelta time, const PipelineStatusCB& cb);
@@ -204,6 +204,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer, public FFmpegURLProtocol {
// read or kReadError in case of error.
virtual void SignalReadCompleted(int size);
+ DemuxerHost* host_;
+
MessageLoop* message_loop_;
// True if the media is a local resource, false if the media require network
« no previous file with comments | « media/filters/dummy_demuxer.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698