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

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

Issue 3000713002: Add audio_level member to RtpSource and set it from RtpReceiverImpl::IncomingRtpPacket. (Closed)
Patch Set: Style feedback from deadbeef Created 3 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
« no previous file with comments | « webrtc/api/rtpreceiverinterface.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.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) 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 private: 72 private:
73 bool HaveReceivedFrame() const; 73 bool HaveReceivedFrame() const;
74 74
75 void CheckSSRCChanged(const RTPHeader& rtp_header); 75 void CheckSSRCChanged(const RTPHeader& rtp_header);
76 void CheckCSRC(const WebRtcRTPHeader& rtp_header); 76 void CheckCSRC(const WebRtcRTPHeader& rtp_header);
77 int32_t CheckPayloadChanged(const RTPHeader& rtp_header, 77 int32_t CheckPayloadChanged(const RTPHeader& rtp_header,
78 const int8_t first_payload_byte, 78 const int8_t first_payload_byte,
79 bool* is_red, 79 bool* is_red,
80 PayloadUnion* payload); 80 PayloadUnion* payload);
81 81
82 void UpdateSources(); 82 void UpdateSources(const rtc::Optional<uint8_t>& ssrc_audio_level);
83 void RemoveOutdatedSources(int64_t now_ms); 83 void RemoveOutdatedSources(int64_t now_ms);
84 84
85 Clock* clock_; 85 Clock* clock_;
86 RTPPayloadRegistry* rtp_payload_registry_; 86 RTPPayloadRegistry* rtp_payload_registry_;
87 std::unique_ptr<RTPReceiverStrategy> rtp_media_receiver_; 87 std::unique_ptr<RTPReceiverStrategy> rtp_media_receiver_;
88 88
89 RtpFeedback* cb_rtp_feedback_; 89 RtpFeedback* cb_rtp_feedback_;
90 90
91 rtc::CriticalSection critical_section_rtp_receiver_; 91 rtc::CriticalSection critical_section_rtp_receiver_;
92 int64_t last_receive_time_; 92 int64_t last_receive_time_;
93 size_t last_received_payload_length_; 93 size_t last_received_payload_length_;
94 94
95 // SSRCs. 95 // SSRCs.
96 uint32_t ssrc_; 96 uint32_t ssrc_;
97 uint8_t num_csrcs_; 97 uint8_t num_csrcs_;
98 uint32_t current_remote_csrc_[kRtpCsrcSize]; 98 uint32_t current_remote_csrc_[kRtpCsrcSize];
99 99
100 uint32_t last_received_timestamp_; 100 uint32_t last_received_timestamp_;
101 int64_t last_received_frame_time_ms_; 101 int64_t last_received_frame_time_ms_;
102 uint16_t last_received_sequence_number_; 102 uint16_t last_received_sequence_number_;
103 103
104 std::unordered_map<uint32_t, std::list<RtpSource>::iterator> 104 std::unordered_map<uint32_t, std::list<RtpSource>::iterator>
105 iterator_by_csrc_; 105 iterator_by_csrc_;
106 // The RtpSource objects are sorted chronologically. 106 // The RtpSource objects are sorted chronologically.
107 std::list<RtpSource> csrc_sources_; 107 std::list<RtpSource> csrc_sources_;
108 std::vector<RtpSource> ssrc_sources_; 108 std::vector<RtpSource> ssrc_sources_;
109 }; 109 };
110 } // namespace webrtc 110 } // namespace webrtc
111 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_ 111 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/api/rtpreceiverinterface.h ('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