talk/media/base/videocapturer.cc - Issue 1655793003: Make cricket::VideoCapturer implement VideoSourceInterface

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/media/base/videocapturer.cc

Issue 1655793003: Make cricket::VideoCapturer implement VideoSourceInterface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Adding VideoSourceInterface and letting cricket::VideoCapturer implement it Created 4 years, 11 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: talk/media/base/videocapturer.cc

diff --git a/talk/media/base/videocapturer.cc b/talk/media/base/videocapturer.cc

index d525a4188edd2ac4ab6e2ee7b6bf9b3b4d6dc954..0028f47f2529c6b47def70cfd9a5f024c5e443d6 100644

--- a/talk/media/base/videocapturer.cc

+++ b/talk/media/base/videocapturer.cc

@@ -350,7 +350,7 @@ void VideoCapturer::OnFrameCaptured(VideoCapturer*,

}

- if (SignalVideoFrame.is_empty()) {

+ if (SignalVideoFrame.is_empty() && !HasSinks()) {

return;

}

@@ -533,6 +533,7 @@ void VideoCapturer::OnFrameCaptured(VideoCapturer*,

// TODO(pthatcher): Use frame_factory_->CreateBlackFrame() instead.

adapted_frame->SetToBlack();

}

+ DeliverFrame(adapted_frame.get());

SignalVideoFrame(this, adapted_frame.get());

pthatcher 2016/02/01 18:40:54 We should leave a comment about how we fire both w

perkj_webrtc 2016/02/02 16:24:00 SignalVideoFrame now removed. I was just not done

UpdateStats(captured_frame);

« no previous file with comments | « talk/media/base/videocapturer.h ('k') | talk/media/webrtc/webrtcvideoengine2.h » ('j') | talk/media/webrtc/webrtcvideoengine2.cc » ('J')