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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 2855373002: Use ffmpeg packet.pos for restarting reading after reenabling video
Patch Set: fixed audio rewinding Created 3 years, 7 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 | « 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 bd223ab9ccb8c5fb115e67bd409bd5d80d1bb65c..3d550ca09fb2886c399996097ec73f77969a6a89 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -271,6 +271,10 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
// FFmpeg callbacks during seeking.
void OnSeekFrameDone(int result);
+ // Called when FFmpeg completes seek initiated in OnSelectedVideoTrackChanged
+ // in order to restart the |stream|.
+ void OnSeekDoneForRestartingStream(FFmpegDemuxerStream* stream, int result);
+
// FFmpeg callbacks during reading + helper method to initiate reads.
void ReadFrameIfNeeded();
void OnReadFrameDone(ScopedAVPacket packet, int result);
@@ -379,6 +383,9 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
std::map<MediaTrack::Id, FFmpegDemuxerStream*> track_id_to_demux_stream_map_;
+ int64_t last_packet_pos_;
+ FFmpegDemuxerStream* restarting_stream_;
+
// NOTE: Weak pointers must be invalidated before all other member variables.
base::WeakPtr<FFmpegDemuxer> weak_this_;
base::WeakPtrFactory<FFmpegDemuxer> cancel_pending_seek_factory_;
« 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