OLD | NEW |
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 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/memory/singleton.h" |
9 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
10 #include "base/memory/singleton.h" | 11 #include "base/strings/string_util.h" |
11 #include "base/string_util.h" | |
12 #include "media/base/decoder_buffer.h" | 12 #include "media/base/decoder_buffer.h" |
13 #include "media/base/gmock_callback_support.h" | 13 #include "media/base/gmock_callback_support.h" |
14 #include "media/base/limits.h" | 14 #include "media/base/limits.h" |
15 #include "media/base/mock_filters.h" | 15 #include "media/base/mock_filters.h" |
16 #include "media/base/test_data_util.h" | 16 #include "media/base/test_data_util.h" |
17 #include "media/base/test_helpers.h" | 17 #include "media/base/test_helpers.h" |
18 #include "media/base/video_decoder.h" | 18 #include "media/base/video_decoder.h" |
19 #include "media/base/video_frame.h" | 19 #include "media/base/video_frame.h" |
20 #include "media/base/video_util.h" | 20 #include "media/base/video_util.h" |
21 #include "media/ffmpeg/ffmpeg_common.h" | 21 #include "media/ffmpeg/ffmpeg_common.h" |
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 // Reset while there is still an outstanding read on the demuxer. | 540 // Reset while there is still an outstanding read on the demuxer. |
541 Reset(); | 541 Reset(); |
542 | 542 |
543 // Signal an aborted demuxer read: a NULL video frame should be returned. | 543 // Signal an aborted demuxer read: a NULL video frame should be returned. |
544 EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull())); | 544 EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull())); |
545 read_cb.Run(DemuxerStream::kAborted, NULL); | 545 read_cb.Run(DemuxerStream::kAborted, NULL); |
546 message_loop_.RunUntilIdle(); | 546 message_loop_.RunUntilIdle(); |
547 } | 547 } |
548 | 548 |
549 } // namespace media | 549 } // namespace media |
OLD | NEW |