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

Synchronize is_screencast_ state in AndroidVideoTrackSource.

Browse Source 
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}
This commit is contained in:
Jakob Ivarsson
2019-11-13 14:08:00 +01:00
committed by Commit Bot
parent c20a19cc4b
commit 017c84f3ea
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/android/src/jni/android_video_track_source.cc
View File

@ -52,7 +52,7 @@ AndroidVideoTrackSource::AndroidVideoTrackSource(rtc::Thread* signaling_thread,
AndroidVideoTrackSource::~AndroidVideoTrackSource() = default; AndroidVideoTrackSource::~AndroidVideoTrackSource() = default;
bool AndroidVideoTrackSource::is_screencast() const { bool AndroidVideoTrackSource::is_screencast() const {
return is_screencast_; return is_screencast_.load();
} }
absl::optional<bool> AndroidVideoTrackSource::needs_denoising() const { absl::optional<bool> AndroidVideoTrackSource::needs_denoising() const {
@ -88,7 +88,7 @@ bool AndroidVideoTrackSource::remote() const {
void AndroidVideoTrackSource::SetIsScreencast(JNIEnv* env, void AndroidVideoTrackSource::SetIsScreencast(JNIEnv* env,
jboolean j_is_screencast) { jboolean j_is_screencast) {
is_screencast_ = j_is_screencast; is_screencast_.store(j_is_screencast);
} }
ScopedJavaLocalRef<jobject> AndroidVideoTrackSource::AdaptFrame( ScopedJavaLocalRef<jobject> AndroidVideoTrackSource::AdaptFrame(

2
sdk/android/src/jni/android_video_track_source.h
View File

@ -89,7 +89,7 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
private: private:
rtc::Thread* signaling_thread_; rtc::Thread* signaling_thread_;
std::atomic<SourceState> state_; std::atomic<SourceState> state_;
bool is_screencast_; std::atomic<bool> is_screencast_;
rtc::TimestampAligner timestamp_aligner_; rtc::TimestampAligner timestamp_aligner_;
const bool align_timestamps_; const bool align_timestamps_;
}; };