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

Side by Side Diff: webrtc/voice_engine/channel.cc

Issue 2644303002: Delete class SSRCDatabase, and its global ssrc registry. (Closed)
Patch Set: Rebase. Created 3 years, 10 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/modules/rtp_rtcp/source/ssrc_database.cc ('k') | webrtc/voice_engine/channel_manager.h » ('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 (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 rtp_payload_registry_->GetPayloadTypeFrequency(header.payloadType); 576 rtp_payload_registry_->GetPayloadTypeFrequency(header.payloadType);
577 if (header.payload_type_frequency < 0) 577 if (header.payload_type_frequency < 0)
578 return false; 578 return false;
579 return ReceivePacket(rtp_packet, rtp_packet_length, header, false); 579 return ReceivePacket(rtp_packet, rtp_packet_length, header, false);
580 } 580 }
581 581
582 MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted( 582 MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted(
583 int32_t id, 583 int32_t id,
584 AudioFrame* audioFrame) { 584 AudioFrame* audioFrame) {
585 unsigned int ssrc; 585 unsigned int ssrc;
586 RTC_CHECK_EQ(GetLocalSSRC(ssrc), 0); 586 RTC_CHECK_EQ(GetRemoteSSRC(ssrc), 0);
587 event_log_proxy_->LogAudioPlayout(ssrc); 587 event_log_proxy_->LogAudioPlayout(ssrc);
588 // Get 10ms raw PCM data from the ACM (mixer limits output frequency) 588 // Get 10ms raw PCM data from the ACM (mixer limits output frequency)
589 bool muted; 589 bool muted;
590 if (audio_coding_->PlayoutData10Ms(audioFrame->sample_rate_hz_, audioFrame, 590 if (audio_coding_->PlayoutData10Ms(audioFrame->sample_rate_hz_, audioFrame,
591 &muted) == -1) { 591 &muted) == -1) {
592 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, _channelId), 592 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, _channelId),
593 "Channel::GetAudioFrame() PlayoutData10Ms() failed!"); 593 "Channel::GetAudioFrame() PlayoutData10Ms() failed!");
594 // In all likelihood, the audio in this frame is garbage. We return an 594 // In all likelihood, the audio in this frame is garbage. We return an
595 // error so that the audio mixer module doesn't add it to the mix. As 595 // error so that the audio mixer module doesn't add it to the mix. As
596 // a result, it won't be played out and the actions skipped here are 596 // a result, it won't be played out and the actions skipped here are
(...skipping 2422 matching lines...) Expand 10 before | Expand all | Expand 10 after
3019 int64_t min_rtt = 0; 3019 int64_t min_rtt = 0;
3020 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3020 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3021 0) { 3021 0) {
3022 return 0; 3022 return 0;
3023 } 3023 }
3024 return rtt; 3024 return rtt;
3025 } 3025 }
3026 3026
3027 } // namespace voe 3027 } // namespace voe
3028 } // namespace webrtc 3028 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/ssrc_database.cc ('k') | webrtc/voice_engine/channel_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698