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

Unified Diff: webrtc/media/devices/carbonvideorenderer.cc

Issue 2287233002: Delete cricket::VideoFrame::ConvertToRgbBuffer. (Closed)
Patch Set: Convert non-linux renderers. Created 4 years, 4 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: webrtc/media/devices/carbonvideorenderer.cc
diff --git a/webrtc/media/devices/carbonvideorenderer.cc b/webrtc/media/devices/carbonvideorenderer.cc
index a1ff6306201c6b7435837450e332d17dac95468f..a3c5390d970c922614f65a47d40313fdf5eed22b 100644
--- a/webrtc/media/devices/carbonvideorenderer.cc
+++ b/webrtc/media/devices/carbonvideorenderer.cc
@@ -114,11 +114,14 @@ void CarbonVideoRenderer::OnFrame(const VideoFrame& video_frame) {
// Grab the image lock so we are not trashing up the image being drawn.
rtc::CritScope cs(&image_crit_);
- frame->ConvertToRgbBuffer(cricket::FOURCC_ABGR,
- image_.get(),
- static_cast<size_t>(frame->width()) *
- frame->height() * 4,
- frame->width() * 4);
+ rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
+ video_frame->video_frame_buffer());
+ libyuv::ConvertFromI420(buffer->DataY(), buffer->StrideY(),
+ buffer->DataU(), buffer->StrideU(),
+ buffer->DataV(), buffer->StrideV(),
+ image_.get(), frame->width() * 4,
+ buffer->width(), buffer->height(),
+ cricket::FOURCC_ABGR);
perkj_webrtc 2016/08/30 07:13:39 should use a libyuv type, not cricket.
}
// Trigger a repaint event for the whole window.

Powered by Google App Engine
This is Rietveld 408576698