зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1136004: fix TSAN warning in webrtc when RED isn't enabled r=cpeterson
This commit is contained in:
Родитель
052ba27385
Коммит
05c71da4ba
|
@ -1416,11 +1416,10 @@ bool AudioCodingModuleImpl::REDStatus() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configure RED status i.e on/off.
|
// Configure RED status i.e on/off.
|
||||||
int AudioCodingModuleImpl::SetREDStatus(
|
int AudioCodingModuleImpl::SetREDStatus(bool enable_red) {
|
||||||
#ifdef WEBRTC_CODEC_RED
|
|
||||||
bool enable_red) {
|
|
||||||
CriticalSectionScoped lock(acm_crit_sect_);
|
CriticalSectionScoped lock(acm_crit_sect_);
|
||||||
|
|
||||||
|
#ifdef WEBRTC_CODEC_RED
|
||||||
if (enable_red == true && codec_fec_enabled_ == true) {
|
if (enable_red == true && codec_fec_enabled_ == true) {
|
||||||
WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, id_,
|
WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, id_,
|
||||||
"Codec internal FEC and RED cannot be co-enabled.");
|
"Codec internal FEC and RED cannot be co-enabled.");
|
||||||
|
@ -1439,7 +1438,6 @@ int AudioCodingModuleImpl::SetREDStatus(
|
||||||
is_first_red_ = true; // Make sure we restart RED.
|
is_first_red_ = true; // Make sure we restart RED.
|
||||||
return 0;
|
return 0;
|
||||||
#else
|
#else
|
||||||
bool /* enable_red */) {
|
|
||||||
red_enabled_ = false;
|
red_enabled_ = false;
|
||||||
WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, id_,
|
WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, id_,
|
||||||
" WEBRTC_CODEC_RED is undefined => red_enabled_ = %d",
|
" WEBRTC_CODEC_RED is undefined => red_enabled_ = %d",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче