| 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 |
| 11 #include <algorithm> // Access to min. | 11 #include <algorithm> // Access to min. |
| 12 | 12 |
| 13 #include "webrtc/base/checks.h" | 13 #include "webrtc/base/checks.h" |
| 14 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" | 14 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" |
| 15 #include "webrtc/modules/utility/include/audio_frame_operations.h" |
| 15 | 16 |
| 16 namespace webrtc { | 17 namespace webrtc { |
| 17 | 18 |
| 18 size_t SyncBuffer::FutureLength() const { | 19 size_t SyncBuffer::FutureLength() const { |
| 19 return Size() - next_index_; | 20 return Size() - next_index_; |
| 20 } | 21 } |
| 21 | 22 |
| 22 void SyncBuffer::PushBack(const AudioMultiVector& append_this) { | 23 void SyncBuffer::PushBack(const AudioMultiVector& append_this) { |
| 23 size_t samples_added = append_this.Size(); | 24 size_t samples_added = append_this.Size(); |
| 24 AudioMultiVector::PushBack(append_this); | 25 AudioMultiVector::PushBack(append_this); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 | 68 |
| 68 void SyncBuffer::ReplaceAtIndex(const AudioMultiVector& insert_this, | 69 void SyncBuffer::ReplaceAtIndex(const AudioMultiVector& insert_this, |
| 69 size_t position) { | 70 size_t position) { |
| 70 ReplaceAtIndex(insert_this, insert_this.Size(), position); | 71 ReplaceAtIndex(insert_this, insert_this.Size(), position); |
| 71 } | 72 } |
| 72 | 73 |
| 73 void SyncBuffer::GetNextAudioInterleaved(size_t requested_len, | 74 void SyncBuffer::GetNextAudioInterleaved(size_t requested_len, |
| 74 AudioFrame* output) { | 75 AudioFrame* output) { |
| 75 RTC_DCHECK(output); | 76 RTC_DCHECK(output); |
| 76 const size_t samples_to_read = std::min(FutureLength(), requested_len); | 77 const size_t samples_to_read = std::min(FutureLength(), requested_len); |
| 77 output->Reset(); | 78 AudioFrameOperations::Reset(output); |
| 78 const size_t tot_samples_read = | 79 const size_t tot_samples_read = |
| 79 ReadInterleavedFromIndex(next_index_, samples_to_read, output->data_); | 80 ReadInterleavedFromIndex(next_index_, samples_to_read, output->data_); |
| 80 const size_t samples_read_per_channel = tot_samples_read / Channels(); | 81 const size_t samples_read_per_channel = tot_samples_read / Channels(); |
| 81 next_index_ += samples_read_per_channel; | 82 next_index_ += samples_read_per_channel; |
| 82 output->num_channels_ = Channels(); | 83 output->num_channels_ = Channels(); |
| 83 output->samples_per_channel_ = samples_read_per_channel; | 84 output->samples_per_channel_ = samples_read_per_channel; |
| 84 } | 85 } |
| 85 | 86 |
| 86 void SyncBuffer::IncreaseEndTimestamp(uint32_t increment) { | 87 void SyncBuffer::IncreaseEndTimestamp(uint32_t increment) { |
| 87 end_timestamp_ += increment; | 88 end_timestamp_ += increment; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 98 // Cannot set |next_index_| larger than the size of the buffer. | 99 // Cannot set |next_index_| larger than the size of the buffer. |
| 99 next_index_ = std::min(value, Size()); | 100 next_index_ = std::min(value, Size()); |
| 100 } | 101 } |
| 101 | 102 |
| 102 void SyncBuffer::set_dtmf_index(size_t value) { | 103 void SyncBuffer::set_dtmf_index(size_t value) { |
| 103 // Cannot set |dtmf_index_| larger than the size of the buffer. | 104 // Cannot set |dtmf_index_| larger than the size of the buffer. |
| 104 dtmf_index_ = std::min(value, Size()); | 105 dtmf_index_ = std::min(value, Size()); |
| 105 } | 106 } |
| 106 | 107 |
| 107 } // namespace webrtc | 108 } // namespace webrtc |
| OLD | NEW |