OLD | NEW |
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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
420 ntp_time_ms_ = -1; | 420 ntp_time_ms_ = -1; |
421 samples_per_channel_ = 0; | 421 samples_per_channel_ = 0; |
422 sample_rate_hz_ = 0; | 422 sample_rate_hz_ = 0; |
423 num_channels_ = 0; | 423 num_channels_ = 0; |
424 speech_type_ = kUndefined; | 424 speech_type_ = kUndefined; |
425 vad_activity_ = kVadUnknown; | 425 vad_activity_ = kVadUnknown; |
426 energy_ = 0xffffffff; | 426 energy_ = 0xffffffff; |
427 interleaved_ = true; | 427 interleaved_ = true; |
428 } | 428 } |
429 | 429 |
430 inline void AudioFrame::UpdateFrame(int id, uint32_t timestamp, | 430 inline void AudioFrame::UpdateFrame(int id, |
| 431 uint32_t timestamp, |
431 const int16_t* data, | 432 const int16_t* data, |
432 int samples_per_channel, int sample_rate_hz, | 433 int samples_per_channel, |
| 434 int sample_rate_hz, |
433 SpeechType speech_type, | 435 SpeechType speech_type, |
434 VADActivity vad_activity, int num_channels, | 436 VADActivity vad_activity, |
| 437 int num_channels, |
435 uint32_t energy) { | 438 uint32_t energy) { |
436 id_ = id; | 439 id_ = id; |
437 timestamp_ = timestamp; | 440 timestamp_ = timestamp; |
438 samples_per_channel_ = samples_per_channel; | 441 samples_per_channel_ = samples_per_channel; |
439 sample_rate_hz_ = sample_rate_hz; | 442 sample_rate_hz_ = sample_rate_hz; |
440 speech_type_ = speech_type; | 443 speech_type_ = speech_type; |
441 vad_activity_ = vad_activity; | 444 vad_activity_ = vad_activity; |
442 num_channels_ = num_channels; | 445 num_channels_ = num_channels; |
443 energy_ = energy; | 446 energy_ = energy; |
444 | 447 |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 : sequence_number2; | 622 : sequence_number2; |
620 } | 623 } |
621 | 624 |
622 inline uint32_t LatestTimestamp(uint32_t timestamp1, uint32_t timestamp2) { | 625 inline uint32_t LatestTimestamp(uint32_t timestamp1, uint32_t timestamp2) { |
623 return IsNewerTimestamp(timestamp1, timestamp2) ? timestamp1 : timestamp2; | 626 return IsNewerTimestamp(timestamp1, timestamp2) ? timestamp1 : timestamp2; |
624 } | 627 } |
625 | 628 |
626 } // namespace webrtc | 629 } // namespace webrtc |
627 | 630 |
628 #endif // MODULE_COMMON_TYPES_H | 631 #endif // MODULE_COMMON_TYPES_H |
OLD | NEW |