diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-29 06:57:40 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-29 06:57:40 +0000 |
| commit | bf2bd58de66f8063ea4158d8f0fa4395f6b170a1 (patch) | |
| tree | d2028e3cb7a099b511aabab3022004cd03989566 /modules/audio_coding/neteq4/packet_buffer.cc | |
| parent | 52dfe97e8b722572766b284b5dc019f6c9b4e874 (diff) | |
| parent | ff6b4a8eddca609ad2691b54f443b6f1e9342579 (diff) | |
| download | webrtc-bf2bd58de66f8063ea4158d8f0fa4395f6b170a1.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at ff6b4a8eddca609ad2691b54f443b6f1e9342579
This commit was generated by merge_from_chromium.py.
Change-Id: I3dceea02410ec9709a6dc1ffab5962cba1821b63
Diffstat (limited to 'modules/audio_coding/neteq4/packet_buffer.cc')
| -rw-r--r-- | modules/audio_coding/neteq4/packet_buffer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/audio_coding/neteq4/packet_buffer.cc b/modules/audio_coding/neteq4/packet_buffer.cc index bcd0e7b4..da3bdf14 100644 --- a/modules/audio_coding/neteq4/packet_buffer.cc +++ b/modules/audio_coding/neteq4/packet_buffer.cc @@ -217,11 +217,11 @@ int PacketBuffer::NumSamplesInBuffer(DecoderDatabase* decoder_database, int duration; if (packet->sync_packet) { duration = last_duration; + } else if (packet->primary) { + duration = + decoder->PacketDuration(packet->payload, packet->payload_length); } else { - duration = packet->primary ? - decoder->PacketDuration(packet->payload, packet->payload_length) : - decoder->PacketDurationRedundant(packet->payload, - packet->payload_length); + continue; } if (duration >= 0) { last_duration = duration; // Save the most up-to-date (valid) duration. |