Tie multibuffers to URLs

components/html_viewer/media_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/media_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 10 matching lines @@
 #include "media/blink/webmediaplayer_params.h"
 #include "media/cdm/default_cdm_factory.h"
 #include "media/filters/default_media_permission.h"
 #include "media/mojo/interfaces/renderer.mojom.h"
 #include "media/mojo/services/mojo_cdm_factory.h"
 #include "media/mojo/services/mojo_renderer_factory.h"
 #include "media/renderers/default_renderer_factory.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 namespace html_viewer {
 
 namespace {
 
 // Enable mojo media Renderer in media pipeline instead of using the internal
 // media::Renderer implementation.
 // TODO(xhwang): Move this to media_switches.h.
 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
 
@@ skipping 53 matching lines @@
                                           GetAudioHardwareConfig()));
   }
 
   media::WebMediaPlayerParams params(
       media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
       media_log, GetMediaThreadTaskRunner(), GetMediaThreadTaskRunner(),
       compositor_task_runner_, media::WebMediaPlayerParams::Context3DCB(),
       GetMediaPermission(), initial_cdm);
   base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
 
+  if (!resource_multibuffer_.get() ||

[liberato (no reviews please), 2015/11/05 19:03:18]

perhaps this should be protected by kMediaUseMultibuffer also.

+      resource_multibuffer_->frame() != frame) {
+    resource_multibuffer_.reset(new media::ResourceMultiBuffer(frame));
+  }
+
   return new media::WebMediaPlayerImpl(frame, client, encrypted_client,
                                        delegate, media_renderer_factory.Pass(),
-                                       GetCdmFactory(), params);
+                                       GetCdmFactory(), resource_multibuffer_,
+                                       params);
 #endif  // defined(OS_ANDROID)
 }
 
 blink::WebEncryptedMediaClient* MediaFactory::GetEncryptedMediaClient() {
   if (!web_encrypted_media_client_) {
     web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
         base::Bind(&AreSecureCodecsSupported), GetCdmFactory(),
         GetMediaPermission()));
   }
   return web_encrypted_media_client_.get();
@@ skipping 49 matching lines @@
 scoped_refptr<base::SingleThreadTaskRunner>
 MediaFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.task_runner();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace html_viewer