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

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

Issue 1812453002: Revert of Clean away use of RtpAudioFeedback interface from RTP/RTCP receiver code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@voe_dtmf_7
Patch Set: Created 4 years, 9 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 | « no previous file | webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h » ('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) 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 27 matching lines...) Expand all
38 // Creates a video-enabled RTP receiver. 38 // Creates a video-enabled RTP receiver.
39 static RtpReceiver* CreateVideoReceiver( 39 static RtpReceiver* CreateVideoReceiver(
40 Clock* clock, 40 Clock* clock,
41 RtpData* incoming_payload_callback, 41 RtpData* incoming_payload_callback,
42 RtpFeedback* incoming_messages_callback, 42 RtpFeedback* incoming_messages_callback,
43 RTPPayloadRegistry* rtp_payload_registry); 43 RTPPayloadRegistry* rtp_payload_registry);
44 44
45 // Creates an audio-enabled RTP receiver. 45 // Creates an audio-enabled RTP receiver.
46 static RtpReceiver* CreateAudioReceiver( 46 static RtpReceiver* CreateAudioReceiver(
47 Clock* clock, 47 Clock* clock,
48 RtpAudioFeedback* incoming_audio_feedback,
48 RtpData* incoming_payload_callback, 49 RtpData* incoming_payload_callback,
49 RtpFeedback* incoming_messages_callback, 50 RtpFeedback* incoming_messages_callback,
50 RTPPayloadRegistry* rtp_payload_registry); 51 RTPPayloadRegistry* rtp_payload_registry);
51 52
52 virtual ~RtpReceiver() {} 53 virtual ~RtpReceiver() {}
53 54
54 // Returns a TelephoneEventHandler if available. 55 // Returns a TelephoneEventHandler if available.
55 virtual TelephoneEventHandler* GetTelephoneEventHandler() = 0; 56 virtual TelephoneEventHandler* GetTelephoneEventHandler() = 0;
56 57
57 // Registers a receive payload in the payload registry and notifies the media 58 // Registers a receive payload in the payload registry and notifies the media
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 94
94 // Returns the current remote CSRCs. 95 // Returns the current remote CSRCs.
95 virtual int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const = 0; 96 virtual int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const = 0;
96 97
97 // Returns the current energy of the RTP stream received. 98 // Returns the current energy of the RTP stream received.
98 virtual int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const = 0; 99 virtual int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const = 0;
99 }; 100 };
100 } // namespace webrtc 101 } // namespace webrtc
101 102
102 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_ 103 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RECEIVER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698