Add new method AcmReceiver::last_packet_sample_rate_hz()

webrtc/modules/audio_coding/main/acm2/acm_receiver.h

Index: webrtc/modules/audio_coding/main/acm2/acm_receiver.h
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h
index f02605bb718434ec561b9eb5749c902ef334206d..4fb9dd6ed2065f2d059e4a115fe91a0568c579c4 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.h
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "webrtc/base/array_view.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_audio/vad/include/webrtc_vad.h"
@@ -154,6 +155,12 @@ class AcmReceiver {
   //
   void ResetInitialDelay();
 
+  // Returns the sample rate of of the codec associated with the last incoming

[kwiberg-webrtc, 2015/11/23 13:03:50]

Even number of ofs; odd number expected.

[hlundin-webrtc, 2015/11/23 13:50:45]

Done.

Took care of of of off-by-one error.

+  // packet. If no packet of a registered non-CNG codec has been received, the
+  // return value is empty. Also, if the codec was unregistered since the last

[kwiberg-webrtc, 2015/11/23 13:03:50]

"codec" -> "decoder", maybe?

[hlundin-webrtc, 2015/11/23 13:50:45]

Done.

+  // packet was inserted, the return value is empty.
+  rtc::Optional<int> last_packet_sample_rate_hz() const;
+
   // Returns last_output_sample_rate_hz from the NetEq instance.
   int last_output_sample_rate_hz() const;
 
@@ -213,13 +220,6 @@ class AcmReceiver {
   bool GetPlayoutTimestamp(uint32_t* timestamp);
 
   //
-  // Return the index of the codec associated with the last non-CNG/non-DTMF
-  // received payload. If no non-CNG/non-DTMF payload is received -1 is
-  // returned.
-  //
-  int last_audio_codec_id() const;  // TODO(turajs): can be inline.
-
-  //
   // Get the audio codec associated with the last non-CNG/non-DTMF received
   // payload. If no non-CNG/non-DTMF packet is received -1 is returned,
   // otherwise return 0.
@@ -295,6 +295,7 @@ class AcmReceiver {
   bool vad_enabled_;
   Clock* clock_;  // TODO(henrik.lundin) Make const if possible.
   bool resampled_last_output_frame_ GUARDED_BY(crit_sect_);
+  rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_);
 };
 
 }  // namespace acm2