zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding a payload type to AudioEncoder objects

Browse Source 
The type is set in the Config struct and is provided in the EncodedInfo
output struct from each Encode() call. The audio_decoder_unittest is
updated to verify correct propagation of the payload type.

BUG=3926
R=kwiberg@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7780 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2014-12-02 12:08:39 +00:00
parent 0cd5558f2b
commit 7f1dfa5b61
8 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,14 @@ namespace webrtc {
class AudioEncoderPcm : public AudioEncoder {
public:
struct Config {
Config() : frame_size_ms(20), num_channels(1) {}
public:
int frame_size_ms;
int num_channels;
int payload_type;
protected:
explicit Config(int pt)
: frame_size_ms(20), num_channels(1), payload_type(pt) {}
};
explicit AudioEncoderPcm(const Config& config);
@ -49,6 +53,7 @@ class AudioEncoderPcm : public AudioEncoder {
private:
static const int kSampleRateHz = 8000;
const int num_channels_;
const int payload_type_;
const int num_10ms_frames_per_packet_;
const int16_t full_frame_samples_;
std::vector<int16_t> speech_buffer_;
@ -57,6 +62,10 @@ class AudioEncoderPcm : public AudioEncoder {
class AudioEncoderPcmA : public AudioEncoderPcm {
public:
struct Config : public AudioEncoderPcm::Config {
Config() : AudioEncoderPcm::Config(8) {}
};
explicit AudioEncoderPcmA(const Config& config) : AudioEncoderPcm(config) {}
protected:
@ -67,6 +76,10 @@ class AudioEncoderPcmA : public AudioEncoderPcm {
class AudioEncoderPcmU : public AudioEncoderPcm {
public:
struct Config : public AudioEncoderPcm::Config {
Config() : AudioEncoderPcm::Config(0) {}
};
explicit AudioEncoderPcmU(const Config& config) : AudioEncoderPcm(config) {}
protected: