webrtc/modules/audio_coding/main/acm2/acm_receiver.cc - Issue 1168753002: Match existing type usage better.

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/main/acm2/acm_receiver.cc

Issue 1168753002: Match existing type usage better. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Resync Created 5 years, 6 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:

Index: webrtc/modules/audio_coding/main/acm2/acm_receiver.cc

diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc

index f9cf89a9ede1b8c6c27edea469fc733f5524849b..ae5a04f25e05aebd80ac21d6b222929e1b3ba896 100644

--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc

+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc

@@ -461,8 +461,8 @@ int AcmReceiver::GetAudio(int desired_freq_hz, AudioFrame* audio_frame) {

// |audio_frame|.

uint32_t playout_timestamp = 0;

if (GetPlayoutTimestamp(&playout_timestamp)) {

- audio_frame->timestamp_ =

- playout_timestamp - audio_frame->samples_per_channel_;

+ audio_frame->timestamp_ = playout_timestamp -

+ static_cast<uint32_t>(audio_frame->samples_per_channel_);

} else {

// Remain 0 until we have a valid |playout_timestamp|.

audio_frame->timestamp_ = 0;