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

Don't call operator== with scoped_ptr<T> and T*

Browse Source 
That won't work when rtc::scoped_ptr becomes a type alias for
std::unique_ptr.

BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1834103002

Cr-Commit-Position: refs/heads/master@{#12145}
This commit is contained in:
kwiberg
2016-03-29 10:17:42 -07:00
committed by Commit bot
parent 345807e599
commit 9708e9c599
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/api/java/jni/androidmediadecoder_jni.cc
View File

@ -463,7 +463,7 @@ int32_t MediaCodecVideoDecoder::ReleaseOnCodecThread() {
} }
void MediaCodecVideoDecoder::CheckOnCodecThread() { void MediaCodecVideoDecoder::CheckOnCodecThread() {
RTC_CHECK(codec_thread_ == ThreadManager::Instance()->CurrentThread()) RTC_CHECK(codec_thread_.get() == ThreadManager::Instance()->CurrentThread())
<< "Running on wrong thread!"; << "Running on wrong thread!";
} }

4
webrtc/api/java/jni/peerconnection_jni.cc
View File

@ -1078,11 +1078,11 @@ void OwnedFactoryAndThreads::JavaCallbackOnFactoryThreads() {
ScopedLocalRefFrame local_ref_frame(jni); ScopedLocalRefFrame local_ref_frame(jni);
jclass j_factory_class = FindClass(jni, "org/webrtc/PeerConnectionFactory"); jclass j_factory_class = FindClass(jni, "org/webrtc/PeerConnectionFactory");
jmethodID m = nullptr; jmethodID m = nullptr;
if (Thread::Current() == worker_thread_) { if (Thread::Current() == worker_thread_.get()) {
LOG(LS_INFO) << "Worker thread JavaCallback"; LOG(LS_INFO) << "Worker thread JavaCallback";
m = GetStaticMethodID(jni, j_factory_class, "onWorkerThreadReady", "()V"); m = GetStaticMethodID(jni, j_factory_class, "onWorkerThreadReady", "()V");
} }
if (Thread::Current() == signaling_thread_) { if (Thread::Current() == signaling_thread_.get()) {
LOG(LS_INFO) << "Signaling thread JavaCallback"; LOG(LS_INFO) << "Signaling thread JavaCallback";
m = GetStaticMethodID( m = GetStaticMethodID(
jni, j_factory_class, "onSignalingThreadReady", "()V"); jni, j_factory_class, "onSignalingThreadReady", "()V");