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

Unified Diff: media/mojo/services/mojo_media_client.h

Issue 1525863002: Remove renderer_service -> media_client dependency. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed compile error 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/default_mojo_media_client.cc ('k') | media/mojo/services/mojo_media_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_media_client.h
diff --git a/media/mojo/services/mojo_media_client.h b/media/mojo/services/mojo_media_client.h
index 88acb3061d653e228d6f99cdbb96732f099187aa..323d748593e68e07670f4fa3b58d542670dd1208 100644
--- a/media/mojo/services/mojo_media_client.h
+++ b/media/mojo/services/mojo_media_client.h
@@ -8,13 +8,10 @@
#include "base/lazy_instance.h"
#include "base/memory/scoped_vector.h"
#include "base/single_thread_task_runner.h"
-#include "media/base/audio_decoder.h"
-#include "media/base/audio_hardware_config.h"
#include "media/base/audio_renderer_sink.h"
#include "media/base/cdm_factory.h"
#include "media/base/media_log.h"
#include "media/base/renderer_factory.h"
-#include "media/base/video_decoder.h"
#include "media/base/video_renderer_sink.h"
namespace mojo {
@@ -34,28 +31,11 @@ class PlatformMojoMediaClient {
// CreateAudioDecoders() and CreateVideoDecoders().
virtual scoped_ptr<RendererFactory> CreateRendererFactory(
const scoped_refptr<MediaLog>& media_log);
-
- // The list of audio or video decoders for use with RendererImpl when
- // CreateRendererFactory() returns null. Ownership of the decoders is passed
- // to the caller. The methods on each decoder will only be called on
- // |media_task_runner|. |media_log| should be used to log errors or important
- // status information.
- virtual ScopedVector<AudioDecoder> CreateAudioDecoders(
- const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
- const scoped_refptr<MediaLog>& media_log);
- virtual ScopedVector<VideoDecoder> CreateVideoDecoders(
- const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
- const scoped_refptr<MediaLog>& media_log);
-
// The output sink used for rendering audio or video respectively.
virtual scoped_refptr<AudioRendererSink> CreateAudioRendererSink();
virtual scoped_ptr<VideoRendererSink> CreateVideoRendererSink(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
- // The platform's audio hardware configuration. Note, this must remain
- // constant for the lifetime of the PlatformMojoMediaClient.
- virtual const AudioHardwareConfig* GetAudioHardwareConfig();
-
// Returns the CdmFactory to be used by MojoCdmService.
virtual scoped_ptr<CdmFactory> CreateCdmFactory(
mojo::ServiceProvider* service_provider);
@@ -70,16 +50,9 @@ class MojoMediaClient {
// Copy of the PlatformMojoMediaClient interface.
scoped_ptr<RendererFactory> CreateRendererFactory(
const scoped_refptr<MediaLog>& media_log);
- ScopedVector<AudioDecoder> CreateAudioDecoders(
- const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
- const scoped_refptr<MediaLog>& media_log);
- ScopedVector<VideoDecoder> CreateVideoDecoders(
- const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
- const scoped_refptr<MediaLog>& media_log);
scoped_refptr<AudioRendererSink> CreateAudioRendererSink();
scoped_ptr<VideoRendererSink> CreateVideoRendererSink(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
- const AudioHardwareConfig* GetAudioHardwareConfig();
scoped_ptr<CdmFactory> CreateCdmFactory(
mojo::ServiceProvider* service_provider);
« no previous file with comments | « media/mojo/services/default_mojo_media_client.cc ('k') | media/mojo/services/mojo_media_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698