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

Unified Diff: content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

Issue 2758413002: cc/paint: Remove PaintCanvas::peekPixels. (Closed)
Patch Set: update Created 3 years, 9 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/media/webrtc/webrtc_video_capturer_adapter.cc
diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
index 77b5241932992dc95f38143209e770ce3ec27087..edde298a76c4b9e32b2a8e21e82de1fa257038ee 100644
--- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc
@@ -101,27 +101,30 @@ class WebRtcVideoCapturerAdapter::TextureFrameCopier
frame->format() == media::PIXEL_FORMAT_UYVY ||
frame->format() == media::PIXEL_FORMAT_NV12);
ScopedWaitableEvent event(waiter);
- sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRasterN32Premul(
- frame->visible_rect().width(), frame->visible_rect().height());
- if (!surface || !provider_) {
+ if (!provider_) {
// Return a black frame (yuv = {0, 0x80, 0x80}).
*new_frame = media::VideoFrame::CreateColorFrame(
frame->visible_rect().size(), 0u, 0x80, 0x80, frame->timestamp());
return;
}
+ SkBitmap bitmap;
+ bitmap.allocPixels(SkImageInfo::MakeN32Premul(
+ frame->visible_rect().width(), frame->visible_rect().height()));
+ cc::SkiaPaintCanvas paint_canvas(bitmap);
+
*new_frame = media::VideoFrame::CreateFrame(
media::PIXEL_FORMAT_I420, frame->coded_size(), frame->visible_rect(),
frame->natural_size(), frame->timestamp());
DCHECK(provider_->ContextGL());
canvas_video_renderer_->Copy(
- frame.get(), surface->getCanvas(),
+ frame.get(), &paint_canvas,
media::Context3D(provider_->ContextGL(), provider_->GrContext()));
SkPixmap pixmap;
- const bool result = surface->getCanvas()->peekPixels(&pixmap);
- DCHECK(result) << "Error trying to access PaintSurface's pixels";
+ const bool result = bitmap.peekPixels(&pixmap);
+ DCHECK(result) << "Error trying to access SkBitmap's pixels";
const uint32 source_pixel_format =
(kN32_SkColorType == kRGBA_8888_SkColorType) ? cricket::FOURCC_ABGR
: cricket::FOURCC_ARGB;

Powered by Google App Engine
This is Rietveld 408576698