From 017c84f3eacbd67a818e5ed8457de82b1b30d188 Mon Sep 17 00:00:00 2001
From: Jakob Ivarsson <jakobi@webrtc.org>
Date: Wed, 13 Nov 2019 14:08:00 +0100
Subject: [PATCH] Synchronize is_screencast_ state in AndroidVideoTrackSource.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow up to https://webrtc-review.googlesource.com/c/src/+/159689.

Bug: None
Change-Id: I3f2b481db091d405c1b00ca18c2e7ce5f3375607
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159702
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29790}
---
 sdk/android/src/jni/android_video_track_source.cc | 4 ++--
 sdk/android/src/jni/android_video_track_source.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/android/src/jni/android_video_track_source.cc b/sdk/android/src/jni/android_video_track_source.cc
index b9e056284d..f8455c91fa 100644
--- a/sdk/android/src/jni/android_video_track_source.cc
+++ b/sdk/android/src/jni/android_video_track_source.cc
@@ -52,7 +52,7 @@ AndroidVideoTrackSource::AndroidVideoTrackSource(rtc::Thread* signaling_thread,
 AndroidVideoTrackSource::~AndroidVideoTrackSource() = default;
 
 bool AndroidVideoTrackSource::is_screencast() const {
-  return is_screencast_;
+  return is_screencast_.load();
 }
 
 absl::optional<bool> AndroidVideoTrackSource::needs_denoising() const {
@@ -88,7 +88,7 @@ bool AndroidVideoTrackSource::remote() const {
 
 void AndroidVideoTrackSource::SetIsScreencast(JNIEnv* env,
                                               jboolean j_is_screencast) {
-  is_screencast_ = j_is_screencast;
+  is_screencast_.store(j_is_screencast);
 }
 
 ScopedJavaLocalRef<jobject> AndroidVideoTrackSource::AdaptFrame(
diff --git a/sdk/android/src/jni/android_video_track_source.h b/sdk/android/src/jni/android_video_track_source.h
index 6fcf5cd6fc..378d380a11 100644
--- a/sdk/android/src/jni/android_video_track_source.h
+++ b/sdk/android/src/jni/android_video_track_source.h
@@ -89,7 +89,7 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
  private:
   rtc::Thread* signaling_thread_;
   std::atomic<SourceState> state_;
-  bool is_screencast_;
+  std::atomic<bool> is_screencast_;
   rtc::TimestampAligner timestamp_aligner_;
   const bool align_timestamps_;
 };