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

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

Issue 2351183002: AcmReceiver: Eliminate AcmReceiver::decoders_ (Closed)
Patch Set: case-insensitive string comparison 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
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/acm2/acm_receiver.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 uint8_t first_payload_byte) const EXCLUSIVE_LOCKS_REQUIRED(crit_sect_); 267 uint8_t first_payload_byte) const EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
268 268
269 uint32_t NowInTimestamp(int decoder_sampling_rate) const; 269 uint32_t NowInTimestamp(int decoder_sampling_rate) const;
270 270
271 rtc::CriticalSection crit_sect_; 271 rtc::CriticalSection crit_sect_;
272 rtc::Optional<CodecInst> last_audio_decoder_ GUARDED_BY(crit_sect_); 272 rtc::Optional<CodecInst> last_audio_decoder_ GUARDED_BY(crit_sect_);
273 ACMResampler resampler_ GUARDED_BY(crit_sect_); 273 ACMResampler resampler_ GUARDED_BY(crit_sect_);
274 std::unique_ptr<int16_t[]> last_audio_buffer_ GUARDED_BY(crit_sect_); 274 std::unique_ptr<int16_t[]> last_audio_buffer_ GUARDED_BY(crit_sect_);
275 CallStatistics call_stats_ GUARDED_BY(crit_sect_); 275 CallStatistics call_stats_ GUARDED_BY(crit_sect_);
276 NetEq* neteq_; 276 NetEq* neteq_;
277 // Decoders map is keyed by payload type
278 std::map<uint8_t, Decoder> decoders_ GUARDED_BY(crit_sect_);
279 Clock* clock_; // TODO(henrik.lundin) Make const if possible. 277 Clock* clock_; // TODO(henrik.lundin) Make const if possible.
280 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_); 278 bool resampled_last_output_frame_ GUARDED_BY(crit_sect_);
281 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_); 279 rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_);
282 }; 280 };
283 281
284 } // namespace acm2 282 } // namespace acm2
285 283
286 } // namespace webrtc 284 } // namespace webrtc
287 285
288 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_ 286 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_RECEIVER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/acm2/acm_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698