Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc.

webrtc/pc/rtpreceiver.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.
  */
 
 #include "webrtc/pc/rtpreceiver.h"
 
 #include "webrtc/api/mediastreamtrackproxy.h"
 #include "webrtc/api/videosourceproxy.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/pc/audiotrack.h"
 #include "webrtc/pc/videotrack.h"
 
 namespace webrtc {
 
-AudioRtpReceiver::AudioRtpReceiver(MediaStreamInterface* stream,
-                                   const std::string& track_id,
+AudioRtpReceiver::AudioRtpReceiver(const std::string& track_id,
                                    uint32_t ssrc,
                                    cricket::VoiceChannel* channel)
     : id_(track_id),
       ssrc_(ssrc),
       channel_(channel),
       track_(AudioTrackProxy::Create(
           rtc::Thread::Current(),
           AudioTrack::Create(track_id,
                              RemoteAudioSource::Create(ssrc, channel)))),
       cached_track_enabled_(track_->enabled()) {
   RTC_DCHECK(track_->GetSource()->remote());
   track_->RegisterObserver(this);
   track_->GetSource()->RegisterAudioObserver(this);
   Reconfigure();
-  stream->AddTrack(track_);
   if (channel_) {
     channel_->SignalFirstPacketReceived.connect(
         this, &AudioRtpReceiver::OnFirstPacketReceived);
   }
 }
 
 AudioRtpReceiver::~AudioRtpReceiver() {
   track_->GetSource()->UnregisterAudioObserver(this);
   track_->UnregisterObserver(this);
   Stop();
@@ skipping 82 matching lines @@
   }
 }
 
 void AudioRtpReceiver::OnFirstPacketReceived(cricket::BaseChannel* channel) {
   if (observer_) {
     observer_->OnFirstPacketReceived(media_type());
   }
   received_first_packet_ = true;
 }
 
-VideoRtpReceiver::VideoRtpReceiver(MediaStreamInterface* stream,
-                                   const std::string& track_id,
+VideoRtpReceiver::VideoRtpReceiver(const std::string& track_id,
                                    rtc::Thread* worker_thread,
                                    uint32_t ssrc,
                                    cricket::VideoChannel* channel)
     : id_(track_id),
       ssrc_(ssrc),
       channel_(channel),
       source_(new RefCountedObject<VideoTrackSource>(&broadcaster_,
                                                      true /* remote */)),
       track_(VideoTrackProxy::Create(
           rtc::Thread::Current(),
           worker_thread,
           VideoTrack::Create(
               track_id,
               VideoTrackSourceProxy::Create(rtc::Thread::Current(),
                                             worker_thread,
                                             source_)))) {
   source_->SetState(MediaSourceInterface::kLive);
   if (!channel_) {
     LOG(LS_ERROR)
         << "VideoRtpReceiver::VideoRtpReceiver: No video channel exists.";
   } else {
     if (!channel_->SetSink(ssrc_, &broadcaster_)) {
       RTC_NOTREACHED();
     }
   }
-  stream->AddTrack(track_);
   if (channel_) {
     channel_->SignalFirstPacketReceived.connect(
         this, &VideoRtpReceiver::OnFirstPacketReceived);
   }
 }
 
 VideoRtpReceiver::~VideoRtpReceiver() {
   // Since cricket::VideoRenderer is not reference counted,
   // we need to remove it from the channel before we are deleted.
   Stop();
@@ skipping 55 matching lines @@
 }
 
 void VideoRtpReceiver::OnFirstPacketReceived(cricket::BaseChannel* channel) {
   if (observer_) {
     observer_->OnFirstPacketReceived(media_type());
   }
   received_first_packet_ = true;
 }
 
 }  // namespace webrtc