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

Side by Side Diff: talk/media/base/mediachannel.h

Issue 1419673014: Remove frame time scheduing in IncomingVideoStream (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove unnecessary if Created 5 years 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
« no previous file with comments | « talk/app/webrtc/webrtcsession.cc ('k') | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 SetFrom(&system_low_adaptation_threshhold, 260 SetFrom(&system_low_adaptation_threshhold,
261 change.system_low_adaptation_threshhold); 261 change.system_low_adaptation_threshhold);
262 SetFrom(&system_high_adaptation_threshhold, 262 SetFrom(&system_high_adaptation_threshhold,
263 change.system_high_adaptation_threshhold); 263 change.system_high_adaptation_threshhold);
264 SetFrom(&dscp, change.dscp); 264 SetFrom(&dscp, change.dscp);
265 SetFrom(&suspend_below_min_bitrate, change.suspend_below_min_bitrate); 265 SetFrom(&suspend_below_min_bitrate, change.suspend_below_min_bitrate);
266 SetFrom(&unsignalled_recv_stream_limit, 266 SetFrom(&unsignalled_recv_stream_limit,
267 change.unsignalled_recv_stream_limit); 267 change.unsignalled_recv_stream_limit);
268 SetFrom(&use_simulcast_adapter, change.use_simulcast_adapter); 268 SetFrom(&use_simulcast_adapter, change.use_simulcast_adapter);
269 SetFrom(&screencast_min_bitrate, change.screencast_min_bitrate); 269 SetFrom(&screencast_min_bitrate, change.screencast_min_bitrate);
270 SetFrom(&disable_prerenderer_smoothing,
271 change.disable_prerenderer_smoothing);
270 } 272 }
271 273
272 bool operator==(const VideoOptions& o) const { 274 bool operator==(const VideoOptions& o) const {
273 return adapt_input_to_cpu_usage == o.adapt_input_to_cpu_usage && 275 return adapt_input_to_cpu_usage == o.adapt_input_to_cpu_usage &&
274 adapt_cpu_with_smoothing == o.adapt_cpu_with_smoothing && 276 adapt_cpu_with_smoothing == o.adapt_cpu_with_smoothing &&
275 video_adapt_third == o.video_adapt_third && 277 video_adapt_third == o.video_adapt_third &&
276 video_noise_reduction == o.video_noise_reduction && 278 video_noise_reduction == o.video_noise_reduction &&
277 video_start_bitrate == o.video_start_bitrate && 279 video_start_bitrate == o.video_start_bitrate &&
278 cpu_overuse_detection == o.cpu_overuse_detection && 280 cpu_overuse_detection == o.cpu_overuse_detection &&
279 cpu_underuse_threshold == o.cpu_underuse_threshold && 281 cpu_underuse_threshold == o.cpu_underuse_threshold &&
280 cpu_overuse_threshold == o.cpu_overuse_threshold && 282 cpu_overuse_threshold == o.cpu_overuse_threshold &&
281 cpu_underuse_encode_rsd_threshold == 283 cpu_underuse_encode_rsd_threshold ==
282 o.cpu_underuse_encode_rsd_threshold && 284 o.cpu_underuse_encode_rsd_threshold &&
283 cpu_overuse_encode_rsd_threshold == 285 cpu_overuse_encode_rsd_threshold ==
284 o.cpu_overuse_encode_rsd_threshold && 286 o.cpu_overuse_encode_rsd_threshold &&
285 cpu_overuse_encode_usage == o.cpu_overuse_encode_usage && 287 cpu_overuse_encode_usage == o.cpu_overuse_encode_usage &&
286 conference_mode == o.conference_mode && 288 conference_mode == o.conference_mode &&
287 process_adaptation_threshhold == o.process_adaptation_threshhold && 289 process_adaptation_threshhold == o.process_adaptation_threshhold &&
288 system_low_adaptation_threshhold == 290 system_low_adaptation_threshhold ==
289 o.system_low_adaptation_threshhold && 291 o.system_low_adaptation_threshhold &&
290 system_high_adaptation_threshhold == 292 system_high_adaptation_threshhold ==
291 o.system_high_adaptation_threshhold && 293 o.system_high_adaptation_threshhold &&
292 dscp == o.dscp && 294 dscp == o.dscp &&
293 suspend_below_min_bitrate == o.suspend_below_min_bitrate && 295 suspend_below_min_bitrate == o.suspend_below_min_bitrate &&
294 unsignalled_recv_stream_limit == o.unsignalled_recv_stream_limit && 296 unsignalled_recv_stream_limit == o.unsignalled_recv_stream_limit &&
295 use_simulcast_adapter == o.use_simulcast_adapter && 297 use_simulcast_adapter == o.use_simulcast_adapter &&
296 screencast_min_bitrate == o.screencast_min_bitrate; 298 screencast_min_bitrate == o.screencast_min_bitrate &&
299 disable_prerenderer_smoothing == o.disable_prerenderer_smoothing;
297 } 300 }
298 301
299 std::string ToString() const { 302 std::string ToString() const {
300 std::ostringstream ost; 303 std::ostringstream ost;
301 ost << "VideoOptions {"; 304 ost << "VideoOptions {";
302 ost << ToStringIfSet("cpu adaption", adapt_input_to_cpu_usage); 305 ost << ToStringIfSet("cpu adaption", adapt_input_to_cpu_usage);
303 ost << ToStringIfSet("cpu adaptation smoothing", adapt_cpu_with_smoothing); 306 ost << ToStringIfSet("cpu adaptation smoothing", adapt_cpu_with_smoothing);
304 ost << ToStringIfSet("video adapt third", video_adapt_third); 307 ost << ToStringIfSet("video adapt third", video_adapt_third);
305 ost << ToStringIfSet("noise reduction", video_noise_reduction); 308 ost << ToStringIfSet("noise reduction", video_noise_reduction);
306 ost << ToStringIfSet("start bitrate", video_start_bitrate); 309 ost << ToStringIfSet("start bitrate", video_start_bitrate);
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 rtc::Optional<bool> dscp; 375 rtc::Optional<bool> dscp;
373 // Enable WebRTC suspension of video. No video frames will be sent when the 376 // Enable WebRTC suspension of video. No video frames will be sent when the
374 // bitrate is below the configured minimum bitrate. 377 // bitrate is below the configured minimum bitrate.
375 rtc::Optional<bool> suspend_below_min_bitrate; 378 rtc::Optional<bool> suspend_below_min_bitrate;
376 // Limit on the number of early receive channels that can be created. 379 // Limit on the number of early receive channels that can be created.
377 rtc::Optional<int> unsignalled_recv_stream_limit; 380 rtc::Optional<int> unsignalled_recv_stream_limit;
378 // Enable use of simulcast adapter. 381 // Enable use of simulcast adapter.
379 rtc::Optional<bool> use_simulcast_adapter; 382 rtc::Optional<bool> use_simulcast_adapter;
380 // Force screencast to use a minimum bitrate 383 // Force screencast to use a minimum bitrate
381 rtc::Optional<int> screencast_min_bitrate; 384 rtc::Optional<int> screencast_min_bitrate;
385 // Set to true if the renderer has an algorithm of frame selection.
386 // If the value is true, then WebRTC will hand over a frame as soon as
387 // possible without delay, and rendering smoothness is completely the duty
388 // of the renderer;
389 // If the value is false, then WebRTC is responsible to delay frame release
390 // in order to increase rendering smoothness.
391 rtc::Optional<bool> disable_prerenderer_smoothing;
382 392
383 private: 393 private:
384 template <typename T> 394 template <typename T>
385 static void SetFrom(rtc::Optional<T>* s, const rtc::Optional<T>& o) { 395 static void SetFrom(rtc::Optional<T>* s, const rtc::Optional<T>& o) {
386 if (o) { 396 if (o) {
387 *s = o; 397 *s = o;
388 } 398 }
389 } 399 }
390 }; 400 };
391 401
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 // Signal when the media channel is ready to send the stream. Arguments are: 1214 // Signal when the media channel is ready to send the stream. Arguments are:
1205 // writable(bool) 1215 // writable(bool)
1206 sigslot::signal1<bool> SignalReadyToSend; 1216 sigslot::signal1<bool> SignalReadyToSend;
1207 // Signal for notifying that the remote side has closed the DataChannel. 1217 // Signal for notifying that the remote side has closed the DataChannel.
1208 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1218 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1209 }; 1219 };
1210 1220
1211 } // namespace cricket 1221 } // namespace cricket
1212 1222
1213 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1223 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsession.cc ('k') | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698