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

Fixing a race condition in ACMGenericCodec

Browse Source 
The old object was deleted before the pointer to it was removed from
the decoder proxy.

BUG=chromium:467209
TBR=tina.legrand@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8736}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8736 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2015-03-16 14:33:16 +00:00
parent 3f11823a1a
commit 02d166b735
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc
View File

@ -339,8 +339,8 @@ void ACMGenericCodec::ResetAudioEncoder() {
config.payload_type = codec_inst.pltype; config.payload_type = codec_inst.pltype;
enc_dec = new AudioEncoderDecoderIsacFix(config); enc_dec = new AudioEncoderDecoderIsacFix(config);
} }
audio_encoder_.reset(enc_dec);
decoder_proxy_.SetDecoder(enc_dec); decoder_proxy_.SetDecoder(enc_dec);
audio_encoder_.reset(enc_dec);
#endif #endif
#ifdef WEBRTC_CODEC_ISAC #ifdef WEBRTC_CODEC_ISAC
} else if (!STR_CASE_CMP(codec_inst.plname, "ISAC")) { } else if (!STR_CASE_CMP(codec_inst.plname, "ISAC")) {
@ -368,8 +368,8 @@ void ACMGenericCodec::ResetAudioEncoder() {
config.payload_type = codec_inst.pltype; config.payload_type = codec_inst.pltype;
enc_dec = new AudioEncoderDecoderIsac(config); enc_dec = new AudioEncoderDecoderIsac(config);
} }
audio_encoder_.reset(enc_dec);
decoder_proxy_.SetDecoder(enc_dec); decoder_proxy_.SetDecoder(enc_dec);
audio_encoder_.reset(enc_dec);
#endif #endif
} else { } else {
FATAL(); FATAL();