diff options
| author | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-11-15 12:32:15 +0000 |
|---|---|---|
| committer | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-11-15 12:32:15 +0000 |
| commit | 69969e2e2f0420df2765ab72d8e6f96d6d9d5d9c (patch) | |
| tree | 0a999011abea59c493c59fa1d7913fb42366b24b /webrtc/test/rtp_rtcp_observer.h | |
| parent | 6e95d7afab12dcc6cd3893210baf56d49df74ea0 (diff) | |
| download | webrtc-69969e2e2f0420df2765ab72d8e6f96d6d9d5d9c.tar.gz | |
Improve Call tests for RTX.
Also does some refactoring to reuse RtpRtcpObserver.
BUG=1811
R=mflodman@webrtc.org, pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/3809004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5126 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/test/rtp_rtcp_observer.h')
| -rw-r--r-- | webrtc/test/rtp_rtcp_observer.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h index ee06e2a958..922981cc4d 100644 --- a/webrtc/test/rtp_rtcp_observer.h +++ b/webrtc/test/rtp_rtcp_observer.h @@ -13,6 +13,7 @@ #include <map> #include <vector> +#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" #include "webrtc/typedefs.h" #include "webrtc/video_send_stream.h" @@ -40,12 +41,15 @@ class RtpRtcpObserver { receive_transport_.StopSending(); } - EventTypeWrapper Wait() { return observation_complete_->Wait(timeout_ms_); } + virtual EventTypeWrapper Wait() { + return observation_complete_->Wait(timeout_ms_); + } protected: RtpRtcpObserver(unsigned int event_timeout_ms) : lock_(CriticalSectionWrapper::CreateCriticalSection()), observation_complete_(EventWrapper::Create()), + parser_(RtpHeaderParser::Create()), send_transport_(lock_.get(), this, &RtpRtcpObserver::OnSendRtp, @@ -135,6 +139,7 @@ class RtpRtcpObserver { protected: scoped_ptr<CriticalSectionWrapper> lock_; scoped_ptr<EventWrapper> observation_complete_; + scoped_ptr<RtpHeaderParser> parser_; private: PacketTransport send_transport_, receive_transport_; |