OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 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 1969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1980 // and we have had some form of connectivity. | 1980 // and we have had some form of connectivity. |
1981 bool send = IsReadyToSendMedia_w(); | 1981 bool send = IsReadyToSendMedia_w(); |
1982 if (!media_channel()->SetSend(send)) { | 1982 if (!media_channel()->SetSend(send)) { |
1983 LOG(LS_ERROR) << "Failed to SetSend on video channel"; | 1983 LOG(LS_ERROR) << "Failed to SetSend on video channel"; |
1984 // TODO(gangji): Report error back to server. | 1984 // TODO(gangji): Report error back to server. |
1985 } | 1985 } |
1986 | 1986 |
1987 LOG(LS_INFO) << "Changing video state, send=" << send; | 1987 LOG(LS_INFO) << "Changing video state, send=" << send; |
1988 } | 1988 } |
1989 | 1989 |
1990 void VideoChannel::FillBitrateInfo(BandwidthEstimationInfo* bwe_info) { | |
1991 RTC_DCHECK(InvokeOnWorker( | |
Taylor Brandstetter
2017/05/07 21:30:44
Why is this in an RTC_DCHECK?
stefan-webrtc
2017/05/08 07:12:56
Copy paste from below, but my method didn't have t
| |
1992 RTC_FROM_HERE, | |
1993 Bind(&VideoMediaChannel::FillBitrateInfo, media_channel(), bwe_info))); | |
1994 } | |
1995 | |
1990 bool VideoChannel::GetStats(VideoMediaInfo* stats) { | 1996 bool VideoChannel::GetStats(VideoMediaInfo* stats) { |
1991 return InvokeOnWorker(RTC_FROM_HERE, Bind(&VideoMediaChannel::GetStats, | 1997 return InvokeOnWorker(RTC_FROM_HERE, Bind(&VideoMediaChannel::GetStats, |
1992 media_channel(), stats)); | 1998 media_channel(), stats)); |
1993 } | 1999 } |
1994 | 2000 |
1995 void VideoChannel::StartMediaMonitor(int cms) { | 2001 void VideoChannel::StartMediaMonitor(int cms) { |
1996 media_monitor_.reset(new VideoMediaMonitor(media_channel(), worker_thread(), | 2002 media_monitor_.reset(new VideoMediaMonitor(media_channel(), worker_thread(), |
1997 rtc::Thread::Current())); | 2003 rtc::Thread::Current())); |
1998 media_monitor_->SignalUpdate.connect( | 2004 media_monitor_->SignalUpdate.connect( |
1999 this, &VideoChannel::OnMediaMonitorUpdate); | 2005 this, &VideoChannel::OnMediaMonitorUpdate); |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2400 | 2406 |
2401 void RtpDataChannel::OnDataChannelReadyToSend(bool writable) { | 2407 void RtpDataChannel::OnDataChannelReadyToSend(bool writable) { |
2402 // This is usded for congestion control to indicate that the stream is ready | 2408 // This is usded for congestion control to indicate that the stream is ready |
2403 // to send by the MediaChannel, as opposed to OnReadyToSend, which indicates | 2409 // to send by the MediaChannel, as opposed to OnReadyToSend, which indicates |
2404 // that the transport channel is ready. | 2410 // that the transport channel is ready. |
2405 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_READYTOSENDDATA, | 2411 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_READYTOSENDDATA, |
2406 new DataChannelReadyToSendMessageData(writable)); | 2412 new DataChannelReadyToSendMessageData(writable)); |
2407 } | 2413 } |
2408 | 2414 |
2409 } // namespace cricket | 2415 } // namespace cricket |
OLD | NEW |