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

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

Issue 2357583002: Remove unnecessary interface TelephoneEventHandler (Closed)
Patch Set: rebase 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) 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_SOURCE_RTP_RECEIVER_AUDIO_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_
13 13
14 #include <set> 14 #include <set>
15 15
16 #include "webrtc/base/onetimeevent.h" 16 #include "webrtc/base/onetimeevent.h"
17 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" 17 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
19 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" 19 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
20 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" 20 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
21 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 // Handles audio RTP packets. This class is thread-safe. 25 // Handles audio RTP packets. This class is thread-safe.
26 class RTPReceiverAudio : public RTPReceiverStrategy, 26 class RTPReceiverAudio : public RTPReceiverStrategy {
27 public TelephoneEventHandler {
28 public: 27 public:
29 explicit RTPReceiverAudio(RtpData* data_callback); 28 explicit RTPReceiverAudio(RtpData* data_callback);
30 virtual ~RTPReceiverAudio() {} 29 virtual ~RTPReceiverAudio() {}
31 30
32 // The following three methods implement the TelephoneEventHandler interface.
33 // Forward DTMFs to decoder for playout.
34 void SetTelephoneEventForwardToDecoder(bool forward_to_decoder) override;
35
36 // Is forwarding of outband telephone events turned on/off?
37 bool TelephoneEventForwardToDecoder() const override;
38
39 // Is TelephoneEvent configured with payload type payload_type 31 // Is TelephoneEvent configured with payload type payload_type
40 bool TelephoneEventPayloadType(const int8_t payload_type) const override; 32 bool TelephoneEventPayloadType(const int8_t payload_type) const;
41
42 TelephoneEventHandler* GetTelephoneEventHandler() override { return this; }
43 33
44 // Returns true if CNG is configured with payload type payload_type. If so, 34 // Returns true if CNG is configured with payload type payload_type. If so,
45 // the frequency and cng_payload_type_has_changed are filled in. 35 // the frequency and cng_payload_type_has_changed are filled in.
46 bool CNGPayloadType(const int8_t payload_type, 36 bool CNGPayloadType(const int8_t payload_type,
47 uint32_t* frequency, 37 uint32_t* frequency,
48 bool* cng_payload_type_has_changed); 38 bool* cng_payload_type_has_changed);
49 39
50 int32_t ParseRtpPacket(WebRtcRTPHeader* rtp_header, 40 int32_t ParseRtpPacket(WebRtcRTPHeader* rtp_header,
51 const PayloadUnion& specific_payload, 41 const PayloadUnion& specific_payload,
52 bool is_red, 42 bool is_red,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 bool last_received_g722_; 105 bool last_received_g722_;
116 106
117 uint8_t num_energy_; 107 uint8_t num_energy_;
118 uint8_t current_remote_energy_[kRtpCsrcSize]; 108 uint8_t current_remote_energy_[kRtpCsrcSize];
119 109
120 ThreadUnsafeOneTimeEvent first_packet_received_; 110 ThreadUnsafeOneTimeEvent first_packet_received_;
121 }; 111 };
122 } // namespace webrtc 112 } // namespace webrtc
123 113
124 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_ 114 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/rtp_receiver.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698