Misc. cleanup split out of https://webrtc-codereview.appspot.com/37699004/ :
* Move constants into the files/functions that use them * Declare variables in the narrowest scope possible * Use correct (expected, actual) order for gtest macros * Remove unused functions * Untabify * 80-column limit * Avoid C-style casts * Prefer true typed constants to "enum hack" constants * Print size_t using the right format macro * Shorten and simplify code * Other random cleanup bits and style fixes BUG=none TEST=none R=henrik.lundin@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/36179004 Cr-Commit-Position: refs/heads/master@{#8467} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8467 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -38,7 +38,7 @@ void DecoderDatabase::Reset() {
|
||||
|
||||
int DecoderDatabase::RegisterPayload(uint8_t rtp_payload_type,
|
||||
NetEqDecoder codec_type) {
|
||||
if (rtp_payload_type > kMaxRtpPayloadType) {
|
||||
if (rtp_payload_type > 0x7F) {
|
||||
return kInvalidRtpPayloadType;
|
||||
}
|
||||
if (!CodecSupported(codec_type)) {
|
||||
@ -74,8 +74,7 @@ int DecoderDatabase::InsertExternal(uint8_t rtp_payload_type,
|
||||
decoder->Init();
|
||||
std::pair<DecoderMap::iterator, bool> ret;
|
||||
DecoderInfo info(codec_type, fs_hz, decoder, true);
|
||||
ret = decoders_.insert(
|
||||
std::pair<uint8_t, DecoderInfo>(rtp_payload_type, info));
|
||||
ret = decoders_.insert(std::make_pair(rtp_payload_type, info));
|
||||
if (ret.second == false) {
|
||||
// Database already contains a decoder with type |rtp_payload_type|.
|
||||
return kDecoderExists;
|
||||
|
||||
Reference in New Issue
Block a user