From 5f811a2dee281e17592fe48973e96451fbccb479 Mon Sep 17 00:00:00 2001
From: "acolwell@chromium.org"
 <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 15 Mar 2013 23:54:51 +0000
Subject: Add Chromium-side changes for MediaSource::isTypeSupported()

BUG=172687
TEST=Existing tests pass & will be tested by a LayoutTest when the WebKit side lands.


Review URL: https://chromiumcodereview.appspot.com/12713004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188512 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/media/webmediaplayer_impl.cc       | 3 ++-
 webkit/media/webmediasourceclient_impl.cc | 7 ++++---
 webkit/media/webmediasourceclient_impl.h  | 8 +++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'webkit/media')

diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index f4e3456..87d907a 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -975,7 +975,8 @@ void WebMediaPlayerImpl::OnPipelineBufferingState(
 void WebMediaPlayerImpl::OnDemuxerOpened(
     scoped_ptr<WebKit::WebMediaSource> media_source) {
   DCHECK(main_loop_->BelongsToCurrentThread());
-  media_source->open(new WebMediaSourceClientImpl(chunk_demuxer_));
+  media_source->open(new WebMediaSourceClientImpl(
+      chunk_demuxer_, base::Bind(&LogMediaSourceError, media_log_)));
 }
 
 void WebMediaPlayerImpl::OnKeyAdded(const std::string& key_system,
diff --git a/webkit/media/webmediasourceclient_impl.cc b/webkit/media/webmediasourceclient_impl.cc
index 2f84c0f..ff6a621 100644
--- a/webkit/media/webmediasourceclient_impl.cc
+++ b/webkit/media/webmediasourceclient_impl.cc
@@ -85,8 +85,10 @@ void WebSourceBufferImpl::removedFromMediaSource() {
 }
 
 WebMediaSourceClientImpl::WebMediaSourceClientImpl(
-    const scoped_refptr<media::ChunkDemuxer>& demuxer)
-    : demuxer_(demuxer) {
+    const scoped_refptr<media::ChunkDemuxer>& demuxer,
+    media::LogCB log_cb)
+    : demuxer_(demuxer),
+      log_cb_(log_cb) {
   DCHECK(demuxer_);
 }
 
@@ -100,7 +102,6 @@ WebMediaSourceClient::AddStatus WebMediaSourceClientImpl::addSourceBuffer(
   std::vector<std::string> new_codecs(codecs.size());
   for (size_t i = 0; i < codecs.size(); ++i)
     new_codecs[i] = codecs[i].utf8().data();
-
   WebMediaSourceClient::AddStatus result =
       static_cast<WebMediaSourceClient::AddStatus>(
           demuxer_->AddId(id, type.utf8().data(), new_codecs));
diff --git a/webkit/media/webmediasourceclient_impl.h b/webkit/media/webmediasourceclient_impl.h
index 738e78b..1aa0f6e 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,7 +21,8 @@ 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();
 
   // WebKit::WebMediaSourceClient implementation.
@@ -31,6 +36,7 @@ class WebMediaSourceClientImpl : public WebKit::WebMediaSourceClient {
 
  private:
   scoped_refptr<media::ChunkDemuxer> demuxer_;
+  media::LogCB log_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaSourceClientImpl);
 };
-- 
cgit v1.1