Revert "Revert of FrameBuffer for the new jitter buffer. (patchset #9 id:160001 of https://codereview.webrtc.org/1969403007/ )"

Also disabled modules_unittest.TestFrameBuffer2.* in drmemory.

This reverts commit b711f10d9683b9de6ee78186f77b225fc7ebfb8f.

TBR=honghaiz@webrtc.org

BUG=

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

Cr-Commit-Position: refs/heads/master@{#12806}
This commit is contained in:
philipel
2016-05-19 12:19:35 +02:00
parent 84f9b98450
commit be7a9e5f8a
10 changed files with 577 additions and 3 deletions

View File

@ -28,7 +28,7 @@ class VCMTiming {
// The primary timing component should be passed
// if this is the dual timing component.
explicit VCMTiming(Clock* clock, VCMTiming* master_timing = NULL);
~VCMTiming();
virtual ~VCMTiming();
// Resets the timing to the initial state.
void Reset();
@ -69,11 +69,11 @@ class VCMTiming {
// Returns the receiver system time when the frame with timestamp
// frame_timestamp should be rendered, assuming that the system time currently
// is now_ms.
int64_t RenderTimeMs(uint32_t frame_timestamp, int64_t now_ms) const;
virtual int64_t RenderTimeMs(uint32_t frame_timestamp, int64_t now_ms) const;
// Returns the maximum time in ms that we can wait for a frame to become
// complete before we must pass it to the decoder.
uint32_t MaxWaitingTime(int64_t render_time_ms, int64_t now_ms) const;
virtual uint32_t MaxWaitingTime(int64_t render_time_ms, int64_t now_ms) const;
// Returns the current target delay which is required delay + decode time +
// render delay.