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

Migrate rtc_tools/, sdk/, and system_wrappers/ to webrtc::Mutex.

Browse Source 
Bug: webrtc:11567
Change-Id: Ia85cf457ac16ebec0a70d319506415e4dec46f30
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178903
Reviewed-by: Magnus Flodman <mflodman@webrtc.org>
Commit-Queue: Markus Handell <handellm@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31693}
This commit is contained in:
Markus Handell
2020-07-08 23:04:37 +02:00
committed by Commit Bot
parent e6f3897945
commit 85585f4a52
13 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/android/src/jni/video_decoder_wrapper.cc
View File

@ -109,7 +109,7 @@ int32_t VideoDecoderWrapper::Decode(
frame_extra_info.qp =
qp_parsing_enabled_ ? ParseQP(input_image) : absl::nullopt;
{
rtc::CritScope cs(&frame_extra_infos_lock_);
MutexLock lock(&frame_extra_infos_lock_);
frame_extra_infos_.push_back(frame_extra_info);
}
@ -135,7 +135,7 @@ int32_t VideoDecoderWrapper::Release() {
jni, Java_VideoDecoder_release(jni, decoder_));
RTC_LOG(LS_INFO) << "release: " << status;
{
rtc::CritScope cs(&frame_extra_infos_lock_);
MutexLock lock(&frame_extra_infos_lock_);
frame_extra_infos_.clear();
}
initialized_ = false;
@ -163,7 +163,7 @@ void VideoDecoderWrapper::OnDecodedFrame(
FrameExtraInfo frame_extra_info;
{
rtc::CritScope cs(&frame_extra_infos_lock_);
MutexLock lock(&frame_extra_infos_lock_);
do {
if (frame_extra_infos_.empty()) {

4
sdk/android/src/jni/video_decoder_wrapper.h
View File

@ -18,8 +18,8 @@
#include "api/video_codecs/video_decoder.h"
#include "common_video/h264/h264_bitstream_parser.h"
#include "rtc_base/critical_section.h"
#include "rtc_base/race_checker.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_checker.h"
#include "sdk/android/src/jni/jni_helpers.h"
@ -105,7 +105,7 @@ class VideoDecoderWrapper : public VideoDecoder {
// Accessed both on the decoder thread and the callback thread.
std::atomic<bool> qp_parsing_enabled_;
rtc::CriticalSection frame_extra_infos_lock_;
Mutex frame_extra_infos_lock_;
std::deque<FrameExtraInfo> frame_extra_infos_
RTC_GUARDED_BY(frame_extra_infos_lock_);
};