Move responsibility for RTP header extensions on video receive.

webrtc/pc/mediacontroller.cc

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 45 matching lines @@
     if (!call_) {
       call_.reset(webrtc::Call::Create(call_config_));
     }
     return call_.get();
   }
   cricket::ChannelManager* channel_manager() const override {
     return channel_manager_;
   }
   const cricket::MediaConfig& config() const override { return media_config_; }
 
+  // Call's SetVideoReceiveRtpHeaderExtensions can be called on any thread,
+  // but we need to go via worker_thread_ to access the call_ pointer.
+  void SetVideoReceiveRtpHeaderExtensions(
+      const std::vector<webrtc::RtpExtension>& extensions) override {
+    if (!worker_thread_->IsCurrent()) {
+      worker_thread_->Invoke<void>(
+          RTC_FROM_HERE,
+          rtc::Bind(&MediaController::SetVideoReceiveRtpHeaderExtensions,
+                    this, extensions));
+      return;
+    }
+    call_w()->SetVideoReceiveRtpHeaderExtensions(extensions);
+  }
+
  private:
   void Construct_w(cricket::MediaEngineInterface* media_engine) {
     RTC_DCHECK(worker_thread_->IsCurrent());
     RTC_DCHECK(media_engine);
     call_config_.audio_state = media_engine->GetAudioState();
     call_config_.bitrate_config.min_bitrate_bps = kMinBandwidthBps;
     call_config_.bitrate_config.start_bitrate_bps = kStartBandwidthBps;
     call_config_.bitrate_config.max_bitrate_bps = kMaxBandwidthBps;
   }
   void Close_w() {
@@ skipping 14 matching lines @@
 namespace webrtc {
 
 MediaControllerInterface* MediaControllerInterface::Create(
     const cricket::MediaConfig& config,
     rtc::Thread* worker_thread,
     cricket::ChannelManager* channel_manager,
     webrtc::RtcEventLog* event_log) {
   return new MediaController(config, worker_thread, channel_manager, event_log);
 }
 }  // namespace webrtc