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

Side by Side Diff: webrtc/audio/audio_receive_stream.cc

Issue 2112643005: Remove audio/video distinction for probe packets. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@52
Patch Set: rebase errors Created 4 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 | « no previous file | webrtc/audio/audio_receive_stream_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 (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 // Only forward if the parsed header has one of the headers necessary for 228 // Only forward if the parsed header has one of the headers necessary for
229 // bandwidth estimation. RTP timestamps has different rates for audio and 229 // bandwidth estimation. RTP timestamps has different rates for audio and
230 // video and shouldn't be mixed. 230 // video and shouldn't be mixed.
231 if (remote_bitrate_estimator_ && 231 if (remote_bitrate_estimator_ &&
232 header.extension.hasTransportSequenceNumber) { 232 header.extension.hasTransportSequenceNumber) {
233 int64_t arrival_time_ms = rtc::TimeMillis(); 233 int64_t arrival_time_ms = rtc::TimeMillis();
234 if (packet_time.timestamp >= 0) 234 if (packet_time.timestamp >= 0)
235 arrival_time_ms = (packet_time.timestamp + 500) / 1000; 235 arrival_time_ms = (packet_time.timestamp + 500) / 1000;
236 size_t payload_size = length - header.headerLength; 236 size_t payload_size = length - header.headerLength;
237 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_size, 237 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_size,
238 header, false); 238 header);
239 } 239 }
240 240
241 return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time); 241 return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time);
242 } 242 }
243 243
244 VoiceEngine* AudioReceiveStream::voice_engine() const { 244 VoiceEngine* AudioReceiveStream::voice_engine() const {
245 internal::AudioState* audio_state = 245 internal::AudioState* audio_state =
246 static_cast<internal::AudioState*>(audio_state_.get()); 246 static_cast<internal::AudioState*>(audio_state_.get());
247 VoiceEngine* voice_engine = audio_state->voice_engine(); 247 VoiceEngine* voice_engine = audio_state->voice_engine();
248 RTC_DCHECK(voice_engine); 248 RTC_DCHECK(voice_engine);
249 return voice_engine; 249 return voice_engine;
250 } 250 }
251 } // namespace internal 251 } // namespace internal
252 } // namespace webrtc 252 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_receive_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698