OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <deque> | 5 #include <deque> |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/singleton.h" | 8 #include "base/singleton.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "media/base/data_buffer.h" | 10 #include "media/base/data_buffer.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 stream_.r_frame_rate.num = 1; | 153 stream_.r_frame_rate.num = 1; |
154 stream_.r_frame_rate.den = 1; | 154 stream_.r_frame_rate.den = 1; |
155 buffer_ = new DataBuffer(1); | 155 buffer_ = new DataBuffer(1); |
156 end_of_stream_buffer_ = new DataBuffer(0); | 156 end_of_stream_buffer_ = new DataBuffer(0); |
157 | 157 |
158 // Initialize MockFFmpeg. | 158 // Initialize MockFFmpeg. |
159 MockFFmpeg::set(&mock_ffmpeg_); | 159 MockFFmpeg::set(&mock_ffmpeg_); |
160 } | 160 } |
161 | 161 |
162 virtual ~FFmpegVideoDecoderTest() { | 162 virtual ~FFmpegVideoDecoderTest() { |
| 163 // We had to set this because not all tests had initialized the engine. |
| 164 engine_->event_handler_ = decoder_.get(); |
163 EXPECT_CALL(callback_, OnFilterCallback()); | 165 EXPECT_CALL(callback_, OnFilterCallback()); |
164 EXPECT_CALL(callback_, OnCallbackDestroyed()); | 166 EXPECT_CALL(callback_, OnCallbackDestroyed()); |
165 | 167 EXPECT_CALL(*engine_, Uninitialize()) |
166 // The presence of an event handler means we need to uninitialize. | 168 .WillOnce(EngineUninitialize(engine_)); |
167 if (engine_->event_handler_) { | |
168 EXPECT_CALL(*engine_, Uninitialize()) | |
169 .WillOnce(EngineUninitialize(engine_)); | |
170 } | |
171 | |
172 decoder_->Stop(callback_.NewCallback()); | 169 decoder_->Stop(callback_.NewCallback()); |
173 | 170 |
174 // Finish up any remaining tasks. | 171 // Finish up any remaining tasks. |
175 message_loop_.RunAllPending(); | 172 message_loop_.RunAllPending(); |
176 | 173 |
177 // Reset MockFFmpeg. | 174 // Reset MockFFmpeg. |
178 MockFFmpeg::set(NULL); | 175 MockFFmpeg::set(NULL); |
179 } | 176 } |
180 | 177 |
181 void InitializeDecoderSuccessfully() { | 178 void InitializeDecoderSuccessfully() { |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
507 EXPECT_CALL(seek_done_cb, OnCallbackDestroyed()); | 504 EXPECT_CALL(seek_done_cb, OnCallbackDestroyed()); |
508 decoder_->Seek(kZero, seek_done_cb.NewCallback()); | 505 decoder_->Seek(kZero, seek_done_cb.NewCallback()); |
509 | 506 |
510 | 507 |
511 EXPECT_TRUE(decoder_->pts_heap_.IsEmpty()); | 508 EXPECT_TRUE(decoder_->pts_heap_.IsEmpty()); |
512 EXPECT_EQ(FFmpegVideoDecoder::kNormal, decoder_->state_); | 509 EXPECT_EQ(FFmpegVideoDecoder::kNormal, decoder_->state_); |
513 } | 510 } |
514 } | 511 } |
515 | 512 |
516 } // namespace media | 513 } // namespace media |
OLD | NEW |