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

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

Issue 2287233002: Delete cricket::VideoFrame::ConvertToRgbBuffer. (Closed)
Patch Set: Rebase. 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
« no previous file with comments | « webrtc/media/base/videoframe_unittest.h ('k') | webrtc/media/devices/gdivideorenderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/devices/carbonvideorenderer.cc
diff --git a/webrtc/media/devices/carbonvideorenderer.cc b/webrtc/media/devices/carbonvideorenderer.cc
index 766904231c88f1552cb35bb4b4ccb2924fea2def..4c40f18b8d93fc5cb674a69fc79df0b119f5ef87 100644
--- a/webrtc/media/devices/carbonvideorenderer.cc
+++ b/webrtc/media/devices/carbonvideorenderer.cc
@@ -12,6 +12,7 @@
#include "webrtc/media/devices/carbonvideorenderer.h"
+#include "libyuv/convert_from.h"
#include "webrtc/base/logging.h"
#include "webrtc/media/base/videocommon.h"
#include "webrtc/media/base/videoframe.h"
@@ -117,11 +118,13 @@ 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(
+ frame.video_frame_buffer());
+ libyuv::I420ToABGR(buffer->DataY(), buffer->StrideY(),
+ buffer->DataU(), buffer->StrideU(),
+ buffer->DataV(), buffer->StrideV(),
+ image_.get(), frame.width() * 4,
+ buffer->width(), buffer->height());
}
// Trigger a repaint event for the whole window.
« no previous file with comments | « webrtc/media/base/videoframe_unittest.h ('k') | webrtc/media/devices/gdivideorenderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698