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

Unified Diff: content/browser/renderer_host/delegated_frame_host.cc

Issue 1893473002: Decouple GLHelper from media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed content_browsertests Created 4 years, 8 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/browser/renderer_host/delegated_frame_host.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/delegated_frame_host.cc
diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
index 266d8219457f5fa22e3ee4bb3a2efb96ed923b98..cef537d39b0e64fd7b7137667b296338eaa1b043 100644
--- a/content/browser/renderer_host/delegated_frame_host.cc
+++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -584,6 +584,7 @@ void DelegatedFrameHost::ReturnSubscriberTexture(
// static
void DelegatedFrameHost::CopyFromCompositingSurfaceFinishedForVideo(
+ scoped_refptr<media::VideoFrame> video_frame,
base::WeakPtr<DelegatedFrameHost> dfh,
const base::Callback<void(bool)>& callback,
scoped_refptr<OwnedMailbox> subscriber_texture,
@@ -711,11 +712,19 @@ void DelegatedFrameHost::CopyFromCompositingSurfaceHasResultForVideo(
base::Callback<void(bool result)> finished_callback = base::Bind(
&DelegatedFrameHost::CopyFromCompositingSurfaceFinishedForVideo,
- dfh->AsWeakPtr(), base::Bind(callback, region_in_frame),
+ video_frame, dfh->AsWeakPtr(), base::Bind(callback, region_in_frame),
subscriber_texture, base::Passed(&release_callback));
yuv_readback_pipeline->ReadbackYUV(
texture_mailbox.mailbox(), texture_mailbox.sync_token(),
- video_frame.get(), region_in_frame.origin(), finished_callback);
+ video_frame->visible_rect(),
+ video_frame->stride(media::VideoFrame::kYPlane),
+ video_frame->data(media::VideoFrame::kYPlane),
+ video_frame->stride(media::VideoFrame::kUPlane),
+ video_frame->data(media::VideoFrame::kUPlane),
+ video_frame->stride(media::VideoFrame::kVPlane),
+ video_frame->data(media::VideoFrame::kVPlane), region_in_frame.origin(),
+ finished_callback);
+ media::LetterboxYUV(video_frame.get(), region_in_frame);
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « content/browser/renderer_host/delegated_frame_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698