OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 8 #include "base/callback.h" |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "base/threading/simple_thread.h" | 10 #include "base/threading/simple_thread.h" |
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 // we cannot fully initialize the pipeline. | 374 // we cannot fully initialize the pipeline. |
375 EXPECT_CALL(*mocks_->demuxer(), Stop(_)) | 375 EXPECT_CALL(*mocks_->demuxer(), Stop(_)) |
376 .WillOnce(Invoke(&RunStopFilterCallback)); | 376 .WillOnce(Invoke(&RunStopFilterCallback)); |
377 // TODO(acolwell,fischman): see TODO in URLNotFound above. | 377 // TODO(acolwell,fischman): see TODO in URLNotFound above. |
378 EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_COULD_NOT_RENDER)); | 378 EXPECT_CALL(callbacks_, OnError(PIPELINE_ERROR_COULD_NOT_RENDER)); |
379 | 379 |
380 InitializePipeline(PIPELINE_OK, PIPELINE_ERROR_COULD_NOT_RENDER); | 380 InitializePipeline(PIPELINE_OK, PIPELINE_ERROR_COULD_NOT_RENDER); |
381 EXPECT_FALSE(pipeline_->IsInitialized()); | 381 EXPECT_FALSE(pipeline_->IsInitialized()); |
382 } | 382 } |
383 | 383 |
384 TEST_F(PipelineImplTest, AudioStream) { | 384 #if defined(OS_MACOSX) |
| 385 // Crashes on OS X - http://crbug.com/105234 |
| 386 #define MAYBE_AudioStream DISABLED_AudioStream |
| 387 #else |
| 388 #define MAYBE_AudioStream AudioStream |
| 389 #endif |
| 390 TEST_F(PipelineImplTest, MAYBE_AudioStream) { |
385 CreateAudioStream(); | 391 CreateAudioStream(); |
386 MockDemuxerStreamVector streams; | 392 MockDemuxerStreamVector streams; |
387 streams.push_back(audio_stream()); | 393 streams.push_back(audio_stream()); |
388 | 394 |
389 InitializeDemuxer(&streams, base::TimeDelta()); | 395 InitializeDemuxer(&streams, base::TimeDelta()); |
390 InitializeAudioDecoder(audio_stream()); | 396 InitializeAudioDecoder(audio_stream()); |
391 InitializeAudioRenderer(); | 397 InitializeAudioRenderer(); |
392 | 398 |
393 InitializePipeline(PIPELINE_OK); | 399 InitializePipeline(PIPELINE_OK); |
394 EXPECT_TRUE(pipeline_->IsInitialized()); | 400 EXPECT_TRUE(pipeline_->IsInitialized()); |
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
917 TestPipelineStatusNotification(0); | 923 TestPipelineStatusNotification(0); |
918 } | 924 } |
919 | 925 |
920 // Test that different-thread, some-delay callback (the expected common case) | 926 // Test that different-thread, some-delay callback (the expected common case) |
921 // works correctly. | 927 // works correctly. |
922 TEST(PipelineStatusNotificationTest, DelayedCallback) { | 928 TEST(PipelineStatusNotificationTest, DelayedCallback) { |
923 TestPipelineStatusNotification(20); | 929 TestPipelineStatusNotification(20); |
924 } | 930 } |
925 | 931 |
926 } // namespace media | 932 } // namespace media |
OLD | NEW |