commit d7301775f54f2e681bdb5efe33636352d0bbd805
author minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Aug 29 00:58:14 2013 +0000
committer minyue@webrtc.org <minyue@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Aug 29 00:58:14 2013 +0000
tree fa69faa4a6315c9317bb74090aef1bafaa6bd91d
parent 8ae641edfb432744ac3432acd853c25e46f3cff3

update neteq 4 to facilitate NACK

BUG=
R=turaj@webrtc.org, turajs@google.com

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

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

webrtc/modules/audio_coding/neteq4/neteq_impl.cc

diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc b/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
index 403fccb..279401a 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
+++ b/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
@@ -87,7 +87,9 @@
       first_packet_(true),
       error_code_(0),
       decoder_error_code_(0),
-      crit_sect_(CriticalSectionWrapper::CreateCriticalSection()) {
+      crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
+      decoded_packet_sequence_number_(-1),
+      decoded_packet_timestamp_(0) {
   if (fs != 8000 && fs != 16000 && fs != 32000 && fs != 48000) {
     LOG(LS_ERROR) << "Sample rate " << fs << " Hz not supported. " <<
         "Changing to 8000 Hz.";
@@ -352,6 +354,15 @@
   first_packet_ = true;
 }
 
+int NetEqImpl::DecodedRtpInfo(int* sequence_number, uint32_t* timestamp) {
+  CriticalSectionScoped lock(crit_sect_);
+  if (decoded_packet_sequence_number_ < 0)
+    return -1;
+  *sequence_number = decoded_packet_sequence_number_;
+  *timestamp = decoded_packet_timestamp_;
+  return 0;
+}
+
 // Methods below this line are private.
 
 
@@ -1662,8 +1673,9 @@
 
     if (first_packet) {
       first_packet = false;
-      prev_sequence_number = packet->header.sequenceNumber;
-      prev_timestamp = packet->header.timestamp;
+      decoded_packet_sequence_number_ = prev_sequence_number =
+          packet->header.sequenceNumber;
+      decoded_packet_timestamp_ = prev_timestamp = packet->header.timestamp;
       prev_payload_type = packet->header.payloadType;
     }