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

Removing macro in acm_opus.cc

Browse Source 
Remove it since macros are not recommended to use according to code style guide.

BUG=
R=tina.legrand@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6917 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
minyue@webrtc.org
2014-08-18 12:06:31 +00:00
parent b5ab52d010
commit e9b493e763
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/audio_coding/main/acm2/acm_opus.cc
View File

@@ -15,8 +15,6 @@
#include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
#include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#define SIGN(x) (x > 0 ? 1 : -1)
#endif #endif
namespace webrtc { namespace webrtc {
@@ -76,7 +74,7 @@ ACMOpus::ACMOpus(int16_t codec_id)
bitrate_(20000), // Default bit-rate. bitrate_(20000), // Default bit-rate.
channels_(1), // Default mono. channels_(1), // Default mono.
fec_enabled_(false), // Default FEC is off. fec_enabled_(false), // Default FEC is off.
packet_loss_rate_(0) { packet_loss_rate_(0) { // Initial packet loss rate.
codec_id_ = codec_id; codec_id_ = codec_id;
// Opus has internal DTX, but we dont use it for now. // Opus has internal DTX, but we dont use it for now.
has_internal_dtx_ = false; has_internal_dtx_ = false;
@@ -194,7 +192,6 @@ int16_t ACMOpus::SetBitRateSafe(const int32_t rate) {
"SetBitRateSafe: Invalid rate Opus"); "SetBitRateSafe: Invalid rate Opus");
return -1; return -1;
} }
// Initial packet loss rate.
bitrate_ = rate; bitrate_ = rate;
@@ -239,13 +236,13 @@ int ACMOpus::SetPacketLossRate(int loss_rate) {
const int kLossRate5Margin = 1; const int kLossRate5Margin = 1;
int opt_loss_rate; int opt_loss_rate;
if (loss_rate >= kPacketLossRate20 + kLossRate20Margin * if (loss_rate >= kPacketLossRate20 + kLossRate20Margin *
SIGN(kPacketLossRate20 - packet_loss_rate_)) { (kPacketLossRate20 - packet_loss_rate_ > 0 ? 1 : -1)) {
opt_loss_rate = kPacketLossRate20; opt_loss_rate = kPacketLossRate20;
} else if (loss_rate >= kPacketLossRate10 + kLossRate10Margin * } else if (loss_rate >= kPacketLossRate10 + kLossRate10Margin *
SIGN(kPacketLossRate10 - packet_loss_rate_)) { (kPacketLossRate10 - packet_loss_rate_ > 0 ? 1 : -1)) {
opt_loss_rate = kPacketLossRate10; opt_loss_rate = kPacketLossRate10;
} else if (loss_rate >= kPacketLossRate5 + kLossRate5Margin * } else if (loss_rate >= kPacketLossRate5 + kLossRate5Margin *
SIGN(kPacketLossRate5 - packet_loss_rate_)) { (kPacketLossRate5 - packet_loss_rate_ > 0 ? 1 : -1)) {
opt_loss_rate = kPacketLossRate5; opt_loss_rate = kPacketLossRate5;
} else if (loss_rate >= kPacketLossRate1) { } else if (loss_rate >= kPacketLossRate1) {
opt_loss_rate = kPacketLossRate1; opt_loss_rate = kPacketLossRate1;