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

Side by Side Diff: webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h

Issue 1967503002: Audio codec usage statistics (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Minor fixes + counting bugfix Created 4 years, 7 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_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/buffer.h" 18 #include "webrtc/base/buffer.h"
19 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/thread_annotations.h" 20 #include "webrtc/base/thread_annotations.h"
21 #include "webrtc/common_types.h" 21 #include "webrtc/common_types.h"
22 #include "webrtc/engine_configurations.h" 22 #include "webrtc/engine_configurations.h"
23 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h" 23 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h"
24 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" 24 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
25 #include "webrtc/modules/audio_coding/acm2/codec_manager.h" 25 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
26 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
26 27
27 namespace webrtc { 28 namespace webrtc {
28 29
29 class AudioCodingImpl; 30 class AudioCodingImpl;
30 31
31 namespace acm2 { 32 namespace acm2 {
32 33
33 struct EncoderFactory; 34 struct EncoderFactory;
34 35
35 class AudioCodingModuleImpl final : public AudioCodingModule { 36 class AudioCodingModuleImpl final : public AudioCodingModule {
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 bool first_10ms_data_ GUARDED_BY(acm_crit_sect_); 289 bool first_10ms_data_ GUARDED_BY(acm_crit_sect_);
289 290
290 bool first_frame_ GUARDED_BY(acm_crit_sect_); 291 bool first_frame_ GUARDED_BY(acm_crit_sect_);
291 uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_); 292 uint32_t last_timestamp_ GUARDED_BY(acm_crit_sect_);
292 uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_); 293 uint32_t last_rtp_timestamp_ GUARDED_BY(acm_crit_sect_);
293 294
294 rtc::CriticalSection callback_crit_sect_; 295 rtc::CriticalSection callback_crit_sect_;
295 AudioPacketizationCallback* packetization_callback_ 296 AudioPacketizationCallback* packetization_callback_
296 GUARDED_BY(callback_crit_sect_); 297 GUARDED_BY(callback_crit_sect_);
297 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); 298 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_);
299
300 size_t codec_histogram_bins_log_[static_cast<size_t>(
301 AudioEncoder::CodecType::kMaxLoggedAudioCodecNames)];
302 size_t number_of_consecutive_empty_packets_;
kwiberg-webrtc 2016/05/12 23:30:21 Why size_t? I would have thought that the counters
aleloi 2016/05/13 09:02:27 No, it was I who probably missed your question. Af
kwiberg-webrtc 2016/05/15 02:06:13 You still haven't changed this. Also, use int, no
aleloi 2016/05/16 08:02:23 Done.
298 }; 303 };
299 304
300 } // namespace acm2 305 } // namespace acm2
301 } // namespace webrtc 306 } // namespace webrtc
302 307
303 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 308 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698