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

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 11420070: Remove locking from FFmpegDemuxerStream and associated TODOs from media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 1 month 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_video_decoder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 6dd0c7c9021e97cf5f32b7aedc7c1fcf0e60fea2..73c058a003dbd5a422bf89e83ed62f9d8b3c0a48 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -713,12 +713,9 @@ TEST_F(FFmpegVideoDecoderTest, AbortPendingReadDuringReset) {
// Reset while there is still an outstanding read on the demuxer.
Reset();
- // Signal an aborted demuxer read.
- read_cb.Run(DemuxerStream::kAborted, NULL);
-
- // Make sure we get a NULL video frame returned.
+ // Signal an aborted demuxer read: a NULL video frame should be returned.
EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));
- message_loop_.RunUntilIdle();
+ read_cb.Run(DemuxerStream::kAborted, NULL);
}
} // namespace media
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698