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

Side by Side Diff: webrtc/modules/rtp_rtcp/include/rtp_rtcp.h

Issue 1571283002: Fixes a bug which incorrectly logs incoming RTCP as outgoing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 4 years, 11 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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_
12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_
13 13
14 #include <set> 14 #include <set>
15 #include <utility> 15 #include <utility>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/modules/include/module.h" 18 #include "webrtc/modules/include/module.h"
19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 // Forward declarations. 22 // Forward declarations.
23 class ReceiveStatistics; 23 class ReceiveStatistics;
24 class RemoteBitrateEstimator; 24 class RemoteBitrateEstimator;
25 class RtpReceiver; 25 class RtpReceiver;
26 class Transport; 26 class Transport;
27 class RtcEventLog;
28
27 namespace rtcp { 29 namespace rtcp {
28 class TransportFeedback; 30 class TransportFeedback;
29 } 31 }
30 32
31 class RtpRtcp : public Module { 33 class RtpRtcp : public Module {
32 public: 34 public:
33 struct Configuration { 35 struct Configuration {
34 Configuration(); 36 Configuration();
35 37
36 /* id - Unique identifier of this RTP/RTCP module object 38 /* id - Unique identifier of this RTP/RTCP module object
(...skipping 29 matching lines...) Expand all
66 TransportFeedbackObserver* transport_feedback_callback; 68 TransportFeedbackObserver* transport_feedback_callback;
67 RtcpRttStats* rtt_stats; 69 RtcpRttStats* rtt_stats;
68 RtcpPacketTypeCounterObserver* rtcp_packet_type_counter_observer; 70 RtcpPacketTypeCounterObserver* rtcp_packet_type_counter_observer;
69 RtpAudioFeedback* audio_messages; 71 RtpAudioFeedback* audio_messages;
70 RemoteBitrateEstimator* remote_bitrate_estimator; 72 RemoteBitrateEstimator* remote_bitrate_estimator;
71 RtpPacketSender* paced_sender; 73 RtpPacketSender* paced_sender;
72 TransportSequenceNumberAllocator* transport_sequence_number_allocator; 74 TransportSequenceNumberAllocator* transport_sequence_number_allocator;
73 BitrateStatisticsObserver* send_bitrate_observer; 75 BitrateStatisticsObserver* send_bitrate_observer;
74 FrameCountObserver* send_frame_count_observer; 76 FrameCountObserver* send_frame_count_observer;
75 SendSideDelayObserver* send_side_delay_observer; 77 SendSideDelayObserver* send_side_delay_observer;
78 RtcEventLog* event_log;
79
80 RTC_DISALLOW_COPY_AND_ASSIGN(Configuration);
76 }; 81 };
77 82
78 /* 83 /*
79 * Create a RTP/RTCP module object using the system clock. 84 * Create a RTP/RTCP module object using the system clock.
80 * 85 *
81 * configuration - Configuration of the RTP/RTCP module. 86 * configuration - Configuration of the RTP/RTCP module.
82 */ 87 */
83 static RtpRtcp* CreateRtpRtcp(const RtpRtcp::Configuration& configuration); 88 static RtpRtcp* CreateRtpRtcp(const RtpRtcp::Configuration& configuration);
84 89
85 /************************************************************************** 90 /**************************************************************************
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 649
645 /* 650 /*
646 * send a request for a keyframe 651 * send a request for a keyframe
647 * 652 *
648 * return -1 on failure else 0 653 * return -1 on failure else 0
649 */ 654 */
650 virtual int32_t RequestKeyFrame() = 0; 655 virtual int32_t RequestKeyFrame() = 0;
651 }; 656 };
652 } // namespace webrtc 657 } // namespace webrtc
653 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_ 658 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_H_
OLDNEW
« no previous file with comments | « webrtc/call/rtc_event_log_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698