media/filters/ffmpeg_video_decoder.h - Issue 159476: Merge 21611 - Implemented proper pausethenseek behaviour for the media pipeli...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/ffmpeg_video_decoder.h

Issue 159476: Merge 21611 - Implemented proper pausethenseek behaviour for the media pipeli... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/

Patch Set: 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

Index: media/filters/ffmpeg_video_decoder.h

===================================================================

--- media/filters/ffmpeg_video_decoder.h (revision 21798)

+++ media/filters/ffmpeg_video_decoder.h (working copy)

@@ -39,13 +39,13 @@

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

Property changes on: media\filters\ffmpeg_video_decoder.h

___________________________________________________________________

Added: svn:mergeinfo

Merged /trunk/src/media/filters/ffmpeg_video_decoder.h:r21611

Merged /branches/chrome_webkit_merge_branch/media/filters/ffmpeg_video_decoder.h:r69-2775

« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »