Relanding r3952: VCM: Updating receiver logic
BUG=r1734
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1433004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3970 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/video_coding/main/source/timing.h b/webrtc/modules/video_coding/main/source/timing.h
index ae0bd57..e100f7a 100644
--- a/webrtc/modules/video_coding/main/source/timing.h
+++ b/webrtc/modules/video_coding/main/source/timing.h
@@ -62,8 +62,8 @@
int64_t startTimeMs,
int64_t nowMs);
- // Used to report that a frame is passed to decoding. Updates the timestamp filter
- // which is used to map between timestamps and receiver system time.
+ // Used to report that a frame is passed to decoding. Updates the timestamp
+ // filter which is used to map between timestamps and receiver system time.
void IncomingTimestamp(uint32_t timeStamp, int64_t lastPacketTimeMs);
// Returns the receiver system time when the frame with timestamp frameTimestamp
@@ -82,16 +82,12 @@
// certain amount of processing time.
bool EnoughTimeToDecode(uint32_t availableProcessingTimeMs) const;
- // Set the max allowed video delay.
- void SetMaxVideoDelay(int maxVideoDelayMs);
-
enum { kDefaultRenderDelayMs = 10 };
enum { kDelayMaxChangeMsPerS = 100 };
protected:
int32_t MaxDecodeTimeMs(FrameType frameType = kVideoFrameDelta) const;
- int64_t RenderTimeMsInternal(uint32_t frameTimestamp,
- int64_t nowMs) const;
+ int64_t RenderTimeMsInternal(uint32_t frameTimestamp, int64_t nowMs) const;
uint32_t TargetDelayInternal() const;
private:
@@ -107,7 +103,6 @@
uint32_t _requiredDelayMs;
uint32_t _currentDelayMs;
uint32_t _prevFrameTimestamp;
- int _maxVideoDelayMs;
};
} // namespace webrtc