OLD | NEW |
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_SENDER_AUDIO_H_ | 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ |
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ | 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ |
13 | 13 |
14 #include "webrtc/common_types.h" | 14 #include "webrtc/common_types.h" |
15 #include "webrtc/modules/rtp_rtcp/source/dtmf_queue.h" | 15 #include "webrtc/modules/rtp_rtcp/source/dtmf_queue.h" |
16 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" | 16 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" |
17 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" | 17 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" |
18 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" | 18 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" |
19 #include "webrtc/typedefs.h" | 19 #include "webrtc/typedefs.h" |
20 | 20 |
21 namespace webrtc { | 21 namespace webrtc { |
22 class RTPSenderAudio : public DTMFqueue { | 22 class RTPSenderAudio : public DTMFqueue { |
23 public: | 23 public: |
24 RTPSenderAudio(Clock* clock, | 24 RTPSenderAudio(Clock* clock, RTPSender* rtpSender); |
25 RTPSender* rtpSender, | |
26 RtpAudioFeedback* audio_feedback); | |
27 virtual ~RTPSenderAudio(); | 25 virtual ~RTPSenderAudio(); |
28 | 26 |
29 int32_t RegisterAudioPayload(const char payloadName[RTP_PAYLOAD_NAME_SIZE], | 27 int32_t RegisterAudioPayload(const char payloadName[RTP_PAYLOAD_NAME_SIZE], |
30 int8_t payloadType, | 28 int8_t payloadType, |
31 uint32_t frequency, | 29 uint32_t frequency, |
32 size_t channels, | 30 size_t channels, |
33 uint32_t rate, | 31 uint32_t rate, |
34 RtpUtility::Payload** payload); | 32 RtpUtility::Payload** payload); |
35 | 33 |
36 int32_t SendAudio(FrameType frameType, | 34 int32_t SendAudio(FrameType frameType, |
(...skipping 29 matching lines...) Expand all Loading... |
66 int8_t dtmf_payload_type, | 64 int8_t dtmf_payload_type, |
67 uint32_t dtmfTimeStamp, | 65 uint32_t dtmfTimeStamp, |
68 uint16_t duration, | 66 uint16_t duration, |
69 bool markerBit); // set on first packet in talk burst | 67 bool markerBit); // set on first packet in talk burst |
70 | 68 |
71 bool MarkerBit(const FrameType frameType, const int8_t payloadType); | 69 bool MarkerBit(const FrameType frameType, const int8_t payloadType); |
72 | 70 |
73 private: | 71 private: |
74 Clock* const _clock; | 72 Clock* const _clock; |
75 RTPSender* const _rtpSender; | 73 RTPSender* const _rtpSender; |
76 RtpAudioFeedback* const _audioFeedback; | |
77 | 74 |
78 rtc::scoped_ptr<CriticalSectionWrapper> _sendAudioCritsect; | 75 rtc::scoped_ptr<CriticalSectionWrapper> _sendAudioCritsect; |
79 | 76 |
80 uint16_t _packetSizeSamples GUARDED_BY(_sendAudioCritsect); | 77 uint16_t _packetSizeSamples GUARDED_BY(_sendAudioCritsect); |
81 | 78 |
82 // DTMF | 79 // DTMF |
83 bool _dtmfEventIsOn; | 80 bool _dtmfEventIsOn; |
84 bool _dtmfEventFirstPacketSent; | 81 bool _dtmfEventFirstPacketSent; |
85 int8_t _dtmfPayloadType GUARDED_BY(_sendAudioCritsect); | 82 int8_t _dtmfPayloadType GUARDED_BY(_sendAudioCritsect); |
86 uint32_t _dtmfTimestamp; | 83 uint32_t _dtmfTimestamp; |
(...skipping 13 matching lines...) Expand all Loading... |
100 int8_t _cngFBPayloadType GUARDED_BY(_sendAudioCritsect); | 97 int8_t _cngFBPayloadType GUARDED_BY(_sendAudioCritsect); |
101 int8_t _lastPayloadType GUARDED_BY(_sendAudioCritsect); | 98 int8_t _lastPayloadType GUARDED_BY(_sendAudioCritsect); |
102 | 99 |
103 // Audio level indication | 100 // Audio level indication |
104 // (https://datatracker.ietf.org/doc/draft-lennox-avt-rtp-audio-level-exthdr/) | 101 // (https://datatracker.ietf.org/doc/draft-lennox-avt-rtp-audio-level-exthdr/) |
105 uint8_t _audioLevel_dBov GUARDED_BY(_sendAudioCritsect); | 102 uint8_t _audioLevel_dBov GUARDED_BY(_sendAudioCritsect); |
106 }; | 103 }; |
107 } // namespace webrtc | 104 } // namespace webrtc |
108 | 105 |
109 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ | 106 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_AUDIO_H_ |
OLD | NEW |