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

Unified Diff: webkit/media/webmediasourceclient_impl.h

Issue 12713004: Add Chromium-side changes for MediaSource::isTypeSupported() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Exclude StreamParserFactory for Android Created 7 years, 9 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: webkit/media/webmediasourceclient_impl.h
diff --git a/webkit/media/webmediasourceclient_impl.h b/webkit/media/webmediasourceclient_impl.h
index 738e78b09a7a033b80dbae5b8050af7bd5c1ebdb..3cdf3dd40da25bf4999926ad8d87ec7572425005 100644
--- a/webkit/media/webmediasourceclient_impl.h
+++ b/webkit/media/webmediasourceclient_impl.h
@@ -5,7 +5,11 @@
#ifndef WEBKIT_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
#define WEBKIT_MEDIA_WEBMEDIASOURCECLIENT_IMPL_H_
+#include <string>
+#include <vector>
+
#include "base/memory/ref_counted.h"
+#include "media/base/media_log.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSourceClient.h"
namespace media {
@@ -17,9 +21,14 @@ namespace webkit_media {
class WebMediaSourceClientImpl : public WebKit::WebMediaSourceClient {
public:
explicit WebMediaSourceClientImpl(
- const scoped_refptr<media::ChunkDemuxer>& demuxer);
+ const scoped_refptr<media::ChunkDemuxer>& demuxer,
+ media::LogCB log_cb);
virtual ~WebMediaSourceClientImpl();
+ static bool isTypeSupported(
+ const std::string& type,
+ const std::vector<std::string>& codecs);
+
// WebKit::WebMediaSourceClient implementation.
virtual AddStatus addSourceBuffer(
const WebKit::WebString& type,
@@ -31,6 +40,7 @@ class WebMediaSourceClientImpl : public WebKit::WebMediaSourceClient {
private:
scoped_refptr<media::ChunkDemuxer> demuxer_;
+ media::LogCB log_cb_;
DISALLOW_COPY_AND_ASSIGN(WebMediaSourceClientImpl);
};

Powered by Google App Engine
This is Rietveld 408576698