Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Side by Side Diff: media/mojo/services/default_mojo_media_client.cc

Issue 1525863002: Remove renderer_service -> media_client dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/mojo/services/mojo_media_client.h" 5 #include "media/mojo/services/mojo_media_client.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "media/audio/audio_manager_base.h" 8 #include "media/audio/audio_manager_base.h"
9 #include "media/audio/audio_output_stream_sink.h" 9 #include "media/audio/audio_output_stream_sink.h"
10 #include "media/audio/fake_audio_log_factory.h" 10 #include "media/audio/fake_audio_log_factory.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 return new AudioOutputStreamSink(); 48 return new AudioOutputStreamSink();
49 } 49 }
50 50
51 scoped_ptr<VideoRendererSink> CreateVideoRendererSink( 51 scoped_ptr<VideoRendererSink> CreateVideoRendererSink(
52 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) override { 52 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) override {
53 return make_scoped_ptr( 53 return make_scoped_ptr(
54 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), 54 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60),
55 NullVideoSink::NewFrameCB(), task_runner)); 55 NullVideoSink::NewFrameCB(), task_runner));
56 } 56 }
57 57
58 const AudioHardwareConfig* GetAudioHardwareConfig() override {
59 return audio_hardware_config_.get();
60 }
61
62 scoped_ptr<CdmFactory> CreateCdmFactory( 58 scoped_ptr<CdmFactory> CreateCdmFactory(
63 mojo::ServiceProvider* /* service_provider */) override { 59 mojo::ServiceProvider* /* service_provider */) override {
64 return make_scoped_ptr(new DefaultCdmFactory()); 60 return make_scoped_ptr(new DefaultCdmFactory());
65 } 61 }
66 62
67 private: 63 private:
68 FakeAudioLogFactory fake_audio_log_factory_; 64 FakeAudioLogFactory fake_audio_log_factory_;
69 scoped_ptr<AudioHardwareConfig> audio_hardware_config_; 65 scoped_ptr<AudioHardwareConfig> audio_hardware_config_;
xhwang 2015/12/15 21:51:41 remove?
alokp 2015/12/15 22:41:04 Done.
alokp 2015/12/15 22:48:17 Actually this is needed to create DefaultRendererF
70 66
71 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); 67 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient);
72 }; 68 };
73 69
74 scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient() { 70 scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient() {
75 return make_scoped_ptr(new DefaultMojoMediaClient()); 71 return make_scoped_ptr(new DefaultMojoMediaClient());
76 } 72 }
77 73
78 } // namespace internal 74 } // namespace internal
79 } // namespace media 75 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698