Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 568 header.payload_type_frequency = | 568 header.payload_type_frequency = |
| 569 rtp_payload_registry_->GetPayloadTypeFrequency(header.payloadType); | 569 rtp_payload_registry_->GetPayloadTypeFrequency(header.payloadType); |
| 570 if (header.payload_type_frequency < 0) | 570 if (header.payload_type_frequency < 0) |
| 571 return false; | 571 return false; |
| 572 return ReceivePacket(rtp_packet, rtp_packet_length, header, false); | 572 return ReceivePacket(rtp_packet, rtp_packet_length, header, false); |
| 573 } | 573 } |
| 574 | 574 |
| 575 MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted( | 575 MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted( |
| 576 int32_t id, | 576 int32_t id, |
| 577 AudioFrame* audioFrame) { | 577 AudioFrame* audioFrame) { |
| 578 unsigned int ssrc; | 578 |
| 579 RTC_CHECK_EQ(GetLocalSSRC(ssrc), 0); | 579 event_log_proxy_->LogAudioPlayout(0); |
|
the sun
2017/02/16 13:52:32
Hang on - RtcEventLog will have the same SSRC for
terelius
2017/02/16 13:58:05
I've never used the SSRC for audio playouts. ivoc@
nisse-webrtc
2017/02/16 14:01:59
Ooops. I misunderstood the GetLocalSSRC call compl
terelius
2017/02/16 14:04:42
If the ssrc is no longer considered useful, please
ivoc
2017/02/16 14:27:06
The SSRC was added in https://codereview.webrtc.or
nisse-webrtc
2017/02/16 14:29:22
But if it's a received stream, we should be using
ivoc
2017/02/16 14:35:38
We only used it to tell the different channels apa
nisse-webrtc
2017/02/17 09:59:47
Undid this change, and then changed GetLocalSsrc t
| |
| 580 event_log_proxy_->LogAudioPlayout(ssrc); | |
| 581 // Get 10ms raw PCM data from the ACM (mixer limits output frequency) | 580 // Get 10ms raw PCM data from the ACM (mixer limits output frequency) |
| 582 bool muted; | 581 bool muted; |
| 583 if (audio_coding_->PlayoutData10Ms(audioFrame->sample_rate_hz_, audioFrame, | 582 if (audio_coding_->PlayoutData10Ms(audioFrame->sample_rate_hz_, audioFrame, |
| 584 &muted) == -1) { | 583 &muted) == -1) { |
| 585 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, _channelId), | 584 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, _channelId), |
| 586 "Channel::GetAudioFrame() PlayoutData10Ms() failed!"); | 585 "Channel::GetAudioFrame() PlayoutData10Ms() failed!"); |
| 587 // In all likelihood, the audio in this frame is garbage. We return an | 586 // In all likelihood, the audio in this frame is garbage. We return an |
| 588 // error so that the audio mixer module doesn't add it to the mix. As | 587 // error so that the audio mixer module doesn't add it to the mix. As |
| 589 // a result, it won't be played out and the actions skipped here are | 588 // a result, it won't be played out and the actions skipped here are |
| 590 // irrelevant. | 589 // irrelevant. |
| (...skipping 2575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3166 int64_t min_rtt = 0; | 3165 int64_t min_rtt = 0; |
| 3167 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != | 3166 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != |
| 3168 0) { | 3167 0) { |
| 3169 return 0; | 3168 return 0; |
| 3170 } | 3169 } |
| 3171 return rtt; | 3170 return rtt; |
| 3172 } | 3171 } |
| 3173 | 3172 |
| 3174 } // namespace voe | 3173 } // namespace voe |
| 3175 } // namespace webrtc | 3174 } // namespace webrtc |
| OLD | NEW |