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

Unified Diff: content/renderer/media/rtc_video_decoder.cc

Issue 1960563002: Add media::VideoFrame::WrapNativeTextures() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | media/base/video_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/rtc_video_decoder.cc
diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc
index 123a90ebfb208de73ae3650c43e53658dc9215b6..abbc95ef96b3357f33c8348dbfd5c39ede84729f 100644
--- a/content/renderer/media/rtc_video_decoder.cc
+++ b/content/renderer/media/rtc_video_decoder.cc
@@ -432,13 +432,16 @@ scoped_refptr<media::VideoFrame> RTCVideoDecoder::CreateVideoFrame(
// This prevents the compositor from messing with it, since the underlying
// platform can handle the former format natively. Make sure the
// correct format is used and everyone down the line understands it.
- scoped_refptr<media::VideoFrame> frame = media::VideoFrame::WrapNativeTexture(
- pixel_format, gpu::MailboxHolder(pb.texture_mailbox(0), gpu::SyncToken(),
- decoder_texture_target_),
- media::BindToCurrentLoop(base::Bind(
- &RTCVideoDecoder::ReleaseMailbox, weak_factory_.GetWeakPtr(),
- factories_, picture.picture_buffer_id(), pb.texture_ids()[0])),
- pb.size(), visible_rect, visible_rect.size(), timestamp_ms);
+ gpu::MailboxHolder holders[media::VideoFrame::kMaxPlanes] = {
+ gpu::MailboxHolder(pb.texture_mailbox(0), gpu::SyncToken(),
+ decoder_texture_target_)};
+ scoped_refptr<media::VideoFrame> frame =
+ media::VideoFrame::WrapNativeTextures(
+ pixel_format, holders,
+ media::BindToCurrentLoop(base::Bind(
+ &RTCVideoDecoder::ReleaseMailbox, weak_factory_.GetWeakPtr(),
+ factories_, picture.picture_buffer_id(), pb.texture_ids()[0])),
+ pb.size(), visible_rect, visible_rect.size(), timestamp_ms);
if (frame && picture.allow_overlay()) {
frame->metadata()->SetBoolean(media::VideoFrameMetadata::ALLOW_OVERLAY,
true);
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | media/base/video_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698