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

Unified Diff: content/renderer/pepper/pepper_media_stream_video_track_host.cc

Issue 1849003002: Add video frame refresh to MediaStream and VideoCapture stacks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nick's PS3 comments (moving non-observer impl out of MSVideoSink interface). Created 4 years, 8 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
« no previous file with comments | « content/renderer/pepper/pepper_media_stream_video_track_host.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e834b1021beeea0870b8175513d9ffa43f65fd0b..8f43feb77acbabb4c91df7964c20f94606bdce42 100644
--- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc
+++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
@@ -229,7 +229,6 @@ PepperMediaStreamVideoTrackHost::PepperMediaStreamVideoTrackHost(
const blink::WebMediaStreamTrack& track)
: PepperMediaStreamTrackHostBase(host, instance, resource),
track_(track),
- connected_(false),
number_of_buffers_(kDefaultNumberOfBuffers),
source_frame_format_(PP_VIDEOFRAME_FORMAT_UNKNOWN),
plugin_frame_format_(PP_VIDEOFRAME_FORMAT_UNKNOWN),
@@ -245,7 +244,6 @@ PepperMediaStreamVideoTrackHost::PepperMediaStreamVideoTrackHost(
PP_Instance instance,
PP_Resource resource)
: PepperMediaStreamTrackHostBase(host, instance, resource),
- connected_(false),
number_of_buffers_(kDefaultNumberOfBuffers),
source_frame_format_(PP_VIDEOFRAME_FORMAT_UNKNOWN),
plugin_frame_format_(PP_VIDEOFRAME_FORMAT_UNKNOWN),
@@ -307,11 +305,8 @@ void PepperMediaStreamVideoTrackHost::InitBuffers() {
}
void PepperMediaStreamVideoTrackHost::OnClose() {
- if (connected_) {
- MediaStreamVideoSink::RemoveFromVideoTrack(this, track_);
- weak_factory_.InvalidateWeakPtrs();
- connected_ = false;
- }
+ MediaStreamVideoSink::DisconnectFromTrack();
+ weak_factory_.InvalidateWeakPtrs();
}
int32_t PepperMediaStreamVideoTrackHost::OnHostMsgEnqueueBuffer(
@@ -447,16 +442,14 @@ void PepperMediaStreamVideoTrackHost::StopSourceImpl() {
}
void PepperMediaStreamVideoTrackHost::DidConnectPendingHostToResource() {
- if (!connected_) {
- MediaStreamVideoSink::AddToVideoTrack(
- this,
- media::BindToCurrentLoop(
- base::Bind(
- &PepperMediaStreamVideoTrackHost::OnVideoFrame,
- weak_factory_.GetWeakPtr())),
- track_);
- connected_ = true;
- }
+ if (!MediaStreamVideoSink::connected_track().isNull())
+ return;
+ MediaStreamVideoSink::ConnectToTrack(
+ track_,
+ media::BindToCurrentLoop(
+ base::Bind(
+ &PepperMediaStreamVideoTrackHost::OnVideoFrame,
+ weak_factory_.GetWeakPtr())));
}
int32_t PepperMediaStreamVideoTrackHost::OnResourceMessageReceived(
« no previous file with comments | « content/renderer/pepper/pepper_media_stream_video_track_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698