From 92df9545856bf5c20a2173cee0254257ef04b591 Mon Sep 17 00:00:00 2001 From: lijing0010 Date: Tue, 20 Aug 2019 14:36:33 +0800 Subject: [PATCH] Fix warning message (#327) Signed-off-by: Jing Li --- Source/App/CMakeLists.txt | 1 - Source/App/EbTime.c | 2 +- Source/{API => App}/EbTime.h | 0 Source/Lib/Codec/EbPacketizationProcess.c | 2 +- Source/Lib/Codec/EbResourceCoordinationProcess.c | 2 +- Source/Lib/Codec/EbUtility.c | 12 ++++++++---- Source/Lib/Codec/EbUtility.h | 8 ++++---- 7 files changed, 15 insertions(+), 12 deletions(-) rename Source/{API => App}/EbTime.h (100%) diff --git a/Source/App/CMakeLists.txt b/Source/App/CMakeLists.txt index b57121c83..89452b0b3 100644 --- a/Source/App/CMakeLists.txt +++ b/Source/App/CMakeLists.txt @@ -21,7 +21,6 @@ add_executable(SvtHevcEncApp EbAppConfig.h EbAppContext.h ../API/EbErrorCodes.h - ../API/EbTime.h EbAppInputy4m.c) #********** SET COMPILE FLAGS************ diff --git a/Source/App/EbTime.c b/Source/App/EbTime.c index 1c9b834fd..34769e3fc 100644 --- a/Source/App/EbTime.c +++ b/Source/App/EbTime.c @@ -5,7 +5,7 @@ #include #include #include - +#include "EbTime.h" #ifdef _WIN32 #include #else diff --git a/Source/API/EbTime.h b/Source/App/EbTime.h similarity index 100% rename from Source/API/EbTime.h rename to Source/App/EbTime.h diff --git a/Source/Lib/Codec/EbPacketizationProcess.c b/Source/Lib/Codec/EbPacketizationProcess.c index 6641fe430..1c00a928d 100644 --- a/Source/Lib/Codec/EbPacketizationProcess.c +++ b/Source/Lib/Codec/EbPacketizationProcess.c @@ -6,6 +6,7 @@ #include #include "EbDefinitions.h" +#include "EbUtility.h" #include "EbPacketizationProcess.h" #include "EbEntropyCodingResults.h" @@ -16,7 +17,6 @@ #include "EbEntropyCoding.h" #include "EbRateControlTasks.h" #include "EbRateControlProcess.h" -#include "EbTime.h" #include "EbPictureDemuxResults.h" static void HrdFullness(SequenceControlSet_t *sequenceControlSetPtr, PictureControlSet_t *pictureControlSetPtr, AppBufferingPeriodSei_t *seiBP) diff --git a/Source/Lib/Codec/EbResourceCoordinationProcess.c b/Source/Lib/Codec/EbResourceCoordinationProcess.c index 2efb308dc..a11a1bccc 100644 --- a/Source/Lib/Codec/EbResourceCoordinationProcess.c +++ b/Source/Lib/Codec/EbResourceCoordinationProcess.c @@ -18,7 +18,7 @@ #include "EbResourceCoordinationResults.h" #include "EbReferenceObject.h" -#include "EbTime.h" +#include "EbUtility.h" /************************************************ * Resource Coordination Context Constructor diff --git a/Source/Lib/Codec/EbUtility.c b/Source/Lib/Codec/EbUtility.c index 383de0f4c..f4f651286 100644 --- a/Source/Lib/Codec/EbUtility.c +++ b/Source/Lib/Codec/EbUtility.c @@ -377,7 +377,8 @@ const MiniGopStats_t* GetMiniGopStats(const EB_U32 miniGopIndex) { return &MiniGopStatsArray[miniGopIndex]; } -void EbStartTime(unsigned long long *Startseconds, unsigned long long *Startuseconds) { +void EbStartTime(EB_U64 *Startseconds, EB_U64 *Startuseconds) +{ #ifdef _WIN32 *Startseconds = (unsigned long long)clock(); (void)(*Startuseconds); @@ -389,7 +390,8 @@ void EbStartTime(unsigned long long *Startseconds, unsigned long long *Startusec #endif } -void EbFinishTime(unsigned long long *Finishseconds, unsigned long long *Finishuseconds) { +void EbFinishTime(EB_U64 *Finishseconds, EB_U64 *Finishuseconds) +{ #ifdef _WIN32 *Finishseconds = (unsigned long long)clock(); (void)(*Finishuseconds); @@ -401,7 +403,8 @@ void EbFinishTime(unsigned long long *Finishseconds, unsigned long long *Finishu #endif } -void EbComputeOverallElapsedTime(unsigned long long Startseconds, unsigned long long Startuseconds, unsigned long long Finishseconds, unsigned long long Finishuseconds, double *duration) { +void EbComputeOverallElapsedTime(EB_U64 Startseconds, EB_U64 Startuseconds, EB_U64 Finishseconds, EB_U64 Finishuseconds, double *duration) +{ #ifdef _WIN32 //double duration; *duration = (double)(Finishseconds - Startseconds) / CLOCKS_PER_SEC; @@ -418,7 +421,8 @@ void EbComputeOverallElapsedTime(unsigned long long Startseconds, unsigned long #endif } -void EbComputeOverallElapsedTimeMs(unsigned long long Startseconds, unsigned long long Startuseconds, unsigned long long Finishseconds, unsigned long long Finishuseconds, double *duration) { +void EbComputeOverallElapsedTimeMs(EB_U64 Startseconds, EB_U64 Startuseconds, EB_U64 Finishseconds, EB_U64 Finishuseconds, double *duration) +{ #ifdef _WIN32 //double duration; *duration = (double)(Finishseconds - Startseconds); diff --git a/Source/Lib/Codec/EbUtility.h b/Source/Lib/Codec/EbUtility.h index fd5e876a7..00910b992 100644 --- a/Source/Lib/Codec/EbUtility.h +++ b/Source/Lib/Codec/EbUtility.h @@ -199,10 +199,10 @@ typedef enum MINI_GOP_INDEX { L3_7_INDEX = 14 } MINI_GOP_INDEX; -//extern void EbStartTime(unsigned long long *Startseconds, unsigned long long *Startuseconds); -//extern void EbFinishTime(unsigned long long *Finishseconds, unsigned long long *Finishuseconds); -//extern void EbComputeOverallElapsedTime(unsigned long long Startseconds, unsigned long long Startuseconds, unsigned long long Finishseconds, unsigned long long Finishuseconds, double *duration); -//extern void EbComputeOverallElapsedTimeMs(unsigned long long Startseconds, unsigned long long Startuseconds, unsigned long long Finishseconds, unsigned long long Finishuseconds, double *duration); +void EbStartTime(EB_U64 *Startseconds, EB_U64 *Startuseconds); +void EbFinishTime(EB_U64 *Finishseconds, EB_U64 *Finishuseconds); +void EbComputeOverallElapsedTime(EB_U64 Startseconds, EB_U64 Startuseconds, EB_U64 Finishseconds, EB_U64 Finishuseconds, double *duration); +void EbComputeOverallElapsedTimeMs(EB_U64 Startseconds, EB_U64 Startuseconds, EB_U64 Finishseconds, EB_U64 Finishuseconds, double *duration); #ifdef __cplusplus } #endif