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

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

Issue 1226093010: Nuke buffered latency mode. It's not actually working, and it's not used. It's just dead code com… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 6375e3fbab126e758b Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « talk/app/webrtc/webrtcsdp_unittest.cc ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 change.cpu_underuse_encode_rsd_threshold); 320 change.cpu_underuse_encode_rsd_threshold);
321 cpu_overuse_encode_rsd_threshold.SetFrom( 321 cpu_overuse_encode_rsd_threshold.SetFrom(
322 change.cpu_overuse_encode_rsd_threshold); 322 change.cpu_overuse_encode_rsd_threshold);
323 cpu_overuse_encode_usage.SetFrom(change.cpu_overuse_encode_usage); 323 cpu_overuse_encode_usage.SetFrom(change.cpu_overuse_encode_usage);
324 conference_mode.SetFrom(change.conference_mode); 324 conference_mode.SetFrom(change.conference_mode);
325 process_adaptation_threshhold.SetFrom(change.process_adaptation_threshhold); 325 process_adaptation_threshhold.SetFrom(change.process_adaptation_threshhold);
326 system_low_adaptation_threshhold.SetFrom( 326 system_low_adaptation_threshhold.SetFrom(
327 change.system_low_adaptation_threshhold); 327 change.system_low_adaptation_threshhold);
328 system_high_adaptation_threshhold.SetFrom( 328 system_high_adaptation_threshhold.SetFrom(
329 change.system_high_adaptation_threshhold); 329 change.system_high_adaptation_threshhold);
330 buffered_mode_latency.SetFrom(change.buffered_mode_latency);
331 dscp.SetFrom(change.dscp); 330 dscp.SetFrom(change.dscp);
332 suspend_below_min_bitrate.SetFrom(change.suspend_below_min_bitrate); 331 suspend_below_min_bitrate.SetFrom(change.suspend_below_min_bitrate);
333 unsignalled_recv_stream_limit.SetFrom(change.unsignalled_recv_stream_limit); 332 unsignalled_recv_stream_limit.SetFrom(change.unsignalled_recv_stream_limit);
334 use_simulcast_adapter.SetFrom(change.use_simulcast_adapter); 333 use_simulcast_adapter.SetFrom(change.use_simulcast_adapter);
335 screencast_min_bitrate.SetFrom(change.screencast_min_bitrate); 334 screencast_min_bitrate.SetFrom(change.screencast_min_bitrate);
336 } 335 }
337 336
338 bool operator==(const VideoOptions& o) const { 337 bool operator==(const VideoOptions& o) const {
339 return adapt_input_to_cpu_usage == o.adapt_input_to_cpu_usage && 338 return adapt_input_to_cpu_usage == o.adapt_input_to_cpu_usage &&
340 adapt_cpu_with_smoothing == o.adapt_cpu_with_smoothing && 339 adapt_cpu_with_smoothing == o.adapt_cpu_with_smoothing &&
341 video_adapt_third == o.video_adapt_third && 340 video_adapt_third == o.video_adapt_third &&
342 video_noise_reduction == o.video_noise_reduction && 341 video_noise_reduction == o.video_noise_reduction &&
343 video_start_bitrate == o.video_start_bitrate && 342 video_start_bitrate == o.video_start_bitrate &&
344 video_highest_bitrate == o.video_highest_bitrate && 343 video_highest_bitrate == o.video_highest_bitrate &&
345 cpu_overuse_detection == o.cpu_overuse_detection && 344 cpu_overuse_detection == o.cpu_overuse_detection &&
346 cpu_underuse_threshold == o.cpu_underuse_threshold && 345 cpu_underuse_threshold == o.cpu_underuse_threshold &&
347 cpu_overuse_threshold == o.cpu_overuse_threshold && 346 cpu_overuse_threshold == o.cpu_overuse_threshold &&
348 cpu_underuse_encode_rsd_threshold == 347 cpu_underuse_encode_rsd_threshold ==
349 o.cpu_underuse_encode_rsd_threshold && 348 o.cpu_underuse_encode_rsd_threshold &&
350 cpu_overuse_encode_rsd_threshold == 349 cpu_overuse_encode_rsd_threshold ==
351 o.cpu_overuse_encode_rsd_threshold && 350 o.cpu_overuse_encode_rsd_threshold &&
352 cpu_overuse_encode_usage == o.cpu_overuse_encode_usage && 351 cpu_overuse_encode_usage == o.cpu_overuse_encode_usage &&
353 conference_mode == o.conference_mode && 352 conference_mode == o.conference_mode &&
354 process_adaptation_threshhold == o.process_adaptation_threshhold && 353 process_adaptation_threshhold == o.process_adaptation_threshhold &&
355 system_low_adaptation_threshhold == 354 system_low_adaptation_threshhold ==
356 o.system_low_adaptation_threshhold && 355 o.system_low_adaptation_threshhold &&
357 system_high_adaptation_threshhold == 356 system_high_adaptation_threshhold ==
358 o.system_high_adaptation_threshhold && 357 o.system_high_adaptation_threshhold &&
359 buffered_mode_latency == o.buffered_mode_latency && dscp == o.dscp && 358 dscp == o.dscp &&
360 suspend_below_min_bitrate == o.suspend_below_min_bitrate && 359 suspend_below_min_bitrate == o.suspend_below_min_bitrate &&
361 unsignalled_recv_stream_limit == o.unsignalled_recv_stream_limit && 360 unsignalled_recv_stream_limit == o.unsignalled_recv_stream_limit &&
362 use_simulcast_adapter == o.use_simulcast_adapter && 361 use_simulcast_adapter == o.use_simulcast_adapter &&
363 screencast_min_bitrate == o.screencast_min_bitrate; 362 screencast_min_bitrate == o.screencast_min_bitrate;
364 } 363 }
365 364
366 std::string ToString() const { 365 std::string ToString() const {
367 std::ostringstream ost; 366 std::ostringstream ost;
368 ost << "VideoOptions {"; 367 ost << "VideoOptions {";
369 ost << ToStringIfSet("cpu adaption", adapt_input_to_cpu_usage); 368 ost << ToStringIfSet("cpu adaption", adapt_input_to_cpu_usage);
370 ost << ToStringIfSet("cpu adaptation smoothing", adapt_cpu_with_smoothing); 369 ost << ToStringIfSet("cpu adaptation smoothing", adapt_cpu_with_smoothing);
371 ost << ToStringIfSet("video adapt third", video_adapt_third); 370 ost << ToStringIfSet("video adapt third", video_adapt_third);
372 ost << ToStringIfSet("noise reduction", video_noise_reduction); 371 ost << ToStringIfSet("noise reduction", video_noise_reduction);
373 ost << ToStringIfSet("start bitrate", video_start_bitrate); 372 ost << ToStringIfSet("start bitrate", video_start_bitrate);
374 ost << ToStringIfSet("highest video bitrate", video_highest_bitrate); 373 ost << ToStringIfSet("highest video bitrate", video_highest_bitrate);
375 ost << ToStringIfSet("cpu overuse detection", cpu_overuse_detection); 374 ost << ToStringIfSet("cpu overuse detection", cpu_overuse_detection);
376 ost << ToStringIfSet("cpu underuse threshold", cpu_underuse_threshold); 375 ost << ToStringIfSet("cpu underuse threshold", cpu_underuse_threshold);
377 ost << ToStringIfSet("cpu overuse threshold", cpu_overuse_threshold); 376 ost << ToStringIfSet("cpu overuse threshold", cpu_overuse_threshold);
378 ost << ToStringIfSet("cpu underuse encode rsd threshold", 377 ost << ToStringIfSet("cpu underuse encode rsd threshold",
379 cpu_underuse_encode_rsd_threshold); 378 cpu_underuse_encode_rsd_threshold);
380 ost << ToStringIfSet("cpu overuse encode rsd threshold", 379 ost << ToStringIfSet("cpu overuse encode rsd threshold",
381 cpu_overuse_encode_rsd_threshold); 380 cpu_overuse_encode_rsd_threshold);
382 ost << ToStringIfSet("cpu overuse encode usage", 381 ost << ToStringIfSet("cpu overuse encode usage",
383 cpu_overuse_encode_usage); 382 cpu_overuse_encode_usage);
384 ost << ToStringIfSet("conference mode", conference_mode); 383 ost << ToStringIfSet("conference mode", conference_mode);
385 ost << ToStringIfSet("process", process_adaptation_threshhold); 384 ost << ToStringIfSet("process", process_adaptation_threshhold);
386 ost << ToStringIfSet("low", system_low_adaptation_threshhold); 385 ost << ToStringIfSet("low", system_low_adaptation_threshhold);
387 ost << ToStringIfSet("high", system_high_adaptation_threshhold); 386 ost << ToStringIfSet("high", system_high_adaptation_threshhold);
388 ost << ToStringIfSet("buffered mode latency", buffered_mode_latency);
389 ost << ToStringIfSet("dscp", dscp); 387 ost << ToStringIfSet("dscp", dscp);
390 ost << ToStringIfSet("suspend below min bitrate", 388 ost << ToStringIfSet("suspend below min bitrate",
391 suspend_below_min_bitrate); 389 suspend_below_min_bitrate);
392 ost << ToStringIfSet("num channels for early receive", 390 ost << ToStringIfSet("num channels for early receive",
393 unsignalled_recv_stream_limit); 391 unsignalled_recv_stream_limit);
394 ost << ToStringIfSet("use simulcast adapter", use_simulcast_adapter); 392 ost << ToStringIfSet("use simulcast adapter", use_simulcast_adapter);
395 ost << ToStringIfSet("screencast min bitrate", screencast_min_bitrate); 393 ost << ToStringIfSet("screencast min bitrate", screencast_min_bitrate);
396 ost << "}"; 394 ost << "}";
397 return ost.str(); 395 return ost.str();
398 } 396 }
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 // Use encode usage for cpu detection. 430 // Use encode usage for cpu detection.
433 Settable<bool> cpu_overuse_encode_usage; 431 Settable<bool> cpu_overuse_encode_usage;
434 // Use conference mode? 432 // Use conference mode?
435 Settable<bool> conference_mode; 433 Settable<bool> conference_mode;
436 // Threshhold for process cpu adaptation. (Process limit) 434 // Threshhold for process cpu adaptation. (Process limit)
437 Settable<float> process_adaptation_threshhold; 435 Settable<float> process_adaptation_threshhold;
438 // Low threshhold for cpu adaptation. (Adapt up) 436 // Low threshhold for cpu adaptation. (Adapt up)
439 Settable<float> system_low_adaptation_threshhold; 437 Settable<float> system_low_adaptation_threshhold;
440 // High threshhold for cpu adaptation. (Adapt down) 438 // High threshhold for cpu adaptation. (Adapt down)
441 Settable<float> system_high_adaptation_threshhold; 439 Settable<float> system_high_adaptation_threshhold;
442 // Specify buffered mode latency in milliseconds.
443 Settable<int> buffered_mode_latency;
444 // Set DSCP value for packet sent from video channel. 440 // Set DSCP value for packet sent from video channel.
445 Settable<bool> dscp; 441 Settable<bool> dscp;
446 // Enable WebRTC suspension of video. No video frames will be sent when the 442 // Enable WebRTC suspension of video. No video frames will be sent when the
447 // bitrate is below the configured minimum bitrate. 443 // bitrate is below the configured minimum bitrate.
448 Settable<bool> suspend_below_min_bitrate; 444 Settable<bool> suspend_below_min_bitrate;
449 // Limit on the number of early receive channels that can be created. 445 // Limit on the number of early receive channels that can be created.
450 Settable<int> unsignalled_recv_stream_limit; 446 Settable<int> unsignalled_recv_stream_limit;
451 // Enable use of simulcast adapter. 447 // Enable use of simulcast adapter.
452 Settable<bool> use_simulcast_adapter; 448 Settable<bool> use_simulcast_adapter;
453 // Force screencast to use a minimum bitrate 449 // Force screencast to use a minimum bitrate
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
1231 // Signal when the media channel is ready to send the stream. Arguments are: 1227 // Signal when the media channel is ready to send the stream. Arguments are:
1232 // writable(bool) 1228 // writable(bool)
1233 sigslot::signal1<bool> SignalReadyToSend; 1229 sigslot::signal1<bool> SignalReadyToSend;
1234 // Signal for notifying that the remote side has closed the DataChannel. 1230 // Signal for notifying that the remote side has closed the DataChannel.
1235 sigslot::signal1<uint32> SignalStreamClosedRemotely; 1231 sigslot::signal1<uint32> SignalStreamClosedRemotely;
1236 }; 1232 };
1237 1233
1238 } // namespace cricket 1234 } // namespace cricket
1239 1235
1240 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1236 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsdp_unittest.cc ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698