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

Side by Side Diff: webrtc/modules/audio_coding/neteq/tools/rtp_generator.h

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting fix. Created 5 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
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 protected: 48 protected:
49 uint16_t seq_number_; 49 uint16_t seq_number_;
50 uint32_t timestamp_; 50 uint32_t timestamp_;
51 uint32_t next_send_time_ms_; 51 uint32_t next_send_time_ms_;
52 const uint32_t ssrc_; 52 const uint32_t ssrc_;
53 const int samples_per_ms_; 53 const int samples_per_ms_;
54 double drift_factor_; 54 double drift_factor_;
55 55
56 private: 56 private:
57 DISALLOW_COPY_AND_ASSIGN(RtpGenerator); 57 RTC_DISALLOW_COPY_AND_ASSIGN(RtpGenerator);
58 }; 58 };
59 59
60 class TimestampJumpRtpGenerator : public RtpGenerator { 60 class TimestampJumpRtpGenerator : public RtpGenerator {
61 public: 61 public:
62 TimestampJumpRtpGenerator(int samples_per_ms, 62 TimestampJumpRtpGenerator(int samples_per_ms,
63 uint16_t start_seq_number, 63 uint16_t start_seq_number,
64 uint32_t start_timestamp, 64 uint32_t start_timestamp,
65 uint32_t jump_from_timestamp, 65 uint32_t jump_from_timestamp,
66 uint32_t jump_to_timestamp) 66 uint32_t jump_to_timestamp)
67 : RtpGenerator(samples_per_ms, start_seq_number, start_timestamp), 67 : RtpGenerator(samples_per_ms, start_seq_number, start_timestamp),
68 jump_from_timestamp_(jump_from_timestamp), 68 jump_from_timestamp_(jump_from_timestamp),
69 jump_to_timestamp_(jump_to_timestamp) {} 69 jump_to_timestamp_(jump_to_timestamp) {}
70 70
71 uint32_t GetRtpHeader(uint8_t payload_type, 71 uint32_t GetRtpHeader(uint8_t payload_type,
72 size_t payload_length_samples, 72 size_t payload_length_samples,
73 WebRtcRTPHeader* rtp_header) override; 73 WebRtcRTPHeader* rtp_header) override;
74 74
75 private: 75 private:
76 uint32_t jump_from_timestamp_; 76 uint32_t jump_from_timestamp_;
77 uint32_t jump_to_timestamp_; 77 uint32_t jump_to_timestamp_;
78 DISALLOW_COPY_AND_ASSIGN(TimestampJumpRtpGenerator); 78 RTC_DISALLOW_COPY_AND_ASSIGN(TimestampJumpRtpGenerator);
79 }; 79 };
80 80
81 } // namespace test 81 } // namespace test
82 } // namespace webrtc 82 } // namespace webrtc
83 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_ 83 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698