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

Remove all aliases to rtc::Thread

Browse Source 
Those alias do not save much typing, but may cause conflicts, specially the one in the header

Bug: None
Change-Id: Ifb17f639e528aaff72861ff55dcd7a96a229715d
Reviewed-on: https://webrtc-review.googlesource.com/c/110784
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25628}
This commit is contained in:
Danil Chapovalov
2018-11-13 18:07:46 +01:00
committed by Commit Bot
parent 428a160dd6
commit 6dbf0e43a5
6 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sdk/android/src/jni/androidmediadecoder.cc
View File

@ -35,7 +35,6 @@
#include "third_party/libyuv/include/libyuv/video_common.h"
using rtc::Bind;
using rtc::Thread;
using rtc::ThreadManager;
namespace webrtc {
namespace jni {
@ -121,7 +120,7 @@ class MediaCodecVideoDecoder : public VideoDecoder, public rtc::MessageHandler {
// State that is constant for the lifetime of this object once the ctor
// returns.
std::unique_ptr<Thread>
std::unique_ptr<rtc::Thread>
codec_thread_; // Thread on which to operate MediaCodec.
ScopedJavaGlobalRef<jobject> j_media_codec_video_decoder_;
@ -137,7 +136,7 @@ MediaCodecVideoDecoder::MediaCodecVideoDecoder(JNIEnv* jni,
inited_(false),
sw_fallback_required_(false),
use_surface_(use_surface),
codec_thread_(Thread::Create()),
codec_thread_(rtc::Thread::Create()),
j_media_codec_video_decoder_(
jni,
Java_MediaCodecVideoDecoder_Constructor(jni)) {

1
sdk/android/src/jni/androidmediaencoder.cc
View File

@ -47,7 +47,6 @@
#include "third_party/libyuv/include/libyuv/video_common.h"
using rtc::Bind;
using rtc::Thread;
using rtc::ThreadManager;
namespace webrtc {

6
sdk/android/src/jni/pc/ownedfactoryandthreads.cc
View File

@ -21,9 +21,9 @@ PeerConnectionFactoryInterface* factoryFromJava(jlong j_p) {
}
OwnedFactoryAndThreads::OwnedFactoryAndThreads(
std::unique_ptr<Thread> network_thread,
std::unique_ptr<Thread> worker_thread,
std::unique_ptr<Thread> signaling_thread,
std::unique_ptr<rtc::Thread> network_thread,
std::unique_ptr<rtc::Thread> worker_thread,
std::unique_ptr<rtc::Thread> signaling_thread,
rtc::NetworkMonitorFactory* network_monitor_factory,
PeerConnectionFactoryInterface* factory)
: network_thread_(std::move(network_thread)),

20
sdk/android/src/jni/pc/ownedfactoryandthreads.h
View File

@ -18,8 +18,6 @@
#include "api/peerconnectioninterface.h"
#include "rtc_base/thread.h"
using rtc::Thread;
namespace webrtc {
namespace jni {
@ -33,18 +31,18 @@ PeerConnectionFactoryInterface* factoryFromJava(jlong j_p);
// single thing for Java to hold and eventually free.
class OwnedFactoryAndThreads {
public:
OwnedFactoryAndThreads(std::unique_ptr<Thread> network_thread,
std::unique_ptr<Thread> worker_thread,
std::unique_ptr<Thread> signaling_thread,
OwnedFactoryAndThreads(std::unique_ptr<rtc::Thread> network_thread,
std::unique_ptr<rtc::Thread> worker_thread,
std::unique_ptr<rtc::Thread> signaling_thread,
rtc::NetworkMonitorFactory* network_monitor_factory,
PeerConnectionFactoryInterface* factory);
~OwnedFactoryAndThreads();
PeerConnectionFactoryInterface* factory() { return factory_; }
Thread* network_thread() { return network_thread_.get(); }
Thread* signaling_thread() { return signaling_thread_.get(); }
Thread* worker_thread() { return worker_thread_.get(); }
rtc::Thread* network_thread() { return network_thread_.get(); }
rtc::Thread* signaling_thread() { return signaling_thread_.get(); }
rtc::Thread* worker_thread() { return worker_thread_.get(); }
rtc::NetworkMonitorFactory* network_monitor_factory() {
return network_monitor_factory_;
}
@ -52,9 +50,9 @@ class OwnedFactoryAndThreads {
void InvokeJavaCallbacksOnFactoryThreads();
private:
const std::unique_ptr<Thread> network_thread_;
const std::unique_ptr<Thread> worker_thread_;
const std::unique_ptr<Thread> signaling_thread_;
const std::unique_ptr<rtc::Thread> network_thread_;
const std::unique_ptr<rtc::Thread> worker_thread_;
const std::unique_ptr<rtc::Thread> signaling_thread_;
rtc::NetworkMonitorFactory* network_monitor_factory_;
PeerConnectionFactoryInterface* factory_; // Const after ctor except dtor.
};