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

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

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 months 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/mojo_renderer_service.cc ('k') | media/mojo/services/renderer_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/renderer_config.h
diff --git a/media/mojo/services/renderer_config.h b/media/mojo/services/renderer_config.h
index 4a531d59eb2dd40eec8234afd4f20b60c78c44e6..08b7e0bbc84fcf70deb15285151c1f592d7b6eec 100644
--- a/media/mojo/services/renderer_config.h
+++ b/media/mojo/services/renderer_config.h
@@ -13,7 +13,6 @@
#include "media/base/audio_renderer_sink.h"
#include "media/base/media_log.h"
#include "media/base/video_decoder.h"
-#include "media/base/video_renderer_sink.h"
namespace media {
@@ -35,13 +34,13 @@ class PlatformRendererConfig {
const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
const LogCB& media_log_cb) = 0;
- // The output sink used for rendering audio or video respectively.
+ // The audio output sink used for rendering audio.
virtual scoped_refptr<AudioRendererSink> GetAudioRendererSink() = 0;
- virtual scoped_ptr<VideoRendererSink> GetVideoRendererSink() = 0;
// The platform's audio hardware configuration. Note, this must remain
// constant for the lifetime of the PlatformRendererConfig.
virtual const AudioHardwareConfig& GetAudioHardwareConfig() = 0;
+
};
class RendererConfig {
@@ -58,7 +57,6 @@ class RendererConfig {
const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
const LogCB& media_log_cb);
scoped_refptr<AudioRendererSink> GetAudioRendererSink();
- scoped_ptr<VideoRendererSink> GetVideoRendererSink();
const AudioHardwareConfig& GetAudioHardwareConfig();
private:
« no previous file with comments | « media/mojo/services/mojo_renderer_service.cc ('k') | media/mojo/services/renderer_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698