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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc

Issue 2362673002: Revert of Remove unnecessary interface TelephoneEventHandler (Closed)
Patch Set: Created 4 years, 3 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) 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 if (last_received_timestamp_ != rtp_header.timestamp) { 193 if (last_received_timestamp_ != rtp_header.timestamp) {
194 last_received_timestamp_ = rtp_header.timestamp; 194 last_received_timestamp_ = rtp_header.timestamp;
195 last_received_frame_time_ms_ = clock_->TimeInMilliseconds(); 195 last_received_frame_time_ms_ = clock_->TimeInMilliseconds();
196 } 196 }
197 last_received_sequence_number_ = rtp_header.sequenceNumber; 197 last_received_sequence_number_ = rtp_header.sequenceNumber;
198 } 198 }
199 } 199 }
200 return true; 200 return true;
201 } 201 }
202 202
203 TelephoneEventHandler* RtpReceiverImpl::GetTelephoneEventHandler() {
204 return rtp_media_receiver_->GetTelephoneEventHandler();
205 }
206
203 bool RtpReceiverImpl::Timestamp(uint32_t* timestamp) const { 207 bool RtpReceiverImpl::Timestamp(uint32_t* timestamp) const {
204 rtc::CritScope lock(&critical_section_rtp_receiver_); 208 rtc::CritScope lock(&critical_section_rtp_receiver_);
205 if (!HaveReceivedFrame()) 209 if (!HaveReceivedFrame())
206 return false; 210 return false;
207 *timestamp = last_received_timestamp_; 211 *timestamp = last_received_timestamp_;
208 return true; 212 return true;
209 } 213 }
210 214
211 bool RtpReceiverImpl::LastReceivedTimeMs(int64_t* receive_time_ms) const { 215 bool RtpReceiverImpl::LastReceivedTimeMs(int64_t* receive_time_ms) const {
212 rtc::CritScope lock(&critical_section_rtp_receiver_); 216 rtc::CritScope lock(&critical_section_rtp_receiver_);
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 // implementations might have CSRC 0 as a valid value. 456 // implementations might have CSRC 0 as a valid value.
453 if (num_csrcs_diff > 0) { 457 if (num_csrcs_diff > 0) {
454 cb_rtp_feedback_->OnIncomingCSRCChanged(0, true); 458 cb_rtp_feedback_->OnIncomingCSRCChanged(0, true);
455 } else if (num_csrcs_diff < 0) { 459 } else if (num_csrcs_diff < 0) {
456 cb_rtp_feedback_->OnIncomingCSRCChanged(0, false); 460 cb_rtp_feedback_->OnIncomingCSRCChanged(0, false);
457 } 461 }
458 } 462 }
459 } 463 }
460 464
461 } // namespace webrtc 465 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698