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

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

Issue 2365873002: Make RtpSenderAudio not inherit from DtmfQueue (Closed)
Patch Set: Make RtpSenderAudio not inherit from DtmfQueue 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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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_DTMF_QUEUE_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_
13 13
14 #include "webrtc/base/criticalsection.h" 14 #include "webrtc/base/criticalsection.h"
15 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" 15 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
16 #include "webrtc/typedefs.h" 16 #include "webrtc/typedefs.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 class DTMFqueue { 19 class DTMFqueue {
20 public: 20 public:
21 DTMFqueue(); 21 DTMFqueue();
22 virtual ~DTMFqueue();
danilchap 2016/09/23 19:05:22 because of critsect_, DTMFqueue has non-trivial de
the sun 2016/09/23 19:15:07 Done.
23 22
24 int32_t AddDTMF(uint8_t dtmf_key, uint16_t len, uint8_t level); 23 int32_t AddDTMF(uint8_t dtmf_key, uint16_t len, uint8_t level);
25 int8_t NextDTMF(uint8_t* dtmf_key, uint16_t* len, uint8_t* level); 24 int8_t NextDTMF(uint8_t* dtmf_key, uint16_t* len, uint8_t* level);
26 bool PendingDTMF(); 25 bool PendingDTMF();
27 void ResetDTMF();
28 26
29 private: 27 private:
30 rtc::CriticalSection dtmf_critsect_; 28 rtc::CriticalSection dtmf_critsect_;
31 uint8_t next_empty_index_; 29 uint8_t next_empty_index_;
32 uint8_t dtmf_key_[DTMF_OUTBAND_MAX]; 30 uint8_t dtmf_key_[DTMF_OUTBAND_MAX];
33 uint16_t dtmf_length[DTMF_OUTBAND_MAX]; 31 uint16_t dtmf_length[DTMF_OUTBAND_MAX];
34 uint8_t dtmf_level_[DTMF_OUTBAND_MAX]; 32 uint8_t dtmf_level_[DTMF_OUTBAND_MAX];
35 }; 33 };
36 } // namespace webrtc 34 } // namespace webrtc
37 35
38 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ 36 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/dtmf_queue.cc » ('j') | webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698