Index: content/renderer/pepper/pepper_media_stream_video_track_host.cc |
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc |
index d0e47c2c95d35882ec8e5991f31c97e76e2a3d56..c8464541efcf68a2ca9f8840052a78de5f047979 100644 |
--- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc |
+++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc |
@@ -13,6 +13,7 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "content/renderer/media/media_stream_video_track.h" |
#include "media/base/bind_to_current_loop.h" |
+#include "media/base/video_util.h" |
#include "media/base/yuv_convert.h" |
#include "ppapi/c/pp_errors.h" |
#include "ppapi/c/ppb_media_stream_video_track.h" |
@@ -370,11 +371,16 @@ int32_t PepperMediaStreamVideoTrackHost::SendFrameToTrack(int32_t index) { |
} |
void PepperMediaStreamVideoTrackHost::OnVideoFrame( |
- const scoped_refptr<VideoFrame>& frame, |
+ const scoped_refptr<VideoFrame>& video_frame, |
base::TimeTicks estimated_capture_time) { |
- DCHECK(frame.get()); |
+ DCHECK(video_frame.get()); |
// TODO(penghuang): Check |frame->end_of_stream()| and close the track. |
+ scoped_refptr<media::VideoFrame> frame = video_frame; |
+ // Drop alpha channel since we do not support it yet. |
+ if (frame->format() == media::PIXEL_FORMAT_YV12A) |
+ frame = media::WrapAsI420VideoFrame(video_frame); |
PP_VideoFrame_Format ppformat = ToPpapiFormat(frame->format()); |
+ |
bbudge
2016/03/08 13:17:33
nit: why add whitespace here?
emircan
2016/03/08 19:01:46
Removed
|
if (ppformat == PP_VIDEOFRAME_FORMAT_UNKNOWN) |
return; |