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

ACMCodecDB: Remove unused stuff, and move private stuff to anonymous namespace

Browse Source 
BUG=webrtc:5028

Review URL: https://codereview.webrtc.org/1360123002

Cr-Commit-Position: refs/heads/master@{#10048}
This commit is contained in:
kwiberg
2015-09-24 04:32:03 -07:00
committed by Commit bot
parent 4a3ccad29e
commit ec249d4eae
2 changed files with 55 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc
View File

@ -27,6 +27,38 @@ namespace webrtc {
namespace acm2 { namespace acm2 {
namespace {
// Checks if the bitrate is valid for the codec.
bool IsRateValid(int codec_id, int rate) {
return ACMCodecDB::database_[codec_id].rate == rate;
}
// Checks if the bitrate is valid for iSAC.
bool IsISACRateValid(int rate) {
return (rate == -1) || ((rate <= 56000) && (rate >= 10000));
}
// Checks if the bitrate is valid for iLBC.
bool IsILBCRateValid(int rate, int frame_size_samples) {
if (((frame_size_samples == 240) || (frame_size_samples == 480)) &&
(rate == 13300)) {
return true;
} else if (((frame_size_samples == 160) || (frame_size_samples == 320)) &&
(rate == 15200)) {
return true;
} else {
return false;
}
}
// Checks if the bitrate is valid for Opus.
bool IsOpusRateValid(int rate) {
return (rate >= 6000) && (rate <= 510000);
}
} // namespace
// Not yet used payload-types. // Not yet used payload-types.
// 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, // 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68,
// 67, 66, 65 // 67, 66, 65
@ -89,55 +121,55 @@ const CodecInst ACMCodecDB::database_[] = {
// Basic block samples, max number of channels that are supported. // Basic block samples, max number of channels that are supported.
const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = { const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
{2, {kIsacPacSize480, kIsacPacSize960}, 0, 1, true}, {2, {kIsacPacSize480, kIsacPacSize960}, 0, 1},
# if (defined(WEBRTC_CODEC_ISAC)) # if (defined(WEBRTC_CODEC_ISAC))
{1, {kIsacPacSize960}, 0, 1, true}, {1, {kIsacPacSize960}, 0, 1},
{1, {kIsacPacSize1440}, 0, 1, true}, {1, {kIsacPacSize1440}, 0, 1},
# endif # endif
#endif #endif
// Mono // Mono
{4, {80, 160, 240, 320}, 0, 2, false}, {4, {80, 160, 240, 320}, 0, 2},
{4, {160, 320, 480, 640}, 0, 2, false}, {4, {160, 320, 480, 640}, 0, 2},
{2, {320, 640}, 0, 2, false}, {2, {320, 640}, 0, 2},
// Stereo // Stereo
{4, {80, 160, 240, 320}, 0, 2, false}, {4, {80, 160, 240, 320}, 0, 2},
{4, {160, 320, 480, 640}, 0, 2, false}, {4, {160, 320, 480, 640}, 0, 2},
{2, {320, 640}, 0, 2}, {2, {320, 640}, 0, 2},
// G.711, PCM mu-law and A-law. // G.711, PCM mu-law and A-law.
// Mono // Mono
{6, {80, 160, 240, 320, 400, 480}, 0, 2, false}, {6, {80, 160, 240, 320, 400, 480}, 0, 2},
{6, {80, 160, 240, 320, 400, 480}, 0, 2, false}, {6, {80, 160, 240, 320, 400, 480}, 0, 2},
// Stereo // Stereo
{6, {80, 160, 240, 320, 400, 480}, 0, 2, false}, {6, {80, 160, 240, 320, 400, 480}, 0, 2},
{6, {80, 160, 240, 320, 400, 480}, 0, 2, false}, {6, {80, 160, 240, 320, 400, 480}, 0, 2},
#ifdef WEBRTC_CODEC_ILBC #ifdef WEBRTC_CODEC_ILBC
{4, {160, 240, 320, 480}, 0, 1, false}, {4, {160, 240, 320, 480}, 0, 1},
#endif #endif
#ifdef WEBRTC_CODEC_G722 #ifdef WEBRTC_CODEC_G722
// Mono // Mono
{6, {160, 320, 480, 640, 800, 960}, 0, 2, false}, {6, {160, 320, 480, 640, 800, 960}, 0, 2},
// Stereo // Stereo
{6, {160, 320, 480, 640, 800, 960}, 0, 2, false}, {6, {160, 320, 480, 640, 800, 960}, 0, 2},
#endif #endif
#ifdef WEBRTC_CODEC_OPUS #ifdef WEBRTC_CODEC_OPUS
// Opus supports frames shorter than 10ms, // Opus supports frames shorter than 10ms,
// but it doesn't help us to use them. // but it doesn't help us to use them.
// Mono and stereo. // Mono and stereo.
{4, {480, 960, 1920, 2880}, 0, 2, false}, {4, {480, 960, 1920, 2880}, 0, 2},
#endif #endif
// Comfort noise for three different sampling frequencies. // Comfort noise for three different sampling frequencies.
{1, {240}, 240, 1, false}, {1, {240}, 240, 1},
{1, {480}, 480, 1, false}, {1, {480}, 480, 1},
{1, {960}, 960, 1, false}, {1, {960}, 960, 1},
#ifdef ENABLE_48000_HZ #ifdef ENABLE_48000_HZ
{1, {1440}, 1440, 1, false}, {1, {1440}, 1440, 1},
#endif #endif
{1, {240}, 240, 1, false}, {1, {240}, 240, 1},
#ifdef WEBRTC_CODEC_RED #ifdef WEBRTC_CODEC_RED
{1, {0}, 0, 1, false}, {1, {0}, 0, 1},
#endif #endif
// To prevent compile errors due to trailing commas. // To prevent compile errors due to trailing commas.
{-1, {-1}, -1, -1, false} {-1, {-1}, -1, -1}
}; };
// Create a database of all NetEQ decoders at compile time. // Create a database of all NetEQ decoders at compile time.
@ -269,21 +301,9 @@ int ACMCodecDB::CodecNumber(const CodecInst& codec_inst) {
} else if (STR_CASE_CMP("ilbc", codec_inst.plname) == 0) { } else if (STR_CASE_CMP("ilbc", codec_inst.plname) == 0) {
return IsILBCRateValid(codec_inst.rate, codec_inst.pacsize) return IsILBCRateValid(codec_inst.rate, codec_inst.pacsize)
? codec_id : kInvalidRate; ? codec_id : kInvalidRate;
} else if (STR_CASE_CMP("amr", codec_inst.plname) == 0) {
return IsAMRRateValid(codec_inst.rate)
? codec_id : kInvalidRate;
} else if (STR_CASE_CMP("amr-wb", codec_inst.plname) == 0) {
return IsAMRwbRateValid(codec_inst.rate)
? codec_id : kInvalidRate;
} else if (STR_CASE_CMP("g7291", codec_inst.plname) == 0) {
return IsG7291RateValid(codec_inst.rate)
? codec_id : kInvalidRate;
} else if (STR_CASE_CMP("opus", codec_inst.plname) == 0) { } else if (STR_CASE_CMP("opus", codec_inst.plname) == 0) {
return IsOpusRateValid(codec_inst.rate) return IsOpusRateValid(codec_inst.rate)
? codec_id : kInvalidRate; ? codec_id : kInvalidRate;
} else if (STR_CASE_CMP("speex", codec_inst.plname) == 0) {
return IsSpeexRateValid(codec_inst.rate)
? codec_id : kInvalidRate;
} }
return IsRateValid(codec_id, codec_inst.rate) ? return IsRateValid(codec_id, codec_inst.rate) ?
@ -345,126 +365,11 @@ int ACMCodecDB::CodecFreq(int codec_id) {
return database_[codec_id].plfreq; return database_[codec_id].plfreq;
} }
// Returns the codec's basic coding block size in samples.
int ACMCodecDB::BasicCodingBlock(int codec_id) {
// Error check to see that codec_id is not out of bounds.
if (codec_id < 0 || codec_id >= kNumCodecs) {
return -1;
}
return codec_settings_[codec_id].basic_block_samples;
}
// Returns the NetEQ decoder database.
const NetEqDecoder* ACMCodecDB::NetEQDecoders() {
return neteq_decoders_;
}
// Checks if the bitrate is valid for the codec.
bool ACMCodecDB::IsRateValid(int codec_id, int rate) {
return database_[codec_id].rate == rate;
}
// Checks if the bitrate is valid for iSAC.
bool ACMCodecDB::IsISACRateValid(int rate) {
return (rate == -1) || ((rate <= 56000) && (rate >= 10000));
}
// Checks if the bitrate is valid for iLBC.
bool ACMCodecDB::IsILBCRateValid(int rate, int frame_size_samples) {
if (((frame_size_samples == 240) || (frame_size_samples == 480)) &&
(rate == 13300)) {
return true;
} else if (((frame_size_samples == 160) || (frame_size_samples == 320)) &&
(rate == 15200)) {
return true;
} else {
return false;
}
}
// Check if the bitrate is valid for the GSM-AMR.
bool ACMCodecDB::IsAMRRateValid(int rate) {
switch (rate) {
case 4750:
case 5150:
case 5900:
case 6700:
case 7400:
case 7950:
case 10200:
case 12200: {
return true;
}
default: {
return false;
}
}
}
// Check if the bitrate is valid for GSM-AMR-WB.
bool ACMCodecDB::IsAMRwbRateValid(int rate) {
switch (rate) {
case 7000:
case 9000:
case 12000:
case 14000:
case 16000:
case 18000:
case 20000:
case 23000:
case 24000: {
return true;
}
default: {
return false;
}
}
}
// Check if the bitrate is valid for G.729.1.
bool ACMCodecDB::IsG7291RateValid(int rate) {
switch (rate) {
case 8000:
case 12000:
case 14000:
case 16000:
case 18000:
case 20000:
case 22000:
case 24000:
case 26000:
case 28000:
case 30000:
case 32000: {
return true;
}
default: {
return false;
}
}
}
// Checks if the bitrate is valid for Speex.
bool ACMCodecDB::IsSpeexRateValid(int rate) {
return rate > 2000;
}
// Checks if the bitrate is valid for Opus.
bool ACMCodecDB::IsOpusRateValid(int rate) {
return (rate >= 6000) && (rate <= 510000);
}
// Checks if the payload type is in the valid range. // Checks if the payload type is in the valid range.
bool ACMCodecDB::ValidPayloadType(int payload_type) { bool ACMCodecDB::ValidPayloadType(int payload_type) {
return (payload_type >= 0) && (payload_type <= 127); return (payload_type >= 0) && (payload_type <= 127);
} }
bool ACMCodecDB::OwnsDecoder(int codec_id) {
assert(codec_id >= 0 && codec_id < ACMCodecDB::kNumCodecs);
return ACMCodecDB::codec_settings_[codec_id].owns_decoder;
}
} // namespace acm2 } // namespace acm2
} // namespace webrtc } // namespace webrtc

42
webrtc/modules/audio_coding/main/acm2/acm_codec_database.h
View File

@ -124,18 +124,11 @@ class ACMCodecDB {
// that can be different from packet size. // that can be different from packet size.
// channel_support - number of channels supported to encode; // channel_support - number of channels supported to encode;
// 1 = mono, 2 = stereo, etc. // 1 = mono, 2 = stereo, etc.
// owns_decoder - if true, it means that the codec should own the
// decoder instance. In this case, the codec should
// implement ACMGenericCodec::Decoder(), which returns
// a pointer to AudioDecoder. This pointer is injected
// into NetEq when this codec is registered as receive
// codec. DEPRECATED.
struct CodecSettings { struct CodecSettings {
int num_packet_sizes; int num_packet_sizes;
int packet_sizes_samples[kMaxNumPacketSize]; int packet_sizes_samples[kMaxNumPacketSize];
int basic_block_samples; int basic_block_samples;
int channel_support; int channel_support;
bool owns_decoder;
}; };
// Gets codec information from database at the position in database given by // Gets codec information from database at the position in database given by
@ -172,41 +165,6 @@ class ACMCodecDB {
// codec sampling frequency if successful, otherwise -1. // codec sampling frequency if successful, otherwise -1.
static int CodecFreq(int codec_id); static int CodecFreq(int codec_id);
// Return the codec's basic coding block size in samples.
// TODO(tlegrand): Check if function is needed, or if we can change
// to access database directly.
// Input:
// [codec_id] - number that specifies at what position in the database to
// get the information.
// Return:
// codec basic block size if successful, otherwise -1.
static int BasicCodingBlock(int codec_id);
// Returns the NetEQ decoder database.
static const NetEqDecoder* NetEQDecoders();
// Specifies if the codec specified by |codec_id| MUST own its own decoder.
// This is the case for codecs which *should* share a single codec instance
// between encoder and decoder. Or for codecs which ACM should have control
// over the decoder. For instance iSAC is such a codec that encoder and
// decoder share the same codec instance.
static bool OwnsDecoder(int codec_id);
// Checks if the bitrate is valid for the codec.
// Input:
// [codec_id] - number that specifies codec's position in the database.
// [rate] - bitrate to check.
// [frame_size_samples] - (used for iLBC) specifies which frame size to go
// with the rate.
static bool IsRateValid(int codec_id, int rate);
static bool IsISACRateValid(int rate);
static bool IsILBCRateValid(int rate, int frame_size_samples);
static bool IsAMRRateValid(int rate);
static bool IsAMRwbRateValid(int rate);
static bool IsG7291RateValid(int rate);
static bool IsSpeexRateValid(int rate);
static bool IsOpusRateValid(int rate);
// Check if the payload type is valid, meaning that it is in the valid range // Check if the payload type is valid, meaning that it is in the valid range
// of 0 to 127. // of 0 to 127.
// Input: // Input: