generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add AudioEncoder::Max10MsFramesInAPacket

Browse Source 
BUG=3926
R=kwiberg@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7834 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2014-12-08 21:15:55 +00:00
parent 130fef89dd
commit 8911bc52f1
9 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_coding/codecs/audio_encoder.h
View File

@@ -67,6 +67,10 @@ class AudioEncoder {
// the preceding packet. // the preceding packet.
virtual int Num10MsFramesInNextPacket() const = 0; virtual int Num10MsFramesInNextPacket() const = 0;
// Returns the maximum value that can be returned by
// Num10MsFramesInNextPacket().
virtual int Max10MsFramesInAPacket() const = 0;
protected: protected:
virtual bool EncodeInternal(uint32_t timestamp, virtual bool EncodeInternal(uint32_t timestamp,
const int16_t* audio, const int16_t* audio,

4
webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc
View File

@@ -53,6 +53,10 @@ int AudioEncoderPcm::Num10MsFramesInNextPacket() const {
return num_10ms_frames_per_packet_; return num_10ms_frames_per_packet_;
} }
int AudioEncoderPcm::Max10MsFramesInAPacket() const {
return num_10ms_frames_per_packet_;
}
bool AudioEncoderPcm::EncodeInternal(uint32_t timestamp, bool AudioEncoderPcm::EncodeInternal(uint32_t timestamp,
const int16_t* audio, const int16_t* audio,
size_t max_encoded_bytes, size_t max_encoded_bytes,

1
webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h
View File

@@ -37,6 +37,7 @@ class AudioEncoderPcm : public AudioEncoder {
virtual int sample_rate_hz() const OVERRIDE; virtual int sample_rate_hz() const OVERRIDE;
virtual int num_channels() const OVERRIDE; virtual int num_channels() const OVERRIDE;
virtual int Num10MsFramesInNextPacket() const OVERRIDE; virtual int Num10MsFramesInNextPacket() const OVERRIDE;
virtual int Max10MsFramesInAPacket() const OVERRIDE;
protected: protected:
virtual bool EncodeInternal(uint32_t timestamp, virtual bool EncodeInternal(uint32_t timestamp,

3
webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc
View File

@@ -60,6 +60,9 @@ int AudioEncoderG722::num_channels() const {
int AudioEncoderG722::Num10MsFramesInNextPacket() const { int AudioEncoderG722::Num10MsFramesInNextPacket() const {
return num_10ms_frames_per_packet_; return num_10ms_frames_per_packet_;
} }
int AudioEncoderG722::Max10MsFramesInAPacket() const {
return num_10ms_frames_per_packet_;
}
bool AudioEncoderG722::EncodeInternal(uint32_t timestamp, bool AudioEncoderG722::EncodeInternal(uint32_t timestamp,
const int16_t* audio, const int16_t* audio,

1
webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h
View File

@@ -33,6 +33,7 @@ class AudioEncoderG722 : public AudioEncoder {
virtual int sample_rate_hz() const OVERRIDE; virtual int sample_rate_hz() const OVERRIDE;
virtual int num_channels() const OVERRIDE; virtual int num_channels() const OVERRIDE;
virtual int Num10MsFramesInNextPacket() const OVERRIDE; virtual int Num10MsFramesInNextPacket() const OVERRIDE;
virtual int Max10MsFramesInAPacket() const OVERRIDE;
protected: protected:
virtual bool EncodeInternal(uint32_t timestamp, virtual bool EncodeInternal(uint32_t timestamp,

3
webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc
View File

@@ -48,6 +48,9 @@ int AudioEncoderIlbc::num_channels() const {
int AudioEncoderIlbc::Num10MsFramesInNextPacket() const { int AudioEncoderIlbc::Num10MsFramesInNextPacket() const {
return num_10ms_frames_per_packet_; return num_10ms_frames_per_packet_;
} }
int AudioEncoderIlbc::Max10MsFramesInAPacket() const {
return num_10ms_frames_per_packet_;
}
bool AudioEncoderIlbc::EncodeInternal(uint32_t timestamp, bool AudioEncoderIlbc::EncodeInternal(uint32_t timestamp,
const int16_t* audio, const int16_t* audio,

1
webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
View File

@@ -32,6 +32,7 @@ class AudioEncoderIlbc : public AudioEncoder {
virtual int sample_rate_hz() const OVERRIDE; virtual int sample_rate_hz() const OVERRIDE;
virtual int num_channels() const OVERRIDE; virtual int num_channels() const OVERRIDE;
virtual int Num10MsFramesInNextPacket() const OVERRIDE; virtual int Num10MsFramesInNextPacket() const OVERRIDE;
virtual int Max10MsFramesInAPacket() const OVERRIDE;
protected: protected:
virtual bool EncodeInternal(uint32_t timestamp, virtual bool EncodeInternal(uint32_t timestamp,

4
webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
View File

@@ -74,6 +74,10 @@ int AudioEncoderOpus::Num10MsFramesInNextPacket() const {
return num_10ms_frames_per_packet_; return num_10ms_frames_per_packet_;
} }
int AudioEncoderOpus::Max10MsFramesInAPacket() const {
return num_10ms_frames_per_packet_;
}
bool AudioEncoderOpus::EncodeInternal(uint32_t timestamp, bool AudioEncoderOpus::EncodeInternal(uint32_t timestamp,
const int16_t* audio, const int16_t* audio,
size_t max_encoded_bytes, size_t max_encoded_bytes,

1
webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h
View File

@@ -34,6 +34,7 @@ class AudioEncoderOpus : public AudioEncoder {
virtual int sample_rate_hz() const OVERRIDE; virtual int sample_rate_hz() const OVERRIDE;
virtual int num_channels() const OVERRIDE; virtual int num_channels() const OVERRIDE;
virtual int Num10MsFramesInNextPacket() const OVERRIDE; virtual int Num10MsFramesInNextPacket() const OVERRIDE;
virtual int Max10MsFramesInAPacket() const OVERRIDE;
protected: protected:
virtual bool EncodeInternal(uint32_t timestamp, virtual bool EncodeInternal(uint32_t timestamp,