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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 11411332: Replace trampolining in FFmpegDemuxer with explicit thread calling convention checks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | « no previous file | media/filters/ffmpeg_demuxer.cc » ('j') | media/filters/ffmpeg_demuxer.cc » ('J')
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 889cc3b0dbb230875a52dfeb586a89dbee8c2a63..34ddbffb259b2cf3e98dbd01b2beb537a18b73c7 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -154,26 +154,20 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
virtual ~FFmpegDemuxer();
- // Carries out initialization on the demuxer thread.
- void InitializeTask(DemuxerHost* host, const PipelineStatusCB& status_cb);
+ // FFmpeg callbacks during initialization.
void OnOpenContextDone(const PipelineStatusCB& status_cb, bool result);
void OnFindStreamInfoDone(const PipelineStatusCB& status_cb, int result);
- // Carries out a seek on the demuxer thread.
- void SeekTask(base::TimeDelta time, const PipelineStatusCB& cb);
+ // FFmpeg callbacks during seeking.
void OnSeekFrameDone(const PipelineStatusCB& cb, int result);
- // Carries out demuxing and satisfying stream reads on the demuxer thread.
- void DemuxTask();
+ // FFmpeg callbacks during reading + helper method to initiate reads.
+ void ReadFrameIfNeeded();
void OnReadFrameDone(ScopedAVPacket packet, int result);
- // Carries out stopping the demuxer streams on the demuxer thread.
- void StopTask(const base::Closure& callback);
+ // DataSource callbacks during stopping.
void OnDataSourceStopped(const base::Closure& callback);
- // Carries out disabling the audio stream on the demuxer thread.
- void DisableAudioStreamTask();
-
// Returns true iff any stream has additional capacity. Note that streams can
// go over capacity depending on how the file is muxed.
bool StreamsHaveAvailableCapacity();
« no previous file with comments | « no previous file | media/filters/ffmpeg_demuxer.cc » ('j') | media/filters/ffmpeg_demuxer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698