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

Unified Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1419673014: Remove frame time scheduing in IncomingVideoStream (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 1 month 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/webrtc/webrtcvideoengine2.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index 101ed15bddd996d4e51d462d537f4d50ee613dd4..c487a0d3996199775b279b3a3ac00a8251874e29 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -1228,7 +1228,7 @@ bool WebRtcVideoChannel2::AddRecvStream(const StreamParams& sp,
receive_streams_[ssrc] = new WebRtcVideoReceiveStream(
call_, sp, config, external_decoder_factory_, default_stream,
- recv_codecs_);
+ recv_codecs_, options_.renderer_can_schedule_frames.value_or(false));
return true;
}
@@ -2337,6 +2337,22 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream(
WebRtcVideoDecoderFactory* external_decoder_factory,
bool default_stream,
const std::vector<VideoCodecSettings>& recv_codecs)
+ : WebRtcVideoReceiveStream(call,
+ sp,
+ config,
+ external_decoder_factory,
+ default_stream,
+ recv_codecs,
+ false) {}
+
+WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream(
+ webrtc::Call* call,
+ const StreamParams& sp,
+ const webrtc::VideoReceiveStream::Config& config,
+ WebRtcVideoDecoderFactory* external_decoder_factory,
+ bool default_stream,
+ const std::vector<VideoCodecSettings>& recv_codecs,
+ bool can_schedule_frame)
: call_(call),
ssrcs_(sp.ssrcs),
ssrc_groups_(sp.ssrc_groups),
@@ -2344,6 +2360,7 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream(
default_stream_(default_stream),
config_(config),
external_decoder_factory_(external_decoder_factory),
+ can_schedule_frame_(can_schedule_frame),
renderer_(NULL),
last_width_(-1),
last_height_(-1),
@@ -2551,6 +2568,10 @@ bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsTextureSupported() const {
return true;
}
+bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::CanScheduleFrame() const {
+ return can_schedule_frame_;
+}
+
bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const {
return default_stream_;
}

Powered by Google App Engine
This is Rietveld 408576698