| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/memory/shared_memory.h" | 9 #include "base/memory/shared_memory.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 public: | 34 public: |
| 35 CmaRendererTest() { | 35 CmaRendererTest() { |
| 36 demuxer_stream_provider_.reset( | 36 demuxer_stream_provider_.reset( |
| 37 new ::media::FakeDemuxerStreamProvider(1, 1, false)); | 37 new ::media::FakeDemuxerStreamProvider(1, 1, false)); |
| 38 null_sink_.reset(new ::media::NullVideoSink( | 38 null_sink_.reset(new ::media::NullVideoSink( |
| 39 false, | 39 false, |
| 40 base::TimeDelta::FromSecondsD(1.0 / 60), | 40 base::TimeDelta::FromSecondsD(1.0 / 60), |
| 41 base::Bind(&MockCB::OnFrameReceived, base::Unretained(&mock_)), | 41 base::Bind(&MockCB::OnFrameReceived, base::Unretained(&mock_)), |
| 42 message_loop_.task_runner())); | 42 message_loop_.task_runner())); |
| 43 | 43 |
| 44 cma_proxy_ = new CmaMessageFilterProxy(message_loop_.message_loop_proxy()); | 44 cma_proxy_ = new CmaMessageFilterProxy(message_loop_.task_runner()); |
| 45 cma_proxy_->OnFilterAdded(&ipc_sink_); | 45 cma_proxy_->OnFilterAdded(&ipc_sink_); |
| 46 | 46 |
| 47 renderer_.reset(new CmaRenderer( | 47 renderer_.reset(new CmaRenderer( |
| 48 scoped_ptr<MediaPipelineProxy>( | 48 scoped_ptr<MediaPipelineProxy>(new MediaPipelineProxy( |
| 49 new MediaPipelineProxy(0, message_loop_.message_loop_proxy(), | 49 0, message_loop_.task_runner(), LoadType::kLoadTypeMediaSource)), |
| 50 LoadType::kLoadTypeMediaSource)), | |
| 51 null_sink_.get())); | 50 null_sink_.get())); |
| 52 } | 51 } |
| 53 | 52 |
| 54 ~CmaRendererTest() override { | 53 ~CmaRendererTest() override { |
| 55 cma_proxy_->OnFilterRemoved(); | 54 cma_proxy_->OnFilterRemoved(); |
| 56 } | 55 } |
| 57 | 56 |
| 58 protected: | 57 protected: |
| 59 base::MessageLoop message_loop_; | 58 base::MessageLoop message_loop_; |
| 60 scoped_ptr<::media::FakeDemuxerStreamProvider> demuxer_stream_provider_; | 59 scoped_ptr<::media::FakeDemuxerStreamProvider> demuxer_stream_provider_; |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 115 |
| 117 EXPECT_CALL(mock_, OnInitialized(::media::PIPELINE_OK)); | 116 EXPECT_CALL(mock_, OnInitialized(::media::PIPELINE_OK)); |
| 118 cma_proxy_->OnMessageReceived( | 117 cma_proxy_->OnMessageReceived( |
| 119 CmaMsg_TrackStateChanged(1, kVideoTrackId, ::media::PIPELINE_OK)); | 118 CmaMsg_TrackStateChanged(1, kVideoTrackId, ::media::PIPELINE_OK)); |
| 120 message_loop_.RunUntilIdle(); | 119 message_loop_.RunUntilIdle(); |
| 121 } | 120 } |
| 122 | 121 |
| 123 | 122 |
| 124 } // namespace media | 123 } // namespace media |
| 125 } // namespace chromecast | 124 } // namespace chromecast |
| OLD | NEW |