webrtc/voice_engine/transmit_mixer.h - Issue 1224163002: Update audio code to use size_t more correctly, webrtc/voice_engine/ portion.

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/voice_engine/transmit_mixer.h

Issue 1224163002: Update audio code to use size_t more correctly, webrtc/voice_engine/ portion. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

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

Download patch

« webrtc/voice_engine/mock/fake_voe_external_media.h ('K') | « webrtc/voice_engine/test/auto_test/standard/neteq_stats_test.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | webrtc/voice_engine/utility.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/voice_engine/transmit_mixer.h

diff --git a/webrtc/voice_engine/transmit_mixer.h b/webrtc/voice_engine/transmit_mixer.h

index 919de131238f5123ddb9fb4c16d7a9ca5423162b..8bbb421a3b55216ac6d892404193e23bb2bc3d93 100644

--- a/webrtc/voice_engine/transmit_mixer.h

+++ b/webrtc/voice_engine/transmit_mixer.h

@@ -51,7 +51,7 @@ public:

AudioProcessing* audioProcessingModule);

int32_t PrepareDemux(const void* audioSamples,

- uint32_t nSamples,

+ size_t nSamples,

uint8_t nChannels,

uint32_t samplesPerSec,

uint16_t totalDelayMS,

@@ -173,7 +173,7 @@ private:

void GetSendCodecInfo(int* max_sample_rate, int* max_channels);

void GenerateAudioFrame(const int16_t audioSamples[],

- int nSamples,

+ size_t nSamples,

int nChannels,

int samplesPerSec);

int32_t RecordAudioToFile(uint32_t mixingFrequency);