Chromium Code Reviews| Index: chromecast/media/cma/filters/cma_renderer.cc |
| diff --git a/chromecast/media/cma/filters/cma_renderer.cc b/chromecast/media/cma/filters/cma_renderer.cc |
| index 1d9dadd6a8da872458dbc8004bb547e9d8c0b9af..dd96f15942a62b01f257516a502992a3429124dd 100644 |
| --- a/chromecast/media/cma/filters/cma_renderer.cc |
| +++ b/chromecast/media/cma/filters/cma_renderer.cc |
| @@ -13,12 +13,12 @@ |
| #include "chromecast/media/cma/base/cma_logging.h" |
| #include "chromecast/media/cma/filters/demuxer_stream_adapter.h" |
| #include "chromecast/media/cma/filters/hole_frame_factory.h" |
| -#include "chromecast/media/cma/pipeline/audio_pipeline.h" |
| #include "chromecast/media/cma/pipeline/av_pipeline_client.h" |
| -#include "chromecast/media/cma/pipeline/media_pipeline.h" |
| #include "chromecast/media/cma/pipeline/media_pipeline_client.h" |
| -#include "chromecast/media/cma/pipeline/video_pipeline.h" |
| #include "chromecast/media/cma/pipeline/video_pipeline_client.h" |
| +#include "chromecast/renderer/media/audio_pipeline_proxy.h" |
|
gunsch
2015/10/12 16:05:12
no no no no no
|
| +#include "chromecast/renderer/media/media_pipeline_proxy.h" |
| +#include "chromecast/renderer/media/video_pipeline_proxy.h" |
| #include "media/base/bind_to_current_loop.h" |
| #include "media/base/demuxer_stream_provider.h" |
| #include "media/base/pipeline_status.h" |
| @@ -42,7 +42,7 @@ void MediaPipelineClientDummyCallback() {} |
| } // namespace |
| CmaRenderer::CmaRenderer( |
| - scoped_ptr<MediaPipeline> media_pipeline, |
| + scoped_ptr<MediaPipelineProxy> media_pipeline, |
| ::media::VideoRendererSink* video_renderer_sink, |
| const scoped_refptr<::media::GpuVideoAcceleratorFactories>& gpu_factories) |
| : media_task_runner_factory_( |