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

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

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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // Returns the last received timestamp. 50 // Returns the last received timestamp.
51 bool Timestamp(uint32_t* timestamp) const override; 51 bool Timestamp(uint32_t* timestamp) const override;
52 bool LastReceivedTimeMs(int64_t* receive_time_ms) const override; 52 bool LastReceivedTimeMs(int64_t* receive_time_ms) const override;
53 53
54 uint32_t SSRC() const override; 54 uint32_t SSRC() const override;
55 55
56 int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const override; 56 int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const override;
57 57
58 int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const override; 58 int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const override;
59 59
60 TelephoneEventHandler* GetTelephoneEventHandler() override;
61
60 private: 62 private:
61 bool HaveReceivedFrame() const; 63 bool HaveReceivedFrame() const;
62 64
63 void CheckSSRCChanged(const RTPHeader& rtp_header); 65 void CheckSSRCChanged(const RTPHeader& rtp_header);
64 void CheckCSRC(const WebRtcRTPHeader& rtp_header); 66 void CheckCSRC(const WebRtcRTPHeader& rtp_header);
65 int32_t CheckPayloadChanged(const RTPHeader& rtp_header, 67 int32_t CheckPayloadChanged(const RTPHeader& rtp_header,
66 const int8_t first_payload_byte, 68 const int8_t first_payload_byte,
67 bool* is_red, 69 bool* is_red,
68 PayloadUnion* payload); 70 PayloadUnion* payload);
69 71
(...skipping 11 matching lines...) Expand all
81 uint32_t ssrc_; 83 uint32_t ssrc_;
82 uint8_t num_csrcs_; 84 uint8_t num_csrcs_;
83 uint32_t current_remote_csrc_[kRtpCsrcSize]; 85 uint32_t current_remote_csrc_[kRtpCsrcSize];
84 86
85 uint32_t last_received_timestamp_; 87 uint32_t last_received_timestamp_;
86 int64_t last_received_frame_time_ms_; 88 int64_t last_received_frame_time_ms_;
87 uint16_t last_received_sequence_number_; 89 uint16_t last_received_sequence_number_;
88 }; 90 };
89 } // namespace webrtc 91 } // namespace webrtc
90 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ 92 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698