Add video frame refresh to MediaStream and VideoCapture stacks.

content/renderer/media/media_stream_video_track.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_video_track.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 194 matching lines @@
   track.setExtraData(new MediaStreamVideoTrack(source,
                                                constraints,
                                                callback,
                                                enabled));
   return track;
 }
 
 // static
 MediaStreamVideoTrack* MediaStreamVideoTrack::GetVideoTrack(
      const blink::WebMediaStreamTrack& track) {
+  if (track.isNull() ||
+      track.source().getType() != blink::WebMediaStreamSource::TypeVideo) {
+    return nullptr;
+  }
   return static_cast<MediaStreamVideoTrack*>(track.getExtraData());
 }
 
 MediaStreamVideoTrack::MediaStreamVideoTrack(
     MediaStreamVideoSource* source,
     const blink::WebMediaConstraints& constraints,
     const MediaStreamVideoSource::ConstraintsCallback& callback,
     bool enabled)
     : MediaStreamTrack(true),
       frame_deliverer_(
@@ skipping 16 matching lines @@
   DVLOG(3) << "~MediaStreamVideoTrack()";
 }
 
 void MediaStreamVideoTrack::AddSink(
     MediaStreamVideoSink* sink, const VideoCaptureDeliverFrameCB& callback) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   DCHECK(std::find(sinks_.begin(), sinks_.end(), sink) == sinks_.end());
   sinks_.push_back(sink);
   frame_deliverer_->AddCallback(sink, callback);
   // Request source to deliver a frame because a new sink is added.
   if (source_)

[xjz, 2016/04/01 19:10:04]

nit: maybe just call RequestRefreshFrame() now?

[miu, 2016/04/01 23:24:27]

Done.

     source_->RequestRefreshFrame();
 }
 
 void MediaStreamVideoTrack::RemoveSink(MediaStreamVideoSink* sink) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   std::vector<MediaStreamVideoSink*>::iterator it =
       std::find(sinks_.begin(), sinks_.end(), sink);
   DCHECK(it != sinks_.end());
   sinks_.erase(it);
   frame_deliverer_->RemoveCallback(sink);
 }
 
 void MediaStreamVideoTrack::SetEnabled(bool enabled) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   frame_deliverer_->SetEnabled(enabled);
   for (auto* sink : sinks_)
     sink->OnEnabledChanged(enabled);
 }
 
+void MediaStreamVideoTrack::RequestRefreshFrame() {
+  DCHECK(main_render_thread_checker_.CalledOnValidThread());
+  if (source_)
+    source_->RequestRefreshFrame();
+}
+
 void MediaStreamVideoTrack::Stop() {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   if (source_) {
     source_->RemoveTrack(this);
     source_ = NULL;
   }
   OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamVideoTrack::OnReadyStateChanged(
     blink::WebMediaStreamSource::ReadyState state) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   for (auto* sink : sinks_)
     sink->OnReadyStateChanged(state);
 }
 
 }  // namespace content