diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder.h b/webrtc/modules/audio_coding/codecs/audio_encoder.h
index 15d6bea9ba..615e428bb7 100644
--- a/webrtc/modules/audio_coding/codecs/audio_encoder.h
+++ b/webrtc/modules/audio_coding/codecs/audio_encoder.h
@@ -67,6 +67,10 @@ class AudioEncoder {
   // the preceding packet.
   virtual int Num10MsFramesInNextPacket() const = 0;
 
+  // Returns the maximum value that can be returned by
+  // Num10MsFramesInNextPacket().
+  virtual int Max10MsFramesInAPacket() const = 0;
+
  protected:
   virtual bool EncodeInternal(uint32_t timestamp,
                               const int16_t* audio,
diff --git a/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc b/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc
index 7882242e1e..93fbeaa38e 100644
--- a/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc
+++ b/webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc
@@ -53,6 +53,10 @@ int AudioEncoderPcm::Num10MsFramesInNextPacket() const {
   return num_10ms_frames_per_packet_;
 }
 
+int AudioEncoderPcm::Max10MsFramesInAPacket() const {
+  return num_10ms_frames_per_packet_;
+}
+
 bool AudioEncoderPcm::EncodeInternal(uint32_t timestamp,
                                      const int16_t* audio,
                                      size_t max_encoded_bytes,
diff --git a/webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h b/webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
index a3a1676762..6d697a1061 100644
--- a/webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
+++ b/webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
@@ -37,6 +37,7 @@ class AudioEncoderPcm : public AudioEncoder {
   virtual int sample_rate_hz() const OVERRIDE;
   virtual int num_channels() const OVERRIDE;
   virtual int Num10MsFramesInNextPacket() const OVERRIDE;
+  virtual int Max10MsFramesInAPacket() const OVERRIDE;
 
  protected:
   virtual bool EncodeInternal(uint32_t timestamp,
diff --git a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
index cb57e6b837..0b055202a4 100644
--- a/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
+++ b/webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
@@ -60,6 +60,9 @@ int AudioEncoderG722::num_channels() const {
 int AudioEncoderG722::Num10MsFramesInNextPacket() const {
   return num_10ms_frames_per_packet_;
 }
+int AudioEncoderG722::Max10MsFramesInAPacket() const {
+  return num_10ms_frames_per_packet_;
+}
 
 bool AudioEncoderG722::EncodeInternal(uint32_t timestamp,
                                       const int16_t* audio,
diff --git a/webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h b/webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h
index 499d225abf..12e9001600 100644
--- a/webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h
+++ b/webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h
@@ -33,6 +33,7 @@ class AudioEncoderG722 : public AudioEncoder {
   virtual int sample_rate_hz() const OVERRIDE;
   virtual int num_channels() const OVERRIDE;
   virtual int Num10MsFramesInNextPacket() const OVERRIDE;
+  virtual int Max10MsFramesInAPacket() const OVERRIDE;
 
  protected:
   virtual bool EncodeInternal(uint32_t timestamp,
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc b/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc
index d6bc4b300f..78d10503e2 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc
+++ b/webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc
@@ -48,6 +48,9 @@ int AudioEncoderIlbc::num_channels() const {
 int AudioEncoderIlbc::Num10MsFramesInNextPacket() const {
   return num_10ms_frames_per_packet_;
 }
+int AudioEncoderIlbc::Max10MsFramesInAPacket() const {
+  return num_10ms_frames_per_packet_;
+}
 
 bool AudioEncoderIlbc::EncodeInternal(uint32_t timestamp,
                                       const int16_t* audio,
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h b/webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
index 199ef2b1fe..fa9730b007 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
+++ b/webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
@@ -32,6 +32,7 @@ class AudioEncoderIlbc : public AudioEncoder {
   virtual int sample_rate_hz() const OVERRIDE;
   virtual int num_channels() const OVERRIDE;
   virtual int Num10MsFramesInNextPacket() const OVERRIDE;
+  virtual int Max10MsFramesInAPacket() const OVERRIDE;
 
  protected:
   virtual bool EncodeInternal(uint32_t timestamp,
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
index 6297c35496..d58a8f1be3 100644
--- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
+++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
@@ -74,6 +74,10 @@ int AudioEncoderOpus::Num10MsFramesInNextPacket() const {
   return num_10ms_frames_per_packet_;
 }
 
+int AudioEncoderOpus::Max10MsFramesInAPacket() const {
+  return num_10ms_frames_per_packet_;
+}
+
 bool AudioEncoderOpus::EncodeInternal(uint32_t timestamp,
                                       const int16_t* audio,
                                       size_t max_encoded_bytes,
diff --git a/webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h b/webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h
index f669f7e974..c404b58168 100644
--- a/webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h
+++ b/webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h
@@ -34,6 +34,7 @@ class AudioEncoderOpus : public AudioEncoder {
   virtual int sample_rate_hz() const OVERRIDE;
   virtual int num_channels() const OVERRIDE;
   virtual int Num10MsFramesInNextPacket() const OVERRIDE;
+  virtual int Max10MsFramesInAPacket() const OVERRIDE;
 
  protected:
   virtual bool EncodeInternal(uint32_t timestamp,