d60d79a145
Effectively re-lands r5516 which was reverted because talk/-only checkouts existed. This now resides in webrtc/base/, so no talk/-only checkouts should be possible. This change also enables -Wthread-safety for talk/ and fixes a bug in talk/media/webrtc/webrtcvideoengine2.cc where a guarded variable was read without taking the corresponding lock. R=andresp@webrtc.org, mflodman@webrtc.org, pthatcher@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/27569004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7284 4adac7df-926f-26a2-2b94-8c16560cd09d
100 lines
3.4 KiB
C++
100 lines
3.4 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2005 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
// Class to collect statistics from a media channel
|
|
|
|
#ifndef TALK_SESSION_MEDIA_MEDIAMONITOR_H_
|
|
#define TALK_SESSION_MEDIA_MEDIAMONITOR_H_
|
|
|
|
#include "talk/media/base/mediachannel.h"
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/sigslot.h"
|
|
#include "webrtc/base/thread.h"
|
|
#include "webrtc/base/thread_annotations.h"
|
|
|
|
namespace cricket {
|
|
|
|
// The base MediaMonitor class, independent of voice and video.
|
|
class MediaMonitor : public rtc::MessageHandler,
|
|
public sigslot::has_slots<> {
|
|
public:
|
|
MediaMonitor(rtc::Thread* worker_thread,
|
|
rtc::Thread* monitor_thread);
|
|
~MediaMonitor();
|
|
|
|
void Start(uint32 milliseconds);
|
|
void Stop();
|
|
|
|
protected:
|
|
void OnMessage(rtc::Message *message);
|
|
void PollMediaChannel();
|
|
virtual void GetStats() = 0;
|
|
virtual void Update() = 0;
|
|
|
|
rtc::CriticalSection crit_;
|
|
rtc::Thread* worker_thread_;
|
|
rtc::Thread* monitor_thread_;
|
|
bool monitoring_;
|
|
uint32 rate_;
|
|
};
|
|
|
|
// Templatized MediaMonitor that can deal with different kinds of media.
|
|
template<class MC, class MI>
|
|
class MediaMonitorT : public MediaMonitor {
|
|
public:
|
|
MediaMonitorT(MC* media_channel, rtc::Thread* worker_thread,
|
|
rtc::Thread* monitor_thread)
|
|
: MediaMonitor(worker_thread, monitor_thread),
|
|
media_channel_(media_channel) {}
|
|
sigslot::signal2<MC*, const MI&> SignalUpdate;
|
|
|
|
protected:
|
|
// These routines assume the crit_ lock is held by the calling thread.
|
|
virtual void GetStats() {
|
|
media_info_.Clear();
|
|
media_channel_->GetStats(&media_info_);
|
|
}
|
|
virtual void Update() EXCLUSIVE_LOCKS_REQUIRED(crit_) {
|
|
MI stats(media_info_);
|
|
crit_.Leave();
|
|
SignalUpdate(media_channel_, stats);
|
|
crit_.Enter();
|
|
}
|
|
|
|
private:
|
|
MC* media_channel_;
|
|
MI media_info_;
|
|
};
|
|
|
|
typedef MediaMonitorT<VoiceMediaChannel, VoiceMediaInfo> VoiceMediaMonitor;
|
|
typedef MediaMonitorT<VideoMediaChannel, VideoMediaInfo> VideoMediaMonitor;
|
|
typedef MediaMonitorT<DataMediaChannel, DataMediaInfo> DataMediaMonitor;
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // TALK_SESSION_MEDIA_MEDIAMONITOR_H_
|