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

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver.h

Issue 2540363003: Wire up rtcp xr target bitrate on receive side. (Closed)
Patch Set: Actual fuzzer fix Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/rtp_rtcp.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
index 6bb771b066caf748d043f1e31ba0c5d0c0c0f80b..8d1e2c23300e4bdf8deef5624978bcf83933d551 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -25,10 +25,12 @@
#include "webrtc/typedefs.h"
namespace webrtc {
+class VideoBitrateAllocationObserver;
namespace rtcp {
class CommonHeader;
class ReportBlock;
class Rrtr;
+class TargetBitrate;
class TmmbItem;
} // namespace rtcp
@@ -53,6 +55,7 @@ class RTCPReceiver {
RtcpBandwidthObserver* rtcp_bandwidth_observer,
RtcpIntraFrameObserver* rtcp_intra_frame_observer,
TransportFeedbackObserver* transport_feedback_observer,
+ VideoBitrateAllocationObserver* bitrate_allocation_observer,
ModuleRtpRtcp* owner);
virtual ~RTCPReceiver();
@@ -163,6 +166,10 @@ class RTCPReceiver {
void HandleXrDlrrReportBlock(const rtcp::ReceiveTimeInfo& rti)
EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
+ void HandleXrTargetBitrate(const rtcp::TargetBitrate& target_bitrate,
+ PacketInformation* packet_information)
+ EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
+
void HandleNACK(const rtcp::CommonHeader& rtcp_block,
PacketInformation* packet_information)
EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
@@ -210,10 +217,11 @@ class RTCPReceiver {
const bool receiver_only_;
ModuleRtpRtcp& _rtpRtcp;
- rtc::CriticalSection _criticalSectionFeedbacks;
- RtcpBandwidthObserver* const _cbRtcpBandwidthObserver;
- RtcpIntraFrameObserver* const _cbRtcpIntraFrameObserver;
- TransportFeedbackObserver* const _cbTransportFeedbackObserver;
+ rtc::CriticalSection feedbacks_lock_;
+ RtcpBandwidthObserver* const rtcp_bandwidth_observer_;
+ RtcpIntraFrameObserver* const rtcp_intra_frame_observer_;
+ TransportFeedbackObserver* const transport_feedback_observer_;
+ VideoBitrateAllocationObserver* const bitrate_allocation_observer_;
rtc::CriticalSection _criticalSectionRTCPReceiver;
uint32_t main_ssrc_ GUARDED_BY(_criticalSectionRTCPReceiver);
@@ -247,7 +255,7 @@ class RTCPReceiver {
// delivered RTP packet to the remote side.
int64_t _lastIncreasedSequenceNumberMs;
- RtcpStatisticsCallback* stats_callback_ GUARDED_BY(_criticalSectionFeedbacks);
+ RtcpStatisticsCallback* stats_callback_ GUARDED_BY(feedbacks_lock_);
RtcpPacketTypeCounterObserver* const packet_type_counter_observer_;
RtcpPacketTypeCounter packet_type_counter_;
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/rtp_rtcp.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698