Webrtc_Word32 => int32_t in video_coding/main/
BUG=
Review URL: https://webrtc-codereview.appspot.com/1279004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3753 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 d1d9cac..74bec72 100644
--- a/webrtc/modules/video_coding/main/source/timing.h
+++ b/webrtc/modules/video_coding/main/source/timing.h
@@ -27,60 +27,60 @@
// The primary timing component should be passed
// if this is the dual timing component.
VCMTiming(Clock* clock,
- WebRtc_Word32 vcmId = 0,
- WebRtc_Word32 timingId = 0,
+ int32_t vcmId = 0,
+ int32_t timingId = 0,
VCMTiming* masterTiming = NULL);
~VCMTiming();
// Resets the timing to the initial state.
- void Reset(WebRtc_Word64 nowMs = -1);
+ void Reset(int64_t nowMs = -1);
void ResetDecodeTime();
// The amount of time needed to render an image. Defaults to 10 ms.
- void SetRenderDelay(WebRtc_UWord32 renderDelayMs);
+ void SetRenderDelay(uint32_t renderDelayMs);
// The minimum time the video must be delayed on the receiver to
// get the desired jitter buffer level.
- void SetRequiredDelay(WebRtc_UWord32 requiredDelayMs);
+ void SetRequiredDelay(uint32_t requiredDelayMs);
// Minimum total delay required to sync video with audio.
- void SetMinimumTotalDelay(WebRtc_UWord32 minTotalDelayMs);
+ void SetMinimumTotalDelay(uint32_t minTotalDelayMs);
// Increases or decreases the current delay to get closer to the target delay.
// Calculates how long it has been since the previous call to this function,
// and increases/decreases the delay in proportion to the time difference.
- void UpdateCurrentDelay(WebRtc_UWord32 frameTimestamp);
+ void UpdateCurrentDelay(uint32_t frameTimestamp);
// Increases or decreases the current delay to get closer to the target delay.
// Given the actual decode time in ms and the render time in ms for a frame, this
// function calculates how late the frame is and increases the delay accordingly.
- void UpdateCurrentDelay(WebRtc_Word64 renderTimeMs, WebRtc_Word64 actualDecodeTimeMs);
+ void UpdateCurrentDelay(int64_t renderTimeMs, int64_t actualDecodeTimeMs);
// Stops the decoder timer, should be called when the decoder returns a frame
// or when the decoded frame callback is called.
- WebRtc_Word32 StopDecodeTimer(WebRtc_UWord32 timeStamp,
- WebRtc_Word64 startTimeMs,
- WebRtc_Word64 nowMs);
+ int32_t StopDecodeTimer(uint32_t timeStamp,
+ 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.
- void IncomingTimestamp(WebRtc_UWord32 timeStamp, WebRtc_Word64 lastPacketTimeMs);
+ void IncomingTimestamp(uint32_t timeStamp, int64_t lastPacketTimeMs);
// Returns the receiver system time when the frame with timestamp frameTimestamp
// should be rendered, assuming that the system time currently is nowMs.
- WebRtc_Word64 RenderTimeMs(WebRtc_UWord32 frameTimestamp, WebRtc_Word64 nowMs) const;
+ int64_t RenderTimeMs(uint32_t frameTimestamp, int64_t nowMs) 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.
- WebRtc_UWord32 MaxWaitingTime(WebRtc_Word64 renderTimeMs, WebRtc_Word64 nowMs) const;
+ uint32_t MaxWaitingTime(int64_t renderTimeMs, int64_t nowMs) const;
// Returns the current target delay which is required delay + decode time + render
// delay.
- WebRtc_UWord32 TargetVideoDelay() const;
+ uint32_t TargetVideoDelay() const;
// Calculates whether or not there is enough time to decode a frame given a
// certain amount of processing time.
- bool EnoughTimeToDecode(WebRtc_UWord32 availableProcessingTimeMs) const;
+ bool EnoughTimeToDecode(uint32_t availableProcessingTimeMs) const;
// Set the max allowed video delay.
void SetMaxVideoDelay(int maxVideoDelayMs);
@@ -89,24 +89,24 @@
enum { kDelayMaxChangeMsPerS = 100 };
protected:
- WebRtc_Word32 MaxDecodeTimeMs(FrameType frameType = kVideoFrameDelta) const;
- WebRtc_Word64 RenderTimeMsInternal(WebRtc_UWord32 frameTimestamp,
- WebRtc_Word64 nowMs) const;
- WebRtc_UWord32 TargetDelayInternal() const;
+ int32_t MaxDecodeTimeMs(FrameType frameType = kVideoFrameDelta) const;
+ int64_t RenderTimeMsInternal(uint32_t frameTimestamp,
+ int64_t nowMs) const;
+ uint32_t TargetDelayInternal() const;
private:
CriticalSectionWrapper* _critSect;
- WebRtc_Word32 _vcmId;
+ int32_t _vcmId;
Clock* _clock;
- WebRtc_Word32 _timingId;
+ int32_t _timingId;
bool _master;
VCMTimestampExtrapolator* _tsExtrapolator;
VCMCodecTimer _codecTimer;
- WebRtc_UWord32 _renderDelayMs;
- WebRtc_UWord32 _minTotalDelayMs;
- WebRtc_UWord32 _requiredDelayMs;
- WebRtc_UWord32 _currentDelayMs;
- WebRtc_UWord32 _prevFrameTimestamp;
+ uint32_t _renderDelayMs;
+ uint32_t _minTotalDelayMs;
+ uint32_t _requiredDelayMs;
+ uint32_t _currentDelayMs;
+ uint32_t _prevFrameTimestamp;
int _maxVideoDelayMs;
};