webrtc/modules/audio_coding/neteq/tools/audio_loop.cc - Issue 1418423010: Pass audio to AudioEncoder::Encode() in an ArrayView

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/neteq/tools/audio_loop.cc

Issue 1418423010: Pass audio to AudioEncoder::Encode() in an ArrayView (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/neteq/tools/audio_loop.h ('k') | webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/tools/audio_loop.cc

diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc b/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc

index 2d2a7e3dd4ad926421922ad845711545bc7d6403..eed95753f0f3e2ea636c429562fb650e57ce2d66 100644

--- a/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc

+++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.cc

@@ -43,13 +43,14 @@ bool AudioLoop::Init(const std::string file_name,

return true;

}

-const int16_t* AudioLoop::GetNextBlock() {

+rtc::ArrayView<const int16_t> AudioLoop::GetNextBlock() {

// Check that the AudioLoop is initialized.

- if (block_length_samples_ == 0) return NULL;

+ if (block_length_samples_ == 0)

+ return rtc::ArrayView<const int16_t>();

const int16_t* output_ptr = &audio_array_[next_index_];

next_index_ = (next_index_ + block_length_samples_) % loop_length_samples_;

- return output_ptr;

+ return rtc::ArrayView<const int16_t>(output_ptr, block_length_samples_);

}