diff options
Diffstat (limited to 'chromium/content/renderer/media/android')
3 files changed, 9 insertions, 12 deletions
diff --git a/chromium/content/renderer/media/android/media_player_renderer_client.cc b/chromium/content/renderer/media/android/media_player_renderer_client.cc index fc95fdf46cc..c5675501e37 100644 --- a/chromium/content/renderer/media/android/media_player_renderer_client.cc +++ b/chromium/content/renderer/media/android/media_player_renderer_client.cc @@ -67,12 +67,6 @@ void MediaPlayerRendererClient::Initialize( weak_factory_.GetWeakPtr(), media_resource)); } -void MediaPlayerRendererClient::SetCdm(media::CdmContext* cdm_context, - media::CdmAttachedCB cdm_attached_cb) { - // MediaPlayerRenderer does not support encrypted media. - NOTREACHED(); -} - void MediaPlayerRendererClient::OnStreamTextureWrapperInitialized( media::MediaResource* media_resource, bool success) { diff --git a/chromium/content/renderer/media/android/media_player_renderer_client.h b/chromium/content/renderer/media/android/media_player_renderer_client.h index 19754f24de4..9bc67210d5e 100644 --- a/chromium/content/renderer/media/android/media_player_renderer_client.h +++ b/chromium/content/renderer/media/android/media_player_renderer_client.h @@ -61,8 +61,6 @@ class CONTENT_EXPORT MediaPlayerRendererClient void Initialize(media::MediaResource* media_resource, media::RendererClient* client, media::PipelineStatusCallback init_cb) override; - void SetCdm(media::CdmContext* cdm_context, - media::CdmAttachedCB cdm_attached_cb) override; // media::mojom::MediaPlayerRendererClientExtension implementation void OnDurationChange(base::TimeDelta duration) override; diff --git a/chromium/content/renderer/media/android/stream_texture_wrapper_impl.cc b/chromium/content/renderer/media/android/stream_texture_wrapper_impl.cc index a02c70aac50..35119cfd491 100644 --- a/chromium/content/renderer/media/android/stream_texture_wrapper_impl.cc +++ b/chromium/content/renderer/media/android/stream_texture_wrapper_impl.cc @@ -7,9 +7,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" +#include "base/logging.h" #include "cc/layers/video_frame_provider.h" #include "gpu/GLES2/gl2extchromium.h" #include "gpu/command_buffer/client/shared_image_interface.h" +#include "gpu/command_buffer/common/shared_image_usage.h" #include "media/base/bind_to_current_loop.h" namespace { @@ -62,6 +64,11 @@ void StreamTextureWrapperImpl::CreateVideoFrame( gpu::MailboxHolder holders[media::VideoFrame::kMaxPlanes] = { gpu::MailboxHolder(mailbox, gpu::SyncToken(), GL_TEXTURE_EXTERNAL_OES)}; + gpu::SharedImageInterface* sii = factory_->SharedImageInterface(); + sii->NotifyMailboxAdded(mailbox, gpu::SHARED_IMAGE_USAGE_DISPLAY | + gpu::SHARED_IMAGE_USAGE_GLES2 | + gpu::SHARED_IMAGE_USAGE_RASTER); + // The pixel format doesn't matter here as long as it's valid for texture // frames. But SkiaRenderer wants to ensure that the format of the resource // used here which will eventually create a promise image must match the @@ -78,10 +85,8 @@ void StreamTextureWrapperImpl::CreateVideoFrame( coded_size, visible_rect, visible_rect.size(), base::TimeDelta()); new_frame->set_ycbcr_info(ycbcr_info); - if (enable_texture_copy_) { - new_frame->metadata()->SetBoolean(media::VideoFrameMetadata::COPY_REQUIRED, - true); - } + if (enable_texture_copy_) + new_frame->metadata()->copy_required = true; SetCurrentFrameInternal(new_frame); } |