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

Side by Side 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: Method A: pass the flag through constructor 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1219 receive_ssrcs_.insert(used_ssrc); 1219 receive_ssrcs_.insert(used_ssrc);
1220 1220
1221 webrtc::VideoReceiveStream::Config config(this); 1221 webrtc::VideoReceiveStream::Config config(this);
1222 ConfigureReceiverRtp(&config, sp); 1222 ConfigureReceiverRtp(&config, sp);
1223 1223
1224 // Set up A/V sync group based on sync label. 1224 // Set up A/V sync group based on sync label.
1225 config.sync_group = sp.sync_label; 1225 config.sync_group = sp.sync_label;
1226 1226
1227 config.rtp.remb = send_codec_ ? HasRemb(send_codec_->codec) : false; 1227 config.rtp.remb = send_codec_ ? HasRemb(send_codec_->codec) : false;
1228 1228
1229 config.renderer_has_time_control = options_.renderer_has_time_control;
pbos 2015/11/16 18:38:46 I want this to be an option on the renderer for Vi
pbos 2015/11/16 18:40:55 Maybe ::SchedulesFrames(), I dunno, wdyt?
pthatcher1 2015/11/16 20:25:27 That gets kind of complicated, because there can b
qiangchen 2015/11/16 20:44:14 For the current data structure, one VideoRenderer
qiangchen 2015/11/16 20:44:14 The reason I chose Config to carry this piece of i
1230
1229 receive_streams_[ssrc] = new WebRtcVideoReceiveStream( 1231 receive_streams_[ssrc] = new WebRtcVideoReceiveStream(
1230 call_, sp, config, external_decoder_factory_, default_stream, 1232 call_, sp, config, external_decoder_factory_, default_stream,
1231 recv_codecs_); 1233 recv_codecs_);
1232 1234
1233 return true; 1235 return true;
1234 } 1236 }
1235 1237
1236 void WebRtcVideoChannel2::ConfigureReceiverRtp( 1238 void WebRtcVideoChannel2::ConfigureReceiverRtp(
1237 webrtc::VideoReceiveStream::Config* config, 1239 webrtc::VideoReceiveStream::Config* config,
1238 const StreamParams& sp) const { 1240 const StreamParams& sp) const {
(...skipping 1503 matching lines...) Expand 10 before | Expand all | Expand 10 after
2742 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2744 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2743 } 2745 }
2744 } 2746 }
2745 2747
2746 return video_codecs; 2748 return video_codecs;
2747 } 2749 }
2748 2750
2749 } // namespace cricket 2751 } // namespace cricket
2750 2752
2751 #endif // HAVE_WEBRTC_VIDEO 2753 #endif // HAVE_WEBRTC_VIDEO
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698