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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 10669022: Add status parameter to DemuxerStream::ReadCB (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 717b251fb48faa4a70e93711e9ed17cd05cc3e3a..c314e69c0d590c0df21afe4b75ad710f04c6830e 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -443,7 +443,8 @@ class MockReadCB : public base::RefCountedThreadSafe<MockReadCB> {
MockReadCB() {}
MOCK_METHOD0(OnDelete, void());
- MOCK_METHOD1(Run, void(const scoped_refptr<DecoderBuffer>& buffer));
+ MOCK_METHOD2(Run, void(DemuxerStream::Status status,
+ const scoped_refptr<DecoderBuffer>& buffer));
protected:
virtual ~MockReadCB() {
@@ -478,7 +479,7 @@ TEST_F(FFmpegDemuxerTest, Stop) {
// The callback should be immediately deleted. We'll use a checkpoint to
// verify that it has indeed been deleted.
- EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer()));
+ EXPECT_CALL(*callback, Run(DemuxerStream::kOk, IsEndOfStreamBuffer()));
EXPECT_CALL(*callback, OnDelete());
EXPECT_CALL(*this, CheckPoint(1));
@@ -518,7 +519,7 @@ TEST_F(FFmpegDemuxerTest, StreamReadAfterStopAndDemuxerDestruction) {
// The callback should be immediately deleted. We'll use a checkpoint to
// verify that it has indeed been deleted.
- EXPECT_CALL(*callback, Run(IsEndOfStreamBuffer()));
+ EXPECT_CALL(*callback, Run(DemuxerStream::kOk, IsEndOfStreamBuffer()));
EXPECT_CALL(*callback, OnDelete());
EXPECT_CALL(*this, CheckPoint(1));

Powered by Google App Engine
This is Rietveld 408576698