Re-implement dependency injection of TickTime into VCM and tests
This change basicly re-enables the change of r1220, which was reverted in r1235 due to Clang issues. The difference from r1220 is that the TickTimeInterface was renamed to TickTimeClass, and no longer inherits from TickTime. Review URL: http://webrtc-codereview.appspot.com/335006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1267 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -33,6 +33,7 @@ enum VCMNackMode
|
||||
};
|
||||
|
||||
// forward declarations
|
||||
class TickTimeBase;
|
||||
class VCMFrameBuffer;
|
||||
class VCMPacket;
|
||||
class VCMEncodedFrame;
|
||||
@@ -49,7 +50,8 @@ public:
|
||||
class VCMJitterBuffer
|
||||
{
|
||||
public:
|
||||
VCMJitterBuffer(WebRtc_Word32 vcmId = -1,
|
||||
VCMJitterBuffer(TickTimeBase* clock,
|
||||
WebRtc_Word32 vcmId = -1,
|
||||
WebRtc_Word32 receiverId = -1,
|
||||
bool master = true);
|
||||
virtual ~VCMJitterBuffer();
|
||||
@@ -191,6 +193,7 @@ private:
|
||||
|
||||
WebRtc_Word32 _vcmId;
|
||||
WebRtc_Word32 _receiverId;
|
||||
TickTimeBase* _clock;
|
||||
// If we are running (have started) or not
|
||||
bool _running;
|
||||
CriticalSectionWrapper* _critSect;
|
||||
|
||||
Reference in New Issue
Block a user