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

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq_impl.h

Issue 1296633002: NetEq/ACM: Refactor how packet waiting times are calculated (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebasing 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
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
13 13
14 #include <vector>
15
16 #include "webrtc/base/constructormagic.h" 14 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/scoped_ptr.h" 15 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/base/thread_annotations.h" 16 #include "webrtc/base/thread_annotations.h"
19 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" 17 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
20 #include "webrtc/modules/audio_coding/neteq/defines.h" 18 #include "webrtc/modules/audio_coding/neteq/defines.h"
21 #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" 19 #include "webrtc/modules/audio_coding/neteq/interface/neteq.h"
22 #include "webrtc/modules/audio_coding/neteq/packet.h" // Declare PacketList. 20 #include "webrtc/modules/audio_coding/neteq/packet.h" // Declare PacketList.
23 #include "webrtc/modules/audio_coding/neteq/random_vector.h" 21 #include "webrtc/modules/audio_coding/neteq/random_vector.h"
24 #include "webrtc/modules/audio_coding/neteq/rtcp.h" 22 #include "webrtc/modules/audio_coding/neteq/rtcp.h"
25 #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" 23 #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 145
148 // Returns the current playout mode. 146 // Returns the current playout mode.
149 // Deprecated. 147 // Deprecated.
150 // TODO(henrik.lundin) Delete. 148 // TODO(henrik.lundin) Delete.
151 NetEqPlayoutMode PlayoutMode() const override; 149 NetEqPlayoutMode PlayoutMode() const override;
152 150
153 // Writes the current network statistics to |stats|. The statistics are reset 151 // Writes the current network statistics to |stats|. The statistics are reset
154 // after the call. 152 // after the call.
155 int NetworkStatistics(NetEqNetworkStatistics* stats) override; 153 int NetworkStatistics(NetEqNetworkStatistics* stats) override;
156 154
157 // Writes the last packet waiting times (in ms) to |waiting_times|. The number
158 // of values written is no more than 100, but may be smaller if the interface
159 // is polled again before 100 packets has arrived.
160 void WaitingTimes(std::vector<int>* waiting_times) override;
161
162 // Writes the current RTCP statistics to |stats|. The statistics are reset 155 // Writes the current RTCP statistics to |stats|. The statistics are reset
163 // and a new report period is started with the call. 156 // and a new report period is started with the call.
164 void GetRtcpStatistics(RtcpStatistics* stats) override; 157 void GetRtcpStatistics(RtcpStatistics* stats) override;
165 158
166 // Same as RtcpStatistics(), but does not reset anything. 159 // Same as RtcpStatistics(), but does not reset anything.
167 void GetRtcpStatisticsNoReset(RtcpStatistics* stats) override; 160 void GetRtcpStatisticsNoReset(RtcpStatistics* stats) override;
168 161
169 // Enables post-decode VAD. When enabled, GetAudio() will return 162 // Enables post-decode VAD. When enabled, GetAudio() will return
170 // kOutputVADPassive when the signal contains no speech. 163 // kOutputVADPassive when the signal contains no speech.
171 void EnableVad() override; 164 void EnableVad() override;
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 // module is designed to compensate for this. 397 // module is designed to compensate for this.
405 int decoded_packet_sequence_number_ GUARDED_BY(crit_sect_); 398 int decoded_packet_sequence_number_ GUARDED_BY(crit_sect_);
406 uint32_t decoded_packet_timestamp_ GUARDED_BY(crit_sect_); 399 uint32_t decoded_packet_timestamp_ GUARDED_BY(crit_sect_);
407 400
408 private: 401 private:
409 DISALLOW_COPY_AND_ASSIGN(NetEqImpl); 402 DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
410 }; 403 };
411 404
412 } // namespace webrtc 405 } // namespace webrtc
413 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 406 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698