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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1399603003: Tie multibuffers to URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_cache
Patch Set: added MEDIA_BLINK_EXPORT 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: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index ef6836878cde2d22259a94bbac3604c0d3f8b66b..18dc0675158681b0282c9b55128831b13dc4c55d 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -113,6 +113,7 @@
#include "gin/modules/module_registry.h"
#include "media/base/audio_renderer_mixer_input.h"
#include "media/base/media_log.h"
+#include "media/blink/resource_multibuffer.h"
#include "media/blink/webencryptedmediaclient_impl.h"
#include "media/blink/webmediaplayer_impl.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
@@ -719,6 +720,7 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
#if defined(ENABLE_BROWSER_CDMS)
cdm_manager_(NULL),
#endif
+ resource_multibuffer_(NULL),
#if defined(VIDEO_HOLE)
contains_media_player_(false),
#endif
@@ -2124,9 +2126,15 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
}
#endif // defined(ENABLE_MOJO_MEDIA)
+ if (!resource_multibuffer_.get() ||
liberato (no reviews please) 2015/11/05 19:03:18 kMediaUseMultibuffer?
+ resource_multibuffer_->frame() != frame) {
+ resource_multibuffer_.reset(new media::ResourceMultiBuffer(frame));
+ }
+
return new media::WebMediaPlayerImpl(
frame, client, encrypted_client, weak_factory_.GetWeakPtr(),
- media_renderer_factory.Pass(), GetCdmFactory(), params);
+ media_renderer_factory.Pass(), GetCdmFactory(), resource_multibuffer_,
+ params);
#endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
}

Powered by Google App Engine
This is Rietveld 408576698