From 2557b86e7648ffebc5781df9f093ca5a84efc219 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Wed, 18 Nov 2015 22:00:21 +0100 Subject: modules/video_coding refactorings The main purpose was the interface-> include rename, but other files were also moved, eliminating the "main" dir. To avoid breaking downstream, the "interface" directories were copied into a new "video_coding/include" dir. The old headers got pragma warnings added about deprecation (a very short deprecation since I plan to remove them as soon downstream is updated). Other files also moved: video_coding/main/source -> video_coding video_coding/main/test -> video_coding/test BUG=webrtc:5095 TESTED=Passing compile-trybots with --clobber flag: git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=stefan@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1417283007 . Cr-Commit-Position: refs/heads/master@{#10694} --- .../video_coding/main/source/inter_frame_delay.h | 66 ---------------------- 1 file changed, 66 deletions(-) delete mode 100644 webrtc/modules/video_coding/main/source/inter_frame_delay.h (limited to 'webrtc/modules/video_coding/main/source/inter_frame_delay.h') diff --git a/webrtc/modules/video_coding/main/source/inter_frame_delay.h b/webrtc/modules/video_coding/main/source/inter_frame_delay.h deleted file mode 100644 index 58b326ae96..0000000000 --- a/webrtc/modules/video_coding/main/source/inter_frame_delay.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ -#define WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ - -#include "webrtc/typedefs.h" - -namespace webrtc -{ - -class VCMInterFrameDelay -{ -public: - VCMInterFrameDelay(int64_t currentWallClock); - - // Resets the estimate. Zeros are given as parameters. - void Reset(int64_t currentWallClock); - - // Calculates the delay of a frame with the given timestamp. - // This method is called when the frame is complete. - // - // Input: - // - timestamp : RTP timestamp of a received frame - // - *delay : Pointer to memory where the result should be stored - // - currentWallClock : The current time in milliseconds. - // Should be -1 for normal operation, only used for testing. - // Return value : true if OK, false when reordered timestamps - bool CalculateDelay(uint32_t timestamp, - int64_t *delay, - int64_t currentWallClock); - - // Returns the current difference between incoming timestamps - // - // Return value : Wrap-around compensated difference between incoming - // timestamps. - uint32_t CurrentTimeStampDiffMs() const; - -private: - // Controls if the RTP timestamp counter has had a wrap around - // between the current and the previously received frame. - // - // Input: - // - timestmap : RTP timestamp of the current frame. - void CheckForWrapArounds(uint32_t timestamp); - - int64_t _zeroWallClock; // Local timestamp of the first video packet received - int32_t _wrapArounds; // Number of wrapArounds detected - // The previous timestamp passed to the delay estimate - uint32_t _prevTimestamp; - // The previous wall clock timestamp used by the delay estimate - int64_t _prevWallClock; - // Wrap-around compensated difference between incoming timestamps - int64_t _dTS; -}; - -} // namespace webrtc - -#endif // WEBRTC_MODULES_VIDEO_CODING_INTER_FRAME_DELAY_H_ -- cgit v1.2.3