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

Side by Side Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 11316293: Replace WaitableEvents and ConditionalVariables in VideoRendererBase tests with MessageLoop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bustage Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "media/base/decoder_buffer.h" 13 #include "media/base/decoder_buffer.h"
14 #include "media/base/decrypt_config.h" 14 #include "media/base/decrypt_config.h"
15 #include "media/base/gmock_callback_support.h" 15 #include "media/base/gmock_callback_support.h"
16 #include "media/base/limits.h" 16 #include "media/base/limits.h"
17 #include "media/base/mock_callback.h"
18 #include "media/base/mock_filters.h" 17 #include "media/base/mock_filters.h"
19 #include "media/base/test_data_util.h" 18 #include "media/base/test_data_util.h"
19 #include "media/base/test_helpers.h"
20 #include "media/base/video_decoder.h" 20 #include "media/base/video_decoder.h"
21 #include "media/base/video_frame.h" 21 #include "media/base/video_frame.h"
22 #include "media/base/video_util.h" 22 #include "media/base/video_util.h"
23 #include "media/ffmpeg/ffmpeg_common.h" 23 #include "media/ffmpeg/ffmpeg_common.h"
24 #include "media/filters/ffmpeg_glue.h" 24 #include "media/filters/ffmpeg_glue.h"
25 #include "media/filters/ffmpeg_video_decoder.h" 25 #include "media/filters/ffmpeg_video_decoder.h"
26 #include "testing/gmock/include/gmock/gmock.h" 26 #include "testing/gmock/include/gmock/gmock.h"
27 27
28 using ::testing::_; 28 using ::testing::_;
29 using ::testing::AtMost; 29 using ::testing::AtMost;
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 710
711 // Reset while there is still an outstanding read on the demuxer. 711 // Reset while there is still an outstanding read on the demuxer.
712 Reset(); 712 Reset();
713 713
714 // Signal an aborted demuxer read: a NULL video frame should be returned. 714 // Signal an aborted demuxer read: a NULL video frame should be returned.
715 EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull())); 715 EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));
716 read_cb.Run(DemuxerStream::kAborted, NULL); 716 read_cb.Run(DemuxerStream::kAborted, NULL);
717 } 717 }
718 718
719 } // namespace media 719 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698