commit 0aa3ee661c11eda7babdd92fd8a3f25c8d7a1fd0
author minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed May 28 07:48:01 2014 +0000
committer minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed May 28 07:48:01 2014 +0000
tree 87e9e815a276873debe5b192a1679dbf6b362d53
parent 1b9df05c8521d1d807b08d7c00eb2f7e5b097fdf

Better buffer size estimation in NetEq for redundant packets

TEST=passed_all_trybots
R=henrik.lundin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15579005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6260 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_coding/neteq4/packet_buffer.cc

diff --git a/webrtc/modules/audio_coding/neteq4/packet_buffer.cc b/webrtc/modules/audio_coding/neteq4/packet_buffer.cc
index bcd0e7b..da3bdf1 100644
--- a/webrtc/modules/audio_coding/neteq4/packet_buffer.cc
+++ b/webrtc/modules/audio_coding/neteq4/packet_buffer.cc
@@ -217,11 +217,11 @@
       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.