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

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

Issue 1006043002: Effects plugin: Chrome OS is ready for switching from BGRA to ARGB. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_video_source_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc/video_destination_handler.cc
diff --git a/content/renderer/media/webrtc/video_destination_handler.cc b/content/renderer/media/webrtc/video_destination_handler.cc
index 0684aa659417936d66b341456e8f0e064cbf5a04..2e3c8b16bfb9611c9787b8417c7e52bfc06792a5 100644
--- a/content/renderer/media/webrtc/video_destination_handler.cc
+++ b/content/renderer/media/webrtc/video_destination_handler.cc
@@ -148,24 +148,16 @@ void PpFrameWriter::PutFrame(PPB_ImageData_Impl* image_data,
frame_pool_.CreateFrame(media::VideoFrame::YV12, frame_size,
gfx::Rect(frame_size), frame_size, timestamp);
- // TODO(magjed): Chrome OS is not ready for switching from BGRA to ARGB.
- // Remove this once http://crbug/434007 is fixed. We have a corresponding
- // problem when we send frames to the effects plugin in PepperVideoSourceHost.
-#if defined(OS_CHROMEOS)
- auto libyuv_xxxx_to_i420 = &libyuv::BGRAToI420;
-#else
- auto libyuv_xxxx_to_i420 = &libyuv::ARGBToI420;
-#endif
- libyuv_xxxx_to_i420(src_data,
- src_stride,
- new_frame->data(media::VideoFrame::kYPlane),
- new_frame->stride(media::VideoFrame::kYPlane),
- new_frame->data(media::VideoFrame::kUPlane),
- new_frame->stride(media::VideoFrame::kUPlane),
- new_frame->data(media::VideoFrame::kVPlane),
- new_frame->stride(media::VideoFrame::kVPlane),
- width,
- height);
+ libyuv::ARGBToI420(src_data,
+ src_stride,
+ new_frame->data(media::VideoFrame::kYPlane),
+ new_frame->stride(media::VideoFrame::kYPlane),
+ new_frame->data(media::VideoFrame::kUPlane),
+ new_frame->stride(media::VideoFrame::kUPlane),
+ new_frame->data(media::VideoFrame::kVPlane),
+ new_frame->stride(media::VideoFrame::kVPlane),
+ width,
+ height);
delegate_->DeliverFrame(new_frame);
}
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_video_source_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698