Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Unified Diff: webrtc/modules/audio_coding/codecs/audio_encoder_mutable_impl.h

Issue 1176303004: Fix a data race in AudioEncoderMutableImpl and derived classes (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/codecs/audio_encoder_mutable_impl.h
diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder_mutable_impl.h b/webrtc/modules/audio_coding/codecs/audio_encoder_mutable_impl.h
index 8d355d8e35a11fe4ab01bd075e8e19527adfb2ee..f760b01c3d9d8a4fb12b2a0816b77424e8fa98b5 100644
--- a/webrtc/modules/audio_coding/codecs/audio_encoder_mutable_impl.h
+++ b/webrtc/modules/audio_coding/codecs/audio_encoder_mutable_impl.h
@@ -12,7 +12,10 @@
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_MUTABLE_IMPL_H_
#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
namespace webrtc {
@@ -44,32 +47,46 @@ class AudioEncoderMutableImpl : public P {
const int16_t* audio,
size_t max_encoded_bytes,
uint8_t* encoded) override {
+ CriticalSectionScoped cs(encoder_lock_.get());
return encoder_->EncodeInternal(rtp_timestamp, audio, max_encoded_bytes,
encoded);
}
- int SampleRateHz() const override { return encoder_->SampleRateHz(); }
- int NumChannels() const override { return encoder_->NumChannels(); }
+ int SampleRateHz() const override {
+ CriticalSectionScoped cs(encoder_lock_.get());
+ return encoder_->SampleRateHz();
+ }
+ int NumChannels() const override {
+ CriticalSectionScoped cs(encoder_lock_.get());
+ return encoder_->NumChannels();
+ }
size_t MaxEncodedBytes() const override {
+ CriticalSectionScoped cs(encoder_lock_.get());
return encoder_->MaxEncodedBytes();
}
int RtpTimestampRateHz() const override {
+ CriticalSectionScoped cs(encoder_lock_.get());
return encoder_->RtpTimestampRateHz();
}
int Num10MsFramesInNextPacket() const override {
+ CriticalSectionScoped cs(encoder_lock_.get());
return encoder_->Num10MsFramesInNextPacket();
}
int Max10MsFramesInAPacket() const override {
+ CriticalSectionScoped cs(encoder_lock_.get());
return encoder_->Max10MsFramesInAPacket();
}
void SetTargetBitrate(int bits_per_second) override {
+ CriticalSectionScoped cs(encoder_lock_.get());
encoder_->SetTargetBitrate(bits_per_second);
}
void SetProjectedPacketLossRate(double fraction) override {
+ CriticalSectionScoped cs(encoder_lock_.get());
encoder_->SetProjectedPacketLossRate(fraction);
}
protected:
- explicit AudioEncoderMutableImpl(const typename T::Config& config) {
+ explicit AudioEncoderMutableImpl(const typename T::Config& config)
+ : encoder_lock_(CriticalSectionWrapper::CreateCriticalSection()) {
Reconstruct(config);
}
@@ -77,16 +94,23 @@ class AudioEncoderMutableImpl : public P {
if (!config.IsOk())
return false;
config_ = config;
+ CriticalSectionScoped cs(encoder_lock_.get());
Jelena 2015/06/13 09:47:50 Actually, lock needs to protect the config_ as wel
kwiberg-webrtc 2015/06/13 20:27:49 I don't think it does, actually. If I'm right, all
hlundin-webrtc 2015/06/15 09:38:10 Moved the critsect as suggested, and added GUARDED
encoder_.reset(new T(config_));
return true;
}
const typename T::Config& config() const { return config_; }
Jelena 2015/06/13 09:47:50 Since config_ can be modified on another thread, y
kwiberg-webrtc 2015/06/13 20:27:49 Same comment as on line 97.
hlundin-webrtc 2015/06/15 09:38:10 Done.
- T* encoder() { return encoder_.get(); }
- const T* encoder() const { return encoder_.get(); }
+ T* encoder() EXCLUSIVE_LOCKS_REQUIRED(encoder_lock_) {
+ return encoder_.get();
+ }
+ const T* encoder() const EXCLUSIVE_LOCKS_REQUIRED(encoder_lock_) {
+ return encoder_.get();
+ }
+
+ const rtc::scoped_ptr<CriticalSectionWrapper> encoder_lock_;
private:
- rtc::scoped_ptr<T> encoder_;
+ rtc::scoped_ptr<T> encoder_ GUARDED_BY(encoder_lock_);
typename T::Config config_;
};
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/codecs/isac/fix/source/audio_encoder_isacfix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698