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

Unified Diff: chromecast/renderer/media/media_pipeline_proxy.h

Issue 1372393007: [Chromecast] Upgrade to new CMA backend API (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Fix end_to_end test + address slan comments Created 5 years, 2 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
Index: chromecast/renderer/media/media_pipeline_proxy.h
diff --git a/chromecast/renderer/media/media_pipeline_proxy.h b/chromecast/renderer/media/media_pipeline_proxy.h
index 1e8e9e6b7abdb3db9f667b0c948adf6dcdb1e8ad..b2ba79203abf3db875f77e489dd682f9c3802583 100644
--- a/chromecast/renderer/media/media_pipeline_proxy.h
+++ b/chromecast/renderer/media/media_pipeline_proxy.h
@@ -11,8 +11,8 @@
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "chromecast/media/cma/pipeline/load_type.h"
-#include "chromecast/media/cma/pipeline/media_pipeline.h"
#include "chromecast/media/cma/pipeline/media_pipeline_client.h"
+#include "chromecast/renderer/media/renderer_media_pipeline.h"
#include "media/base/serial_runner.h"
namespace base {
@@ -26,14 +26,14 @@ class MediaChannelProxy;
class MediaPipelineProxyInternal;
class VideoPipelineProxy;
-class MediaPipelineProxy : public MediaPipeline {
+class MediaPipelineProxy : public RendererMediaPipeline {
public:
MediaPipelineProxy(int render_frame_id,
scoped_refptr<base::SingleThreadTaskRunner> task_runner,
LoadType load_type);
~MediaPipelineProxy() override;
- // MediaPipeline implementation.
+ // RendererMediaPipeline implementation.
void SetClient(const MediaPipelineClient& client) override;
void SetCdm(int cdm_id) override;
AudioPipeline* GetAudioPipeline() const override;

Powered by Google App Engine
This is Rietveld 408576698