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

Unified Diff: content/renderer/media/media_stream_video_source.cc

Issue 2365223002: Video Capture: Allow suspension of individual devices. (Closed)
Patch Set: REBASE, and clean-ups+tests suggested by chfremer@. Created 4 years, 3 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: content/renderer/media/media_stream_video_source.cc
diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
index b2e550c221de1c69b55c5ac69e0779ef433807d7..0f531443b61e26566ce755385c84f5cb1dbf2ea7 100644
--- a/content/renderer/media/media_stream_video_source.cc
+++ b/content/renderer/media/media_stream_video_source.cc
@@ -393,11 +393,26 @@ void MediaStreamVideoSource::RemoveTrack(MediaStreamVideoTrack* video_track) {
StopSource();
}
+void MediaStreamVideoSource::UpdateHasConsumers(MediaStreamVideoTrack* track,
+ bool has_consumers) {
+ DCHECK(CalledOnValidThread());
+ const auto it =
+ std::find(suspended_tracks_.begin(), suspended_tracks_.end(), track);
+ if (has_consumers) {
+ if (it != suspended_tracks_.end())
+ suspended_tracks_.erase(it);
+ } else {
+ if (it == suspended_tracks_.end())
emircan 2016/09/28 17:16:24 std::set would be a more appropriate container for
miu 2016/09/28 20:57:50 Actually, no, because std::set is an ordered set.
+ suspended_tracks_.push_back(track);
+ }
+ OnHasConsumers(suspended_tracks_.size() < tracks_.size());
+}
+
void MediaStreamVideoSource::UpdateCapturingLinkSecure(
- MediaStreamVideoTrack* track,
- bool is_secure) {
+ MediaStreamVideoTrack* track, bool is_secure) {
+ DCHECK(CalledOnValidThread());
secure_tracker_.Update(track, is_secure);
- SetCapturingLinkSecured(secure_tracker_.is_capturing_secure());
+ OnCapturingLinkSecured(secure_tracker_.is_capturing_secure());
}
base::SingleThreadTaskRunner* MediaStreamVideoSource::io_task_runner() const {

Powered by Google App Engine
This is Rietveld 408576698