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

Unified Diff: media/filters/ffmpeg_video_decoder.h

Issue 160005: Implemented proper pause-then-seek behaviour for the media pipeline. (Closed)
Patch Set: yay 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/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index 7905e4476b51b79d54baf5c2a9fedc6712dc3977..c017d5a7e79d546902ffb40f8f20959cc21f3895 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -39,13 +39,13 @@ class FFmpegVideoDecoder : public DecoderBase<VideoDecoder, VideoFrame> {
friend class FFmpegVideoDecoderTest;
FRIEND_TEST(FFmpegVideoDecoderTest, DecodeFrame_0ByteFrame);
FRIEND_TEST(FFmpegVideoDecoderTest, DecodeFrame_DecodeError);
- FRIEND_TEST(FFmpegVideoDecoderTest, DecodeFrame_DiscontinuousBuffer);
FRIEND_TEST(FFmpegVideoDecoderTest, DecodeFrame_Normal);
FRIEND_TEST(FFmpegVideoDecoderTest, FindPtsAndDuration);
FRIEND_TEST(FFmpegVideoDecoderTest, GetSurfaceFormat);
FRIEND_TEST(FFmpegVideoDecoderTest, OnDecode_EnqueueVideoFrameError);
FRIEND_TEST(FFmpegVideoDecoderTest, OnDecode_FinishEnqueuesEmptyFrames);
FRIEND_TEST(FFmpegVideoDecoderTest, OnDecode_TestStateTransition);
+ FRIEND_TEST(FFmpegVideoDecoderTest, OnSeek);
FRIEND_TEST(FFmpegVideoDecoderTest, TimeQueue_Ordering);
// FFmpeg outputs packets in decode timestamp (dts) order, which may not
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698