Make LoadObserver settable per video send stream. Gives client flexibility and makes the implementa…

talk/media/webrtc/webrtcvideoengine2.cc

 /*
  * libjingle
  * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 771 matching lines @@
     : unsignalled_ssrc_handler_(&default_unsignalled_ssrc_handler_),
       voice_channel_(voice_channel),
       voice_channel_id_(voice_channel ? voice_channel->voe_channel() : -1),
       external_encoder_factory_(external_encoder_factory),
       external_decoder_factory_(external_decoder_factory) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SetDefaultOptions();
   options_.SetAll(options);
   options_.cpu_overuse_detection.Get(&signal_cpu_adaptation_);
   webrtc::Call::Config config;
-  config.overuse_callback = this;
   if (voice_engine != NULL) {
     config.voice_engine = voice_engine->voe()->engine();
   }
   config.bitrate_config.min_bitrate_bps = kMinBandwidthBps;
   config.bitrate_config.start_bitrate_bps = kStartBandwidthBps;
   config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps;
   call_.reset(call_factory->CreateCall(config));
   if (voice_channel_) {
     voice_channel_->SetCall(call_.get());
   }
@@ skipping 307 matching lines @@
     return false;
 
   rtc::CritScope stream_lock(&stream_crit_);
 
   if (!ValidateSendSsrcAvailability(sp))
     return false;
 
   for (uint32 used_ssrc : sp.ssrcs)
     send_ssrcs_.insert(used_ssrc);
 
+  webrtc::VideoSendStream::Config config(this);
+  config.overuse_callback = this;

[pbos-webrtc, 2015/09/03 20:36:39]

Can you set WebRtcVideoSendStream::this inside the constructor instead? Or do
you want me to do that one (one adaptation per stream) in a follow-up?

[the sun, 2015/09/03 20:54:55]

I'm just changing the API and introducing the possibility, not changing the
strategy. So if we prioritize adaptation per stream, yes, do it in a follow-up.

+
   WebRtcVideoSendStream* stream =
       new WebRtcVideoSendStream(call_.get(),
                                 sp,
-                                webrtc::VideoSendStream::Config(this),
+                                config,
                                 external_encoder_factory_,
                                 options_,
                                 bitrate_config_.max_bitrate_bps,
                                 send_codec_,
                                 send_rtp_extensions_);
 
   uint32 ssrc = sp.first_ssrc();
   DCHECK(ssrc != 0);
   send_streams_[ssrc] = stream;
 
@@ skipping 1610 matching lines @@
       video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
     }
   }
 
   return video_codecs;
 }
 
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VIDEO