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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 1757683002: Make the audio channel communicate network state changes to the call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing code review issues Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
1353 // filter RTCP anymore incoming RTCP packets could've been going to audio (so 1353 // filter RTCP anymore incoming RTCP packets could've been going to audio (so
1354 // logging failures spam the log). 1354 // logging failures spam the log).
1355 call_->Receiver()->DeliverPacket( 1355 call_->Receiver()->DeliverPacket(
1356 webrtc::MediaType::VIDEO, 1356 webrtc::MediaType::VIDEO,
1357 reinterpret_cast<const uint8_t*>(packet->data()), packet->size(), 1357 reinterpret_cast<const uint8_t*>(packet->data()), packet->size(),
1358 webrtc_packet_time); 1358 webrtc_packet_time);
1359 } 1359 }
1360 1360
1361 void WebRtcVideoChannel2::OnReadyToSend(bool ready) { 1361 void WebRtcVideoChannel2::OnReadyToSend(bool ready) {
1362 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready."); 1362 LOG(LS_VERBOSE) << "OnReadyToSend: " << (ready ? "Ready." : "Not ready.");
1363 call_->SignalNetworkState(ready ? webrtc::kNetworkUp : webrtc::kNetworkDown); 1363 call_->SignalChannelNetworkState(
1364 webrtc::MediaType::VIDEO,
1365 ready ? webrtc::kNetworkUp : webrtc::kNetworkDown);
1364 } 1366 }
1365 1367
1366 bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) { 1368 bool WebRtcVideoChannel2::MuteStream(uint32_t ssrc, bool mute) {
1367 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> " 1369 LOG(LS_VERBOSE) << "MuteStream: " << ssrc << " -> "
1368 << (mute ? "mute" : "unmute"); 1370 << (mute ? "mute" : "unmute");
1369 RTC_DCHECK(ssrc != 0); 1371 RTC_DCHECK(ssrc != 0);
1370 rtc::CritScope stream_lock(&stream_crit_); 1372 rtc::CritScope stream_lock(&stream_crit_);
1371 const auto& kv = send_streams_.find(ssrc); 1373 const auto& kv = send_streams_.find(ssrc);
1372 if (kv == send_streams_.end()) { 1374 if (kv == send_streams_.end()) {
1373 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc; 1375 LOG(LS_ERROR) << "No sending stream on ssrc " << ssrc;
(...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after
2534 rtx_mapping[video_codecs[i].codec.id] != 2536 rtx_mapping[video_codecs[i].codec.id] !=
2535 fec_settings.red_payload_type) { 2537 fec_settings.red_payload_type) {
2536 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2538 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2537 } 2539 }
2538 } 2540 }
2539 2541
2540 return video_codecs; 2542 return video_codecs;
2541 } 2543 }
2542 2544
2543 } // namespace cricket 2545 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698