admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Auto)update libjingle 78296920-> 78342456

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7507 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-10-23 12:22:06 +00:00
parent 8539bd0184
commit 9d446f2e16
2 changed files with 30 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
talk/media/webrtc/webrtcvoiceengine.cc
View File

@ -405,22 +405,28 @@ static bool IsOpusStereoEnabled(const AudioCodec& codec) {
return codec.GetParam(kCodecParamStereo, &value) && value == 1;
}
// TODO(minyue): Clamp bitrate when invalid.
static bool IsValidOpusBitrate(int bitrate) {
return (bitrate >= kOpusMinBitrate && bitrate <= kOpusMaxBitrate);
}
// Returns 0 if params[kCodecParamMaxAverageBitrate] is not defined or invalid.
// Returns the value of params[kCodecParamMaxAverageBitrate] otherwise.
static int GetOpusBitrateFromParams(const AudioCodec& codec) {
// Use params[kCodecParamMaxAverageBitrate] if it is defined, use codec.bitrate
// otherwise. If the value (either from params or codec.bitrate) <=0, use the
// default configuration. If the value is beyond feasible bit rate of Opus,
// clamp it. Returns the Opus bit rate for operation.
static int GetOpusBitrate(const AudioCodec& codec) {
int bitrate = 0;
bool use_param = true;
if (!codec.GetParam(kCodecParamMaxAverageBitrate, &bitrate)) {
return 0;
bitrate = codec.bitrate;
use_param = false;
}
if (!IsValidOpusBitrate(bitrate)) {
LOG(LS_WARNING) << "Codec parameter \"maxaveragebitrate\" has an "
<< "invalid value: " << bitrate;
return 0;
if (bitrate <= 0) {
bitrate = IsOpusStereoEnabled(codec) ? kOpusStereoBitrate :
kOpusMonoBitrate;
} else if (bitrate < kOpusMinBitrate || bitrate > kOpusMaxBitrate) {
bitrate = (bitrate < kOpusMinBitrate) ? kOpusMinBitrate : kOpusMaxBitrate;
std::string rate_source =
use_param ? "Codec parameter \"maxaveragebitrate\"" :
"Supplied Opus bitrate";
LOG(LS_WARNING) << rate_source
<< " is invalid and is replaced by: "
<< bitrate;
}
return bitrate;
}
@ -450,39 +456,14 @@ static void GetOpusConfig(const AudioCodec& codec, webrtc::CodecInst* voe_codec,
// If OPUS, change what we send according to the "stereo" codec
// parameter, and not the "channels" parameter. We set
// voe_codec.channels to 2 if "stereo=1" and 1 otherwise. If
// the bitrate is not specified, i.e. is zero, we set it to the
// the bitrate is not specified, i.e. is <= zero, we set it to the
// appropriate default value for mono or stereo Opus.
// TODO(minyue): The determination of bit rate might take the maximum playback
// rate into account.
if (IsOpusStereoEnabled(codec)) {
voe_codec->channels = 2;
if (!IsValidOpusBitrate(codec.bitrate)) {
if (codec.bitrate != 0) {
LOG(LS_WARNING) << "Overrides the invalid supplied bitrate("
<< codec.bitrate
<< ") with default opus stereo bitrate: "
<< kOpusStereoBitrate;
}
voe_codec->rate = kOpusStereoBitrate;
}
} else {
voe_codec->channels = 1;
if (!IsValidOpusBitrate(codec.bitrate)) {
if (codec.bitrate != 0) {
LOG(LS_WARNING) << "Overrides the invalid supplied bitrate("
<< codec.bitrate
<< ") with default opus mono bitrate: "
<< kOpusMonoBitrate;
}
voe_codec->rate = kOpusMonoBitrate;
}
}
int bitrate_from_params = GetOpusBitrateFromParams(codec);
if (bitrate_from_params != 0) {
voe_codec->rate = bitrate_from_params;
}
voe_codec->channels = IsOpusStereoEnabled(codec) ? 2 : 1;
voe_codec->rate = GetOpusBitrate(codec);
}
void WebRtcVoiceEngine::ConstructCodecs() {

18
talk/media/webrtc/webrtcvoiceengine_unittest.cc
View File

@ -876,21 +876,20 @@ TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecOpusGoodXBitrate0Stereo) {
codecs[0].params["stereo"] = "0";
webrtc::CodecInst gcodec;
// bitrate that's out of the range between 6000 and 510000 will be considered
// as invalid and ignored.
// bitrate that's out of the range between 6000 and 510000 will be clamped.
codecs[0].bitrate = 5999;
EXPECT_TRUE(channel_->SetSendCodecs(codecs));
EXPECT_EQ(0, voe_.GetSendCodec(channel_num, gcodec));
EXPECT_STREQ("opus", gcodec.plname);
EXPECT_EQ(1, gcodec.channels);
EXPECT_EQ(32000, gcodec.rate);
EXPECT_EQ(6000, gcodec.rate);
codecs[0].bitrate = 510001;
EXPECT_TRUE(channel_->SetSendCodecs(codecs));
EXPECT_EQ(0, voe_.GetSendCodec(channel_num, gcodec));
EXPECT_STREQ("opus", gcodec.plname);
EXPECT_EQ(1, gcodec.channels);
EXPECT_EQ(32000, gcodec.rate);
EXPECT_EQ(510000, gcodec.rate);
}
// Test that with bitrate=0 and stereo=1,
@ -920,21 +919,20 @@ TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecOpusGoodXBitrate1Stereo) {
codecs[0].params["stereo"] = "1";
webrtc::CodecInst gcodec;
// bitrate that's out of the range between 6000 and 510000 will be considered
// as invalid and ignored.
// bitrate that's out of the range between 6000 and 510000 will be clamped.
codecs[0].bitrate = 5999;
EXPECT_TRUE(channel_->SetSendCodecs(codecs));
EXPECT_EQ(0, voe_.GetSendCodec(channel_num, gcodec));
EXPECT_STREQ("opus", gcodec.plname);
EXPECT_EQ(2, gcodec.channels);
EXPECT_EQ(64000, gcodec.rate);
EXPECT_EQ(6000, gcodec.rate);
codecs[0].bitrate = 510001;
EXPECT_TRUE(channel_->SetSendCodecs(codecs));
EXPECT_EQ(0, voe_.GetSendCodec(channel_num, gcodec));
EXPECT_STREQ("opus", gcodec.plname);
EXPECT_EQ(2, gcodec.channels);
EXPECT_EQ(64000, gcodec.rate);
EXPECT_EQ(510000, gcodec.rate);
}
// Test that with bitrate=N and stereo unset,
@ -1020,13 +1018,13 @@ TEST_F(WebRtcVoiceEngineTestFake, SetSendCodecOpusMaxAverageBitrate) {
codecs[0].params["maxaveragebitrate"] = "5999";
EXPECT_TRUE(channel_->SetSendCodecs(codecs));
EXPECT_EQ(0, voe_.GetSendCodec(channel_num, gcodec));
EXPECT_EQ(30000, gcodec.rate);
EXPECT_EQ(6000, gcodec.rate);
// Ignore if larger than 510000.
codecs[0].params["maxaveragebitrate"] = "510001";
EXPECT_TRUE(channel_->SetSendCodecs(codecs));
EXPECT_EQ(0, voe_.GetSendCodec(channel_num, gcodec));
EXPECT_EQ(30000, gcodec.rate);
EXPECT_EQ(510000, gcodec.rate);
codecs[0].params["maxaveragebitrate"] = "200000";
EXPECT_TRUE(channel_->SetSendCodecs(codecs));