Chromium Code Reviews| 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 199cdff7538a42aafd901257dae07a394a9e974a..bb4ce24fc326e85126e572c424021bc5f27796e0 100644 |
| --- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc |
| +++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc |
| @@ -7,8 +7,10 @@ |
| #include "base/bind.h" |
| #include "base/debug/trace_event.h" |
| #include "base/memory/aligned_memory.h" |
| +#include "content/renderer/media/native_handle_impl.h" |
| #include "media/base/video_frame.h" |
| #include "third_party/libyuv/include/libyuv/convert.h" |
| +#include "third_party/webrtc/system_wrappers/interface/ref_count.h" |
| namespace content { |
| @@ -78,7 +80,8 @@ bool WebRtcVideoCapturerAdapter::GetBestCaptureFormat( |
| void WebRtcVideoCapturerAdapter::OnFrameCaptured( |
| const scoped_refptr<media::VideoFrame>& frame) { |
| DCHECK(media::VideoFrame::I420 == frame->format() || |
| - media::VideoFrame::YV12 == frame->format()); |
| + media::VideoFrame::YV12 == frame->format() || |
| + media::VideoFrame::NATIVE_TEXTURE == frame->format()); |
| if (first_frame_timestamp_ == media::kNoTimestamp()) |
| first_frame_timestamp_ = frame->timestamp(); |
| @@ -98,7 +101,11 @@ void WebRtcVideoCapturerAdapter::OnFrameCaptured( |
| // Libjingle expects contiguous layout of image planes as input. |
| // The only format where that is true in Chrome is I420 where the |
| // coded_size == visible_rect().size(). |
| - if (frame->format() != media::VideoFrame::I420 || |
| + if (frame->format() == media::VideoFrame::NATIVE_TEXTURE) { |
| + webrtc::RefCountImpl<NativeHandleImpl>* handle = |
| + new webrtc::RefCountImpl<NativeHandleImpl>(frame.get()); |
|
perkj_chrome
2014/05/12 08:19:42
nit:indentation
wuchengli
2014/05/12 09:41:29
Done. Ran git cl format.
|
| + captured_frame.handle = handle; |
|
perkj_chrome
2014/05/12 08:19:42
How does this ensure |frame| is not released while
wuchengli
2014/05/12 09:41:29
NativeHandleImpl keeps a reference to |frame|. htt
|
| + } else if (frame->format() != media::VideoFrame::I420 || |
| frame->coded_size() != frame->visible_rect().size()) { |
| // Cropping and or switching UV planes is needed. |
| UpdateI420Buffer(frame); |