| Index: webrtc/video/video_send_stream_tests.cc
|
| diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
|
| index 688278eadca40159af3b52d9d160c40375322e56..d7e51a636ba1503ef7df68a2b665582365e87cf8 100644
|
| --- a/webrtc/video/video_send_stream_tests.cc
|
| +++ b/webrtc/video/video_send_stream_tests.cc
|
| @@ -12,6 +12,7 @@
|
|
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +#include "webrtc/base/atomicops.h"
|
| #include "webrtc/base/bind.h"
|
| #include "webrtc/base/checks.h"
|
| #include "webrtc/base/criticalsection.h"
|
| @@ -583,7 +584,7 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format,
|
| } else if (fec_packet_received_) {
|
| fec_packet_received_ = false;
|
| ++current_size_rtp_;
|
| - ++current_size_frame_;
|
| + rtc::AtomicOps::Increment(¤t_size_frame_);
|
| }
|
| }
|
| }
|
| @@ -614,10 +615,12 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format,
|
| // Increase frame size for next encoded frame, in the context of the
|
| // encoder thread.
|
| if (!use_fec_ &&
|
| - current_size_frame_.Value() < static_cast<int32_t>(stop_size_)) {
|
| - ++current_size_frame_;
|
| + rtc::AtomicOps::AcquireLoad(¤t_size_frame_) <
|
| + static_cast<int32_t>(stop_size_)) {
|
| + rtc::AtomicOps::Increment(¤t_size_frame_);
|
| }
|
| - encoder_.SetFrameSize(static_cast<size_t>(current_size_frame_.Value()));
|
| + encoder_.SetFrameSize(static_cast<size_t>(
|
| + rtc::AtomicOps::AcquireLoad(¤t_size_frame_)));
|
| }
|
|
|
| Call::Config GetSenderCallConfig() override {
|
| @@ -666,7 +669,7 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format,
|
| bool fec_packet_received_;
|
|
|
| size_t current_size_rtp_;
|
| - Atomic32 current_size_frame_;
|
| + volatile int current_size_frame_;
|
| };
|
|
|
| // Don't auto increment if FEC is used; continue sending frame size until
|
|
|