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

Side by Side Diff: webrtc/pc/rtpreceiver.cc

Issue 2979493003: Revert: Change VideoTrack implementation to invoke VideoTrackSourceInterface::AddOrUpdateSink on wt (Closed)
Patch Set: Created 3 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 | « webrtc/pc/rtcstatscollector_unittest.cc ('k') | webrtc/pc/rtpsenderreceiver_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 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 channel_(channel), 148 channel_(channel),
149 source_(new RefCountedObject<VideoTrackSource>(&broadcaster_, 149 source_(new RefCountedObject<VideoTrackSource>(&broadcaster_,
150 true /* remote */)), 150 true /* remote */)),
151 track_(VideoTrackProxy::Create( 151 track_(VideoTrackProxy::Create(
152 rtc::Thread::Current(), 152 rtc::Thread::Current(),
153 worker_thread, 153 worker_thread,
154 VideoTrack::Create( 154 VideoTrack::Create(
155 track_id, 155 track_id,
156 VideoTrackSourceProxy::Create(rtc::Thread::Current(), 156 VideoTrackSourceProxy::Create(rtc::Thread::Current(),
157 worker_thread, 157 worker_thread,
158 source_), 158 source_)))) {
159 worker_thread))) {
160 source_->SetState(MediaSourceInterface::kLive); 159 source_->SetState(MediaSourceInterface::kLive);
161 if (!channel_) { 160 if (!channel_) {
162 LOG(LS_ERROR) 161 LOG(LS_ERROR)
163 << "VideoRtpReceiver::VideoRtpReceiver: No video channel exists."; 162 << "VideoRtpReceiver::VideoRtpReceiver: No video channel exists.";
164 } else { 163 } else {
165 if (!channel_->SetSink(ssrc_, &broadcaster_)) { 164 if (!channel_->SetSink(ssrc_, &broadcaster_)) {
166 RTC_NOTREACHED(); 165 RTC_NOTREACHED();
167 } 166 }
168 } 167 }
169 if (channel_) { 168 if (channel_) {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 } 233 }
235 234
236 void VideoRtpReceiver::OnFirstPacketReceived(cricket::BaseChannel* channel) { 235 void VideoRtpReceiver::OnFirstPacketReceived(cricket::BaseChannel* channel) {
237 if (observer_) { 236 if (observer_) {
238 observer_->OnFirstPacketReceived(media_type()); 237 observer_->OnFirstPacketReceived(media_type());
239 } 238 }
240 received_first_packet_ = true; 239 received_first_packet_ = true;
241 } 240 }
242 241
243 } // namespace webrtc 242 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/rtcstatscollector_unittest.cc ('k') | webrtc/pc/rtpsenderreceiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698