| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 | 553 |
| 554 TEST_F(VideoRendererImplTest, ReinitializeForAnotherStream) { | 554 TEST_F(VideoRendererImplTest, ReinitializeForAnotherStream) { |
| 555 Initialize(); | 555 Initialize(); |
| 556 StartPlayingFrom(0); | 556 StartPlayingFrom(0); |
| 557 Flush(); | 557 Flush(); |
| 558 NiceMock<MockDemuxerStream> new_stream(DemuxerStream::VIDEO); | 558 NiceMock<MockDemuxerStream> new_stream(DemuxerStream::VIDEO); |
| 559 new_stream.set_video_decoder_config(TestVideoConfig::Normal()); | 559 new_stream.set_video_decoder_config(TestVideoConfig::Normal()); |
| 560 InitializeRenderer(&new_stream, false, true); | 560 InitializeRenderer(&new_stream, false, true); |
| 561 } | 561 } |
| 562 | 562 |
| 563 // crbug.com/697171. | 563 // crbug.com/711318. |
| 564 #if defined(MEMORY_SANITIZER) | 564 #if defined(MEMORY_SANITIZER) |
| 565 #define MAYBE_DestroyWhileInitializing DISABLED_DestroyWhileInitializing | 565 #define MAYBE_DestroyWhileInitializing DISABLED_DestroyWhileInitializing |
| 566 #else | 566 #else |
| 567 #define MAYBE_DestroyWhileInitializing DestroyWhileInitializing | 567 #define MAYBE_DestroyWhileInitializing DestroyWhileInitializing |
| 568 #endif | 568 #endif |
| 569 TEST_F(VideoRendererImplTest, MAYBE_DestroyWhileInitializing) { | 569 TEST_F(VideoRendererImplTest, MAYBE_DestroyWhileInitializing) { |
| 570 CallInitialize(&demuxer_stream_, NewExpectedStatusCB(PIPELINE_ERROR_ABORT), | 570 CallInitialize(&demuxer_stream_, NewExpectedStatusCB(PIPELINE_ERROR_ABORT), |
| 571 false, PIPELINE_OK); | 571 false, PIPELINE_OK); |
| 572 Destroy(); | 572 Destroy(); |
| 573 } | 573 } |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1216 QueueFrames("0 10 20 30"); | 1216 QueueFrames("0 10 20 30"); |
| 1217 StartPlayingFrom(0); | 1217 StartPlayingFrom(0); |
| 1218 Flush(); | 1218 Flush(); |
| 1219 ASSERT_EQ(1u, frame_ready_cbs_.size()); | 1219 ASSERT_EQ(1u, frame_ready_cbs_.size()); |
| 1220 // This frame will be discarded. | 1220 // This frame will be discarded. |
| 1221 frame_ready_cbs_.front().Run(); | 1221 frame_ready_cbs_.front().Run(); |
| 1222 Destroy(); | 1222 Destroy(); |
| 1223 } | 1223 } |
| 1224 | 1224 |
| 1225 } // namespace media | 1225 } // namespace media |
| OLD | NEW |