webrtc/modules/audio_coding/neteq/packet_buffer.cc - Issue 1172163004: Reformat existing code. There should be no functional effects.

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/packet_buffer.cc

Issue 1172163004: Reformat existing code. There should be no functional effects. (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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_impl.cc ('k') | webrtc/modules/audio_coding/neteq/preemptive_expand.h » ('j') | webrtc/system_wrappers/interface/aligned_array.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/packet_buffer.cc

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

index 08b237f8463bc881f6db3b95bef62ced32a1c3db..5792b227ef84aeb7e51aa9d1c125cf407a7ffe15 100644

--- a/webrtc/modules/audio_coding/neteq/packet_buffer.cc

+++ b/webrtc/modules/audio_coding/neteq/packet_buffer.cc

@@ -250,16 +250,12 @@ int PacketBuffer::NumSamplesInBuffer(DecoderDatabase* decoder_database,

Packet* packet = (*it);

AudioDecoder* decoder =

decoder_database->GetDecoder(packet->header.payloadType);

- if (decoder) {

- int duration;

- if (packet->sync_packet) {

- duration = last_duration;

- } else if (packet->primary) {

- duration =

- decoder->PacketDuration(packet->payload, packet->payload_length);

- } else {

+ if (decoder && !packet->sync_packet) {

+ if (!packet->primary) {

continue;

}

+ int duration =

+ decoder->PacketDuration(packet->payload, packet->payload_length);

if (duration >= 0) {

last_duration = duration; // Save the most up-to-date (valid) duration.

}