ref: 8b8e0d4b3ed27be24708e80b9b25acbffe09d420
parent: 1e549e6f9ac604775d2d55b0939f46c294694f97
parent: 80862eec774e2c5ddc14c4ab085c3bdd18ee6421
author: Ethan Hugg <ethanhugg@gmail.com>
date: Mon Feb 10 05:46:12 EST 2014
Merge pull request #274 from mstorsjo/typedef-cleanup Remove typedefs for standard C++ types
--- a/codec/api/svc/codec_app_def.h
+++ b/codec/api/svc/codec_app_def.h
@@ -211,7 +211,7 @@
bool bEnableAdaptiveQuant; // adaptive quantization control
bool bEnableFrameSkip; // allow skipping frames to keep the bitrate within limits
bool bEnableCropPic; // enable cropping source picture. 8/25/2010
- // FALSE: Streaming Video Sharing; TRUE: Video Conferencing Meeting;
+ // false: Streaming Video Sharing; true: Video Conferencing Meeting;
bool bEnableLongTermReference; // 0: on, 1: off
int iLtrMarkPeriod;
--- a/codec/common/WelsThreadLib.cpp
+++ b/codec/common/WelsThreadLib.cpp
@@ -268,7 +268,7 @@
return sem_destroy (event); // match with sem_init
}
-WELS_THREAD_ERROR_CODE WelsEventOpen (WELS_EVENT** p_event, str_t* event_name) {+WELS_THREAD_ERROR_CODE WelsEventOpen (WELS_EVENT** p_event, char* event_name) {if (p_event == NULL || event_name == NULL)
return WELS_THREAD_ERROR_GENERAL;
*p_event = sem_open (event_name, O_CREAT, (S_IRUSR | S_IWUSR)/*0600*/, 0);
@@ -280,7 +280,7 @@
return WELS_THREAD_ERROR_OK;
}
}
-WELS_THREAD_ERROR_CODE WelsEventClose (WELS_EVENT* event, str_t* event_name) {+WELS_THREAD_ERROR_CODE WelsEventClose (WELS_EVENT* event, char* event_name) {WELS_THREAD_ERROR_CODE err = sem_close (event); // match with sem_open
if (event_name)
sem_unlink (event_name);
--- a/codec/common/WelsThreadLib.h
+++ b/codec/common/WelsThreadLib.h
@@ -110,8 +110,8 @@
WELS_THREAD_ERROR_CODE WelsMutexDestroy (WELS_MUTEX* mutex);
#ifdef __GNUC__
-WELS_THREAD_ERROR_CODE WelsEventOpen (WELS_EVENT** p_event, str_t* event_name);
-WELS_THREAD_ERROR_CODE WelsEventClose (WELS_EVENT* event, str_t* event_name);
+WELS_THREAD_ERROR_CODE WelsEventOpen (WELS_EVENT** p_event, char* event_name);
+WELS_THREAD_ERROR_CODE WelsEventClose (WELS_EVENT* event, char* event_name);
#endif//__GNUC__
WELS_THREAD_ERROR_CODE WelsEventInit (WELS_EVENT* event);
WELS_THREAD_ERROR_CODE WelsEventDestroy (WELS_EVENT* event);
--- a/codec/common/cpu.cpp
+++ b/codec/common/cpu.cpp
@@ -92,8 +92,8 @@
/* CMOV instruction checking */
uiCPU |= WELS_CPU_CMOV;
}
- if ((!strcmp ((const str_t*)chVendorName, CPU_Vendor_INTEL)) ||
- (!strcmp((const str_t*)chVendorName, CPU_Vendor_AMD)) ) { // confirmed_safe_unsafe_usage+ if ((!strcmp ((const char*)chVendorName, CPU_Vendor_INTEL)) ||
+ (!strcmp((const char*)chVendorName, CPU_Vendor_AMD)) ) { // confirmed_safe_unsafe_usage if (uiFeatureD & 0x10000000) {/* Multi-Threading checking: contains of multiple logic processors */
uiCPU |= WELS_CPU_HTT;
@@ -139,7 +139,7 @@
} else {*pNumberOfLogicProcessors = 1;
}
- if( !strcmp((const str_t*)chVendorName, CPU_Vendor_INTEL) ){+ if( !strcmp((const char*)chVendorName, CPU_Vendor_INTEL) ){ if( uiMaxCpuidLevel >= 4 ){uiFeatureC = 0;
WelsCPUId(0x4, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
@@ -152,7 +152,7 @@
WelsCPUId (0x80000000, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
- if ((!strcmp ((const str_t*)chVendorName, CPU_Vendor_AMD))
+ if ((!strcmp ((const char*)chVendorName, CPU_Vendor_AMD))
&& (uiFeatureA >= 0x80000001)) { // confirmed_safe_unsafe_usageWelsCPUId (0x80000001, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
if (uiFeatureD & 0x00400000) {@@ -163,7 +163,7 @@
}
}
- if (!strcmp ((const str_t*)chVendorName, CPU_Vendor_INTEL)) { // confirmed_safe_unsafe_usage+ if (!strcmp ((const char*)chVendorName, CPU_Vendor_INTEL)) { // confirmed_safe_unsafe_usageint32_t family, model;
WelsCPUId (1, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
@@ -176,8 +176,8 @@
}
// get cache line size
- if ((!strcmp ((const str_t*)chVendorName, CPU_Vendor_INTEL))
- || ! (strcmp ((const str_t*)chVendorName, CPU_Vendor_CYRIX))) { // confirmed_safe_unsafe_usage+ if ((!strcmp ((const char*)chVendorName, CPU_Vendor_INTEL))
+ || ! (strcmp ((const char*)chVendorName, CPU_Vendor_CYRIX))) { // confirmed_safe_unsafe_usageWelsCPUId (1, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
CacheLineSize = (uiFeatureB & 0xff00) >>
--- a/codec/common/cpu.h
+++ b/codec/common/cpu.h
@@ -55,12 +55,12 @@
*/
int32_t WelsCPUIdVerify();
-void_t WelsCPUId (uint32_t uiIndex, uint32_t* pFeatureA, uint32_t* pFeatureB, uint32_t* pFeatureC, uint32_t* pFeatureD);
+void WelsCPUId (uint32_t uiIndex, uint32_t* pFeatureA, uint32_t* pFeatureB, uint32_t* pFeatureC, uint32_t* pFeatureD);
int32_t WelsCPUSupportAVX (uint32_t eax, uint32_t ecx);
int32_t WelsCPUSupportFMA (uint32_t eax, uint32_t ecx);
-void_t WelsEmms();
+void WelsEmms();
uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors);
--- a/codec/common/crt_util_safe_x.cpp
+++ b/codec/common/crt_util_safe_x.cpp
@@ -61,7 +61,7 @@
#if defined(_MSC_VER) && (_MSC_VER>=1500)
-int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {+int32_t WelsSnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, ...) {va_list pArgPtr;
int32_t iRc;
@@ -74,17 +74,17 @@
return iRc;
}
-str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc) {+char* WelsStrncpy (char* pDest, int32_t iSizeInBytes, const char* kpSrc) {strncpy_s (pDest, iSizeInBytes, kpSrc, _TRUNCATE);
return pDest;
}
-int32_t WelsVsnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {+int32_t WelsVsnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, va_list pArgPtr) {return vsnprintf_s (pBuffer, iSizeOfBuffer, _TRUNCATE, kpFormat, pArgPtr);
}
-WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {+WelsFileHandle* WelsFopen (const char* kpFilename, const char* kpMode) {WelsFileHandle* pFp = NULL;
if (fopen_s (&pFp, kpFilename, kpMode) != 0) {return NULL;
@@ -101,7 +101,7 @@
return _ftime_s (pTp);
}
-int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {+int32_t WelsStrftime (char* pBuffer, int32_t iSize, const char* kpFormat, const SWelsTime* kpTp) {struct tm sTimeNow;
int32_t iRc;
@@ -115,7 +115,7 @@
#else
-int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {+int32_t WelsSnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, ...) {va_list pArgPtr;
int32_t iRc;
@@ -130,7 +130,7 @@
return iRc;
}
-str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc) {+char* WelsStrncpy (char* pDest, int32_t iSizeInBytes, const char* kpSrc) {strncpy (pDest, kpSrc, iSizeInBytes); //confirmed_safe_unsafe_usage
pDest[iSizeInBytes - 1] = '\0';
@@ -137,7 +137,7 @@
return pDest;
}
-int32_t WelsVsnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {+int32_t WelsVsnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, va_list pArgPtr) {int32_t iRc = vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
if (iRc < 0)
pBuffer[iSizeOfBuffer - 1] = '\0';
@@ -145,7 +145,7 @@
}
-WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {+WelsFileHandle* WelsFopen (const char* kpFilename, const char* kpMode) {return fopen (kpFilename, kpMode);
}
@@ -158,7 +158,7 @@
return 0;
}
-int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {+int32_t WelsStrftime (char* pBuffer, int32_t iSize, const char* kpFormat, const SWelsTime* kpTp) {struct tm* pTnow;
int32_t iRc;
@@ -175,7 +175,7 @@
#else //GCC
-int32_t WelsSnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, ...) {+int32_t WelsSnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, ...) {va_list pArgPtr;
int32_t iRc;
@@ -188,17 +188,17 @@
return iRc;
}
-str_t* WelsStrncpy (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc) {+char* WelsStrncpy (char* pDest, int32_t iSizeInBytes, const char* kpSrc) {strncpy (pDest, kpSrc, iSizeInBytes); //confirmed_safe_unsafe_usage
pDest[iSizeInBytes - 1] = '\0';
return pDest;
}
-int32_t WelsVsnprintf (str_t* pBuffer, int32_t iSizeOfBuffer, const str_t* kpFormat, va_list pArgPtr) {+int32_t WelsVsnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, va_list pArgPtr) {return vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
}
-WelsFileHandle* WelsFopen (const str_t* kpFilename, const str_t* kpMode) {+WelsFileHandle* WelsFopen (const char* kpFilename, const char* kpMode) {return fopen (kpFilename, kpMode);
}
@@ -219,7 +219,7 @@
return 0;
}
-int32_t WelsStrftime (str_t* pBuffer, int32_t iSize, const str_t* kpFormat, const SWelsTime* kpTp) {+int32_t WelsStrftime (char* pBuffer, int32_t iSize, const char* kpFormat, const SWelsTime* kpTp) {struct tm* pTnow;
int32_t iRc;
@@ -234,12 +234,12 @@
#endif
-str_t* WelsStrcat (str_t* pDest, int32_t iSizeInBytes, const str_t* kpSrc) {+char* WelsStrcat (char* pDest, int32_t iSizeInBytes, const char* kpSrc) {int32_t iCurLen = strlen(pDest);
return WelsStrncpy(pDest + iCurLen, iSizeInBytes - iCurLen, kpSrc);
}
-int32_t WelsFwrite (const void_t* kpBuffer, int32_t iSize, int32_t iCount, WelsFileHandle* pFp) {+int32_t WelsFwrite (const void* kpBuffer, int32_t iSize, int32_t iCount, WelsFileHandle* pFp) {return fwrite (kpBuffer, iSize, iCount, pFp);
}
--- a/codec/common/crt_util_safe_x.h
+++ b/codec/common/crt_util_safe_x.h
@@ -75,12 +75,12 @@
typedef struct timeb SWelsTime;
#endif
-int32_t WelsSnprintf (str_t* buffer, int32_t sizeOfBuffer, const str_t* format, ...);
-str_t* WelsStrncpy (str_t* dest, int32_t sizeInBytes, const str_t* src);
-str_t* WelsStrcat (str_t* dest, int32_t sizeInBytes, const str_t* src);
-int32_t WelsVsnprintf (str_t* buffer, int32_t sizeOfBuffer, const str_t* format, va_list argptr);
+int32_t WelsSnprintf (char* buffer, int32_t sizeOfBuffer, const char* format, ...);
+char* WelsStrncpy (char* dest, int32_t sizeInBytes, const char* src);
+char* WelsStrcat (char* dest, int32_t sizeInBytes, const char* src);
+int32_t WelsVsnprintf (char* buffer, int32_t sizeOfBuffer, const char* format, va_list argptr);
-WelsFileHandle* WelsFopen (const str_t* filename, const str_t* mode);
+WelsFileHandle* WelsFopen (const char* filename, const char* mode);
int32_t WelsFclose (WelsFileHandle* fp);
int32_t WelsFread (void* buffer, int32_t size, int32_t count, WelsFileHandle* fp);
int32_t WelsFwrite (const void* buffer, int32_t size, int32_t count, WelsFileHandle* fp);
@@ -88,7 +88,7 @@
int32_t WelsFflush (WelsFileHandle* fp);
int32_t WelsGetTimeOfDay (SWelsTime* tp);
-int32_t WelsStrftime (str_t* buffer, int32_t size, const str_t* format, const SWelsTime* tp);
+int32_t WelsStrftime (char* buffer, int32_t size, const char* format, const SWelsTime* tp);
uint16_t WelsGetMillisecond (const SWelsTime* tp);
--- a/codec/common/deblocking_common.cpp
+++ b/codec/common/deblocking_common.cpp
@@ -1,7 +1,7 @@
#include "deblocking_common.h"
#include "macros.h"
// C code only
-void_t DeblockLumaLt4_c (uint8_t* pPix, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha, int32_t iBeta,
+void DeblockLumaLt4_c (uint8_t* pPix, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha, int32_t iBeta,
int8_t* pTc) { for (int32_t i = 0; i < 16; i++) {int32_t iTc0 = pTc[i >> 2];
@@ -12,13 +12,13 @@
int32_t q0 = pPix[0];
int32_t q1 = pPix[iStrideX];
int32_t q2 = pPix[2 * iStrideX];
- bool_t bDetaP0Q0 = WELS_ABS (p0 - q0) < iAlpha;
- bool_t bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
- bool_t bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+ bool bDetaP0Q0 = WELS_ABS (p0 - q0) < iAlpha;
+ bool bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
+ bool bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
int32_t iTc = iTc0;
if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {- bool_t bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
- bool_t bDetaQ2Q0 = WELS_ABS (q2 - q0) < iBeta;
+ bool bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
+ bool bDetaQ2Q0 = WELS_ABS (q2 - q0) < iBeta;
if (bDetaP2P0) {pPix[-2 * iStrideX] = p1 + WELS_CLIP3 ((p2 + ((p0 + q0 + 1) >> 1) - (p1 << 1)) >> 1, -iTc0, iTc0);
iTc++;
@@ -35,10 +35,10 @@
pPix += iStrideY;
}
}
-void_t DeblockLumaEq4_c (uint8_t* pPix, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha, int32_t iBeta) {+void DeblockLumaEq4_c (uint8_t* pPix, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha, int32_t iBeta) {int32_t p0, p1, p2, q0, q1, q2;
int32_t iDetaP0Q0;
- bool_t bDetaP1P0, bDetaQ1Q0;
+ bool bDetaP1P0, bDetaQ1Q0;
for (int32_t i = 0; i < 16; i++) {p0 = pPix[-iStrideX];
p1 = pPix[-2 * iStrideX];
@@ -51,8 +51,8 @@
bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
if ((iDetaP0Q0 < iAlpha) && bDetaP1P0 && bDetaQ1Q0) { if (iDetaP0Q0 < ((iAlpha >> 2) + 2)) {- bool_t bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
- bool_t bDetaQ2Q0 = WELS_ABS (q2 - q0) < iBeta;
+ bool bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
+ bool bDetaQ2Q0 = WELS_ABS (q2 - q0) < iBeta;
if (bDetaP2P0) {const int32_t p3 = pPix[-4 * iStrideX];
pPix[-iStrideX] = (p2 + (p1 << 1) + (p0 << 1) + (q0 << 1) + q1 + 4) >> 3; //p0
@@ -77,22 +77,22 @@
pPix += iStrideY;
}
}
-void_t DeblockLumaLt4V_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* tc) {+void DeblockLumaLt4V_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* tc) {DeblockLumaLt4_c (pPix, iStride, 1, iAlpha, iBeta, tc);
}
-void_t DeblockLumaLt4H_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* tc) {+void DeblockLumaLt4H_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* tc) {DeblockLumaLt4_c (pPix, 1, iStride, iAlpha, iBeta, tc);
}
-void_t DeblockLumaEq4V_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta) {+void DeblockLumaEq4V_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta) {DeblockLumaEq4_c (pPix, iStride, 1, iAlpha, iBeta);
}
-void_t DeblockLumaEq4H_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta) {+void DeblockLumaEq4H_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta) {DeblockLumaEq4_c (pPix, 1, iStride, iAlpha, iBeta);
}
-void_t DeblockChromaLt4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
+void DeblockChromaLt4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
int32_t iBeta, int8_t* pTc) {int32_t p0, p1, q0, q1, iDeta;
- bool_t bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+ bool bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
for (int32_t i = 0; i < 8; i++) {int32_t iTc0 = pTc[i >> 1];
@@ -131,10 +131,10 @@
pPixCr += iStrideY;
}
}
-void_t DeblockChromaEq4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
+void DeblockChromaEq4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
int32_t iBeta) {int32_t p0, p1, q0, q1;
- bool_t bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+ bool bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
for (int32_t i = 0; i < 8; i++) {//cb
p0 = pPixCb[-iStrideX];
@@ -165,18 +165,18 @@
pPixCb += iStrideY;
}
}
-void_t DeblockChromaLt4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+void DeblockChromaLt4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
int8_t* tc) {DeblockChromaLt4_c (pPixCb, pPixCr, iStride, 1, iAlpha, iBeta, tc);
}
-void_t DeblockChromaLt4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+void DeblockChromaLt4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
int8_t* tc) {DeblockChromaLt4_c (pPixCb, pPixCr, 1, iStride, iAlpha, iBeta, tc);
}
-void_t DeblockChromaEq4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta) {+void DeblockChromaEq4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta) {DeblockChromaEq4_c (pPixCb, pPixCr, iStride, 1, iAlpha, iBeta);
}
-void_t DeblockChromaEq4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta) {+void DeblockChromaEq4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta) {DeblockChromaEq4_c (pPixCb, pPixCr, 1, iStride, iAlpha, iBeta);
}
--- a/codec/common/deblocking_common.h
+++ b/codec/common/deblocking_common.h
@@ -1,19 +1,19 @@
#ifndef WELS_DEBLOCKING_COMMON_H__
#define WELS_DEBLOCKING_COMMON_H__
#include "typedefs.h"
-void_t DeblockLumaLt4V_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
-void_t DeblockLumaEq4V_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockLumaLt4V_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4V_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
-void_t DeblockLumaLt4H_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
-void_t DeblockLumaEq4H_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockLumaLt4H_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4H_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
-void_t DeblockChromaLt4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+void DeblockChromaLt4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
int8_t* pTc);
-void_t DeblockChromaEq4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaEq4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
-void_t DeblockChromaLt4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+void DeblockChromaLt4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
int8_t* pTc);
-void_t DeblockChromaEq4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaEq4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
#if defined(__cplusplus)
extern "C" {--- a/codec/common/logging.cpp
+++ b/codec/common/logging.cpp
@@ -41,7 +41,7 @@
g_TraceLevel = level;
}
-int32_t welsStderrLevelTrace (int32_t level, const str_t* format, va_list ap) {+int32_t welsStderrLevelTrace (int32_t level, const char* format, va_list ap) { if (level < g_TraceLevel) {vfprintf (stderr, format, ap);
}
--- a/codec/common/logging.h
+++ b/codec/common/logging.h
@@ -40,10 +40,10 @@
// Internal details.
-int32_t welsStderrLevelTrace (int32_t level, const str_t* format, va_list ap);
+int32_t welsStderrLevelTrace (int32_t level, const char* format, va_list ap);
template<int level> int32_t welsStderrTrace (
- const str_t* format, ...) {+ const char* format, ...) {va_list ap;
va_start (ap, format);
welsStderrLevelTrace (level, format, ap);
--- a/codec/common/ls_defines.h
+++ b/codec/common/ls_defines.h
@@ -57,9 +57,9 @@
#define ST32(a, b) (((struct tagUnaligned_32 *) (a))->l) = (b)
#define ST64(a, b) (((struct tagUnaligned_64 *) (a))->l) = (b)
// #else
-// inline void_t __ST16(void_t *dst, uint16_t v) { memcpy(dst, &v, 2); }-// inline void_t __ST32(void_t *dst, uint32_t v) { memcpy(dst, &v, 4); }-//inline void_t __ST64(void_t *dst, uint64_t v) { memcpy(dst, &v, 8); }+// inline void __ST16(void *dst, uint16_t v) { memcpy(dst, &v, 2); }+// inline void __ST32(void *dst, uint32_t v) { memcpy(dst, &v, 4); }+//inline void __ST64(void *dst, uint64_t v) { memcpy(dst, &v, 8); }// #endif
#else
--- a/codec/common/macros.h
+++ b/codec/common/macros.h
@@ -248,7 +248,7 @@
#define BUTTERFLY4x8(dw) (((uint64_t)(dw)<<32) | (dw))
#endif//BUTTERFLY4x8
-static inline BOOL_T WELS_POWER2_IF (uint32_t v) {+static inline bool WELS_POWER2_IF (uint32_t v) {return (v && ! (v & (v - 1)));
}
--- a/codec/common/mb_copy.asm
+++ b/codec/common/mb_copy.asm
@@ -432,7 +432,7 @@
ALIGN 16
;*******************************************************************************
-; void_t PixelAvgWidthEq4_mmx( uint8_t *pDst, int iDstStride,
+; void PixelAvgWidthEq4_mmx( uint8_t *pDst, int iDstStride,
; uint8_t *pSrcA, int iSrcAStride,
; uint8_t *pSrcB, int iSrcBStride,
; int iHeight );
@@ -468,7 +468,7 @@
ALIGN 16
;*******************************************************************************
-; void_t PixelAvgWidthEq8_mmx( uint8_t *pDst, int iDstStride,
+; void PixelAvgWidthEq8_mmx( uint8_t *pDst, int iDstStride,
; uint8_t *pSrcA, int iSrcAStride,
; uint8_t *pSrcB, int iSrcBStride,
; int iHeight );
@@ -522,7 +522,7 @@
ALIGN 16
;*******************************************************************************
-; void_t PixelAvgWidthEq16_sse2( uint8_t *pDst, int iDstStride,
+; void PixelAvgWidthEq16_sse2( uint8_t *pDst, int iDstStride,
; uint8_t *pSrcA, int iSrcAStride,
; uint8_t *pSrcB, int iSrcBStride,
; int iHeight );
@@ -577,7 +577,7 @@
ALIGN 16
;*******************************************************************************
-; void_t McCopyWidthEq4_mmx( uint8_t *pSrc, int iSrcStride,
+; void McCopyWidthEq4_mmx( uint8_t *pSrc, int iSrcStride,
; uint8_t *pDst, int iDstStride, int iHeight )
;*******************************************************************************
McCopyWidthEq4_mmx:
@@ -618,7 +618,7 @@
ALIGN 16
;*******************************************************************************
-; void_t McCopyWidthEq8_mmx( uint8_t *pSrc, int iSrcStride,
+; void McCopyWidthEq8_mmx( uint8_t *pSrc, int iSrcStride,
; uint8_t *pDst, int iDstStride, int iHeight )
;*******************************************************************************
McCopyWidthEq8_mmx:
@@ -655,7 +655,7 @@
ALIGN 16
;*******************************************************************************
-; void_t McCopyWidthEq16_sse2( uint8_t *pSrc, int iSrcStride, uint8_t *pDst, int iDstStride, int iHeight )
+; void McCopyWidthEq16_sse2( uint8_t *pSrc, int iSrcStride, uint8_t *pDst, int iDstStride, int iHeight )
;*******************************************************************************
;read unaligned memory
%macro SSE_READ_UNA 2
--- a/codec/common/mc_luma.asm
+++ b/codec/common/mc_luma.asm
@@ -76,7 +76,7 @@
ALIGN 16
;*******************************************************************************
-; void_t McHorVer20WidthEq4_mmx( uint8_t *pSrc,
+; void McHorVer20WidthEq4_mmx( uint8_t *pSrc,
; int iSrcStride,
; uint8_t *pDst,
; int iDstStride,
@@ -179,7 +179,7 @@
ALIGN 16
;***********************************************************************
-; void_t McHorVer22Width8HorFirst_sse2(int16_t *pSrc,
+; void McHorVer22Width8HorFirst_sse2(int16_t *pSrc,
; int16_t iSrcStride,
; uint8_t *pDst,
; int32_t iDstStride
@@ -241,7 +241,7 @@
ALIGN 16
;*******************************************************************************
-; void_t McHorVer20WidthEq8_sse2( uint8_t *pSrc,
+; void McHorVer20WidthEq8_sse2( uint8_t *pSrc,
; int iSrcStride,
; uint8_t *pDst,
; int iDstStride,
@@ -307,7 +307,7 @@
ALIGN 16
;*******************************************************************************
-; void_t McHorVer20WidthEq16_sse2( uint8_t *pSrc,
+; void McHorVer20WidthEq16_sse2( uint8_t *pSrc,
; int iSrcStride,
; uint8_t *pDst,
; int iDstStride,
@@ -398,7 +398,7 @@
;*******************************************************************************
-; void_t McHorVer02WidthEq8_sse2( uint8_t *pSrc,
+; void McHorVer02WidthEq8_sse2( uint8_t *pSrc,
; int iSrcStride,
; uint8_t *pDst,
; int iDstStride,
@@ -1290,4 +1290,4 @@
pop r12
%endif
LOAD_6_PARA_POP
- ret
\ No newline at end of file
+ ret
--- a/codec/common/measure_time.h
+++ b/codec/common/measure_time.h
@@ -57,11 +57,11 @@
/*!
* \brief time cost measure utilization
- * \param void_t
+ * \param void
* \return time elapsed since run (unit: microsecond)
*/
-static inline int64_t WelsTime (void_t) {+static inline int64_t WelsTime (void) {#ifndef _WIN32
struct timeval tv_date;
--- a/codec/common/typedefs.h
+++ b/codec/common/typedefs.h
@@ -60,8 +60,6 @@
#endif // _MSC_VER defined
-// FIXME: all string type should be declared explicit as char.
-typedef char str_t;
// The 'float' type is portable and usable without any need for any extra typedefs.
#ifdef EPSN
@@ -68,21 +66,6 @@
#undef EPSN
#endif//EPSN
#define EPSN (0.000001f) // (1e-6) // desired float precision
-
-typedef bool bool_t;
-typedef int32_t BOOL_T;
-
-#ifndef FALSE
-#define FALSE ((int32_t)0)
-#endif//FALSE
-
-#ifndef TRUE
-#define TRUE ((int32_t)1)
-#endif//TRUE
-
-#ifndef void_t
-#define void_t void
-#endif
#endif //WELS_TYPE_DEFINES_H__
--- a/codec/console/dec/src/h264dec.cpp
+++ b/codec/console/dec/src/h264dec.cpp
@@ -57,8 +57,8 @@
//#define STICK_STREAM_SIZE // For Demo interfaces test with track file of integrated frames
-void_t H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, const char* kpOuputFileName,
- int32_t& iWidth, int32_t& iHeight, void_t* pOptionFileName) {+void H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, const char* kpOuputFileName,
+ int32_t& iWidth, int32_t& iHeight, void* pOptionFileName) {FILE* pH264File = NULL;
FILE* pYuvFile = NULL;
FILE* pOptionFile = NULL;
@@ -68,7 +68,7 @@
uint8_t* pBuf = NULL;
uint8_t uiStartCode[4] = {0, 0, 0, 1};- void_t* pData[3] = {NULL};+ void* pData[3] = {NULL}; uint8_t* pDst[3] = {NULL};SBufferInfo sDstBufInfo;
@@ -171,7 +171,7 @@
if (iBufPos >= iFileSize) {iEndOfStreamFlag = true;
if (iEndOfStreamFlag)
- pDecoder->SetOption (DECODER_OPTION_END_OF_STREAM, (void_t*)&iEndOfStreamFlag);
+ pDecoder->SetOption (DECODER_OPTION_END_OF_STREAM, (void*)&iEndOfStreamFlag);
break;
}
@@ -228,7 +228,7 @@
iTotal += iEnd - iStart;
if (sDstBufInfo.iBufferStatus == 1) {iFrameNum++;
- cOutputModule.Process ((void_t**)pDst, &sDstBufInfo, pYuvFile);
+ cOutputModule.Process ((void**)pDst, &sDstBufInfo, pYuvFile);
if (sDstBufInfo.eBufferProperty == BUFFER_HOST) {iWidth = sDstBufInfo.UsrData.sSystemBuffer.iWidth;
iHeight = sDstBufInfo.UsrData.sSystemBuffer.iHeight;
@@ -267,7 +267,7 @@
}
if (sDstBufInfo.iBufferStatus == 1) {- cOutputModule.Process ((void_t**)pDst, &sDstBufInfo, pYuvFile);
+ cOutputModule.Process ((void**)pDst, &sDstBufInfo, pYuvFile);
if (sDstBufInfo.eBufferProperty == BUFFER_HOST) {iWidth = sDstBufInfo.UsrData.sSystemBuffer.iWidth;
iHeight = sDstBufInfo.UsrData.sSystemBuffer.iHeight;
@@ -446,7 +446,7 @@
H264DecodeInstance (pDecoder, strInputFile.c_str(), strOutputFile.c_str(), iWidth, iHeight,
- (!strOptionFile.empty() ? (void_t*) (const_cast<char*> (strOptionFile.c_str())) : NULL));
+ (!strOptionFile.empty() ? (void*) (const_cast<char*> (strOptionFile.c_str())) : NULL));
if (sDecParam.pFileNameRestructed != NULL) {delete []sDecParam.pFileNameRestructed;
--- a/codec/console/enc/src/welsenc.cpp
+++ b/codec/console/enc/src/welsenc.cpp
@@ -255,7 +255,7 @@
while (!cRdLayerCfg.EndOfFile()) {long iLayerRd = cRdLayerCfg.ReadLine (&strTag[0]);
- bool_t bFound = false;
+ bool bFound = false;
if (iLayerRd > 0) {if (strTag[0].empty())
continue;
@@ -283,7 +283,7 @@
} else if (strTag[0].compare ("ProfileIdc") == 0) {pDLayer->uiProfileIdc = atoi (strTag[1].c_str());
} else if (strTag[0].compare ("FRExt") == 0) {-// pDLayer->frext_mode = (bool_t)atoi(strTag[1].c_str());
+// pDLayer->frext_mode = (bool)atoi(strTag[1].c_str());
} else if (strTag[0].compare ("SpatialBitrate") == 0) {pDLayer->iSpatialBitrate = 1000 * atoi (strTag[1].c_str());
if (pSvcParam.bEnableRc && pDLayer->iSpatialBitrate <= 0) {@@ -523,7 +523,7 @@
} else if (strTag[0].compare ("ProfileIdc") == 0) {pDLayer->uiProfileIdc = atoi (strTag[1].c_str());
} else if (strTag[0].compare ("FRExt") == 0) {-// pDLayer->frext_mode = (bool_t)atoi(strTag[1].c_str());
+// pDLayer->frext_mode = (bool)atoi(strTag[1].c_str());
} else if (strTag[0].compare ("SpatialBitrate") == 0) {pDLayer->iSpatialBitrate = 1000 * atoi (strTag[1].c_str());
} else if (strTag[0].compare ("InitialQP") == 0) {@@ -1040,8 +1040,8 @@
iFrameIdx = 0;
while (iFrameIdx < iTotalFrameMax && (((int32_t)sSvcParam.uiFrameToBeCoded <= 0)
|| (iFrameIdx < (int32_t)sSvcParam.uiFrameToBeCoded))) {- bool_t bOnePicAvailableAtLeast = false;
- bool_t bSomeSpatialUnavailable = false;
+ bool bOnePicAvailableAtLeast = false;
+ bool bSomeSpatialUnavailable = false;
#ifdef ONLY_ENC_FRAMES_NUM
// Only encoded some limited frames here
@@ -1057,7 +1057,7 @@
const int kiPicResSize = ((pDLayer->iActualWidth * pDLayer->iActualHeight) * 3) >> 1;
uint32_t uiSkipIdx = (1 << pDLayer->iTemporalResolution);
- bool_t bCanBeRead = false;
+ bool bCanBeRead = false;
if (iFrameIdx % uiSkipIdx == 0) { // such layer is enabled to encode indeedbCanBeRead = (fread (pYUV[iDlayerIdx], 1, kiPicResSize, pFileYUV[iDlayerIdx]) == kiPicResSize);
--- a/codec/decoder/core/asm/block_add.asm
+++ b/codec/decoder/core/asm/block_add.asm
@@ -53,7 +53,7 @@
ALIGN 16
;*******************************************************************************
-; void_t WelsResBlockZero16x16_sse2(int16_t* pBlock,int32_t iStride)
+; void WelsResBlockZero16x16_sse2(int16_t* pBlock,int32_t iStride)
;*******************************************************************************
WelsResBlockZero16x16_sse2:
;push r0
@@ -134,7 +134,7 @@
ALIGN 16
;*******************************************************************************
-; void_t WelsResBlockZero8x8_sse2(int16_t * pBlock, int32_t iStride)
+; void WelsResBlockZero8x8_sse2(int16_t * pBlock, int32_t iStride)
;*******************************************************************************
WelsResBlockZero8x8_sse2:
;push r0
--- a/codec/decoder/core/asm/dct.asm
+++ b/codec/decoder/core/asm/dct.asm
@@ -87,7 +87,7 @@
ALIGN 16
;*******************************************************************************
-; void_t __cdecl IdctResAddPred_mmx( uint8_t *pPred, const int32_t kiStride, int16_t *pRs )
+; void __cdecl IdctResAddPred_mmx( uint8_t *pPred, const int32_t kiStride, int16_t *pRs )
;*******************************************************************************
IdctResAddPred_mmx:
--- a/codec/decoder/core/asm/intra_pred.asm
+++ b/codec/decoder/core/asm/intra_pred.asm
@@ -184,7 +184,7 @@
ALIGN 16
;*******************************************************************************
-; void_t __cdecl WelsDecoderI4x4LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride)
+; void __cdecl WelsDecoderI4x4LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride)
;
; pPred must align to 16
;*******************************************************************************
@@ -224,7 +224,7 @@
ret
;*******************************************************************************
-; void_t WelsDecoderI16x16LumaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
+; void WelsDecoderI16x16LumaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
;*******************************************************************************
WelsDecoderI16x16LumaPredPlane_sse2:
;%define pushsize 4
@@ -325,7 +325,7 @@
;*******************************************************************************
-; void_t WelsDecoderI16x16LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride);
+; void WelsDecoderI16x16LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride);
;*******************************************************************************
%macro SSE2_PRED_H_16X16_TWO_LINE_DEC 2
@@ -363,7 +363,7 @@
ret
;*******************************************************************************
-; void_t WelsDecoderI16x16LumaPredV_sse2(uint8_t *pPred, const int32_t kiStride);
+; void WelsDecoderI16x16LumaPredV_sse2(uint8_t *pPred, const int32_t kiStride);
;*******************************************************************************
WELS_EXTERN WelsDecoderI16x16LumaPredV_sse2
WelsDecoderI16x16LumaPredV_sse2:
@@ -406,7 +406,7 @@
ret
;*******************************************************************************
-; void_t WelsDecoderIChromaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
+; void WelsDecoderIChromaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
;*******************************************************************************
WELS_EXTERN WelsDecoderIChromaPredPlane_sse2
WelsDecoderIChromaPredPlane_sse2:
@@ -515,7 +515,7 @@
; 7 is the start pixel of current 4x4 block
; pPred[7] = ([6]+[0]*2+[1]+2)/4
;
-; void_t __cdecl WelsDecoderI4x4LumaPredDDR_mmx(uint8_t *pPred, const int32_t kiStride)
+; void __cdecl WelsDecoderI4x4LumaPredDDR_mmx(uint8_t *pPred, const int32_t kiStride)
;
;*******************************************************************************
WelsDecoderI4x4LumaPredDDR_mmx:
@@ -571,7 +571,7 @@
ALIGN 16
;*******************************************************************************
-; void_t __cdecl WelsDecoderIChromaPredH_mmx(uint8_t *pPred, const int32_t kiStride)
+; void __cdecl WelsDecoderIChromaPredH_mmx(uint8_t *pPred, const int32_t kiStride)
; copy 8 pixel of 8 line from left
;*******************************************************************************
%macro MMX_PRED_H_8X8_ONE_LINE 4
@@ -637,7 +637,7 @@
ALIGN 16
;*******************************************************************************
-; void_t __cdecl WelsDecoderIChromaPredV_mmx(uint8_t *pPred, const int32_t kiStride)
+; void __cdecl WelsDecoderIChromaPredV_mmx(uint8_t *pPred, const int32_t kiStride)
; copy 8 pixels from top 8 pixels
;*******************************************************************************
WELS_EXTERN WelsDecoderIChromaPredV_mmx
@@ -697,7 +697,7 @@
; j = (2 + l3 + (l2<<1) + l1)>>2
; [b a f e h g j i] + [d c b a] --> mov to memory
;
-; void_t WelsDecoderI4x4LumaPredHD_mmx(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderI4x4LumaPredHD_mmx(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderI4x4LumaPredHD_mmx
WelsDecoderI4x4LumaPredHD_mmx:
@@ -786,7 +786,7 @@
; [g g f e d c b a] + [g g g g] --> mov to memory
;
-; void_t WelsDecoderI4x4LumaPredHU_mmx(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderI4x4LumaPredHU_mmx(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderI4x4LumaPredHU_mmx
WelsDecoderI4x4LumaPredHU_mmx:
@@ -878,7 +878,7 @@
; i = (2 + lt + (l0<<1) + l1)>>2
; j = (2 + l0 + (l1<<1) + l2)>>2
;
-; void_t WelsDecoderI4x4LumaPredVR_mmx(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderI4x4LumaPredVR_mmx(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderI4x4LumaPredVR_mmx
WelsDecoderI4x4LumaPredVR_mmx:
@@ -971,7 +971,7 @@
; [g f e d c b a] --> mov to memory
;
-; void_t WelsDecoderI4x4LumaPredDDL_mmx(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderI4x4LumaPredDDL_mmx(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderI4x4LumaPredDDL_mmx
WelsDecoderI4x4LumaPredDDL_mmx:
@@ -1046,7 +1046,7 @@
; [i d c b a] + [j h g f e] --> mov to memory
;
-; void_t WelsDecoderI4x4LumaPredVL_mmx(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderI4x4LumaPredVL_mmx(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderI4x4LumaPredVL_mmx
WelsDecoderI4x4LumaPredVL_mmx:
@@ -1093,7 +1093,7 @@
ALIGN 16
;*******************************************************************************
;
-; void_t WelsDecoderIChromaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderIChromaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderIChromaPredDc_sse2
WelsDecoderIChromaPredDc_sse2:
@@ -1198,7 +1198,7 @@
ALIGN 16
;*******************************************************************************
;
-; void_t WelsDecoderI16x16LumaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderI16x16LumaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderI16x16LumaPredDc_sse2
WelsDecoderI16x16LumaPredDc_sse2:
@@ -1286,7 +1286,7 @@
ALIGN 16
;*******************************************************************************
-; void_t WelsDecoderI16x16LumaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderI16x16LumaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderI16x16LumaPredDcTop_sse2
WelsDecoderI16x16LumaPredDcTop_sse2:
@@ -1366,7 +1366,7 @@
ALIGN 16
;*******************************************************************************
-; void_t WelsDecoderI16x16LumaPredDcNA_sse2(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderI16x16LumaPredDcNA_sse2(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderI16x16LumaPredDcNA_sse2
WelsDecoderI16x16LumaPredDcNA_sse2:
@@ -1412,7 +1412,7 @@
ALIGN 16
;*******************************************************************************
-; void_t WelsDecoderIChromaPredDcLeft_mmx(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderIChromaPredDcLeft_mmx(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderIChromaPredDcLeft_mmx
WelsDecoderIChromaPredDcLeft_mmx:
@@ -1495,7 +1495,7 @@
ALIGN 16
;*******************************************************************************
-; void_t WelsDecoderIChromaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderIChromaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderIChromaPredDcTop_sse2
WelsDecoderIChromaPredDcTop_sse2:
@@ -1544,7 +1544,7 @@
ALIGN 16
;*******************************************************************************
-; void_t WelsDecoderIChromaPredDcNA_mmx(uint8_t *pPred, const int32_t kiStride)
+; void WelsDecoderIChromaPredDcNA_mmx(uint8_t *pPred, const int32_t kiStride)
;*******************************************************************************
WELS_EXTERN WelsDecoderIChromaPredDcNA_mmx
WelsDecoderIChromaPredDcNA_mmx:
--- a/codec/decoder/core/inc/au_parser.h
+++ b/codec/decoder/core/inc/au_parser.h
@@ -88,12 +88,12 @@
int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t kiSrcLen);
-void_t ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePicMarking);
+void ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePicMarking);
-void_t ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs);
+void ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs);
-bool_t CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps);
-bool_t CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
+bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps);
+bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader);
/*!
*************************************************************************************
@@ -141,7 +141,7 @@
* \note Call it in case eNalUnitType is NAL_UNIT_SEI.
*************************************************************************************
*/
-int32_t ParseSei (void_t* pSei, PBitStringAux pBsAux); // reserved Sei_Msg type
+int32_t ParseSei (void* pSei, PBitStringAux pBsAux); // reserved Sei_Msg type
/*!
*************************************************************************************
--- a/codec/decoder/core/inc/bit_stream.h
+++ b/codec/decoder/core/inc/bit_stream.h
@@ -64,7 +64,7 @@
*/
int32_t InitBits (PBitStringAux pBitString, const uint8_t* kpBuf, const int32_t kiSize);
-void_t InitReadBits (PBitStringAux pBitString);
+void InitReadBits (PBitStringAux pBitString);
--- a/codec/decoder/core/inc/deblocking.h
+++ b/codec/decoder/core/inc/deblocking.h
@@ -54,7 +54,7 @@
* \return NONE
*/
-void_t DeblockingInit (PDeblockingFunc pDeblockingFunc, int32_t iCpu);
+void DeblockingInit (PDeblockingFunc pDeblockingFunc, int32_t iCpu);
/*!
@@ -64,7 +64,7 @@
*
* \return NONE
*/
-void_t WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb);
+void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb);
/*!
* \brief pixel deblocking filtering
@@ -81,10 +81,10 @@
int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterIdc);
-void_t DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag);
-void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4], int32_t iBoundryFlag);
+void DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag);
+void DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4], int32_t iBoundryFlag);
-void_t WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag);
+void WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag);
} // namespace WelsDec
--- a/codec/decoder/core/inc/dec_frame.h
+++ b/codec/decoder/core/inc/dec_frame.h
@@ -107,14 +107,14 @@
PPicture pRef; // reference picture pointer
PPicture pDec; // reconstruction picture pointer for layer
- bool_t bStoreRefBasePicFlag; // iCurTid == 0 && iCurQid = 0 && bEncodeKeyPic = 1
- bool_t bTCoeffLevelPredFlag;
- bool_t bConstrainedIntraResamplingFlag;
+ bool bStoreRefBasePicFlag; // iCurTid == 0 && iCurQid = 0 && bEncodeKeyPic = 1
+ bool bTCoeffLevelPredFlag;
+ bool bConstrainedIntraResamplingFlag;
uint8_t uiRefLayerDqId;
uint8_t uiRefLayerChromaPhaseXPlus1Flag;
uint8_t uiRefLayerChromaPhaseYPlus1;
uint8_t uiLayerDqId; // dq_id of current layer
- bool_t bUseRefBasePicFlag; // whether reference pic or reference base pic is referred?
+ bool bUseRefBasePicFlag; // whether reference pic or reference base pic is referred?
};
typedef struct TagGpuAvcLayer {--- a/codec/decoder/core/inc/dec_golomb.h
+++ b/codec/decoder/core/inc/dec_golomb.h
@@ -68,7 +68,7 @@
static inline int32_t ShowBits (PBitStringAux pBs, int32_t iNumBits) {return UBITS (pBs->uiCurBits, iNumBits);
}
-static inline void_t FlushBits (PBitStringAux pBs, int32_t iNumBits) {+static inline void FlushBits (PBitStringAux pBs, int32_t iNumBits) {DUMP_BITS (pBs->uiCurBits, pBs->pCurBuf, pBs->iLeftBits, iNumBits);
}
static inline int32_t BsGetBits (PBitStringAux pBs, int32_t iNumBits) {@@ -133,7 +133,7 @@
return (g_kuiLeadingZeroTable[iValue] + 8);
}
-//ASSERT(FALSE); // should not go here
+//ASSERT(false); // should not go here
return -1;
}
--- a/codec/decoder/core/inc/decode_mb_aux.h
+++ b/codec/decoder/core/inc/decode_mb_aux.h
@@ -38,9 +38,9 @@
namespace WelsDec {-void_t InitDctClipTable (void_t);
+void InitDctClipTable (void);
-void_t IdctResAddPred_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+void IdctResAddPred_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
#if defined(__cplusplus)
extern "C" {@@ -47,7 +47,7 @@
#endif//__cplusplus
#if defined(X86_ASM)
-void_t IdctResAddPred_mmx (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+void IdctResAddPred_mmx (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
#endif//X86_ASM
#if defined(__cplusplus)
@@ -54,7 +54,7 @@
}
#endif//__cplusplus
-void_t GetI4LumaIChromaAddrTable (int32_t* pBlockOffset, const int32_t kiYStride, const int32_t kiUVStride);
+void GetI4LumaIChromaAddrTable (int32_t* pBlockOffset, const int32_t kiYStride, const int32_t kiUVStride);
} // namespace WelsDec
--- a/codec/decoder/core/inc/decode_slice.h
+++ b/codec/decoder/core/inc/decode_slice.h
@@ -37,7 +37,7 @@
namespace WelsDec {-void_t WelsBlockInit (int16_t* pBlock, int32_t iWidth, int32_t iHeight, int32_t iStride, uint8_t uiVal);
+void WelsBlockInit (int16_t* pBlock, int32_t iWidth, int32_t iHeight, int32_t iStride, uint8_t uiVal);
int32_t WelsActualDecodeMbCavlcISlice (PWelsDecoderContext pCtx);
int32_t WelsDecodeMbCavlcISlice (PWelsDecoderContext pCtx, PNalUnit pNalCur);
@@ -48,21 +48,21 @@
int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx); //construction based on slice
-int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool_t bFirstSliceInLayer, PNalUnit pNalCur);
+int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNalUnit pNalCur);
int32_t WelsTargetMbConstruction (PWelsDecoderContext pCtx);
-int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool_t bOutput);
+int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool bOutput);
int32_t WelsMbInterSampleConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer,
uint8_t* pDstY, uint8_t* pDstU, uint8_t* pDstV, int32_t iStrideL, int32_t iStrideC);
int32_t WelsMbInterConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer);
-void_t WelsLumaDcDequantIdct (int16_t* pBlock, int32_t iQp);
+void WelsLumaDcDequantIdct (int16_t* pBlock, int32_t iQp);
int32_t WelsMbInterPrediction (PWelsDecoderContext pCtx, PDqLayer pCurLayer);
-void_t WelsMbCopy (uint8_t* pDst, int32_t iStrideDst, uint8_t* pSrc, int32_t iStrideSrc,
+void WelsMbCopy (uint8_t* pDst, int32_t iStrideDst, uint8_t* pSrc, int32_t iStrideSrc,
int32_t iHeight, int32_t iWidth);
-void_t WelsChromaDcIdct (int16_t* pBlock);
+void WelsChromaDcIdct (int16_t* pBlock);
#ifdef __cplusplus
extern "C" {@@ -69,8 +69,8 @@
#endif//__cplusplus
#ifdef X86_ASM
-void_t WelsResBlockZero16x16_sse2 (int16_t* pBlock, int32_t iStride);
-void_t WelsResBlockZero8x8_sse2 (int16_t* pBlock, int32_t iStride);
+void WelsResBlockZero16x16_sse2 (int16_t* pBlock, int32_t iStride);
+void WelsResBlockZero8x8_sse2 (int16_t* pBlock, int32_t iStride);
#endif
#ifdef __cplusplus
@@ -77,11 +77,11 @@
}
#endif//__cplusplus
-void_t WelsBlockZero16x16_c (int16_t* pBlock, int32_t iStride);
-void_t WelsBlockZero8x8_c (int16_t* pBlock, int32_t iStride);
-void_t SetNonZeroCount_c (int16_t* pBlock, int8_t* pNonZeroCount);
+void WelsBlockZero16x16_c (int16_t* pBlock, int32_t iStride);
+void WelsBlockZero8x8_c (int16_t* pBlock, int32_t iStride);
+void SetNonZeroCount_c (int16_t* pBlock, int8_t* pNonZeroCount);
-void_t WelsBlockFuncInit (SBlockFunc* pFunc, int32_t iCpu);
+void WelsBlockFuncInit (SBlockFunc* pFunc, int32_t iCpu);
} // namespace WelsDec
--- a/codec/decoder/core/inc/decoder.h
+++ b/codec/decoder/core/inc/decoder.h
@@ -52,7 +52,7 @@
/*!
* \brief configure decoder parameters
*/
-int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const void_t* kpParam);
+int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const void* kpParam);
/*!
*************************************************************************************
@@ -68,7 +68,7 @@
* \note N/A
*************************************************************************************
*/
-int32_t WelsInitDecoder (PWelsDecoderContext pCtx, void_t* pTraceHandle, PWelsLogCallbackFunc pLog);
+int32_t WelsInitDecoder (PWelsDecoderContext pCtx, void* pTraceHandle, PWelsLogCallbackFunc pLog);
/*!
*************************************************************************************
@@ -81,7 +81,7 @@
* \note N/A
*************************************************************************************
*/
-void_t WelsEndDecoder (PWelsDecoderContext pCtx);
+void WelsEndDecoder (PWelsDecoderContext pCtx);
/*!
*************************************************************************************
@@ -112,7 +112,7 @@
/*
* free memory blocks in avc
*/
-void_t WelsFreeMem (PWelsDecoderContext pCtx);
+void WelsFreeMem (PWelsDecoderContext pCtx);
/*
* set colorspace format in decoder
@@ -130,11 +130,11 @@
*/
int32_t SyncPictureResolutionExt (PWelsDecoderContext pCtx, const int32_t kiMbWidth, const int32_t kiMbHeight);
-void_t AssignFuncPointerForRec (PWelsDecoderContext pCtx);
+void AssignFuncPointerForRec (PWelsDecoderContext pCtx);
-void_t ResetParameterSetsState (PWelsDecoderContext pCtx);
+void ResetParameterSetsState (PWelsDecoderContext pCtx);
-void_t GetVclNalTemporalId (PWelsDecoderContext pCtx); //get the info that whether or not have VCL NAL in current AU,
+void GetVclNalTemporalId (PWelsDecoderContext pCtx); //get the info that whether or not have VCL NAL in current AU,
//and if YES, get the temporal ID
#ifdef __cplusplus
--- a/codec/decoder/core/inc/decoder_context.h
+++ b/codec/decoder/core/inc/decoder_context.h
@@ -79,9 +79,9 @@
//typedef int32_t (*rec_mb) (Mb *cur_mb, PWelsDecoderContext pCtx);
/*typedef for get intra predictor func pointer*/
-typedef void_t (*PGetIntraPredFunc) (uint8_t* pPred, const int32_t kiLumaStride);
-typedef void_t (*PIdctResAddPredFunc) (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
-typedef void_t (*PExpandPictureFunc) (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicWidth,
+typedef void (*PGetIntraPredFunc) (uint8_t* pPred, const int32_t kiLumaStride);
+typedef void (*PIdctResAddPredFunc) (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+typedef void (*PExpandPictureFunc) (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicWidth,
const int32_t kiPicHeight);
/**/
@@ -95,7 +95,7 @@
int32_t iMaxLongTermFrameIdx;
} SRefPic, *PRefPic;
-typedef void_t (*PWelsMcFunc) (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+typedef void (*PWelsMcFunc) (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight);
typedef struct TagMcFunc {PWelsMcFunc pMcLumaFunc;
@@ -116,13 +116,13 @@
struct TagDeblockingFunc* pLoopf;
} SDeblockingFilter, *PDeblockingFilter;
-typedef void_t (*PDeblockingFilterMbFunc) (PDqLayer pCurDqLayer, PDeblockingFilter filter, int32_t boundry_flag);
-typedef void_t (*PLumaDeblockingLT4Func) (uint8_t* iSampleY, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+typedef void (*PDeblockingFilterMbFunc) (PDqLayer pCurDqLayer, PDeblockingFilter filter, int32_t boundry_flag);
+typedef void (*PLumaDeblockingLT4Func) (uint8_t* iSampleY, int32_t iStride, int32_t iAlpha, int32_t iBeta,
int8_t* iTc);
-typedef void_t (*PLumaDeblockingEQ4Func) (uint8_t* iSampleY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
-typedef void_t (*PChromaDeblockingLT4Func) (uint8_t* iSampleCb, uint8_t* iSampleCr, int32_t iStride, int32_t iAlpha,
+typedef void (*PLumaDeblockingEQ4Func) (uint8_t* iSampleY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+typedef void (*PChromaDeblockingLT4Func) (uint8_t* iSampleCb, uint8_t* iSampleCr, int32_t iStride, int32_t iAlpha,
int32_t iBeta, int8_t* iTc);
-typedef void_t (*PChromaDeblockingEQ4Func) (uint8_t* iSampleCb, uint8_t* iSampleCr, int32_t iStride, int32_t iAlpha,
+typedef void (*PChromaDeblockingEQ4Func) (uint8_t* iSampleCb, uint8_t* iSampleCr, int32_t iStride, int32_t iAlpha,
int32_t iBeta);
typedef struct TagDeblockingFunc {@@ -137,11 +137,11 @@
PChromaDeblockingEQ4Func pfChromaDeblockinEQ4Hor;
} SDeblockingFunc, *PDeblockingFunc;
-typedef void_t (*PWelsBlockAddStrideFunc) (uint8_t* pDest, uint8_t* pPred, int16_t* pRes, int32_t iPredStride,
+typedef void (*PWelsBlockAddStrideFunc) (uint8_t* pDest, uint8_t* pPred, int16_t* pRes, int32_t iPredStride,
int32_t iResStride);
-typedef void_t (*PWelsBlockZeroFunc) (int16_t* pBlock, int32_t iStride);
-typedef void_t (*PWelsNonZeroCountFunc) (int16_t* pBlock, int8_t* pNonZeroCount);
-typedef void_t (*PWelsSimpleIdct4x4AddFunc) (int16_t* pDest, int16_t* pSrc, int32_t iStride);
+typedef void (*PWelsBlockZeroFunc) (int16_t* pBlock, int32_t iStride);
+typedef void (*PWelsNonZeroCountFunc) (int16_t* pBlock, int8_t* pNonZeroCount);
+typedef void (*PWelsSimpleIdct4x4AddFunc) (int16_t* pDest, int16_t* pSrc, int32_t iStride);
typedef struct TagBlockFunc {PWelsBlockZeroFunc pWelsBlockZero16x16Func;
@@ -149,7 +149,7 @@
PWelsNonZeroCountFunc pWelsSetNonZeroCountFunc;
} SBlockFunc;
-typedef void_t (*PWelsFillNeighborMbInfoIntra4x4Func) (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+typedef void (*PWelsFillNeighborMbInfoIntra4x4Func) (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
int8_t* pIntraPredMode, PDqLayer pCurLayer);
typedef int32_t (*PWelsParseIntra4x4ModeFunc) (PNeighAvail pNeighAvail, int8_t* pIntraPredMode, PBitStringAux pBs,
PDqLayer pCurDqLayer);
@@ -166,7 +166,7 @@
typedef struct TagWelsDecoderContext {// Input
- void_t* pArgDec; // structured arguments for decoder, reserved here for extension in the future
+ void* pArgDec; // structured arguments for decoder, reserved here for extension in the future
SDataBuffer sRawData;
@@ -180,8 +180,8 @@
int32_t iOutputColorFormat; // color space format to be outputed
VIDEO_BITSTREAM_TYPE eVideoType; //indicate the type of video to decide whether or not to do qp_delta error detection.
- bool_t bErrorResilienceFlag; // error resilience flag
- bool_t bHaveGotMemory; // global memory for decoder context related ever requested?
+ bool bErrorResilienceFlag; // error resilience flag
+ bool bHaveGotMemory; // global memory for decoder context related ever requested?
int32_t iImgWidthInPixel; // width of image in pixel reconstruction picture to be output
int32_t iImgHeightInPixel;// height of image in pixel reconstruction picture to be output
@@ -191,7 +191,7 @@
ESliceType eSliceType; // Slice type
int32_t iFrameNum;
int32_t iPrevFrameNum; // frame number of previous frame well decoded for non-truncated mode yet
- bool_t bLastHasMmco5; //
+ bool bLastHasMmco5; //
int32_t iErrorCode; // error code return while decoding in case packets lost
SFmo sFmoList[MAX_PPS_COUNT]; // list for FMO storage
PFmo pFmo; // current fmo context after parsed slice_header
@@ -270,25 +270,25 @@
int32_t iPicHeightReq; // picture height have requested the memory
uint8_t uiTargetDqId; // maximal DQ ID in current access unit, meaning target layer ID
- bool_t bAvcBasedFlag; // For decoding bitstream:
- bool_t bEndOfStreamFlag; // Flag on end of stream requested by external application layer
- bool_t bInitialDqLayersMem; // dq layers related memory is available?
+ bool bAvcBasedFlag; // For decoding bitstream:
+ bool bEndOfStreamFlag; // Flag on end of stream requested by external application layer
+ bool bInitialDqLayersMem; // dq layers related memory is available?
- bool_t bOnlyOneLayerInCurAuFlag; //only one layer in current AU: 1
+ bool bOnlyOneLayerInCurAuFlag; //only one layer in current AU: 1
// for EC parameter sets
- bool_t bSpsExistAheadFlag; // whether does SPS NAL exist ahead of sequence?
- bool_t bSubspsExistAheadFlag;// whether does Subset SPS NAL exist ahead of sequence?
- bool_t bPpsExistAheadFlag; // whether does PPS NAL exist ahead of sequence?
+ bool bSpsExistAheadFlag; // whether does SPS NAL exist ahead of sequence?
+ bool bSubspsExistAheadFlag;// whether does Subset SPS NAL exist ahead of sequence?
+ bool bPpsExistAheadFlag; // whether does PPS NAL exist ahead of sequence?
- bool_t bSpsAvailFlags[MAX_SPS_COUNT];
- bool_t bSubspsAvailFlags[MAX_SPS_COUNT];
- bool_t bPpsAvailFlags[MAX_PPS_COUNT];
- bool_t bReferenceLostAtT0Flag;
+ bool bSpsAvailFlags[MAX_SPS_COUNT];
+ bool bSubspsAvailFlags[MAX_SPS_COUNT];
+ bool bPpsAvailFlags[MAX_PPS_COUNT];
+ bool bReferenceLostAtT0Flag;
#ifdef LONG_TERM_REF
- bool_t bParamSetsLostFlag; //sps or pps do not exist or not correct
+ bool bParamSetsLostFlag; //sps or pps do not exist or not correct
- bool_t
+ bool
bCurAuContainLtrMarkSeFlag; //current AU has the LTR marking syntax element, mark the previous frame or self
int32_t iFrameNumOfAuMarkedLtr; //if bCurAuContainLtrMarkSeFlag==true, SHOULD set this variable
@@ -319,10 +319,10 @@
int32_t iFeedbackVclNalInAu;
int32_t iFeedbackTidInAu;
- bool_t bAuReadyFlag; // TRUE: one au is ready for decoding; FALSE: default value
+ bool bAuReadyFlag; // true: one au is ready for decoding; false: default value
//trace handle
- void_t* pTraceHandle;
+ void* pTraceHandle;
#ifdef NO_WAITING_AU
//Save the last nal header info
--- a/codec/decoder/core/inc/decoder_core.h
+++ b/codec/decoder/core/inc/decoder_core.h
@@ -64,7 +64,7 @@
* Free memory introduced in WelsInitMemory at destruction of decoder.
*
*/
-void_t WelsFreeMemory (PWelsDecoderContext pCtx);
+void WelsFreeMemory (PWelsDecoderContext pCtx);
/*!
* \brief request memory when maximal picture width and height are available
@@ -74,7 +74,7 @@
/*!
* \brief free dq layer context memory related
*/
-void_t UninitialDqLayersContext (PWelsDecoderContext pCtx);
+void UninitialDqLayersContext (PWelsDecoderContext pCtx);
/*
* DecodeNalHeaderExt
@@ -83,19 +83,19 @@
* pNal: target NALUnit ptr
* pSrc: NAL Unit bitstream
*/
-void_t DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc);
+void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc);
/*
* ParseSliceHeaderSyntaxs
* Parse slice header of bitstream
*/
-int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool_t kbExtensionFlag);
+int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag);
/*
* Copy relative syntax elements of NALUnitHeaderExt, sRefPicBaseMarking and bStoreRefBasePicFlag in prefix nal unit.
* pSrc: mark as decoded prefix NAL
* pDst: succeeded VCL NAL based AVC (I/P Slice)
*/
-bool_t PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kpDst, PNalUnit const kpSrc);
+bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kpDst, PNalUnit const kpSrc);
/*
@@ -123,14 +123,14 @@
/*
* Prepare current dq layer context initialization.
*/
-void_t WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps);
+void WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps);
int32_t WelsDecodeAccessUnitStart (PWelsDecoderContext pCtx);
-void_t WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx);
+void WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx);
-void_t ForceResetCurrentAccessUnit (PAccessUnit pAu);
-void_t ForceClearCurrentNal (PAccessUnit pAu);
+void ForceResetCurrentAccessUnit (PAccessUnit pAu);
+void ForceClearCurrentNal (PAccessUnit pAu);
} // namespace WelsDec
--- a/codec/decoder/core/inc/expand_pic.h
+++ b/codec/decoder/core/inc/expand_pic.h
@@ -47,10 +47,10 @@
namespace WelsDec {-void_t ExpandReferencingPicture (PPicture pPic, PExpandPictureFunc pExpandPictureLuma,
+void ExpandReferencingPicture (PPicture pPic, PExpandPictureFunc pExpandPictureLuma,
PExpandPictureFunc pExpandPictureChroma[2]);
-void_t InitExpandPictureFunc (SExpandPicFunc* pExpandPicFunc, const uint32_t kuiCpuFlags);
+void InitExpandPictureFunc (SExpandPicFunc* pExpandPicFunc, const uint32_t kuiCpuFlags);
} // namespace WelsDec
--- a/codec/decoder/core/inc/fmo.h
+++ b/codec/decoder/core/inc/fmo.h
@@ -58,7 +58,7 @@
int32_t iCountMbNum;
int32_t iSliceGroupCount;
int32_t iSliceGroupType;
-bool_t bActiveFlag;
+bool bActiveFlag;
uint8_t uiReserved[3]; // reserved padding bytes
} SFmo, *PFmo;
@@ -84,7 +84,7 @@
*
* \return NONE
*/
-void_t UninitFmoList (PFmo pFmo, const int32_t kiCnt, const int32_t kiAvail);
+void UninitFmoList (PFmo pFmo, const int32_t kiCnt, const int32_t kiAvail);
/*!
* \brief update/insert FMO parameter unit
@@ -96,7 +96,7 @@
*
* \return true - update/insert successfully; false - failed;
*/
-bool_t FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum);
+bool FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum);
/*!
* \brief Get successive mb to be processed with given current mb_xy
--- a/codec/decoder/core/inc/get_intra_predictor.h
+++ b/codec/decoder/core/inc/get_intra_predictor.h
@@ -45,36 +45,36 @@
namespace WelsDec {-void_t WelsI4x4LumaPredV_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredH_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDc_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDDL_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDDLTop_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDDR_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredVL_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredVLTop_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredVR_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredHU_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredHD_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredV_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredH_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDc_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDDL_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDDLTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDDR_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredVL_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredVLTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredVR_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredHU_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredHD_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredV_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredH_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredPlane_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredDc_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredV_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredH_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredPlane_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredDc_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredV_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredH_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredPlane_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredDc_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredV_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredH_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredPlane_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredDc_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
#if defined(__cplusplus)
extern "C" {@@ -81,30 +81,30 @@
#endif//__cplusplus
#if defined(X86_ASM)
-void_t WelsDecoderI16x16LumaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI16x16LumaPredH_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI16x16LumaPredV_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI16x16LumaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI16x16LumaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI16x16LumaPredDcNA_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredH_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredV_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDcNA_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderIChromaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderIChromaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderIChromaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderIChromaPredH_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderIChromaPredV_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderIChromaPredDcLeft_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderIChromaPredDcNA_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredH_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredV_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDcLeft_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDcNA_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI4x4LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride);
-void_t WelsDecoderI4x4LumaPredDDR_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI4x4LumaPredHD_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI4x4LumaPredHU_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI4x4LumaPredVR_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI4x4LumaPredDDL_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsDecoderI4x4LumaPredVL_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDDR_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredHD_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredHU_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVR_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDDL_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVL_mmx (uint8_t* pPred, const int32_t kiStride);
#endif//X86_ASM
#if defined(__cplusplus)
--- a/codec/decoder/core/inc/manage_dec_ref.h
+++ b/codec/decoder/core/inc/manage_dec_ref.h
@@ -53,10 +53,10 @@
REMOVE_BASE_FIRST = 2
} ERemoveFlag;
-void_t WelsResetRefPic (PWelsDecoderContext pCtx);
+void WelsResetRefPic (PWelsDecoderContext pCtx);
int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc);
int32_t WelsReorderRefList (PWelsDecoderContext pCtx);
-int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool_t kbRefBaseMarkingFlag);
+int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool kbRefBaseMarkingFlag);
static PPicture WelsDelShortFromList (PRefPic pRefPic, int32_t iFrameNum, ERemoveFlag eRemoveFlag);
static PPicture WelsDelLongFromList (PRefPic pRefPic, uint32_t uiLongTermFrameIdx, ERemoveFlag eRemoveFlag);
@@ -65,7 +65,7 @@
static int32_t MMCOBase (PWelsDecoderContext pCtx, PRefBasePicMarking pRefPicBaseMarking);
static int32_t MMCO (PWelsDecoderContext pCtx, PRefPicMarking pRefPicMarking);
-static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool_t bRefBasePic,
+static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool bRefBasePic,
int32_t iShortFrameNum, uint32_t uiLongTermPicNum, int32_t iLongTermFrameIdx, int32_t iMaxLongTermFrameIdx);
static int32_t SlidingWindow (PWelsDecoderContext pCtx);
--- a/codec/decoder/core/inc/mc.h
+++ b/codec/decoder/core/inc/mc.h
@@ -40,10 +40,10 @@
namespace WelsDec {-typedef void_t (*PMcChromaWidthExtFunc) (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+typedef void (*PMcChromaWidthExtFunc) (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
const uint8_t* kpABCD, int32_t iHeight);
-void_t InitMcFunc (SMcFunc* pMcFunc, int32_t iCpu);
+void InitMcFunc (SMcFunc* pMcFunc, int32_t iCpu);
} // namespace WelsDec
--- a/codec/decoder/core/inc/mem_align.h
+++ b/codec/decoder/core/inc/mem_align.h
@@ -59,7 +59,7 @@
* \note N/A
*************************************************************************************
*/
-void_t* WelsMalloc (const uint32_t kuiSize, const str_t* kpTag);
+void* WelsMalloc (const uint32_t kuiSize, const char* kpTag);
/*!
*************************************************************************************
@@ -73,7 +73,7 @@
* \note N/A
*************************************************************************************
*/
-void_t WelsFree (void_t* pPtr, const str_t* kpTag);
+void WelsFree (void* pPtr, const char* kpTag);
#define WELS_SAFE_FREE(pPtr, pTag) if (pPtr) { WelsFree(pPtr, pTag); pPtr = NULL; }--- a/codec/decoder/core/inc/mv_pred.h
+++ b/codec/decoder/core/inc/mv_pred.h
@@ -50,7 +50,7 @@
* \param
* \param
*/
-void_t UpdateP16x16MotionInfo (PDqLayer pCurDqLayer, int8_t iRef, int16_t iMVs[2]);
+void UpdateP16x16MotionInfo (PDqLayer pCurDqLayer, int8_t iRef, int16_t iMVs[2]);
/*!
* \brief update mv and ref_index cache for current MB, only for P_16x8
@@ -57,7 +57,7 @@
* \param
* \param
*/
-void_t UpdateP16x8MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
+void UpdateP16x8MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int8_t iRef, int16_t iMVs[2]);
@@ -67,7 +67,7 @@
* \param
* \param
*/
-void_t UpdateP8x16MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
+void UpdateP8x16MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int8_t iRef, int16_t iMVs[2]);
@@ -76,7 +76,7 @@
* \param
* \param output iMvp[]
*/
-void_t PredPSkipMvFromNeighbor (PDqLayer pCurLayer, int16_t iMvp[2]);
+void PredPSkipMvFromNeighbor (PDqLayer pCurLayer, int16_t iMvp[2]);
/*!
* \brief get the motion predictor for 4*4 or 8*8 or 16*16 block
@@ -83,7 +83,7 @@
* \param
* \param output iMvp[]
*/
-void_t PredMv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+void PredMv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int32_t iPartWidth, int8_t iRef, int16_t iMVP[2]);
/*!
@@ -91,7 +91,7 @@
* \param
* \param output mvp_x and mvp_y
*/
-void_t PredInter16x8Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+void PredInter16x8Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int8_t iRef, int16_t iMVP[2]);
/*!
@@ -99,7 +99,7 @@
* \param
* \param output mvp_x and mvp_y
*/
-void_t PredInter8x16Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+void PredInter8x16Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int8_t iRef, int16_t iMVP[2]);
} // namespace WelsDec
--- a/codec/decoder/core/inc/nal_prefix.h
+++ b/codec/decoder/core/inc/nal_prefix.h
@@ -55,7 +55,7 @@
SNalUnitHeader sNalUnitHeader;
// uint8_t reserved_one_bit;
- bool_t bIdrFlag;
+ bool bIdrFlag;
uint8_t uiPriorityId;
int8_t iNoInterLayerPredFlag; // change as int8_t to support 3 values probably in encoder
uint8_t uiDependencyId;
@@ -62,22 +62,22 @@
uint8_t uiQualityId;
uint8_t uiTemporalId;
- bool_t bUseRefBasePicFlag;
- bool_t bDiscardableFlag;
+ bool bUseRefBasePicFlag;
+ bool bDiscardableFlag;
- bool_t bOutputFlag;
+ bool bOutputFlag;
uint8_t uiReservedThree2Bits;
// Derived variable(s)
uint8_t uiLayerDqId;
- bool_t bNalExtFlag;
+ bool bNalExtFlag;
} SNalUnitHeaderExt, *PNalUnitHeaderExt;
/* Prefix NAL Unix syntax, refer to Page 392 in JVT X201wcm */
typedef struct TagPrefixNalUnit {SRefBasePicMarking sRefPicBaseMarking;
- bool_t bStoreRefBasePicFlag;
- bool_t bPrefixNalUnitAdditionalExtFlag;
- bool_t bPrefixNalUnitExtFlag;
+ bool bStoreRefBasePicFlag;
+ bool bPrefixNalUnitAdditionalExtFlag;
+ bool bPrefixNalUnitExtFlag;
} SPrefixNalUnit, *PPrefixNalUnit;
} // namespace WelsDec
--- a/codec/decoder/core/inc/nalu.h
+++ b/codec/decoder/core/inc/nalu.h
@@ -53,7 +53,7 @@
SBitStringAux sSliceBitsRead;
uint8_t* pNalPos; // save the address of slice nal for GPU function
int32_t iNalLength; // save the nal length for GPU function
- bool_t bSliceHeaderExtFlag;
+ bool bSliceHeaderExtFlag;
} sVclNal;
SPrefixNalUnit sPrefixNal;
} sNalData;
@@ -71,7 +71,7 @@
uint32_t uiCountUnitsNum; // Count size number of malloced NAL Units in each AU list
uint32_t uiStartPos;
uint32_t uiEndPos;
-bool_t bCompletedAuFlag; // Indicate whether it is a completed AU
+bool bCompletedAuFlag; // Indicate whether it is a completed AU
} SAccessUnit, *PAccessUnit;
} // namespace WelsDec
--- a/codec/decoder/core/inc/parameter_sets.h
+++ b/codec/decoder/core/inc/parameter_sets.h
@@ -80,25 +80,25 @@
uint8_t uiBitDepthLuma;
uint8_t uiBitDepthChroma;
/* TO BE CONTINUE: POC type 1 */
-bool_t bDeltaPicOrderAlwaysZeroFlag;
-bool_t bGapsInFrameNumValueAllowedFlag;
+bool bDeltaPicOrderAlwaysZeroFlag;
+bool bGapsInFrameNumValueAllowedFlag;
-bool_t bFrameMbsOnlyFlag;
-bool_t bMbaffFlag; // MB Adapative Frame Field
-bool_t bDirect8x8InferenceFlag;
-bool_t bFrameCroppingFlag;
+bool bFrameMbsOnlyFlag;
+bool bMbaffFlag; // MB Adapative Frame Field
+bool bDirect8x8InferenceFlag;
+bool bFrameCroppingFlag;
-bool_t bVuiParamPresentFlag;
-// bool_t bTimingInfoPresentFlag;
-// bool_t bFixedFrameRateFlag;
-bool_t bConstraintSet0Flag;
-bool_t bConstraintSet1Flag;
-bool_t bConstraintSet2Flag;
-bool_t bConstraintSet3Flag;
-bool_t bSeparateColorPlaneFlag;
-bool_t bQpPrimeYZeroTransfBypassFlag;
-bool_t bSeqScalingMatrixPresentFlag;
-bool_t bSeqScalingListPresentFlag[12];
+bool bVuiParamPresentFlag;
+// bool bTimingInfoPresentFlag;
+// bool bFixedFrameRateFlag;
+bool bConstraintSet0Flag;
+bool bConstraintSet1Flag;
+bool bConstraintSet2Flag;
+bool bConstraintSet3Flag;
+bool bSeparateColorPlaneFlag;
+bool bQpPrimeYZeroTransfBypassFlag;
+bool bSeqScalingMatrixPresentFlag;
+bool bSeqScalingListPresentFlag[12];
const SLevelLimits *pSLevelLimits;
} SSps, *PSps;
@@ -111,8 +111,8 @@
// int32_t iAlphaTransparentValue;
// uint8_t uiBitDepthAux;
-// bool_t bAlphaIncrFlag;
-// bool_t bAdditionalExtFlag;
+// bool bAlphaIncrFlag;
+// bool bAdditionalExtFlag;
//}SSpsExt, *PSpsExt;
/* Sequence Parameter Set extension syntax, refer to Page 391 in JVT X201wcm */
@@ -124,10 +124,10 @@
uint8_t uiChromaPhaseYPlus1;
uint8_t uiSeqRefLayerChromaPhaseXPlus1Flag;
uint8_t uiSeqRefLayerChromaPhaseYPlus1;
-bool_t bInterLayerDeblockingFilterCtrlPresentFlag;
-bool_t bSeqTCoeffLevelPredFlag;
-bool_t bAdaptiveTCoeffLevelPredFlag;
-bool_t bSliceHeaderRestrictionFlag;
+bool bInterLayerDeblockingFilterCtrlPresentFlag;
+bool bSeqTCoeffLevelPredFlag;
+bool bAdaptiveTCoeffLevelPredFlag;
+bool bSliceHeaderRestrictionFlag;
} SSpsSvcExt, *PSpsSvcExt;
/* Subset sequence parameter set syntax, refer to Page 391 in JVT X201wcm */
@@ -134,9 +134,9 @@
typedef struct TagSubsetSps {SSps sSps;
SSpsSvcExt sSpsSvcExt;
-bool_t bSvcVuiParamPresentFlag;
-bool_t bAdditionalExtension2Flag;
-bool_t bAdditionalExtension2DataFlag;
+bool bSvcVuiParamPresentFlag;
+bool bAdditionalExtension2Flag;
+bool bAdditionalExtension2DataFlag;
} SSubsetSps, *PSubsetSps;
/* Picture parameter set syntax, refer to Page 59 in JVT X201wcm */
@@ -164,15 +164,15 @@
int32_t iPicInitQs;
int32_t iChromaQpIndexOffset;
-bool_t bEntropyCodingModeFlag;
-bool_t bPicOrderPresentFlag;
+bool bEntropyCodingModeFlag;
+bool bPicOrderPresentFlag;
/* slice_group_map_type = 3, 4 or 5 */
-bool_t bSliceGroupChangeDirectionFlag;
-bool_t bDeblockingFilterControlPresentFlag;
+bool bSliceGroupChangeDirectionFlag;
+bool bDeblockingFilterControlPresentFlag;
-bool_t bConstainedIntraPredFlag;
-bool_t bRedundantPicCntPresentFlag;
-bool_t bWeightedPredFlag;
+bool bConstainedIntraPredFlag;
+bool bRedundantPicCntPresentFlag;
+bool bWeightedPredFlag;
uint8_t uiWeightedBipredIdc;
} SPps, *PPps;
--- a/codec/decoder/core/inc/parse_mb_syn_cavlc.h
+++ b/codec/decoder/core/inc/parse_mb_syn_cavlc.h
@@ -134,13 +134,13 @@
{SUB_MB_TYPE_4x4, 4, 1},};
-void_t GetNeighborAvailMbType (PNeighAvail pNeighAvail, PDqLayer pCurLayer);
-void_t WelsFillCacheNonZeroCount (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, PDqLayer pCurLayer);
-void_t WelsFillCacheConstrain0Intra4x4 (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
+void GetNeighborAvailMbType (PNeighAvail pNeighAvail, PDqLayer pCurLayer);
+void WelsFillCacheNonZeroCount (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, PDqLayer pCurLayer);
+void WelsFillCacheConstrain0Intra4x4 (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
PDqLayer pCurLayer);
-void_t WelsFillCacheConstrain1Intra4x4 (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
+void WelsFillCacheConstrain1Intra4x4 (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
PDqLayer pCurLayer);
-void_t WelsFillCacheInter (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+void WelsFillCacheInter (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
int16_t iMvArray[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30], PDqLayer pCurLayer);
@@ -173,8 +173,8 @@
int32_t PredIntra4x4Mode (int8_t* pIntraPredMode, int32_t iIdx4);
-void_t BsStartCavlc (PBitStringAux pBs);
-void_t BsEndCavlc (PBitStringAux pBs);
+void BsStartCavlc (PBitStringAux pBs);
+void BsEndCavlc (PBitStringAux pBs);
int32_t WelsResidualBlockCavlc (SVlcTable* pVlcTable,
uint8_t* pNonZeroCountCache,
--- a/codec/decoder/core/inc/picture.h
+++ b/codec/decoder/core/inc/picture.h
@@ -58,16 +58,16 @@
int32_t iFramePoc; // frame POC
/*******************************sef_definition for misc use****************************/
-bool_t bUsedAsRef; //for ref pic management
-bool_t bIsLongRef; // long term reference frame flag //for ref pic management
+bool bUsedAsRef; //for ref pic management
+bool bIsLongRef; // long term reference frame flag //for ref pic management
uint8_t uiRefCount;
-bool_t bAvailableFlag; // indicate whether it is available in this picture memory block.
+bool bAvailableFlag; // indicate whether it is available in this picture memory block.
/*******************************for future use****************************/
uint8_t uiTemporalId;
uint8_t uiSpatialId;
uint8_t uiQualityId;
-bool_t bRefBaseFlag;
+bool bRefBaseFlag;
int32_t iFrameNum; // frame number //for ref pic management
int32_t iLongTermFrameIdx; //id for long term ref pic
--- a/codec/decoder/core/inc/rec_mb.h
+++ b/codec/decoder/core/inc/rec_mb.h
@@ -49,7 +49,7 @@
namespace WelsDec {-void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool_t bOutput, PDqLayer pCurLayer);
+void WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurLayer);
int32_t RecI4x4Mb (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
@@ -61,9 +61,9 @@
int32_t RecChroma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
-void_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWelsDecoderContext pCtx);
+void GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWelsDecoderContext pCtx);
-void_t FillBufForMc (uint8_t* pBuf, int32_t iBufStride, uint8_t* pSrc, int32_t iSrcStride, int32_t iSrcOffset,
+void FillBufForMc (uint8_t* pBuf, int32_t iBufStride, uint8_t* pSrc, int32_t iSrcStride, int32_t iSrcOffset,
int32_t iBlockWidth, int32_t iBlockHeight, int32_t iSrcX, int32_t iSrcY, int32_t iPicWidth, int32_t iPicHeight);
} // namespace WelsDec
--- a/codec/decoder/core/inc/slice.h
+++ b/codec/decoder/core/inc/slice.h
@@ -51,7 +51,7 @@
uint16_t uiLongTermPicNum;
uint16_t uiReorderingOfPicNumsIdc;
} sReorderingSyn[LIST_A][MAX_REF_PIC_COUNT];
- bool_t bRefPicListReorderingFlag[LIST_A];
+ bool bRefPicListReorderingFlag[LIST_A];
} SRefPicListReorderSyn, *PRefPicListReorderSyn;
/*
@@ -65,8 +65,8 @@
int32_t iLumaOffset[MAX_REF_PIC_COUNT];
int32_t iChromaWeight[MAX_REF_PIC_COUNT][2];
int32_t iChromaOffset[MAX_REF_PIC_COUNT][2];
- bool_t bLumaWeightFlag;
- bool_t bChromaWeightFlag;
+ bool bLumaWeightFlag;
+ bool bChromaWeightFlag;
} sPredList[LIST_A];
} SPredWeightTabSyn;
@@ -81,9 +81,9 @@
int32_t iMaxLongTermFrameIdx;
} sMmcoRef[MAX_MMCO_COUNT];
- bool_t bNoOutputOfPriorPicsFlag;
- bool_t bLongTermRefFlag;
- bool_t bAdaptiveRefPicMarkingModeFlag;
+ bool bNoOutputOfPriorPicsFlag;
+ bool bLongTermRefFlag;
+ bool bAdaptiveRefPicMarkingModeFlag;
} SRefPicMarking, *PRefPicMarking;
/* Decode reference base picture marking syntax in Page 396 of JVT X201wcm */
@@ -95,7 +95,7 @@
uint32_t uiLongTermPicNum; //should uint32_t, cover larger range of iFrameNum.
} mmco_base[MAX_MMCO_COUNT]; // MAX_REF_PIC for reference picture based on frame
- bool_t bAdaptiveRefBasePicMarkingModeFlag;
+ bool bAdaptiveRefBasePicMarkingModeFlag;
} SRefBasePicMarking, *PRefBasePicMarking;
/* Header of slice syntax elements, refer to Page 63 in JVT X201wcm */
@@ -131,11 +131,11 @@
uint16_t uiIdrPicId;
ESliceType eSliceType;
- bool_t bNumRefIdxActiveOverrideFlag;
- bool_t bFieldPicFlag; //not supported in base profile
- bool_t bBottomFiledFlag; //not supported in base profile
+ bool bNumRefIdxActiveOverrideFlag;
+ bool bFieldPicFlag; //not supported in base profile
+ bool bBottomFiledFlag; //not supported in base profile
uint8_t uiPadding1Byte;
- bool_t bSpForSwitchFlag; // For SP/SI slices
+ bool bSpForSwitchFlag; // For SP/SI slices
int16_t iPadding2Bytes;
} SSliceHeader, *PSliceHeader;
@@ -155,18 +155,18 @@
int32_t iScaledRefLayerPicHeightInSampleLuma;
SRefBasePicMarking sRefBasePicMarking;
- bool_t bBasePredWeightTableFlag;
- bool_t bStoreRefBasePicFlag;
- bool_t bConstrainedIntraResamplingFlag;
- bool_t bSliceSkipFlag;
+ bool bBasePredWeightTableFlag;
+ bool bStoreRefBasePicFlag;
+ bool bConstrainedIntraResamplingFlag;
+ bool bSliceSkipFlag;
- bool_t bAdaptiveBaseModeFlag;
- bool_t bDefaultBaseModeFlag;
- bool_t bAdaptiveMotionPredFlag;
- bool_t bDefaultMotionPredFlag;
- bool_t bAdaptiveResidualPredFlag;
- bool_t bDefaultResidualPredFlag;
- bool_t bTCoeffLevelPredFlag;
+ bool bAdaptiveBaseModeFlag;
+ bool bDefaultBaseModeFlag;
+ bool bAdaptiveMotionPredFlag;
+ bool bDefaultMotionPredFlag;
+ bool bAdaptiveResidualPredFlag;
+ bool bDefaultResidualPredFlag;
+ bool bTCoeffLevelPredFlag;
uint8_t uiRefLayerChromaPhaseXPlus1Flag;
uint8_t uiRefLayerChromaPhaseYPlus1;
@@ -192,7 +192,7 @@
/*slice_data_ext() generate*/
/*******************************misc use****************************/
- bool_t bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
+ bool bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
/*************got from other layer for effiency if possible***************/
/*from lower layer: slice header*/
uint8_t eSliceType;
--- a/codec/decoder/core/inc/utils.h
+++ b/codec/decoder/core/inc/utils.h
@@ -53,15 +53,15 @@
* Function pointer declaration for various tool sets
*/
// wels log output
-typedef void_t (*PWelsLogCallbackFunc) (void_t* pPtr, const int32_t kiLevel, const char* kpFmt, va_list pArgv);
+typedef void (*PWelsLogCallbackFunc) (void* pPtr, const int32_t kiLevel, const char* kpFmt, va_list pArgv);
extern PWelsLogCallbackFunc g_pLog;
#ifdef __GNUC__
-extern void_t WelsLog (void_t* pPtr, int32_t iLevel, const char* kpFmt, ...) __attribute__ ((__format__ (__printf__, 3,
+extern void WelsLog (void* pPtr, int32_t iLevel, const char* kpFmt, ...) __attribute__ ((__format__ (__printf__, 3,
4)));
#else
-extern void_t WelsLog (void_t* pPtr, int32_t iLevel, const char* kpFmt, ...);
+extern void WelsLog (void* pPtr, int32_t iLevel, const char* kpFmt, ...);
#endif
#define DECODER_MODE_NAME(a) ((a == SW_MODE)?"SW_MODE":((a == GPU_MODE)?"GPU_MODE":((a == AUTO_MODE)?"AUTO_MODE":"SWITCH_MODE")))
--- a/codec/decoder/core/inc/vlc_decoder.h
+++ b/codec/decoder/core/inc/vlc_decoder.h
@@ -116,7 +116,7 @@
#define WELS_GET_PREFIX_BITS(inval, outval) outval = GetPrefixBits(inval)
#endif
-static inline void_t InitVlcTable (SVlcTable* pVlcTable) {+static inline void InitVlcTable (SVlcTable* pVlcTable) {pVlcTable->kpChromaCoeffTokenVlcTable = g_kuiVlcChromaTable;
pVlcTable->kpCoeffTokenVlcTable[0][0] = g_kuiVlcTable_0;
--- a/codec/decoder/core/src/au_parser.cpp
+++ b/codec/decoder/core/src/au_parser.cpp
@@ -108,7 +108,7 @@
uint8_t* pNal = pSrcRbsp;
int32_t iNalSize = iSrcRbspLen;
PBitStringAux pBs = NULL;
- bool_t bExtensionFlag = false;
+ bool bExtensionFlag = false;
int32_t iErr = ERR_NONE;
int32_t iBitSize = 0;
@@ -362,66 +362,66 @@
}
-bool_t CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
+bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader) {const PSps kpSps = pCurSliceHeader->pSps;
//Sub-clause 7.1.4.1.1 temporal_id
if (pLastNalHdrExt->uiTemporalId != pCurNalHeaderExt->uiTemporalId) {- return TRUE;
+ return true;
}
// Subclause 7.4.1.2.5
if (pLastSliceHeader->iRedundantPicCnt < pCurSliceHeader->iRedundantPicCnt)
- return FALSE;
+ return false;
else if (pLastSliceHeader->iRedundantPicCnt > pCurSliceHeader->iRedundantPicCnt)
- return TRUE;
+ return true;
// Subclause G7.4.1.2.4
if (pLastNalHdrExt->uiDependencyId < pCurNalHeaderExt->uiDependencyId)
- return FALSE;
+ return false;
else if (pLastNalHdrExt->uiDependencyId > pCurNalHeaderExt->uiDependencyId)
- return TRUE;
+ return true;
if (pLastNalHdrExt->uiQualityId < pCurNalHeaderExt->uiQualityId)
- return FALSE;
+ return false;
else if (pLastNalHdrExt->uiQualityId > pCurNalHeaderExt->uiQualityId)
- return TRUE;
+ return true;
// Subclause 7.4.1.2.4
if (pLastSliceHeader->iFrameNum != pCurSliceHeader->iFrameNum)
- return TRUE;
+ return true;
if (pLastSliceHeader->iPpsId != pCurSliceHeader->iPpsId)
- return TRUE;
+ return true;
if (pLastSliceHeader->bFieldPicFlag != pCurSliceHeader->bFieldPicFlag)
- return TRUE;
+ return true;
if (pLastSliceHeader->bBottomFiledFlag != pCurSliceHeader->bBottomFiledFlag)
- return TRUE;
+ return true;
if ((pLastNalHdrExt->sNalUnitHeader.uiNalRefIdc != NRI_PRI_LOWEST) != (pCurNalHeaderExt->sNalUnitHeader.uiNalRefIdc !=
NRI_PRI_LOWEST))
- return TRUE;
+ return true;
if (pLastNalHdrExt->bIdrFlag != pCurNalHeaderExt->bIdrFlag)
- return TRUE;
+ return true;
if (pCurNalHeaderExt->bIdrFlag) {if (pLastSliceHeader->uiIdrPicId != pCurSliceHeader->uiIdrPicId)
- return TRUE;
+ return true;
}
if (kpSps->uiPocType == 0) {if (pLastSliceHeader->iPicOrderCntLsb != pCurSliceHeader->iPicOrderCntLsb)
- return TRUE;
+ return true;
if (pLastSliceHeader->iDeltaPicOrderCntBottom != pCurSliceHeader->iDeltaPicOrderCntBottom)
- return TRUE;
+ return true;
} else if (kpSps->uiPocType == 1) {if (pLastSliceHeader->iDeltaPicOrderCnt[0] != pCurSliceHeader->iDeltaPicOrderCnt[0])
- return TRUE;
+ return true;
if (pLastSliceHeader->iDeltaPicOrderCnt[1] != pCurSliceHeader->iDeltaPicOrderCnt[1])
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-bool_t CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps) {+bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps) {const PNalUnitHeaderExt kpLastNalHeaderExt = &kpLastNal->sNalHeaderExt;
const PNalUnitHeaderExt kpCurNalHeaderExt = &kpCurNal->sNalHeaderExt;
const SSliceHeader* kpLastSliceHeader = &kpLastNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
@@ -429,56 +429,56 @@
//Sub-clause 7.1.4.1.1 temporal_id
if (kpLastNalHeaderExt->uiTemporalId != kpCurNalHeaderExt->uiTemporalId) {- return TRUE;
+ return true;
}
// Subclause 7.4.1.2.5
if (kpLastSliceHeader->iRedundantPicCnt < kpCurSliceHeader->iRedundantPicCnt)
- return FALSE;
+ return false;
else if (kpLastSliceHeader->iRedundantPicCnt > kpCurSliceHeader->iRedundantPicCnt)
- return TRUE;
+ return true;
// Subclause G7.4.1.2.4
if (kpLastNalHeaderExt->uiDependencyId < kpCurNalHeaderExt->uiDependencyId)
- return FALSE;
+ return false;
else if (kpLastNalHeaderExt->uiDependencyId > kpCurNalHeaderExt->uiDependencyId)
- return TRUE;
+ return true;
if (kpLastNalHeaderExt->uiQualityId < kpCurNalHeaderExt->uiQualityId)
- return FALSE;
+ return false;
else if (kpLastNalHeaderExt->uiQualityId > kpCurNalHeaderExt->uiQualityId)
- return TRUE;
+ return true;
// Subclause 7.4.1.2.4
if (kpLastSliceHeader->iFrameNum != kpCurSliceHeader->iFrameNum)
- return TRUE;
+ return true;
if (kpLastSliceHeader->iPpsId != kpCurSliceHeader->iPpsId)
- return TRUE;
+ return true;
if (kpLastSliceHeader->bFieldPicFlag != kpCurSliceHeader->bFieldPicFlag)
- return TRUE;
+ return true;
if (kpLastSliceHeader->bBottomFiledFlag != kpCurSliceHeader->bBottomFiledFlag)
- return TRUE;
+ return true;
if ((kpLastNalHeaderExt->sNalUnitHeader.uiNalRefIdc != NRI_PRI_LOWEST) != (kpCurNalHeaderExt->sNalUnitHeader.uiNalRefIdc
!= NRI_PRI_LOWEST))
- return TRUE;
+ return true;
if (kpLastNalHeaderExt->bIdrFlag != kpCurNalHeaderExt->bIdrFlag)
- return TRUE;
+ return true;
if (kpCurNalHeaderExt->bIdrFlag) {if (kpLastSliceHeader->uiIdrPicId != kpCurSliceHeader->uiIdrPicId)
- return TRUE;
+ return true;
}
if (kpSps->uiPocType == 0) {if (kpLastSliceHeader->iPicOrderCntLsb != kpCurSliceHeader->iPicOrderCntLsb)
- return TRUE;
+ return true;
if (kpLastSliceHeader->iDeltaPicOrderCntBottom != kpCurSliceHeader->iDeltaPicOrderCntBottom)
- return TRUE;
+ return true;
} else if (kpSps->uiPocType == 1) {if (kpLastSliceHeader->iDeltaPicOrderCnt[0] != kpCurSliceHeader->iDeltaPicOrderCnt[0])
- return TRUE;
+ return true;
if (kpLastSliceHeader->iDeltaPicOrderCnt[1] != kpCurSliceHeader->iDeltaPicOrderCnt[1])
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
/*!
@@ -559,8 +559,8 @@
return iErr;
}
-void_t ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePicMarking) {- const bool_t kbAdaptiveMarkingModeFlag = !!BsGetOneBit (pBs);
+void ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePicMarking) {+ const bool kbAdaptiveMarkingModeFlag = !!BsGetOneBit (pBs);
pRefBasePicMarking->bAdaptiveRefBasePicMarkingModeFlag = kbAdaptiveMarkingModeFlag;
if (kbAdaptiveMarkingModeFlag) {int32_t iIdx = 0;
@@ -583,7 +583,7 @@
}
}
-void_t ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs) {+void ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs) {PNalUnit pCurNal = &pCtx->sPrefixNal;
if (pCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc != 0) {@@ -670,7 +670,7 @@
{2073600, 36864, 184320, 240000, 240000, -2048, 2047, 2, 16} /* level 5.2 */};
-const SLevelLimits *GetLevelLimits(int32_t iLevelIdx, bool_t bConstraint3) {+const SLevelLimits *GetLevelLimits(int32_t iLevelIdx, bool bConstraint3) { switch (iLevelIdx) {case 10:
return &g_kSLevelLimits[0];
@@ -737,8 +737,8 @@
ProfileIdc uiProfileIdc;
uint8_t uiLevelIdc;
int32_t iSpsId;
- bool_t bConstraintSetFlags[6] = { false };- const bool_t kbUseSubsetFlag = IS_SUBSET_SPS_NAL (pNalHead->eNalUnitType);
+ bool bConstraintSetFlags[6] = { false };+ const bool kbUseSubsetFlag = IS_SUBSET_SPS_NAL (pNalHead->eNalUnitType);
if (kbUseSubsetFlag) { // SubsetSps@@ -1030,7 +1030,7 @@
* \note Call it in case eNalUnitType is NAL_UNIT_SEI.
*************************************************************************************
*/
-int32_t ParseSei (void_t* pSei, PBitStringAux pBsAux) { // reserved Sei_Msg type+int32_t ParseSei (void* pSei, PBitStringAux pBsAux) { // reserved Sei_Msg typereturn ERR_NONE;
--- a/codec/decoder/core/src/bit_stream.cpp
+++ b/codec/decoder/core/src/bit_stream.cpp
@@ -47,7 +47,7 @@
return uiValue;
}
-void_t InitReadBits (PBitStringAux pBitString) {+void InitReadBits (PBitStringAux pBitString) {pBitString->uiCurBits = GetValue4Bytes (pBitString->pCurBuf);
pBitString->pCurBuf += 4;
pBitString->iLeftBits = -16;
--- a/codec/decoder/core/src/deblocking.cpp
+++ b/codec/decoder/core/src/deblocking.cpp
@@ -143,7 +143,7 @@
tc[3] = g_kiTc0Table(iIndexA)[pBS[3]] + bChroma;\
}
-void_t inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) {+void inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) {uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
uiNnz32b0 = * (uint32_t*) (pNnzTab + 0);
@@ -172,7 +172,7 @@
}
-void_t static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS[2][4][4], int8_t* pNnzTab,
+void static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS[2][4][4], int8_t* pNnzTab,
int32_t iMbXy) {uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
int8_t* iRefIndex = pCurDqLayer->pRefIndex[LIST_0][iMbXy];
@@ -251,8 +251,8 @@
int32_t iMbY = pCurDqLayer->iMbY;
int32_t iMbX = pCurDqLayer->iMbX;
int32_t iMbXy = pCurDqLayer->iMbXyIndex;
- BOOL_T bLeftFlag = FALSE;
- BOOL_T bTopFlag = FALSE;
+ bool bLeftFlag = false;
+ bool bTopFlag = false;
if (2 == iFilterIdc) {bLeftFlag = (iMbX > 0) && (pCurDqLayer->pSliceIdc[iMbXy] == pCurDqLayer->pSliceIdc[iMbXy - 1]);
@@ -264,7 +264,7 @@
return (bLeftFlag << LEFT_FLAG_BIT) | (bTopFlag << TOP_FLAG_BIT);
}
-void_t FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {+void FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {int32_t iIndexA;
int32_t iAlpha;
int32_t iBeta;
@@ -281,7 +281,7 @@
}
-void_t FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {+void FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {int32_t iIndexA;
int32_t iAlpha;
int32_t iBeta;
@@ -298,7 +298,7 @@
}
-void_t FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {+void FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {int32_t iIndexA;
int32_t iAlpha;
int32_t iBeta;
@@ -312,7 +312,7 @@
return;
}
-void_t FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {+void FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {int32_t iIndexA;
int32_t iAlpha;
int32_t iBeta;
@@ -325,7 +325,7 @@
}
return;
}
-void_t FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+void FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
uint8_t* pBS) {int32_t iIndexA;
int32_t iAlpha;
@@ -341,7 +341,7 @@
}
return;
}
-void_t FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+void FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
uint8_t* pBS) {int32_t iIndexA;
int32_t iAlpha;
@@ -358,7 +358,7 @@
return;
}
-void_t FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+void FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
uint8_t* pBS) {int32_t iIndexA;
int32_t iAlpha;
@@ -373,7 +373,7 @@
return;
}
-void_t FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+void FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
uint8_t* pBS) {int32_t iIndexA;
int32_t iAlpha;
@@ -389,7 +389,7 @@
}
-void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4],
+void DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4],
int32_t iBoundryFlag) {int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
int32_t iMbX = pCurDqLayer->iMbX;
@@ -471,7 +471,7 @@
}
}
-void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {+void FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
int32_t iMbX = pCurDqLayer->iMbX;
int32_t iMbY = pCurDqLayer->iMbY;
@@ -519,7 +519,7 @@
pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
}
}
-void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {+void FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
int32_t iMbX = pCurDqLayer->iMbX;
int32_t iMbY = pCurDqLayer->iMbY;
@@ -566,12 +566,12 @@
}
// merge h&v lookup table operation to save performance
-void_t DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {+void DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {FilteringEdgeLumaHV (pCurDqLayer, pFilter, iBoundryFlag);
FilteringEdgeChromaHV (pCurDqLayer, pFilter, iBoundryFlag);
}
-void_t WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {+void WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) { uint8_t nBS[2][4][4] = { 0 };int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
@@ -623,7 +623,7 @@
*
* \return NONE
*/
-void_t WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {+void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;
int32_t iMbWidth = pCurDqLayer->iMbWidth;
@@ -694,7 +694,7 @@
* \return NONE
*/
-void_t DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {+void DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_c;
pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_c;
pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_c;
--- a/codec/decoder/core/src/decode_mb_aux.cpp
+++ b/codec/decoder/core/src/decode_mb_aux.cpp
@@ -43,7 +43,7 @@
/* init pClip table to pClip the final dct data */
-void_t InitDctClipTable (void_t) {+void InitDctClipTable (void) {uint8_t* p = &g_ClipTable[0];
const int32_t kiLength = MAX_NEG_CROP * sizeof (uint8_t);
int32_t i = 0;
@@ -65,7 +65,7 @@
//NOTE::: p_RS should NOT be modified and it will lead to mismatch with JSVM.
// so should allocate kA array to store the temporary value (idct).
-void_t IdctResAddPred_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs) {+void IdctResAddPred_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs) {int16_t iSrc[16];
uint8_t* pDst = pPred;
@@ -103,7 +103,7 @@
}
}
-void_t GetI4LumaIChromaAddrTable (int32_t* pBlockOffset, const int32_t kiYStride, const int32_t kiUVStride) {+void GetI4LumaIChromaAddrTable (int32_t* pBlockOffset, const int32_t kiYStride, const int32_t kiUVStride) {int32_t* pOffset = pBlockOffset;
int32_t i;
const uint8_t kuiScan0 = g_kuiScan8[0];
--- a/codec/decoder/core/src/decode_slice.cpp
+++ b/codec/decoder/core/src/decode_slice.cpp
@@ -192,7 +192,7 @@
return 0;
}
-void_t WelsLumaDcDequantIdct (int16_t* pBlock, int32_t iQp) {+void WelsLumaDcDequantIdct (int16_t* pBlock, int32_t iQp) {const int32_t kiQMul = g_kuiDequantCoeff[iQp][0];
#define STRIDE 16
int32_t i;
@@ -234,7 +234,7 @@
#undef STRIDE
}
-int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool_t bOutput) {+int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool bOutput) {//seems IPCM should not enter this path
int32_t iMbXy = pCurLayer->iMbXyIndex;
@@ -270,7 +270,7 @@
return 0;
}
-void_t WelsMbCopy (uint8_t* pDst, int32_t iStrideDst, uint8_t* pSrc, int32_t iStrideSrc,
+void WelsMbCopy (uint8_t* pDst, int32_t iStrideDst, uint8_t* pSrc, int32_t iStrideSrc,
int32_t iHeight, int32_t iWidth) {int32_t i;
int32_t iOffsetDst = 0, iOffsetSrc = 0;
@@ -328,7 +328,7 @@
return 0;
}
-void_t WelsChromaDcIdct (int16_t* pBlock) {+void WelsChromaDcIdct (int16_t* pBlock) {int32_t iStride = 32;
int32_t iXStride = 16;
int32_t iStride1 = iXStride + iStride;
@@ -351,7 +351,7 @@
pBlk[iStride1] = (iE - iB) >> 1;
}
-int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool_t bFirstSliceInLayer, PNalUnit pNalCur) {+int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNalUnit pNalCur) {PDqLayer pCurLayer = pCtx->pCurDqLayer;
PFmo pFmo = pCtx->pFmo;
int32_t i, iRet;
@@ -1111,7 +1111,7 @@
return 0;
}
-void_t WelsBlockInit (int16_t* pBlock, int32_t iWidth, int32_t iHeight, int32_t iStride, uint8_t uiVal) {+void WelsBlockInit (int16_t* pBlock, int32_t iWidth, int32_t iHeight, int32_t iStride, uint8_t uiVal) {int32_t i;
int16_t* pDst = pBlock;
@@ -1121,7 +1121,7 @@
}
}
-void_t WelsBlockFuncInit (SBlockFunc* pFunc, int32_t iCpu) {+void WelsBlockFuncInit (SBlockFunc* pFunc, int32_t iCpu) {pFunc->pWelsBlockZero16x16Func = WelsBlockZero16x16_c;
pFunc->pWelsBlockZero8x8Func = WelsBlockZero8x8_c;
pFunc->pWelsSetNonZeroCountFunc = SetNonZeroCount_c;
@@ -1133,15 +1133,15 @@
}
#endif
}
-void_t WelsBlockZero16x16_c (int16_t* pBlock, int32_t iStride) {+void WelsBlockZero16x16_c (int16_t* pBlock, int32_t iStride) {WelsBlockInit (pBlock, 16, 16, iStride, 0);
}
-void_t WelsBlockZero8x8_c (int16_t* pBlock, int32_t iStride) {+void WelsBlockZero8x8_c (int16_t* pBlock, int32_t iStride) {WelsBlockInit (pBlock, 8, 8, iStride, 0);
}
-void_t SetNonZeroCount_c (int16_t* pBlock, int8_t* pNonZeroCount) {+void SetNonZeroCount_c (int16_t* pBlock, int8_t* pNonZeroCount) {int32_t i;
int32_t iIndex;
--- a/codec/decoder/core/src/decoder.cpp
+++ b/codec/decoder/core/src/decoder.cpp
@@ -57,9 +57,9 @@
extern PPicture AllocPicture (PWelsDecoderContext pCtx, const int32_t kiPicWidth, const int32_t kiPicHeight);
-extern void_t FreePicture (PPicture pPic);
+extern void FreePicture (PPicture pPic);
-inline void_t GetValueOf4Bytes (uint8_t* pDstNal, int32_t iDdstIdx) {+inline void GetValueOf4Bytes (uint8_t* pDstNal, int32_t iDdstIdx) {ST32(pDstNal, iDdstIdx);
}
@@ -98,7 +98,7 @@
return 0;
}
-static void_t DestroyPicBuff (PPicBuff* ppPicBuf) {+static void DestroyPicBuff (PPicBuff* ppPicBuf) {PPicBuff pPicBuf = NULL;
if (NULL == ppPicBuf || NULL == *ppPicBuf)
@@ -131,7 +131,7 @@
/*
* fill data fields in default for decoder context
*/
-void_t WelsDecoderDefaults (PWelsDecoderContext pCtx) {+void WelsDecoderDefaults (PWelsDecoderContext pCtx) {int32_t iCpuCores = 1;
memset (pCtx, 0, sizeof (SWelsDecoderContext)); // fill zero first
@@ -177,11 +177,11 @@
* get size of reference picture list in target layer incoming, = (iNumRefFrames x 2)
*/
static inline int32_t GetTargetRefListSize (PWelsDecoderContext pCtx) {- bool_t* pSubsetSpsAvail = &pCtx->bSubspsAvailFlags[0];
- bool_t* pSpsAvail = &pCtx->bSpsAvailFlags[0];
+ bool* pSubsetSpsAvail = &pCtx->bSubspsAvailFlags[0];
+ bool* pSpsAvail = &pCtx->bSpsAvailFlags[0];
int32_t iSubsetIdx = -1;
int32_t iSpsIdx = -1;
- bool_t bExistSubsetSps = false;
+ bool bExistSubsetSps = false;
int32_t bExistSps = false;
int32_t iPos = MAX_SPS_COUNT - 1;
int32_t iNumRefFrames = 0;
@@ -238,7 +238,7 @@
int32_t iListIdx = 0; //, mb_blocks = 0;
int32_t iPicQueueSize = 0; // adaptive size of picture queue, = (pSps->iNumRefFrames x 2)
- bool_t bNeedChangePicQueue = true;
+ bool bNeedChangePicQueue = true;
WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pCtx || kiPicWidth <= 0 || kiPicHeight <= 0))
@@ -282,7 +282,7 @@
/*
* free memory blocks in avc
*/
-void_t WelsFreeMem (PWelsDecoderContext pCtx) {+void WelsFreeMem (PWelsDecoderContext pCtx) {int32_t iListIdx = 0;
/* TODO: free memory blocks introduced in avc */
@@ -308,7 +308,7 @@
/*!
* \brief Open decoder
*/
-void_t WelsOpenDecoder (PWelsDecoderContext pCtx) {+void WelsOpenDecoder (PWelsDecoderContext pCtx) {// function pointers
//initial MC function pointer--
InitMcFunc (& (pCtx->sMcFunc), pCtx->uiCpuFlag);
@@ -333,7 +333,7 @@
/*!
* \brief Close decoder
*/
-void_t WelsCloseDecoder (PWelsDecoderContext pCtx) {+void WelsCloseDecoder (PWelsDecoderContext pCtx) {WelsFreeMem (pCtx);
WelsFreeMemory (pCtx);
@@ -350,7 +350,7 @@
/*!
* \brief configure decoder parameters
*/
-int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const void_t* kpParam) {+int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const void* kpParam) {if (NULL == pCtx || NULL == kpParam)
return 1;
@@ -387,7 +387,7 @@
* \note N/A
*************************************************************************************
*/
-int32_t WelsInitDecoder (PWelsDecoderContext pCtx, void_t* pTraceHandle, PWelsLogCallbackFunc pLog) {+int32_t WelsInitDecoder (PWelsDecoderContext pCtx, void* pTraceHandle, PWelsLogCallbackFunc pLog) { if (pCtx == NULL) {return ERR_INFO_INVALID_PTR;
}
@@ -423,12 +423,12 @@
* \note N/A
*************************************************************************************
*/
-void_t WelsEndDecoder (PWelsDecoderContext pCtx) {+void WelsEndDecoder (PWelsDecoderContext pCtx) {// close decoder
WelsCloseDecoder (pCtx);
}
-void_t GetVclNalTemporalId (PWelsDecoderContext pCtx) {+void GetVclNalTemporalId (PWelsDecoderContext pCtx) {PAccessUnit pAccessUnit = pCtx->pAccessUnitList;
int32_t idx = pAccessUnit->uiStartPos;
@@ -661,7 +661,7 @@
return iErr;
}
-void_t AssignFuncPointerForRec (PWelsDecoderContext pCtx) {+void AssignFuncPointerForRec (PWelsDecoderContext pCtx) {pCtx->pGetI16x16LumaPredFunc[I16_PRED_V ] = WelsI16x16LumaPredV_c;
pCtx->pGetI16x16LumaPredFunc[I16_PRED_H ] = WelsI16x16LumaPredH_c;
pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC ] = WelsI16x16LumaPredDc_c;
--- a/codec/decoder/core/src/decoder_core.cpp
+++ b/codec/decoder/core/src/decoder_core.cpp
@@ -105,7 +105,7 @@
return 0;
}
-inline BOOL_T CheckSliceNeedReconstruct (int16_t iCurDid, int16_t iCurQid, bool_t bStoreRefBasePicFlag,
+inline bool CheckSliceNeedReconstruct (int16_t iCurDid, int16_t iCurQid, bool bStoreRefBasePicFlag,
uint8_t uiDidMax, uint8_t uiLayerDqId, uint8_t uiTargetDqId) {return ((iCurDid == uiDidMax) && (iCurQid == BASE_QUALITY_ID) && (bStoreRefBasePicFlag)) // store base
|| (uiLayerDqId == uiTargetDqId); // target layer
@@ -118,7 +118,7 @@
}
-inline void_t HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal) {+inline void HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal) { if (0 == pCurNal->sNalHeaderExt.uiTemporalId) {pCtx->bReferenceLostAtT0Flag = true;
}
@@ -130,7 +130,7 @@
pCtx->iErrorCode |= dsBitstreamError;
}
-inline void_t HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) {+inline void HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) { if ((0 == pCurNal->sNalHeaderExt.uiTemporalId) || (1 == pCurNal->sNalHeaderExt.uiTemporalId)) {pCtx->bReferenceLostAtT0Flag = true;
}
@@ -201,7 +201,7 @@
}
int32_t ParseDecRefPicMarking (PWelsDecoderContext pCtx, PBitStringAux pBs, PSliceHeader pSh, PSps pSps,
- const bool_t kbIdrFlag) {+ const bool kbIdrFlag) {PRefPicMarking const kpRefMarking = &pSh->sRefMarking;
if (kbIdrFlag) {@@ -238,7 +238,7 @@
return ERR_NONE;
}
-bool_t FillDefaultSliceHeaderExt (PSliceHeaderExt pShExt, PNalUnitHeaderExt pNalExt) {+bool FillDefaultSliceHeaderExt (PSliceHeaderExt pShExt, PNalUnitHeaderExt pNalExt) {if (pShExt == NULL || pNalExt == NULL)
return false;
@@ -309,7 +309,7 @@
* Free memory introduced in WelsInitMemory at destruction of decoder.
*
*/
-void_t WelsFreeMemory (PWelsDecoderContext pCtx) {+void WelsFreeMemory (PWelsDecoderContext pCtx) {if (pCtx == NULL)
return;
@@ -337,7 +337,7 @@
* pNal: target NALUnit ptr
* pSrc: NAL Unit bitstream
*/
-void_t DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {+void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {PNalUnitHeaderExt pHeaderExt = &pNal->sNalHeaderExt;
uint8_t uiCurByte = *pSrc;
@@ -392,7 +392,7 @@
}
int32_t CheckSpsId (PWelsDecoderContext pCtx, PSubsetSps* ppSubsetSps, PSps* ppSps, int32_t iSpsId,
- bool_t bExtensionFlag) {+ bool bExtensionFlag) {PSps pSpsList = pCtx->sSpsBuffer;
PSubsetSps pSubspsList = pCtx->sSubsetSpsBuffer;
@@ -455,7 +455,7 @@
* decode_slice_header_avc
* Parse slice header of bitstream in avc for storing data structure
*/
-int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool_t kbExtensionFlag) {+int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag) {PNalUnit const kpCurNal = pCtx->pAccessUnitList->pNalUnitsList[pCtx->pAccessUnitList->uiAvailUnitsNum - 1];
PNalUnitHeaderExt pNalHeaderExt = NULL;
@@ -469,8 +469,8 @@
int32_t iRet = ERR_NONE;
uint8_t uiSliceType = 0;
uint8_t uiQualityId = BASE_QUALITY_ID;
- bool_t bIdrFlag = false;
- bool_t bSgChangeCycleInvolved = false; // involved slice group change cycle ?
+ bool bIdrFlag = false;
+ bool bSgChangeCycleInvolved = false; // involved slice group change cycle ?
if (kpCurNal == NULL) {return ERR_INFO_OUT_OF_MEMORY;
@@ -484,7 +484,7 @@
if (pSliceHeadExt) {SRefBasePicMarking sBaseMarking;
- const bool_t kbStoreRefBaseFlag = pSliceHeadExt->bStoreRefBasePicFlag;
+ const bool kbStoreRefBaseFlag = pSliceHeadExt->bStoreRefBasePicFlag;
memcpy (&sBaseMarking, &pSliceHeadExt->sRefBasePicMarking, sizeof (SRefBasePicMarking)); //confirmed_safe_unsafe_usage
memset (pSliceHeadExt, 0, sizeof (SSliceHeaderExt));
pSliceHeadExt->bStoreRefBasePicFlag = kbStoreRefBaseFlag;
@@ -619,7 +619,7 @@
if (kbExtensionFlag) {uiQualityId = pNalHeaderExt->uiQualityId;
} else if (uiSliceType == P_SLICE || uiSliceType == SP_SLICE || uiSliceType == B_SLICE) {- const bool_t kbBipredFlag = (B_SLICE == uiSliceType);
+ const bool kbBipredFlag = (B_SLICE == uiSliceType);
if (kbBipredFlag) {WelsLog (pCtx, WELS_LOG_WARNING, "ParseSliceHeaderSyntaxs(): kbBipredFlag = 1 not supported.\n");
return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_BIPRED);
@@ -820,7 +820,7 @@
* pSrc: mark as decoded prefix NAL
* ppDst: succeeded VCL NAL based AVC (I/P Slice)
*/
-bool_t PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {+bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {PNalUnitHeaderExt pNalHdrExtD = NULL, pNalHdrExtS = NULL;
PSliceHeaderExt pShExtD = NULL;
PPrefixNalUnit pPrefixS = NULL;
@@ -1029,7 +1029,7 @@
return ERR_NONE;
}
-void_t UninitialDqLayersContext (PWelsDecoderContext pCtx) {+void UninitialDqLayersContext (PWelsDecoderContext pCtx) {int32_t i = 0;
int32_t j = 0;
@@ -1183,7 +1183,7 @@
pCtx->bInitialDqLayersMem = false;
}
-void_t ResetCurrentAccessUnit (PWelsDecoderContext pCtx) {+void ResetCurrentAccessUnit (PWelsDecoderContext pCtx) {PAccessUnit pCurAu = pCtx->pAccessUnitList;
pCurAu->uiEndPos = 0;
@@ -1211,7 +1211,7 @@
* \author
* \history 11/16/2009
*/
-void_t ForceResetCurrentAccessUnit (PAccessUnit pAu) {+void ForceResetCurrentAccessUnit (PAccessUnit pAu) {uint32_t uiSucAuIdx = pAu->uiEndPos + 1;
uint32_t uiCurAuIdx = 0;
@@ -1235,13 +1235,13 @@
}
//clear current corrupted NAL from pNalUnitsList
-void_t ForceClearCurrentNal (PAccessUnit pAu) {+void ForceClearCurrentNal (PAccessUnit pAu) {if (pAu->uiAvailUnitsNum > 0)
-- pAu->uiAvailUnitsNum;
}
-void_t CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStartIdx, int32_t iEndIdx) {+void CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStartIdx, int32_t iEndIdx) {PAccessUnit pCurAu = pCtx->pAccessUnitList;
uint8_t uiLastNuDependencyId, uiLastNuLayerDqId;
@@ -1284,7 +1284,7 @@
//main purpose: to support multi-slice and to include all slice which have the same uiDependencyId, uiQualityId and frame_num
//for single slice, pIdxNoInterLayerPred SHOULD NOT be modified
-void_t RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerPred) {+void RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerPred) {int32_t iLastNalDependId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiDependencyId;
int32_t iLastNalQualityId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiQualityId;
uint8_t uiLastNalTId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiTemporalId;
@@ -1297,7 +1297,7 @@
int32_t iCurNalDependId, iCurNalQualityId, iCurNalTId, iCurNalFrameNum, iCurNalPoc, iCurNalFirstMb, iCurIdx,
iFinalIdxNoInterLayerPred;
- bool_t bMultiSliceFind = false;
+ bool bMultiSliceFind = false;
iFinalIdxNoInterLayerPred = 0;
iCurIdx = *pIdxNoInterLayerPred - 1;
@@ -1332,7 +1332,7 @@
}
}
-bool_t CheckPocOfCurValidNalUnits (PAccessUnit pCurAu, int32_t pIdxNoInterLayerPred) {+bool CheckPocOfCurValidNalUnits (PAccessUnit pCurAu, int32_t pIdxNoInterLayerPred) {int32_t iEndIdx = pCurAu->uiEndPos;
int32_t iCurAuPoc =
pCurAu->pNalUnitsList[pIdxNoInterLayerPred]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iPicOrderCntLsb;
@@ -1347,7 +1347,7 @@
return true;
}
-bool_t CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) {+bool CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) {PAccessUnit pCurAu = pCtx->pAccessUnitList;
const int32_t kiEndPos = pCurAu->uiEndPos;
int32_t iIdxNoInterLayerPred = 0;
@@ -1391,7 +1391,7 @@
pCurAu->pNalUnitsList[pCurAu->uiEndPos]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iMbHeight << 4;
} else { //P_SLICE//step 1: search uiDependencyId equal to pCtx->cur_seq_interval_target_dependency_id
- bool_t bGetDependId = false;
+ bool bGetDependId = false;
int32_t iIdxDependId = 0;
iIdxDependId = kiEndPos;
@@ -1406,7 +1406,7 @@
//step 2: switch according to whether or not find the index of pNalUnit whose uiDependencyId equal to iCurSeqIntervalTargetDependId
if (bGetDependId) { //get the index of pNalUnit whose uiDependencyId equal to iCurSeqIntervalTargetDependId- bool_t bGetNoInterPredFront = false;
+ bool bGetNoInterPredFront = false;
//step 2a: search iNoInterLayerPredFlag [0....iIdxDependId]
iIdxNoInterLayerPred = iIdxDependId;
while (iIdxNoInterLayerPred >= 0) {@@ -1471,7 +1471,7 @@
return true;
}
-void_t CheckOnlyOneLayerInAu (PWelsDecoderContext pCtx) {+void CheckOnlyOneLayerInAu (PWelsDecoderContext pCtx) {PAccessUnit pCurAu = pCtx->pAccessUnitList;
int32_t iEndIdx = pCurAu->uiEndPos;
@@ -1524,7 +1524,7 @@
return ERR_NONE;
}
-void_t WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx) {+void WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx) {// uninitialize context of current access unit and rbsp buffer clean
ResetCurrentAccessUnit (pCtx);
}
@@ -1596,7 +1596,7 @@
return 0;
}
-static inline void_t InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, PNalUnit pNalUnit, PPicture pPicDec) {+static inline void InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, PNalUnit pNalUnit, PPicture pPicDec) {PNalUnitHeaderExt pNalHdrExt = &pNalUnit->sNalHeaderExt;
PSliceHeaderExt pShExt = &pNalUnit->sNalData.sVclNal.sSliceHeaderExt;
PSliceHeader pSh = &pShExt->sSliceHeader;
@@ -1634,7 +1634,7 @@
pDqLayer->bUseRefBasePicFlag = pNalHdrExt->bUseRefBasePicFlag;
}
-void_t WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps) {+void WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps) {SNalUnitHeader* pNalHdr = &pCurNal->sNalHeaderExt.sNalUnitHeader;
PSliceHeader pSh = &pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
@@ -1650,7 +1650,7 @@
}
}
-int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, const bool_t kbFirstSlice, int32_t iPoc) {+int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, const bool kbFirstSlice, int32_t iPoc) {int32_t iRet = ERR_NONE;
if (kbFirstSlice)
iRet = WelsInitRefList (pCtx, iPoc);
@@ -1661,7 +1661,7 @@
return iRet;
}
-void_t InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) {+void InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) { if (NULL != pCtx && NULL != pCurDq) {pCurDq->pCsData[0] = pCtx->pCsListXchg[0][0];
pCurDq->pCsData[1] = pCtx->pCsListXchg[0][1];
@@ -1691,7 +1691,7 @@
// added to reset state of parameter sets to waiting successive incoming IDR, 6/4/2010
// It will be called in case packets lost/ broken and decoded failed at temporal level 0
-void_t ResetParameterSetsState (PWelsDecoderContext pCtx) {+void ResetParameterSetsState (PWelsDecoderContext pCtx) {pCtx->bSpsExistAheadFlag = false;
pCtx->bSubspsExistAheadFlag = false;
pCtx->bPpsExistAheadFlag = false;
@@ -1718,7 +1718,7 @@
int16_t iLastIdD = -1, iLastIdQ = -1;
int16_t iCurrIdD = 0, iCurrIdQ = 0;
uint8_t uiNalRefIdc = 0;
- bool_t bFreshSliceAvailable =
+ bool bFreshSliceAvailable =
true; // Another fresh slice comingup for given dq layer, for multiple slices in case of header parts of slices sometimes loss over error-prone channels, 8/14/2008
PPicture pStoreBasePic = NULL;
@@ -1774,7 +1774,7 @@
* Loop decoding for slices (even FMO and/ multiple slices) within a dq layer
*/
while (iIdx <= iEndIdx) {- BOOL_T bReconstructSlice;
+ bool bReconstructSlice;
iCurrIdQ = pNalCur->sNalHeaderExt.uiQualityId;
iCurrIdD = pNalCur->sNalHeaderExt.uiDependencyId;
pSh = &pNalCur->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
@@ -1823,7 +1823,7 @@
InitDqLayerInfo (dq_cur, &pLayerInfo, pNalCur, pCtx->pDec);
if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) {- const bool_t kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
+ const bool kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
|| (dq_cur->sLayerInfo.sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR);
// Subclause 8.2.5.2 Decoding process for gaps in frame_num
if (!kbIdrFlag &&
--- a/codec/decoder/core/src/expand_pic.cpp
+++ b/codec/decoder/core/src/expand_pic.cpp
@@ -37,7 +37,7 @@
namespace WelsDec {// rewrite it (split into luma & chroma) that is helpful for mmx/sse2 optimization perform, 9/27/2009
-static inline void_t ExpandPictureLuma_c (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicWidth,
+static inline void ExpandPictureLuma_c (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicWidth,
const int32_t kiPicHeight) {uint8_t* pTmp = pDst;
uint8_t* pDstLastLine = pTmp + (kiPicHeight - 1) * kiStride;
@@ -77,7 +77,7 @@
} while (i < kiPicHeight);
}
-static inline void_t ExpandPictureChroma_c (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicWidth,
+static inline void ExpandPictureChroma_c (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicWidth,
const int32_t kiPicHeight) {uint8_t* pTmp = pDst;
uint8_t* pDstLastLine = pTmp + (kiPicHeight - 1) * kiStride;
@@ -117,7 +117,7 @@
} while (i < kiPicHeight);
}
-void_t InitExpandPictureFunc (SExpandPicFunc* pExpandPicFunc, const uint32_t kuiCpuFlags) {+void InitExpandPictureFunc (SExpandPicFunc* pExpandPicFunc, const uint32_t kuiCpuFlags) {pExpandPicFunc->pExpandLumaPicture = ExpandPictureLuma_c;
pExpandPicFunc->pExpandChromaPicture[0] = ExpandPictureChroma_c;
pExpandPicFunc->pExpandChromaPicture[1] = ExpandPictureChroma_c;
@@ -131,7 +131,7 @@
#endif//X86_ASM
}
-void_t ExpandReferencingPicture (PPicture pPic, PExpandPictureFunc pExpLuma, PExpandPictureFunc pExpChroma[2]) {+void ExpandReferencingPicture (PPicture pPic, PExpandPictureFunc pExpLuma, PExpandPictureFunc pExpChroma[2]) {/*local variable*/
uint8_t* pPicY = pPic->pData[0];
uint8_t* pPicCb = pPic->pData[1];
@@ -144,7 +144,7 @@
pExpLuma (pPicY, pPic->iLinesize[0], kiWidthY, kiHeightY);
if (kiWidthUV >= 16) {// fix coding picture size as 16x16 issues 7/27/2010
- const bool_t kbChrAligned = /*(kiWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+kiWidthUV) & 15
+ const bool kbChrAligned = /*(kiWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+kiWidthUV) & 15
pExpChroma[kbChrAligned] (pPicCb, pPic->iLinesize[1], kiWidthUV, kiHeightUV);
pExpChroma[kbChrAligned] (pPicCr, pPic->iLinesize[2], kiWidthUV, kiHeightUV);
} else {--- a/codec/decoder/core/src/fmo.cpp
+++ b/codec/decoder/core/src/fmo.cpp
@@ -119,7 +119,7 @@
const int32_t kiMbHeight) {int32_t iNumMb = 0;
int32_t iErr = 0;
- bool_t bResolutionChanged = false;
+ bool bResolutionChanged = false;
// the cases we would not like
WELS_VERIFY_RETURN_IF (1, (NULL == pFmo || NULL == kpPps))
@@ -200,7 +200,7 @@
*
* \return NONE
*/
-void_t UninitFmoList (PFmo pFmo, const int32_t kiCnt, const int32_t kiAvail) {+void UninitFmoList (PFmo pFmo, const int32_t kiCnt, const int32_t kiAvail) {PFmo pIter = pFmo;
int32_t i = 0;
int32_t iFreeNodes = 0;
@@ -238,7 +238,7 @@
*
* \return true - changed or not initialized yet; false - not change at all
*/
-bool_t FmoParamSetsChanged (PFmo pFmo, const int32_t kiCountNumMb, const int32_t kiSliceGroupType,
+bool FmoParamSetsChanged (PFmo pFmo, const int32_t kiCountNumMb, const int32_t kiSliceGroupType,
const int32_t kiSliceGroupCount) {WELS_VERIFY_RETURN_IF (false, (NULL == pFmo))
@@ -258,7 +258,7 @@
*
* \return true - update/insert successfully; false - failed;
*/
-bool_t FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum) {+bool FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum) {const uint32_t kuiMbWidth = pSps->iMbWidth;
const uint32_t kuiMbHeight = pSps->iMbHeight;
@@ -330,4 +330,4 @@
return iNextMb;
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/get_intra_predictor.cpp
+++ b/codec/decoder/core/src/get_intra_predictor.cpp
@@ -51,7 +51,7 @@
#define I8x8_COUNT 8
#define I16x16_COUNT 16
-void_t WelsI4x4LumaPredV_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredV_c (uint8_t* pPred, const int32_t kiStride) {const uint32_t kuiVal = LD32 (pPred - kiStride);
ST32 (pPred , kuiVal);
@@ -60,7 +60,7 @@
ST32 (pPred + (kiStride << 1) + kiStride , kuiVal);
}
-void_t WelsI4x4LumaPredH_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredH_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride2 + kiStride;
const uint32_t kuiL0 = 0x01010101U * pPred[-1 ];
@@ -74,7 +74,7 @@
ST32 (pPred + kiStride3, kuiL3);
}
-void_t WelsI4x4LumaPredDc_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredDc_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride2 + kiStride;
const uint8_t kuiMean = (pPred[-1] + pPred[-1 + kiStride] + pPred[-1 + kiStride2] + pPred[-1 + kiStride3] +
@@ -87,7 +87,7 @@
ST32 (pPred + kiStride3, kuiMean32);
}
-void_t WelsI4x4LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride2 + kiStride;
const uint8_t kuiMean = (pPred[-1] + pPred[-1 + kiStride] + pPred[-1 + kiStride2] + pPred[-1 + kiStride3] + 2) >> 2;
@@ -99,7 +99,7 @@
ST32 (pPred + kiStride3, kuiMean32);
}
-void_t WelsI4x4LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride2 + kiStride;
const uint8_t kuiMean = (pPred[-kiStride] + pPred[-kiStride + 1] + pPred[-kiStride + 2] + pPred[-kiStride + 3] + 2) >>
@@ -112,7 +112,7 @@
ST32 (pPred + kiStride3, kuiMean32);
}
-void_t WelsI4x4LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {const uint32_t kuiDC32 = 0x80808080U;
ST32 (pPred , kuiDC32);
@@ -122,7 +122,7 @@
}
/*down pLeft*/
-void_t WelsI4x4LumaPredDDL_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredDDL_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride + kiStride2;
/*get pTop*/
@@ -151,7 +151,7 @@
}
/*down pLeft*/
-void_t WelsI4x4LumaPredDDLTop_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredDDLTop_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride + kiStride2;
/*get pTop*/
@@ -178,7 +178,7 @@
/*down right*/
-void_t WelsI4x4LumaPredDDR_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredDDR_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride + kiStride2;
uint8_t* ptopleft = &pPred[- (kiStride + 1)];
@@ -218,7 +218,7 @@
/*vertical pLeft*/
-void_t WelsI4x4LumaPredVL_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredVL_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride + kiStride2;
uint8_t* ptopleft = &pPred[- (kiStride + 1)];
@@ -255,7 +255,7 @@
}
/*vertical pLeft*/
-void_t WelsI4x4LumaPredVLTop_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredVLTop_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride + kiStride2;
uint8_t* ptopleft = &pPred[- (kiStride + 1)];
@@ -286,7 +286,7 @@
/*vertical right*/
-void_t WelsI4x4LumaPredVR_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredVR_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride + kiStride2;
const uint8_t kuiLT = pPred[-kiStride - 1];
@@ -317,7 +317,7 @@
}
/*horizontal up*/
-void_t WelsI4x4LumaPredHU_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredHU_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride + kiStride2;
/*get pLeft*/
@@ -343,7 +343,7 @@
}
/*horizontal down*/
-void_t WelsI4x4LumaPredHD_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI4x4LumaPredHD_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride3 = kiStride + kiStride2;
const uint8_t kuiLT = pPred[- (kiStride + 1)];
@@ -380,7 +380,7 @@
ST32 (pPred + kiStride3, LD32 (kuiList));
}
-void_t WelsIChromaPredV_c (uint8_t* pPred, const int32_t kiStride) {+void WelsIChromaPredV_c (uint8_t* pPred, const int32_t kiStride) {const uint64_t kuiVal64 = LD64 (&pPred[-kiStride]);
const int32_t kiStride2 = kiStride << 1;
const int32_t kiStride4 = kiStride2 << 1;
@@ -395,7 +395,7 @@
ST64 (pPred + (kiStride << 3) - kiStride , kuiVal64);
}
-void_t WelsIChromaPredH_c (uint8_t* pPred, const int32_t kiStride) {+void WelsIChromaPredH_c (uint8_t* pPred, const int32_t kiStride) {int32_t iTmp = (kiStride << 3) - kiStride;
uint8_t i = 7;
@@ -410,7 +410,7 @@
}
-void_t WelsIChromaPredPlane_c (uint8_t* pPred, const int32_t kiStride) {+void WelsIChromaPredPlane_c (uint8_t* pPred, const int32_t kiStride) {int32_t a = 0, b = 0, c = 0, H = 0, V = 0;
int32_t i, j;
uint8_t* pTop = &pPred[-kiStride];
@@ -436,7 +436,7 @@
}
-void_t WelsIChromaPredDc_c (uint8_t* pPred, const int32_t kiStride) {+void WelsIChromaPredDc_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiL1 = kiStride - 1;
const int32_t kiL2 = kiL1 + kiStride;
const int32_t kiL3 = kiL2 + kiStride;
@@ -467,7 +467,7 @@
ST64 (pPred + kiL7 + 1, kuiDN64);
}
-void_t WelsIChromaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {+void WelsIChromaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {const int32_t kiL1 = -1 + kiStride;
const int32_t kiL2 = kiL1 + kiStride;
const int32_t kiL3 = kiL2 + kiStride;
@@ -491,7 +491,7 @@
ST64 (pPred + kiL7 + 1, kuiDN64);
}
-void_t WelsIChromaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {+void WelsIChromaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {int32_t iTmp = (kiStride << 3) - kiStride;
/*caculate the kMean value*/
const uint8_t kuiM1 = (pPred[-kiStride] + pPred[1 - kiStride] + pPred[2 - kiStride] + pPred[3 - kiStride] + 2) >> 2;
@@ -508,7 +508,7 @@
} while (i-- > 0);
}
-void_t WelsIChromaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {+void WelsIChromaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {int32_t iTmp = (kiStride << 3) - kiStride;
const uint64_t kuiDC64 = 0x8080808080808080ULL;
uint8_t i = 7;
@@ -520,7 +520,7 @@
} while (i-- > 0);
}
-void_t WelsI16x16LumaPredV_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI16x16LumaPredV_c (uint8_t* pPred, const int32_t kiStride) {int32_t iTmp = (kiStride << 4) - kiStride;
const uint64_t kuiTop1 = LD64 (pPred - kiStride);
const uint64_t kuiTop2 = LD64 (pPred - kiStride + 8);
@@ -534,7 +534,7 @@
} while (i-- > 0);
}
-void_t WelsI16x16LumaPredH_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI16x16LumaPredH_c (uint8_t* pPred, const int32_t kiStride) {int32_t iTmp = (kiStride << 4) - kiStride;
uint8_t i = 15;
@@ -549,7 +549,7 @@
} while (i-- > 0);
}
-void_t WelsI16x16LumaPredPlane_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI16x16LumaPredPlane_c (uint8_t* pPred, const int32_t kiStride) {int32_t a = 0, b = 0, c = 0, H = 0, V = 0;
int32_t i, j;
uint8_t* pTop = &pPred[-kiStride];
@@ -574,7 +574,7 @@
}
}
-void_t WelsI16x16LumaPredDc_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI16x16LumaPredDc_c (uint8_t* pPred, const int32_t kiStride) {int32_t iTmp = (kiStride << 4) - kiStride;
int32_t iSum = 0;
uint8_t i = 15;
@@ -596,7 +596,7 @@
}
-void_t WelsI16x16LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI16x16LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {int32_t iTmp = (kiStride << 4) - kiStride;
int32_t iSum = 0;
uint8_t i = 15;
@@ -615,7 +615,7 @@
} while (i-- > 0);
}
-void_t WelsI16x16LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI16x16LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {int32_t iTmp = (kiStride << 4) - kiStride;
int32_t iSum = 0;
uint64_t uiMean64 = 0;
@@ -640,7 +640,7 @@
} while (i-- > 0);
}
-void_t WelsI16x16LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {+void WelsI16x16LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {const uint64_t kuiDC64 = 0x8080808080808080ULL;
int32_t iTmp = (kiStride << 4) - kiStride;
uint8_t i = 15;
@@ -653,4 +653,4 @@
} while (i-- > 0);
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/manage_dec_ref.cpp
+++ b/codec/decoder/core/src/manage_dec_ref.cpp
@@ -44,7 +44,7 @@
namespace WelsDec {-static void_t SetUnRef (PPicture pRef) {+static void SetUnRef (PPicture pRef) { if (NULL != pRef) {pRef->bUsedAsRef = false;
pRef->bIsLongRef = false;
@@ -63,7 +63,7 @@
// 1.sps arrived that is new sequence starting
// 2.IDR NAL i.e. 1st layer in IDR AU
-void_t WelsResetRefPic (PWelsDecoderContext pCtx) {+void WelsResetRefPic (PWelsDecoderContext pCtx) {int32_t i = 0;
PRefPic pRefPic = &pCtx->sRefPic;
pCtx->sRefPic.uiLongRefCount[0] = pCtx->sRefPic.uiShortRefCount[0] = 0;
@@ -92,7 +92,7 @@
*/
int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc) {int32_t i, j, iCount = 0;
- const bool_t kbUseRefBasePicFlag = pCtx->pCurDqLayer->bUseRefBasePicFlag;
+ const bool kbUseRefBasePicFlag = pCtx->pCurDqLayer->bUseRefBasePicFlag;
PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0];
PPicture* ppLongRefList = pCtx->sRefPic.pLongRefList[LIST_0];
memset (pCtx->sRefPic.pRefList[LIST_0], 0, MAX_REF_PIC_COUNT * sizeof (PPicture));
@@ -215,12 +215,12 @@
return ERR_NONE;
}
-int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool_t kbRefBaseMarkingFlag) {+int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool kbRefBaseMarkingFlag) {PRefPic pRefPic = &pCtx->sRefPic;
PRefPicMarking pRefPicMarking = pCtx->pCurDqLayer->pRefPicMarking;
PRefBasePicMarking pRefPicBaseMarking = pCtx->pCurDqLayer->pRefPicBaseMarking;
PAccessUnit pCurAU = pCtx->pAccessUnitList;
- bool_t bIsIDRAU = FALSE;
+ bool bIsIDRAU = false;
uint32_t j;
int32_t iRet = ERR_NONE;
@@ -228,7 +228,7 @@
return ERR_INFO_INVALID_MMCO_REF_NUM_NOT_ENOUGH;
}
- pCtx->pDec->bUsedAsRef = TRUE;
+ pCtx->pDec->bUsedAsRef = true;
pCtx->pDec->uiQualityId = pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.uiQualityId;
pCtx->pDec->uiTemporalId = pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.uiTemporalId;
pCtx->pDec->bRefBaseFlag = kbRefBaseMarkingFlag;
@@ -236,7 +236,7 @@
for (j = pCurAU->uiStartPos; j <= pCurAU->uiEndPos; j++) {if (pCurAU->pNalUnitsList[j]->sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR
|| pCurAU->pNalUnitsList[j]->sNalHeaderExt.bIdrFlag) {- bIsIDRAU = TRUE;
+ bIsIDRAU = true;
break;
}
}
@@ -290,7 +290,7 @@
if (uiMmcoType > MMCO_LONG2UNUSED) {return ERR_INFO_INVALID_MMCO_OPCODE_BASE;
}
- iRet = MMCOProcess (pCtx, uiMmcoType, TRUE, iShortFrameNum, uiLongTermPicNum, 0, 0);
+ iRet = MMCOProcess (pCtx, uiMmcoType, true, iShortFrameNum, uiLongTermPicNum, 0, 0);
if (iRet != ERR_NONE) {return iRet;
@@ -314,7 +314,7 @@
if (uiMmcoType > MMCO_LONG) {return ERR_INFO_INVALID_MMCO_OPCODE_BASE;
}
- iRet = MMCOProcess (pCtx, uiMmcoType, FALSE, iShortFrameNum, uiLongTermPicNum, iLongTermFrameIdx, iMaxLongTermFrameIdx);
+ iRet = MMCOProcess (pCtx, uiMmcoType, false, iShortFrameNum, uiLongTermPicNum, iLongTermFrameIdx, iMaxLongTermFrameIdx);
if (iRet != ERR_NONE) {return iRet;
}
@@ -322,7 +322,7 @@
return ERR_NONE;
}
-static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool_t bRefBasePic,
+static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool bRefBasePic,
int32_t iShortFrameNum, uint32_t uiLongTermPicNum , int32_t iLongTermFrameIdx, int32_t iMaxLongTermFrameIdx) {PRefPic pRefPic = &pCtx->sRefPic;
PPicture pPic = NULL;
@@ -450,8 +450,8 @@
if (((eRemoveFlag == REMOVE_TARGET) && ! (pPic->bRefBaseFlag)) || ((eRemoveFlag == REMOVE_BASE)
&& pPic->bRefBaseFlag)) {int32_t iMoveSize = pRefPic->uiLongRefCount[LIST_0] - i - 1;
- pPic->bUsedAsRef = FALSE;
- pPic->bIsLongRef = FALSE;
+ pPic->bUsedAsRef = false;
+ pPic->bIsLongRef = false;
if (iMoveSize > 0) {memmove (&pRefPic->pLongRefList[LIST_0][i], &pRefPic->pLongRefList[LIST_0][i + 1],
iMoveSize * sizeof (PPicture)); //confirmed_safe_unsafe_usage
@@ -474,8 +474,8 @@
}
static int32_t AddShortTermToList (PRefPic pRefPic, PPicture pPic) {- pPic->bUsedAsRef = TRUE;
- pPic->bIsLongRef = FALSE;
+ pPic->bUsedAsRef = true;
+ pPic->bIsLongRef = false;
pPic->iLongTermFrameIdx = -1;
if (pRefPic->uiShortRefCount[LIST_0] > 0) {memmove (&pRefPic->pShortRefList[LIST_0][1], &pRefPic->pShortRefList[LIST_0][0],
@@ -489,8 +489,8 @@
static int32_t AddLongTermToList (PRefPic pRefPic, PPicture pPic, int32_t iLongTermFrameIdx) {int32_t i = 0;
- pPic->bUsedAsRef = TRUE;
- pPic->bIsLongRef = TRUE;
+ pPic->bUsedAsRef = true;
+ pPic->bIsLongRef = true;
pPic->iLongTermFrameIdx = iLongTermFrameIdx;
if (pRefPic->uiLongRefCount[LIST_0] == 0) {pRefPic->pLongRefList[LIST_0][pRefPic->uiLongRefCount[LIST_0]] = pPic;
@@ -551,4 +551,4 @@
return iRet;
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/mc.cpp
+++ b/codec/decoder/core/src/mc.cpp
@@ -84,13 +84,13 @@
}
};
-typedef void_t (*PWelsMcWidthHeightFunc) (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+typedef void (*PWelsMcWidthHeightFunc) (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight);
//***************************************************************************//
// C code implementation //
//***************************************************************************//
-static inline void_t McCopyWidthEq2_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McCopyWidthEq2_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iHeight) {int32_t i;
for (i = 0; i < iHeight; i++) { // iWidth == 2 only for chroma@@ -100,7 +100,7 @@
}
}
-static inline void_t McCopyWidthEq4_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McCopyWidthEq4_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iHeight) {int32_t i;
for (i = 0; i < iHeight; i++) {@@ -110,7 +110,7 @@
}
}
-static inline void_t McCopyWidthEq8_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McCopyWidthEq8_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iHeight) {int32_t i;
for (i = 0; i < iHeight; i++) {@@ -120,7 +120,7 @@
}
}
-static inline void_t McCopyWidthEq16_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McCopyWidthEq16_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iHeight) {int32_t i;
for (i = 0; i < iHeight; i++) {@@ -152,7 +152,7 @@
return (kuiPix05 - ((kuiPix14 << 2) + kuiPix14) + (kuiPix23 << 4) + (kuiPix23 << 2));
}
-static inline void_t PixelAvg_c (uint8_t* pDst, int32_t iDstStride, uint8_t* pSrcA, int32_t iSrcAStride,
+static inline void PixelAvg_c (uint8_t* pDst, int32_t iDstStride, uint8_t* pSrcA, int32_t iSrcAStride,
uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) {int32_t i, j;
for (i = 0; i < iHeight; i++) {@@ -164,7 +164,7 @@
pSrcB += iSrcBStride;
}
}
-static inline void_t McCopy_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McCopy_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) {if (iWidth == 16)
McCopyWidthEq16_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
@@ -176,7 +176,7 @@
McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
}
-static inline void_t McHorVer20_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer20_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) {int32_t i, j;
for (i = 0; i < iHeight; i++) {@@ -188,7 +188,7 @@
}
}
-static inline void_t McHorVer02_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer02_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) {int32_t i, j;
for (i = 0; i < iHeight; i++) {@@ -200,7 +200,7 @@
}
}
-static inline void_t McHorVer22_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer22_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { int16_t iTmp[16 + 5] = {0}; //16int32_t i, j, k;
@@ -218,25 +218,25 @@
}
/////////////////////luma MC//////////////////////////
-static inline void_t McHorVer01_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer01_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiTmp[256] = { 0 };McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer03_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer03_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiTmp[256] = { 0 };McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, uiTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer10_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer10_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiTmp[256] = { 0 };McHorVer20_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer11_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer11_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiHorTmp[256] = { 0 }; uint8_t uiVerTmp[256] = { 0 };@@ -244,7 +244,7 @@
McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer12_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer12_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiVerTmp[256] = { 0 }; uint8_t uiCtrTmp[256] = { 0 };@@ -252,7 +252,7 @@
McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer13_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer13_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiHorTmp[256] = { 0 }; uint8_t uiVerTmp[256] = { 0 };@@ -260,7 +260,7 @@
McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer21_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer21_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiHorTmp[256] = { 0 }; uint8_t uiCtrTmp[256] = { 0 };@@ -268,7 +268,7 @@
McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer23_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer23_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiHorTmp[256] = { 0 }; uint8_t uiCtrTmp[256] = { 0 };@@ -276,13 +276,13 @@
McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer30_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer30_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiHorTmp[256] = { 0 };McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, pSrc + 1, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer31_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer31_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiHorTmp[256] = { 0 }; uint8_t uiVerTmp[256] = { 0 };@@ -290,7 +290,7 @@
McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer32_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer32_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiVerTmp[256] = { 0 }; uint8_t uiCtrTmp[256] = { 0 };@@ -298,7 +298,7 @@
McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
}
-static inline void_t McHorVer33_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McHorVer33_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) { uint8_t uiHorTmp[256] = { 0 }; uint8_t uiVerTmp[256] = { 0 };@@ -307,7 +307,7 @@
PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
}
-void_t McLuma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+void McLuma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight)
//pSrc has been added the offset of mv
{@@ -321,7 +321,7 @@
pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
}
-static inline void_t McChromaWithFragMv_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McChromaWithFragMv_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {int32_t i, j;
int32_t iA, iB, iC, iD;
@@ -341,7 +341,7 @@
}
}
-void_t McChroma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+void McChroma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight)
//pSrc has been added the offset of mv
{@@ -357,7 +357,7 @@
//***************************************************************************//
// SSE2 implement //
//***************************************************************************//
-static inline void_t McHorVer22WidthEq8_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer22WidthEq8_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iHeight) {ENFORCE_STACK_ALIGN_2D (int16_t, iTap, 21, 8, 16)
McHorVer22Width8HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)iTap, 16, iHeight + 5);
@@ -364,19 +364,19 @@
McHorVer22Width8VerLastAlign_sse2 ((uint8_t*)iTap, 16, pDst, iDstStride, 8, iHeight);
}
-static inline void_t McHorVer02WidthEq16_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer02WidthEq16_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iHeight) {McHorVer02WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
McHorVer02WidthEq8_sse2 (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight);
}
-static inline void_t McHorVer22WidthEq16_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer22WidthEq16_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iHeight) {McHorVer22WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
McHorVer22WidthEq8_sse2 (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight);
}
-static inline void_t McCopy_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+static inline void McCopy_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
int32_t iHeight) {if (iWidth == 16)
McCopyWidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
@@ -388,7 +388,7 @@
McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
}
-static inline void_t McHorVer20_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer20_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {if (iWidth == 16)
McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
@@ -398,7 +398,7 @@
McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pDst, iDstStride, iHeight);
}
-static inline void_t McHorVer02_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer02_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {if (iWidth == 16)
McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
@@ -408,7 +408,7 @@
McHorVer02_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight);
}
-static inline void_t McHorVer22_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer22_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {if (iWidth == 16)
McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
@@ -418,7 +418,7 @@
McHorVer22_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight);
}
-static inline void_t McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
if (iWidth == 16) {@@ -432,7 +432,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
}
}
-static inline void_t McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
if (iWidth == 16) {@@ -446,7 +446,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);
}
}
-static inline void_t McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
if (iWidth == 16) {@@ -460,7 +460,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
}
}
-static inline void_t McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
@@ -478,7 +478,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
}
}
-static inline void_t McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
@@ -496,7 +496,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
}
}
-static inline void_t McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
@@ -514,7 +514,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
}
}
-static inline void_t McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
@@ -532,7 +532,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
}
}
-static inline void_t McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
@@ -550,7 +550,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
}
}
-static inline void_t McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
if (iWidth == 16) {@@ -564,7 +564,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);
}
}
-static inline void_t McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
@@ -582,7 +582,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
}
}
-static inline void_t McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
@@ -600,7 +600,7 @@
PixelAvgWidthEq4_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
}
}
-static inline void_t McHorVer33_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+static inline void McHorVer33_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int32_t iWidth, int32_t iHeight) {ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
@@ -619,7 +619,7 @@
}
}
-void_t McLuma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+void McLuma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight)
//pSrc has been added the offset of mv
{@@ -633,7 +633,7 @@
pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
}
-void_t McChroma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+void McChroma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) { static const PMcChromaWidthExtFunc kpMcChromaWidthFuncs[2] = {McChromaWidthEq4_mmx,
@@ -654,7 +654,7 @@
#endif //X86_ASM
-void_t InitMcFunc (SMcFunc* pMcFunc, int32_t iCpu) {+void InitMcFunc (SMcFunc* pMcFunc, int32_t iCpu) {pMcFunc->pMcLumaFunc = McLuma_c;
pMcFunc->pMcChromaFunc = McChroma_c;
--- a/codec/decoder/core/src/mem_align.cpp
+++ b/codec/decoder/core/src/mem_align.cpp
@@ -44,8 +44,8 @@
#endif
//
-void_t* WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) {- const int32_t kiSizeVoidPtr = sizeof (void_t**);
+void* WelsMalloc (const uint32_t kuiSize, const char* kpTag) {+ const int32_t kiSizeVoidPtr = sizeof (void**);
const int32_t kiSizeInt = sizeof (int32_t);
const int32_t kiAlignBytes = 15;
uint8_t* pBuf = (uint8_t*) malloc (kuiSize + kiAlignBytes + kiSizeVoidPtr + kiSizeInt);
@@ -59,7 +59,7 @@
if (kpTag != NULL) { if (pMemCheckMalloc != NULL) {- fprintf (pMemCheckMalloc, "0x%x, size: %d , malloc %s\n", (void_t*)pBuf,
+ fprintf (pMemCheckMalloc, "0x%x, size: %d , malloc %s\n", (void*)pBuf,
(kuiSize + kiAlignBytes + kiSizeVoidPtr + kiSizeInt), kpTag);
}
if (pMemCheckMalloc != NULL) {@@ -76,7 +76,7 @@
pAlignBuf = pBuf + kiAlignBytes + kiSizeVoidPtr + kiSizeInt;
pAlignBuf -= (uintptr_t) pAlignBuf & kiAlignBytes;
- * ((void_t**) (pAlignBuf - kiSizeVoidPtr)) = pBuf;
+ * ((void**) (pAlignBuf - kiSizeVoidPtr)) = pBuf;
* ((int32_t*) (pAlignBuf - (kiSizeVoidPtr + kiSizeInt))) = kuiSize;
return (pAlignBuf);
@@ -84,15 +84,15 @@
/////////////////////////////////////////////////////////////////////////////
-void_t WelsFree (void_t* pPtr, const str_t* kpTag) {+void WelsFree (void* pPtr, const char* kpTag) { if (pPtr) {#ifdef MEMORY_CHECK
if (NULL != pMemCheckFree && kpTag != NULL) {- fprintf (pMemCheckFree, "0x%x, free %s\n", (void_t*) (* (((void_t**) pPtr) - 1)), kpTag);
+ fprintf (pMemCheckFree, "0x%x, free %s\n", (void*) (* (((void**) pPtr) - 1)), kpTag);
fflush (pMemCheckFree);
}
#endif
- free (* (((void_t**) pPtr) - 1));
+ free (* (((void**) pPtr) - 1));
}
}
--- a/codec/decoder/core/src/memmgr_nal_unit.cpp
+++ b/codec/decoder/core/src/memmgr_nal_unit.cpp
@@ -143,4 +143,4 @@
return pNu;
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/mv_pred.cpp
+++ b/codec/decoder/core/src/mv_pred.cpp
@@ -43,8 +43,8 @@
#include "mb_cache.h"
namespace WelsDec {-void_t PredPSkipMvFromNeighbor (PDqLayer pCurLayer, int16_t iMvp[2]) {- bool_t bTopAvail, bLeftTopAvail, bRightTopAvail, bLeftAvail;
+void PredPSkipMvFromNeighbor (PDqLayer pCurLayer, int16_t iMvp[2]) {+ bool bTopAvail, bLeftTopAvail, bRightTopAvail, bLeftAvail;
int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;
int32_t iLeftTopType, iRightTopType, iTopType, iLeftType;
@@ -194,7 +194,7 @@
//basic iMVs prediction unit for iMVs partition width (4, 2, 1)
-void_t PredMv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+void PredMv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int32_t iPartWidth, int8_t iRef, int16_t iMVP[2]) {const uint8_t kuiLeftIdx = g_kuiCache30ScanIdx[iPartIdx] - 1;
const uint8_t kuiTopIdx = g_kuiCache30ScanIdx[iPartIdx] - 6;
@@ -241,7 +241,7 @@
iMVP[1] = WelsMedian (iAMV[1], iBMV[1], iCMV[1]);
}
}
-void_t PredInter8x16Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+void PredInter8x16Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int8_t iRef, int16_t iMVP[2]) { if (0 == iPartIdx) {const int8_t kiLeftRef = iRefIndex[0][6];
@@ -264,7 +264,7 @@
PredMv (iMotionVector, iRefIndex, iPartIdx, 2, iRef, iMVP);
}
-void_t PredInter16x8Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+void PredInter16x8Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int8_t iRef, int16_t iMVP[2]) { if (0 == iPartIdx) {const int8_t kiTopRef = iRefIndex[0][1];
@@ -285,7 +285,7 @@
//update iMVs and iRefIndex cache for current MB, only for P_16*16 (SKIP inclusive)
/* can be further optimized */
-void_t UpdateP16x16MotionInfo (PDqLayer pCurDqLayer, int8_t iRef, int16_t iMVs[2]) {+void UpdateP16x16MotionInfo (PDqLayer pCurDqLayer, int8_t iRef, int16_t iMVs[2]) {const int16_t kiRef2 = (iRef << 8) | iRef;
const int32_t kiMV32 = LD32 (iMVs);
int32_t i;
@@ -308,7 +308,7 @@
//update iRefIndex and iMVs of Mb, only for P16x8
/*need further optimization, mb_cache not work */
-void_t UpdateP16x8MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
+void UpdateP16x8MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int8_t iRef, int16_t iMVs[2]) {const int16_t kiRef2 = (iRef << 8) | iRef;
@@ -338,7 +338,7 @@
}
}
//update iRefIndex and iMVs of both Mb and Mb_cache, only for P8x16
-void_t UpdateP8x16MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
+void UpdateP8x16MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
int8_t iRefIndex[LIST_A][30],
int32_t iPartIdx, int8_t iRef, int16_t iMVs[2]) {const int16_t kiRef2 = (iRef << 8) | iRef;
@@ -369,4 +369,4 @@
}
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
+++ b/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
@@ -45,7 +45,7 @@
namespace WelsDec {-void_t GetNeighborAvailMbType (PNeighAvail pNeighAvail, PDqLayer pCurLayer) {+void GetNeighborAvailMbType (PNeighAvail pNeighAvail, PDqLayer pCurLayer) {int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;
int32_t iCurXy, iTopXy, iLeftXy, iLeftTopXy, iRightTopXy;
int32_t iCurX, iCurY;
@@ -92,7 +92,7 @@
pNeighAvail->iLeftTopType = (pNeighAvail->iLeftTopAvail ? pCurLayer->pMbType[iLeftTopXy] : 0);
pNeighAvail->iRightTopType = (pNeighAvail->iRightTopAvail ? pCurLayer->pMbType[iRightTopXy] : 0);
}
-void_t WelsFillCacheNonZeroCount (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+void WelsFillCacheNonZeroCount (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
PDqLayer pCurLayer) { //no matter slice type, intra_pred_constrained_flagint32_t iCurXy = pCurLayer->iMbXyIndex;
int32_t iTopXy = 0;
@@ -143,7 +143,7 @@
pNonZeroCount[5 + 8 * 5] = -1;//unavailable
}
}
-void_t WelsFillCacheConstrain1Intra4x4 (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
+void WelsFillCacheConstrain1Intra4x4 (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
PDqLayer pCurLayer) { //no matter slice typeint32_t iCurXy = pCurLayer->iMbXyIndex;
int32_t iTopXy = 0;
@@ -189,7 +189,7 @@
}
}
-void_t WelsFillCacheConstrain0Intra4x4 (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
+void WelsFillCacheConstrain0Intra4x4 (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
PDqLayer pCurLayer) { //no matter slice typeint32_t iCurXy = pCurLayer->iMbXyIndex;
int32_t iTopXy = 0;
@@ -235,7 +235,7 @@
}
}
-void_t WelsFillCacheInter (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+void WelsFillCacheInter (PNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
int16_t iMvArray[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30], PDqLayer pCurLayer) {int32_t iCurXy = pCurLayer->iMbXyIndex;
int32_t iTopXy = 0;
@@ -398,7 +398,7 @@
*pMode = I16_PRED_DC_128;
}
} else {- bool_t bModeAvail = CHECK_I16_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+ bool bModeAvail = CHECK_I16_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
if (0 == bModeAvail) {return ERR_INFO_INVALID_I16x16_PRED_MODE;
}
@@ -423,7 +423,7 @@
*pMode = C_PRED_DC_128;
}
} else {- bool_t bModeAvail = CHECK_CHROMA_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+ bool bModeAvail = CHECK_CHROMA_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
if (0 == bModeAvail) {return ERR_INFO_INVALID_I_CHROMA_PRED_MODE;
}
@@ -455,7 +455,7 @@
iFinalMode = I4_PRED_DC_128;
}
} else {- bool_t bModeAvail = CHECK_I4_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+ bool bModeAvail = CHECK_I4_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
if (0 == bModeAvail) {return ERR_INVALID_INTRA4X4_MODE;
}
@@ -472,10 +472,10 @@
return iFinalMode;
}
-void_t BsStartCavlc (PBitStringAux pBs) {+void BsStartCavlc (PBitStringAux pBs) {pBs->iIndex = ((pBs->pCurBuf - pBs->pStartBuf) << 3) - (16 - pBs->iLeftBits);
}
-void_t BsEndCavlc (PBitStringAux pBs) {+void BsEndCavlc (PBitStringAux pBs) {pBs->pCurBuf = pBs->pStartBuf + (pBs->iIndex >> 3);
pBs->uiCurBits = ((((pBs->pCurBuf[0] << 8) | pBs->pCurBuf[1]) << 16) | (pBs->pCurBuf[2] << 8) | pBs->pCurBuf[3]) <<
(pBs->iIndex & 0x07);
@@ -486,7 +486,7 @@
// return: used bits
static int32_t CavlcGetTrailingOnesAndTotalCoeff (uint8_t& uiTotalCoeff, uint8_t& uiTrailingOnes,
- SReadBitsCache* pBitsCache, SVlcTable* pVlcTable, bool_t bChromaDc, int8_t nC) {+ SReadBitsCache* pBitsCache, SVlcTable* pVlcTable, bool bChromaDc, int8_t nC) { const uint8_t* kpVlcTableMoreBitsCountList[3] = {g_kuiVlcTableMoreBitsCount0, g_kuiVlcTableMoreBitsCount1, g_kuiVlcTableMoreBitsCount2};int32_t iUsedBits = 0;
int32_t iIndexVlc, iIndexValue, iNcMapIdx;
@@ -587,7 +587,7 @@
}
static int32_t CavlcGetTotalZeros (int32_t& iZerosLeft, SReadBitsCache* pBitsCache, uint8_t uiTotalCoeff,
- SVlcTable* pVlcTable, bool_t bChromaDc) {+ SVlcTable* pVlcTable, bool bChromaDc) {int32_t iCount, iUsedBits = 0;
const uint8_t* kpBitNumMap;
uint32_t uiValue;
@@ -673,7 +673,7 @@
int32_t iUsedBits = 0;
int32_t iCurIdx = pBs->iIndex;
uint8_t* pBuf = ((uint8_t*)pBs->pStartBuf) + (iCurIdx >> 3);
- bool_t bChromaDc = (CHROMA_DC == iResidualProperty);
+ bool bChromaDc = (CHROMA_DC == iResidualProperty);
uint8_t bChroma = (bChromaDc || CHROMA_AC == iResidualProperty);
SReadBitsCache sReadBitsCache;
--- a/codec/decoder/core/src/pic_queue.cpp
+++ b/codec/decoder/core/src/pic_queue.cpp
@@ -44,7 +44,7 @@
namespace WelsDec {-void_t FreePicture (PPicture pPic);
+void FreePicture (PPicture pPic);
///////////////////////////////////Recycled queue management for pictures///////////////////////////////////
@@ -106,7 +106,7 @@
return pPic;
}
-void_t FreePicture (PPicture pPic) {+void FreePicture (PPicture pPic) { if (NULL != pPic) { if (pPic->pBuffer[0]) {@@ -149,4 +149,4 @@
return pPic;
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/rec_mb.cpp
+++ b/codec/decoder/core/src/rec_mb.cpp
@@ -44,7 +44,7 @@
namespace WelsDec {-void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool_t bOutput, PDqLayer pCurLayer) {+void WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurLayer) {PPicture pCurPic = pCtx->pDec;
int32_t iLumaStride = pCurPic->iLinesize[0];
int32_t iChromaStride = pCurPic->iLinesize[1];
@@ -183,7 +183,7 @@
int32_t iPicHeight;
} sMCRefMember;
//according to current 8*8 block ref_index to gain reference picture
-static inline void_t GetRefPic (sMCRefMember* pMCRefMem, PWelsDecoderContext pCtx, int8_t* pRefIdxList,
+static inline void GetRefPic (sMCRefMember* pMCRefMem, PWelsDecoderContext pCtx, int8_t* pRefIdxList,
int32_t iIndex) {PPicture pRefPic;
@@ -202,7 +202,7 @@
#ifndef MC_FLOW_SIMPLE_JUDGE
#define MC_FLOW_SIMPLE_JUDGE 1
#endif //MC_FLOW_SIMPLE_JUDGE
-static inline void_t BaseMC (sMCRefMember* pMCRefMem, int32_t iXOffset, int32_t iYOffset, SMcFunc* pMCFunc,
+static inline void BaseMC (sMCRefMember* pMCRefMem, int32_t iXOffset, int32_t iYOffset, SMcFunc* pMCFunc,
int32_t iBlkWidth, int32_t iBlkHeight, int16_t iMVs[2]) {int32_t iExpandWidth = PADDING_LENGTH;
int32_t iExpandHeight = PADDING_LENGTH;
@@ -235,7 +235,7 @@
uint8_t* pDstY = pMCRefMem->pDstY;
uint8_t* pDstU = pMCRefMem->pDstU;
uint8_t* pDstV = pMCRefMem->pDstV;
- bool_t bExpand = false;
+ bool bExpand = false;
ENFORCE_STACK_ALIGN_1D (uint8_t, uiExpandBuf, (PADDING_LENGTH + 6) * (PADDING_LENGTH + 6), 16);
@@ -289,7 +289,7 @@
}
}
-void_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWelsDecoderContext pCtx) {+void GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWelsDecoderContext pCtx) {sMCRefMember pMCRefMem;
PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
SMcFunc* pMCFunc = &pCtx->sMcFunc;
@@ -464,7 +464,7 @@
return ERR_NONE;
}
-void_t FillBufForMc (uint8_t* pBuf, int32_t iBufStride, uint8_t* pSrc, int32_t iSrcStride, int32_t iSrcOffset,
+void FillBufForMc (uint8_t* pBuf, int32_t iBufStride, uint8_t* pSrc, int32_t iSrcStride, int32_t iSrcOffset,
int32_t iBlockWidth, int32_t iBlockHeight, int32_t iSrcX, int32_t iSrcY, int32_t iPicWidth, int32_t iPicHeight) {int32_t iY;
int32_t iStartY, iStartX, iEndY, iEndX;
--- a/codec/decoder/core/src/utils.cpp
+++ b/codec/decoder/core/src/utils.cpp
@@ -48,7 +48,7 @@
-void_t WelsLog (void_t* pPtr, int32_t iLevel, const char* kpFmt, ...) {+void WelsLog (void* pPtr, int32_t iLevel, const char* kpFmt, ...) {va_list pVl;
PWelsDecoderContext pCtx = (PWelsDecoderContext)pPtr;
--- a/codec/decoder/plus/inc/welsCodecTrace.h
+++ b/codec/decoder/plus/inc/welsCodecTrace.h
@@ -66,9 +66,9 @@
virtual ~IWelsTrace() {};virtual int32_t SetTraceLevel (int32_t iLevel) = 0;
-virtual int32_t Trace (const int32_t kLevel, const str_t* kpFormat, va_list pVl) = 0;
+virtual int32_t Trace (const int32_t kLevel, const char* kpFormat, va_list pVl) = 0;
-static void_t WelsTrace (void_t* pObject, const int32_t kLevel, const str_t* kpFormat, va_list pVl) {+static void WelsTrace (void* pObject, const int32_t kLevel, const char* kpFormat, va_list pVl) {IWelsTrace* pThis = (IWelsTrace*) (pObject);
if (pThis) {@@ -76,7 +76,7 @@
}
}
-static void_t WelsVTrace (void_t* pObject, const int32_t kLevel, const str_t* kpFormat, ...) {+static void WelsVTrace (void* pObject, const int32_t kLevel, const char* kpFormat, ...) {IWelsTrace* pThis = (IWelsTrace*) (pObject);
va_list argptr;
@@ -96,9 +96,9 @@
class CWelsTraceBase : public IWelsTrace {public:
virtual int32_t SetTraceLevel (int32_t iLevel);
-virtual int32_t Trace (const int32_t kLevel, const str_t* kpFormat, va_list pVl);
+virtual int32_t Trace (const int32_t kLevel, const char* kpFormat, va_list pVl);
-virtual int32_t WriteString (int32_t iLevel, const str_t* pStr) = 0;
+virtual int32_t WriteString (int32_t iLevel, const char* pStr) = 0;
protected:
CWelsTraceBase() {m_iLevel = WELS_LOG_DEFAULT;
@@ -110,11 +110,11 @@
class CWelsTraceFile : public CWelsTraceBase {public:
-CWelsTraceFile (const str_t* filename = (const str_t*)"wels_decoder_trace.txt");
+CWelsTraceFile (const char* filename = (const char*)"wels_decoder_trace.txt");
virtual ~CWelsTraceFile();
public:
-virtual int32_t WriteString (int32_t iLevel, const str_t* pStr);
+virtual int32_t WriteString (int32_t iLevel, const char* pStr);
private:
WelsFileHandle* m_pTraceFile;
@@ -127,7 +127,7 @@
virtual ~CWelsTraceWinDgb() {};public:
-virtual int32_t WriteString (int32_t iLevel, const str_t* pStr);
+virtual int32_t WriteString (int32_t iLevel, const char* pStr);
};
#endif
@@ -137,7 +137,7 @@
virtual ~CWelsCodecTrace();
public:
-virtual int32_t WriteString (int32_t iLevel, const str_t* pStr);
+virtual int32_t WriteString (int32_t iLevel, const char* pStr);
protected:
int32_t LoadWelsTraceModule();
@@ -152,7 +152,7 @@
};
-IWelsTrace* CreateWelsTrace (EWelsTraceType eType, void_t* pParam = NULL);
+IWelsTrace* CreateWelsTrace (EWelsTraceType eType, void* pParam = NULL);
} // namespace WelsDec
--- a/codec/decoder/plus/inc/welsDecoderExt.h
+++ b/codec/decoder/plus/inc/welsDecoderExt.h
@@ -56,10 +56,10 @@
class CWelsDecoder : public ISVCDecoder {public:
-CWelsDecoder (void_t);
+CWelsDecoder (void);
virtual ~CWelsDecoder();
-virtual long EXTAPI Initialize (void_t* pParam, const INIT_TYPE keInitType);
+virtual long EXTAPI Initialize (void* pParam, const INIT_TYPE keInitType);
virtual long EXTAPI Uninitialize();
/***************************************************************************
@@ -83,7 +83,7 @@
virtual DECODING_STATE EXTAPI DecodeFrame2 (const unsigned char* kpSrc,
const int kiSrcLen,
- void_t** ppDst,
+ void** ppDst,
SBufferInfo* pDstInfo);
virtual DECODING_STATE EXTAPI DecodeFrameEx (const unsigned char* kpSrc,
const int kiSrcLen,
@@ -94,15 +94,15 @@
int& iHeight,
int& color_format);
-virtual long EXTAPI SetOption (DECODER_OPTION eOptID, void_t* pOption);
-virtual long EXTAPI GetOption (DECODER_OPTION eOptID, void_t* pOption);
+virtual long EXTAPI SetOption (DECODER_OPTION eOptID, void* pOption);
+virtual long EXTAPI GetOption (DECODER_OPTION eOptID, void* pOption);
private:
PWelsDecoderContext m_pDecContext;
IWelsTrace* m_pTrace;
-void_t InitDecoder (void_t);
-void_t UninitDecoder (void_t);
+void InitDecoder (void);
+void UninitDecoder (void);
XMMREG_PROTECT_DECLARE(CWelsH264Decoder);
--- a/codec/decoder/plus/src/welsCodecTrace.cpp
+++ b/codec/decoder/plus/src/welsCodecTrace.cpp
@@ -57,14 +57,14 @@
return 0;
}
-int32_t CWelsTraceBase::Trace (const int kLevel, const str_t* kpFormat, va_list pVl) {+int32_t CWelsTraceBase::Trace (const int kLevel, const char* kpFormat, va_list pVl) { if (kLevel & m_iLevel) {- str_t chBuf[MAX_LOG_SIZE] = {0};+ char chBuf[MAX_LOG_SIZE] = {0}; const int32_t kLen = strlen ("[DECODER]: ");- WelsStrncpy (chBuf, MAX_LOG_SIZE, (const str_t*)"[DECODER]: ");
+ WelsStrncpy (chBuf, MAX_LOG_SIZE, (const char*)"[DECODER]: ");
- WelsVsnprintf ((chBuf + kLen), MAX_LOG_SIZE - kLen, (const str_t*)kpFormat, pVl);
+ WelsVsnprintf ((chBuf + kLen), MAX_LOG_SIZE - kLen, (const char*)kpFormat, pVl);
WriteString (kLevel, chBuf);
}
@@ -72,8 +72,8 @@
return 0;
}
-CWelsTraceFile::CWelsTraceFile (const str_t* pFileName) {- m_pTraceFile = WelsFopen (pFileName, (const str_t*)"wt");
+CWelsTraceFile::CWelsTraceFile (const char* pFileName) {+ m_pTraceFile = WelsFopen (pFileName, (const char*)"wt");
}
CWelsTraceFile::~CWelsTraceFile() {@@ -83,9 +83,9 @@
}
}
-int32_t CWelsTraceFile::WriteString (int32_t iLevel, const str_t* pStr) {+int32_t CWelsTraceFile::WriteString (int32_t iLevel, const char* pStr) {int iRC = 0;
- const static str_t chEnter[16] = "\n";
+ const static char chEnter[16] = "\n";
if (m_pTraceFile) {iRC += WelsFwrite (pStr, 1, strlen (pStr), m_pTraceFile);
iRC += WelsFwrite (chEnter, 1, strlen (chEnter), m_pTraceFile);
@@ -97,7 +97,7 @@
#ifdef _WIN32
-int32_t CWelsTraceWinDgb::WriteString (int32_t iLevel, const str_t* pStr) {+int32_t CWelsTraceWinDgb::WriteString (int32_t iLevel, const char* pStr) {OutputDebugStringA (pStr);
return strlen (pStr);
@@ -134,7 +134,7 @@
return 0;
}
-int32_t CWelsCodecTrace::WriteString (int32_t iLevel, const str_t* pStr) {+int32_t CWelsCodecTrace::WriteString (int32_t iLevel, const char* pStr) { { switch (iLevel) {case WELS_LOG_ERROR:
@@ -164,7 +164,7 @@
}
-IWelsTrace* CreateWelsTrace (EWelsTraceType eType, void_t* pParam) {+IWelsTrace* CreateWelsTrace (EWelsTraceType eType, void* pParam) {IWelsTrace* pTrace = NULL;
switch (eType) {case Wels_Trace_Type:
--- a/codec/decoder/plus/src/welsDecoderExt.cpp
+++ b/codec/decoder/plus/src/welsDecoderExt.cpp
@@ -83,16 +83,16 @@
*
* return: none
***************************************************************************/
-CWelsDecoder::CWelsDecoder (void_t)
+CWelsDecoder::CWelsDecoder (void)
: m_pDecContext (NULL),
m_pTrace (NULL) {#ifdef OUTPUT_BIT_STREAM
- str_t chFileName[1024] = { 0 }; //for .264+ char chFileName[1024] = { 0 }; //for .264int iBufUsed = 0;
int iBufLeft = 1023;
int iCurUsed;
- str_t chFileNameSize[1024] = { 0 }; //for .len+ char chFileNameSize[1024] = { 0 }; //for .lenint iBufUsedSize = 0;
int iBufLeftSize = 1023;
int iCurUsedSize;
@@ -108,8 +108,8 @@
WelsGetTimeOfDay (&sCurTime);
- iCurUsed = WelsSnprintf (chFileName, iBufLeft, "bs_0x%p_", (void_t*)this);
- iCurUsedSize = WelsSnprintf (chFileNameSize, iBufLeftSize, "size_0x%p_", (void_t*)this);
+ iCurUsed = WelsSnprintf (chFileName, iBufLeft, "bs_0x%p_", (void*)this);
+ iCurUsedSize = WelsSnprintf (chFileNameSize, iBufLeftSize, "size_0x%p_", (void*)this);
if (iCurUsed > 0) {iBufUsed += iCurUsed;
@@ -186,7 +186,7 @@
}
}
-long CWelsDecoder::Initialize (void_t* pParam, const INIT_TYPE keInitType) {+long CWelsDecoder::Initialize (void* pParam, const INIT_TYPE keInitType) { if (pParam == NULL || keInitType != INIT_TYPE_PARAMETER_BASED) {IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::Initialize(), invalid input argument.");
return cmInitParaError;
@@ -206,7 +206,7 @@
return ERR_NONE;
}
-void_t CWelsDecoder::UninitDecoder (void_t) {+void CWelsDecoder::UninitDecoder (void) {if (NULL == m_pDecContext)
return;
@@ -224,7 +224,7 @@
}
// the return value of this function is not suitable, it need report failure info to upper layer.
-void_t CWelsDecoder::InitDecoder (void_t) {+void CWelsDecoder::InitDecoder (void) {IWelsTrace::WelsVTrace (m_pTrace, IWelsTrace::WELS_LOG_INFO, "CWelsDecoder::init_decoder()..");
m_pDecContext = (PWelsDecoderContext)WelsMalloc (sizeof (SWelsDecoderContext), "m_pDecContext");
@@ -237,7 +237,7 @@
/*
* Set Option
*/
-long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void_t* pOption) {+long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) {int iVal = 0;
if (m_pDecContext == NULL)
@@ -294,7 +294,7 @@
/*
* Get Option
*/
-long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void_t* pOption) {+long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void* pOption) {int iVal = 0;
if (m_pDecContext == NULL)
@@ -359,7 +359,7 @@
DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc,
const int kiSrcLen,
- void_t** ppDst,
+ void** ppDst,
SBufferInfo* pDstInfo) { if (kiSrcLen > MAX_ACCESS_UNIT_CAPACITY) {m_pDecContext->iErrorCode |= dsOutOfMemory;
@@ -449,7 +449,7 @@
DstInfo.UsrData.sSystemBuffer.iHeight = iHeight;
DstInfo.eBufferProperty = BUFFER_HOST;
- eDecState = DecodeFrame2 (kpSrc, kiSrcLen, (void_t**)ppDst, &DstInfo);
+ eDecState = DecodeFrame2 (kpSrc, kiSrcLen, (void**)ppDst, &DstInfo);
if (eDecState == dsErrorFree) {pStride[0] = DstInfo.UsrData.sSystemBuffer.iStride[0];
pStride[1] = DstInfo.UsrData.sSystemBuffer.iStride[1];
@@ -503,7 +503,7 @@
/*
* DestroyDecoder
*/
-void_t DestroyDecoder (ISVCDecoder* pDecoder) {+void DestroyDecoder (ISVCDecoder* pDecoder) { if (NULL != pDecoder) {delete (CWelsDecoder*)pDecoder;
}
--- a/codec/encoder/core/inc/au_set.h
+++ b/codec/encoder/core/inc/au_set.h
@@ -105,7 +105,7 @@
*/
int32_t WelsInitSps (SWelsSPS* pSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,
const int32_t kiNumRefFrame,
- const uint32_t kiSpsId, const bool_t kbEnableFrameCropping, bool_t bEnableRc);
+ const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc);
/*!
* \brief initialize subset pSps based on configurable parameters in svc
@@ -117,7 +117,7 @@
*/
int32_t WelsInitSubsetSps (SSubsetSps* pSubsetSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,
const int32_t kiNumRefFrame,
- const uint32_t kiSpsId, const bool_t kbEnableFrameCropping, bool_t bEnableRc);
+ const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc);
/*!
* \brief initialize pPps based on configurable parameters and pSps(subset pSps) in svc
@@ -124,9 +124,9 @@
* \param pPps SWelsPPS*
* \param pSps SWelsSPS*
* \param pSubsetSps SSubsetSps*
- * \param kbDeblockingFilterPresentFlag bool_t
+ * \param kbDeblockingFilterPresentFlag bool
* \param kiPpsId PPS Id
- * \param kbUsingSubsetSps bool_t
+ * \param kbUsingSubsetSps bool
* \return 0 - successful
* 1 - failed
*/
@@ -134,8 +134,8 @@
SWelsSPS* pSps,
SSubsetSps* pSubsetSps,
const uint32_t kuiPpsId,
- const bool_t kbDeblockingFilterPresentFlag,
- const bool_t kbUsingSubsetSps);
+ const bool kbDeblockingFilterPresentFlag,
+ const bool kbUsingSubsetSps);
}
#endif//WELS_ACCESS_UNIT_PARSER_H__
--- a/codec/encoder/core/inc/bundleloader.h
+++ b/codec/encoder/core/inc/bundleloader.h
@@ -134,4 +134,4 @@
}
#endif
-#endif
\ No newline at end of file
+#endif
--- a/codec/encoder/core/inc/encoder.h
+++ b/codec/encoder/core/inc/encoder.h
@@ -81,12 +81,12 @@
* \brief Dump reconstruction for dependency layer
*/
-extern "C" void DumpDependencyRec (SPicture* pSrcPic, const str_t* kpFileName, const int8_t kiDid);
+extern "C" void DumpDependencyRec (SPicture* pSrcPic, const char* kpFileName, const int8_t kiDid);
/*!
* \brief Dump the reconstruction pictures
*/
-void DumpRecFrame (SPicture* pSrcPic, const str_t* kpFileName);
+void DumpRecFrame (SPicture* pSrcPic, const char* kpFileName);
/*!
--- a/codec/encoder/core/inc/encoder_context.h
+++ b/codec/encoder/core/inc/encoder_context.h
@@ -92,9 +92,9 @@
int32_t iLastLtrIdx;
uint32_t uiLtrMarkInterval;// the interval from the last int32_t term pRef mark
- bool_t bLTRMarkingFlag; //decide whether current frame marked as LTR
- bool_t bLTRMarkEnable; //when LTR is confirmed and the interval is no smaller than the marking period
- bool_t bReceivedT0LostFlag; // indicate whether a t0 lost feedback is recieved, for LTR recovery
+ bool bLTRMarkingFlag; //decide whether current frame marked as LTR
+ bool bLTRMarkEnable; //when LTR is confirmed and the interval is no smaller than the marking period
+ bool bReceivedT0LostFlag; // indicate whether a t0 lost feedback is recieved, for LTR recovery
} SLTRState;
typedef struct TagSpatialPicIndex {@@ -162,8 +162,8 @@
uint8_t uiDependencyId; // Idc of dependecy layer to be coded
uint8_t uiTemporalId; // Idc of temporal layer to be coded
- bool_t bNeedPrefixNalFlag; // whether add prefix nal
- bool_t bEncCurFrmAsIdrFlag;
+ bool bNeedPrefixNalFlag; // whether add prefix nal
+ bool bEncCurFrmAsIdrFlag;
// Rate control routine
SWelsSvcRc* pWelsSvcRc;
@@ -198,7 +198,7 @@
uint8_t uiSpatialLayersInTemporal[MAX_DEPENDENCY_LAYER];
uint8_t uiSpatialPicNum[MAX_DEPENDENCY_LAYER];
- bool_t bLongTermRefFlag[MAX_DEPENDENCY_LAYER][MAX_TEMPORAL_LEVEL + 1/*+LONG_TERM_REF_NUM*/];
+ bool bLongTermRefFlag[MAX_DEPENDENCY_LAYER][MAX_TEMPORAL_LEVEL + 1/*+LONG_TERM_REF_NUM*/];
int16_t iMaxSliceCount;// maximal count number of slices for all layers observation
int16_t iActiveThreadsNum; // number of threads active so far
--- a/codec/encoder/core/inc/mb_cache.h
+++ b/codec/encoder/core/inc/mb_cache.h
@@ -106,14 +106,14 @@
uint8_t* pBufferInterPredMe; // [4][400] is enough because only h&v or v&hv or h&hv. but if both h&v&hv is needed when 8 quart pixel, future we have to use [5][400].
//no scan4[] order, just as memory order to store
-//ALIGNED_DECLARE(bool_t, pPrevIntra4x4PredModeFlag[16], 16);//if 1, means no rem_intra4x4_pred_mode; if 0, means rem_intra4x4_pred_mode != 0
-bool_t* pPrevIntra4x4PredModeFlag;
+//ALIGNED_DECLARE(bool, pPrevIntra4x4PredModeFlag[16], 16);//if 1, means no rem_intra4x4_pred_mode; if 0, means rem_intra4x4_pred_mode != 0
+bool* pPrevIntra4x4PredModeFlag;
//ALIGNED_DECLARE(int8_t, pRemIntra4x4PredModeFlag[16], 16);//-1 as default; if pPrevIntra4x4PredModeFlag==0,
//pRemIntra4x4PredModeFlag or added by 1 is the best pred_mode
int8_t* pRemIntra4x4PredModeFlag;
int32_t iSadCostSkip[4]; //avail 1; unavail 0
-bool_t bMbTypeSkip[4]; //1: skip; 0: non-skip
+bool bMbTypeSkip[4]; //1: skip; 0: non-skip
int32_t* pEncSad;
//for residual encoding at the side of Encoder
@@ -123,7 +123,7 @@
uint8_t uiLumaI16x16Mode;
uint8_t uiChmaI8x8Mode;
-bool_t bCollocatedPredFlag;//denote if current MB is collocated predicted (MV==0).
+bool bCollocatedPredFlag;//denote if current MB is collocated predicted (MV==0).
uint32_t uiRefMbType;
struct {--- a/codec/encoder/core/inc/md.h
+++ b/codec/encoder/core/inc/md.h
@@ -83,7 +83,7 @@
int32_t iSadPredMb;
uint8_t uiRef; //uiRefIndex appointed by Encoder, used for MC
-bool_t bMdUsingSad;
+bool bMdUsingSad;
uint16_t uiReserved;
int32_t iCostSkipMb;
@@ -114,7 +114,7 @@
static void md_intra_init (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb);
static void md_inter_init (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb);
-void FillNeighborCacheIntra (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth/*, bool_t constrained_intra_pred_flag*/);
+void FillNeighborCacheIntra (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth/*, bool constrained_intra_pred_flag*/);
void FillNeighborCacheInterWithoutBGD (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth,
int8_t* pVaaBgMbFlag); //BGD spatial func
void FillNeighborCacheInterWithBGD (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth, int8_t* pVaaBgMbFlag);
@@ -125,12 +125,12 @@
void PredictSad (int8_t* pRefIndexCache, int32_t* pSadCostCache, int32_t uiRef, int32_t* pSadPred);
-void PredictSadSkip (int8_t* pRefIndexCache, bool_t* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
+void PredictSadSkip (int8_t* pRefIndexCache, bool* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
int32_t* iSadPredSkip);
// for pfGetVarianceFromIntraVaa function ptr adaptive by CPU features, 6/7/2010
void InitIntraAnalysisVaaInfo (SWelsFuncPtrList* pFuncList, const uint32_t kuiCpuFlag);
-BOOL_T MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb);
+bool MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb);
uint8_t MdInterAnalysisVaaInfo_c (int32_t* pSad8x8);
--- a/codec/encoder/core/inc/memory_align.h
+++ b/codec/encoder/core/inc/memory_align.h
@@ -46,9 +46,9 @@
CMemoryAlign (const uint32_t kuiCacheLineSize);
virtual ~CMemoryAlign();
-void* WelsMallocz (const uint32_t kuiSize, const str_t* kpTag);
-void* WelsMalloc (const uint32_t kuiSize, const str_t* kpTag);
-void WelsFree (void* pPointer, const str_t* kpTag);
+void* WelsMallocz (const uint32_t kuiSize, const char* kpTag);
+void* WelsMalloc (const uint32_t kuiSize, const char* kpTag);
+void WelsFree (void* pPointer, const char* kpTag);
const uint32_t WelsGetCacheLineSize() const;
#if defined(MEMORY_MONITOR)
const uint32_t WelsGetMemoryUsage() const;
--- a/codec/encoder/core/inc/nal_encap.h
+++ b/codec/encoder/core/inc/nal_encap.h
@@ -73,7 +73,7 @@
// SVC: num_sps (MAX_D) + num_pps (MAX_D) + num_vcl (MAX_D * MAX_Q)
int32_t iNalIndex; // coding NAL currently, 0 based
-// BOOL_T bAnnexBFlag; // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
+// bool bAnnexBFlag; // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
} SWelsEncoderOutput;
//#define MT_DEBUG_BS_WR 0 // for MT debugging if needed
@@ -91,9 +91,9 @@
int32_t iNalLen[2];
int32_t iNalIndex; // coding NAL currently, 0 based
-// BOOL_T bAnnexBFlag; // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
+// bool bAnnexBFlag; // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
#if MT_DEBUG_BS_WR
-BOOL_T bSliceCodedFlag;
+bool bSliceCodedFlag;
#endif//MT_DEBUG_BS_WR
} SWelsSliceBs;
@@ -145,6 +145,6 @@
/*!
* \brief write prefix nal
*/
-int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t keNalRefIdc, const bool_t kbIdrFlag);
+int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t keNalRefIdc, const bool kbIdrFlag);
}
#endif//WELS_NAL_UNIT_ENCAPSULATION_H__
--- a/codec/encoder/core/inc/nal_prefix.h
+++ b/codec/encoder/core/inc/nal_prefix.h
@@ -53,10 +53,10 @@
typedef struct TagNalUnitHeaderExt {SNalUnitHeader sNalHeader;
- bool_t bIdrFlag;
+ bool bIdrFlag;
uint8_t uiDependencyId;
uint8_t uiTemporalId;
- bool_t bDiscardableFlag;
+ bool bDiscardableFlag;
} SNalUnitHeaderExt, *PNalUnitHeaderExt;
--- a/codec/encoder/core/inc/param_svc.h
+++ b/codec/encoder/core/inc/param_svc.h
@@ -102,7 +102,7 @@
float fOutputFrameRate; // output frame rate
#ifdef ENABLE_FRAME_DUMP
-str_t sRecFileName[MAX_FNAME_LEN]; // file to be constructed
+char sRecFileName[MAX_FNAME_LEN]; // file to be constructed
#endif//ENABLE_FRAME_DUMP
} SDLayerParam;
@@ -127,7 +127,7 @@
int32_t iHeight;
} SUsedPicRect; // the rect in input picture that encoder actually used
-str_t* pCurPath; // record current lib path such as:/pData/pData/com.wels.enc/lib/
+char* pCurPath; // record current lib path such as:/pData/pData/com.wels.enc/lib/
float fMaxFrameRate; // maximal frame rate [Hz / fps]
int32_t iInputCsp; // color space of input sequence
@@ -140,13 +140,13 @@
int32_t iLTRRefNum;
uint32_t uiLtrMarkPeriod; //the min distance of two int32_t references
-bool_t bDeblockingParallelFlag; // deblocking filter parallelization control flag
-bool_t bMgsT0OnlyStrategy; //MGS_T0_only_strategy
-bool_t bEnableSSEI;
-bool_t bEnableFrameCroppingFlag; // enable frame cropping flag: TRUE alwayse in application
+bool bDeblockingParallelFlag; // deblocking filter parallelization control flag
+bool bMgsT0OnlyStrategy; //MGS_T0_only_strategy
+bool bEnableSSEI;
+bool bEnableFrameCroppingFlag; // enable frame cropping flag: true alwayse in application
-bool_t bEnableCropPic; // enable cropping source picture. , 8/25/2010
-// FALSE: Streaming Video Sharing; TRUE: Video Conferencing Meeting;
+bool bEnableCropPic; // enable cropping source picture. , 8/25/2010
+// false: Streaming Video Sharing; true: Video Conferencing Meeting;
int8_t iDecompStages; // GOP size dependency
/* Deblocking loop filter */
@@ -159,27 +159,27 @@
int8_t iInterLayerLoopFilterBetaOffset; // InterLayerLoopFilterBetaOffset
/* Rate Control */
-bool_t bEnableRc;
+bool bEnableRc;
int8_t iRCMode;
int8_t iPaddingFlag;
/* denoise control */
-bool_t bEnableDenoise;
+bool bEnableDenoise;
/* scene change detection control */
-bool_t bEnableSceneChangeDetect;
+bool bEnableSceneChangeDetect;
// background detection control
-bool_t bEnableBackgroundDetection;
+bool bEnableBackgroundDetection;
/* adaptive quantization control */
-bool_t bEnableAdaptiveQuant;
+bool bEnableAdaptiveQuant;
/* frame skipping */
-bool_t bEnableFrameSkip;
+bool bEnableFrameSkip;
/* long term reference control */
-bool_t bEnableLongTermReference;
+bool bEnableLongTermReference;
/* pSps pPps id addition control */
-bool_t bEnableSpsPpsIdAddition;
+bool bEnableSpsPpsIdAddition;
/* Layer definition */
-bool_t bPrefixNalAddingCtrl;
+bool bPrefixNalAddingCtrl;
int8_t iNumDependencyLayer; // number of dependency(Spatial/CGS) layers used to be encoded
int8_t iNumTemporalLayer; // number of temporal layer specified
@@ -186,12 +186,12 @@
public:
-TagWelsSvcCodingParam (const bool_t kbEnableRc = true) {+TagWelsSvcCodingParam (const bool kbEnableRc = true) {FillDefault (kbEnableRc);
}
~TagWelsSvcCodingParam() {}-void FillDefault (const bool_t kbEnableRc) {+void FillDefault (const bool kbEnableRc) {uiGopSize = 1; // GOP size (at maximal frame rate: 16)
uiIntraPeriod = 0; // intra period (multiple of GOP size as desired)
iNumRefFrame = MIN_REF_PIC_COUNT; // number of reference frame used
@@ -225,9 +225,9 @@
bMgsT0OnlyStrategy =
true; // Strategy of have MGS only at T0 frames (0: do not use this strategy; 1: use this strategy)
bEnableSSEI = true;
- bEnableFrameCroppingFlag = true; // enable frame cropping flag: TRUE alwayse in application
+ bEnableFrameCroppingFlag = true; // enable frame cropping flag: true alwayse in application
bEnableCropPic = true; // enable cropping source picture. , 8/25/2010
- // FALSE: Streaming Video Sharing; TRUE: Video Conferencing Meeting;
+ // false: Streaming Video Sharing; true: Video Conferencing Meeting;
iDecompStages = 0; // GOP size dependency, unknown here and be revised later
/* Deblocking loop filter */
@@ -257,7 +257,7 @@
memset(sDependencyLayers,0,sizeof(SDLayerParam)*MAX_DEPENDENCY_LAYER);
}
-int32_t ParamTranscode (SVCEncodingParam& pCodingParam, const bool_t kbEnableRc = true) {+int32_t ParamTranscode (SVCEncodingParam& pCodingParam, const bool kbEnableRc = true) {pCodingParam.fFrameRate = WELS_CLIP3 (pCodingParam.fFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE);
iInputCsp = pCodingParam.iInputCsp; // color space of input sequence
uiFrameToBeCoded = (uint32_t) -
--- a/codec/encoder/core/inc/parameter_sets.h
+++ b/codec/encoder/core/inc/parameter_sets.h
@@ -67,24 +67,24 @@
// uint8_t uiBitDepthLuma; //=8, only used in decoder, encoder in general_***; it can be removed when removed general up_sample
// uint8_t uiBitDepthChroma; //=8
/* TO BE CONTINUE: POC type 1 */
-// bool_t bDeltaPicOrderAlwaysZeroFlag;
-// bool_t bGapsInFrameNumValueAllowedFlag; //=true
+// bool bDeltaPicOrderAlwaysZeroFlag;
+// bool bGapsInFrameNumValueAllowedFlag; //=true
-// bool_t bFrameMbsOnlyFlag;
-// bool_t bMbaffFlag; // MB Adapative Frame Field
-// bool_t bDirect8x8InferenceFlag;
-bool_t bFrameCroppingFlag;
+// bool bFrameMbsOnlyFlag;
+// bool bMbaffFlag; // MB Adapative Frame Field
+// bool bDirect8x8InferenceFlag;
+bool bFrameCroppingFlag;
-// bool_t bVuiParamPresentFlag;
-// bool_t bTimingInfoPresentFlag;
-// bool_t bFixedFrameRateFlag;
+// bool bVuiParamPresentFlag;
+// bool bTimingInfoPresentFlag;
+// bool bFixedFrameRateFlag;
-bool_t bConstraintSet0Flag;
-bool_t bConstraintSet1Flag;
-bool_t bConstraintSet2Flag;
+bool bConstraintSet0Flag;
+bool bConstraintSet1Flag;
+bool bConstraintSet2Flag;
-// bool_t bConstraintSet3Flag; // reintroduce constrain_set3_flag instead of reserved filling bytes here
-// bool_t bSeparateColorPlaneFlag; // =false,: only used in decoder, encoder in general_***; it can be removed when removed general up_sample
+// bool bConstraintSet3Flag; // reintroduce constrain_set3_flag instead of reserved filling bytes here
+// bool bSeparateColorPlaneFlag; // =false,: only used in decoder, encoder in general_***; it can be removed when removed general up_sample
} SWelsSPS, *PWelsSPS;
@@ -98,10 +98,10 @@
// uint8_t uiChromaPhaseYPlus1;
// uint8_t uiSeqRefLayerChromaPhaseXPlus1Flag;
// uint8_t uiSeqRefLayerChromaPhaseYPlus1;
-// bool_t bInterLayerDeblockingFilterCtrlPresentFlag;
-bool_t bSeqTcoeffLevelPredFlag;
-bool_t bAdaptiveTcoeffLevelPredFlag;
-bool_t bSliceHeaderRestrictionFlag;
+// bool bInterLayerDeblockingFilterCtrlPresentFlag;
+bool bSeqTcoeffLevelPredFlag;
+bool bAdaptiveTcoeffLevelPredFlag;
+bool bSliceHeaderRestrictionFlag;
} SSpsSvcExt, *PSpsSvcExt;
/* Subset sequence parameter set syntax, refer to Page 391 in JVT X201wcm */
@@ -109,9 +109,9 @@
SWelsSPS pSps;
SSpsSvcExt sSpsSvcExt;
-// bool_t bSvcVuiParamPresentFlag;
-// bool_t bAdditionalExtension2Flag;
-// bool_t bAdditionalExtension2DataFlag;
+// bool bSvcVuiParamPresentFlag;
+// bool bAdditionalExtension2Flag;
+// bool bAdditionalExtension2DataFlag;
} SSubsetSps, *PSubsetSps;
/* Picture parameter set syntax, refer to Page 59 in JVT X201wcm */
@@ -129,7 +129,7 @@
uint32_t uiBottomRight[MAX_SLICEGROUP_IDS];
/* uiSliceGroupMapType = 3, 4 or 5 */
/* uiSliceGroupMapType = 3, 4 or 5 */
-bool_t bSliceGroupChangeDirectionFlag;
+bool bSliceGroupChangeDirectionFlag;
uint32_t uiSliceGroupChangeRate;
/* uiSliceGroupMapType = 6 */
uint32_t uiPicSizeInMapUnits;
@@ -147,13 +147,13 @@
// int32_t iSecondChromaQpIndexOffset;
// /* potential application for High profile */
-// bool_t bPicOrderPresentFlag;
+// bool bPicOrderPresentFlag;
-bool_t bDeblockingFilterControlPresentFlag;
+bool bDeblockingFilterControlPresentFlag;
-// bool_t bConstainedIntraPredFlag;
-// bool_t bRedundantPicCntPresentFlag;
-// bool_t bWeightedPredFlag;
+// bool bConstainedIntraPredFlag;
+// bool bRedundantPicCntPresentFlag;
+// bool bWeightedPredFlag;
// uint8_t uiWeightedBiPredIdc;
} SWelsPPS, *PWelsPPPS;
--- a/codec/encoder/core/inc/picture.h
+++ b/codec/encoder/core/inc/picture.h
@@ -72,8 +72,8 @@
int32_t iMarkFrameNum;
int32_t iLongTermPicNum;
- bool_t bUsedAsRef; //for pRef pic management
- bool_t bIsLongRef; // long term reference frame flag //for pRef pic management
+ bool bUsedAsRef; //for pRef pic management
+ bool bIsLongRef; // long term reference frame flag //for pRef pic management
uint8_t uiRecieveConfirmed;
uint8_t uiTemporalId;
uint8_t uiSpatialId;
--- a/codec/encoder/core/inc/picture_handle.h
+++ b/codec/encoder/core/inc/picture_handle.h
@@ -52,7 +52,7 @@
* \pram need_expand need borders expanding
* \return successful if effective picture pointer returned, otherwise failed with NULL
*/
-SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth, const int32_t kiHeight, bool_t bNeedMbInfo);
+SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth, const int32_t kiHeight, bool bNeedMbInfo);
/*!
* \brief free picture pData planes
--- a/codec/encoder/core/inc/property.h
+++ b/codec/encoder/core/inc/property.h
@@ -51,7 +51,7 @@
* \param iSize size of pBuffer overall
* \return actual size of pBuffer used; 0 returned in failure
*/
-int32_t GetCodeName (str_t* pBuf, int32_t iSize);
+int32_t GetCodeName (char* pBuf, int32_t iSize);
/*!
* \brief get library/module name
@@ -59,7 +59,7 @@
* \param iSize size of pBuffer overall
* \return actual size of pBuffer used; 0 returned in failure
*/
-int32_t GetLibName (str_t* pBuf, int32_t iSize);
+int32_t GetLibName (char* pBuf, int32_t iSize);
/*!
* \brief get version number
@@ -67,7 +67,7 @@
* \param iSize size of pBuffer overall
* \return actual size of pBuffer used; 0 returned in failure
*/
-int32_t GetVerNum (str_t* pBuf, int32_t iSize);
+int32_t GetVerNum (char* pBuf, int32_t iSize);
/*!
* \brief get identify information
@@ -75,6 +75,6 @@
* \param iSize size of pBuffer overall
* \return actual size of pBuffer used; 0 returned in failure
*/
-int32_t GetIdentInfo (str_t* pBuf, int32_t iSize);
+int32_t GetIdentInfo (char* pBuf, int32_t iSize);
}
#endif//WELS_DECODER_PROPERTY_H__
--- a/codec/encoder/core/inc/ref_list_mgr_svc.h
+++ b/codec/encoder/core/inc/ref_list_mgr_svc.h
@@ -77,11 +77,11 @@
/*
* update reference picture list
*/
-BOOL_T WelsUpdateRefList (sWelsEncCtx* pCtx);
+bool WelsUpdateRefList (sWelsEncCtx* pCtx);
/*
* build reference picture list
*/
-BOOL_T WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t kiPOC);
+bool WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t kiPOC);
/*
* update syntax for reference base related
@@ -92,7 +92,7 @@
/*
* check current mark iFrameNum used in LTR list or not
*/
-bool_t CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx);
+bool CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx);
/*
* decide whether current frame include long term reference mark and update long term reference mark syntax
*/
--- a/codec/encoder/core/inc/slice.h
+++ b/codec/encoder/core/inc/slice.h
@@ -75,9 +75,9 @@
// int32_t mmco_index;
uint8_t uiMmcoCount;
- bool_t bNoOutputOfPriorPicsFlag;
- bool_t bLongTermRefFlag;
- bool_t bAdaptiveRefPicMarkingModeFlag;
+ bool bNoOutputOfPriorPicsFlag;
+ bool bLongTermRefFlag;
+ bool bAdaptiveRefPicMarkingModeFlag;
} SRefPicMarking;
@@ -118,9 +118,9 @@
uint16_t uiIdrPicId;
// uint8_t color_plane_id;//from?
- bool_t bNumRefIdxActiveOverrideFlag;
-// bool_t field_pic_flag; //not supported in base profile
-// bool_t bottom_field_flag; //not supported in base profile
+ bool bNumRefIdxActiveOverrideFlag;
+// bool field_pic_flag; //not supported in base profile
+// bool bottom_field_flag; //not supported in base profile
uint8_t uiPadding1Bytes;
SRefPicMarking sRefMarking; // Decoded reference picture marking syntaxs
@@ -137,18 +137,18 @@
uint32_t uiNumMbsInSlice;
- bool_t bStoreRefBasePicFlag;
- bool_t bConstrainedIntraResamplingFlag;
- bool_t bSliceSkipFlag;
+ bool bStoreRefBasePicFlag;
+ bool bConstrainedIntraResamplingFlag;
+ bool bSliceSkipFlag;
- bool_t bAdaptiveBaseModeFlag;
- bool_t bDefaultBaseModeFlag;
- bool_t bAdaptiveMotionPredFlag;
- bool_t bDefaultMotionPredFlag;
+ bool bAdaptiveBaseModeFlag;
+ bool bDefaultBaseModeFlag;
+ bool bAdaptiveMotionPredFlag;
+ bool bDefaultMotionPredFlag;
- bool_t bAdaptiveResidualPredFlag;
- bool_t bDefaultResidualPredFlag;
- bool_t bTcoeffLevelPredFlag;
+ bool bAdaptiveResidualPredFlag;
+ bool bDefaultResidualPredFlag;
+ bool bTcoeffLevelPredFlag;
uint8_t uiDisableInterLayerDeblockingFilterIdc;
} SSliceHeaderExt, *PSliceHeaderExt;
@@ -170,10 +170,10 @@
uint8_t sScaleShift;
uint8_t uiSliceIdx;
- bool_t bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
+ bool bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
uint8_t uiLastMbQp; // stored qp for last mb coded, maybe more efficient for mb skip detection etc.
- bool_t bDynamicSlicingSliceSizeCtrlFlag;
+ bool bDynamicSlicingSliceSizeCtrlFlag;
uint8_t uiAssumeLog2BytePerMb;
uint8_t uiReservedFillByte; // reserved to meet 4 bytes alignment
} SSlice, *PSlice;
--- a/codec/encoder/core/inc/slice_multi_threading.h
+++ b/codec/encoder/core/inc/slice_multi_threading.h
@@ -98,10 +98,10 @@
#ifdef _WIN32
int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLayerBsInfo,
- const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const BOOL_T kbIsDynamicSlicingMode);
+ const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const bool kbIsDynamicSlicingMode);
#else
int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** ppEventsList, SLayerBSInfo* pLayerBsInfo,
- const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const BOOL_T kbIsDynamicSlicingMode);
+ const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const bool kbIsDynamicSlicingMode);
#endif//_WIN32
int32_t DynamicDetectCpuCores();
--- a/codec/encoder/core/inc/svc_base_layer_md.h
+++ b/codec/encoder/core/inc/svc_base_layer_md.h
@@ -56,8 +56,8 @@
void WelsMdIntraMb (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
-void WelsMdBackgroundMbEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice, bool_t bSkipMbFlag);
-BOOL_T WelsMdPSkipEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache);
+void WelsMdBackgroundMbEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice, bool bSkipMbFlag);
+bool WelsMdPSkipEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache);
int32_t WelsMdP16x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb);
int32_t WelsMdP16x8 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice);
@@ -67,25 +67,25 @@
/*static*/ void WelsMdInterFinePartition (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, int32_t bestCost);
/*static*/ void WelsMdInterFinePartitionVaa (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, int32_t bestCost);
void WelsMdInterMbRefinement (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
-BOOL_T WelsMdFirstIntraMode (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache);
-//BOOL_T svc_md_first_intra_mode_constrained(void* pEnc, void* pMd, SMB* pCurMb, SMbCache *pMbCache);
+bool WelsMdFirstIntraMode (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache);
+//bool svc_md_first_intra_mode_constrained(void* pEnc, void* pMd, SMB* pCurMb, SMbCache *pMbCache);
void WelsMdInterMb (void* pEncCtx, void* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pUnused);
//both used in BL and EL
-//void wels_md_inter_init ( SWelsMD* pMd, const uint8_t ref_idx, const bool_t is_highest_dlayer_flag );
+//void wels_md_inter_init ( SWelsMD* pMd, const uint8_t ref_idx, const bool is_highest_dlayer_flag );
-bool_t WelsMdInterJudgeBGDPskip (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- BOOL_T* bKeepSkip);
-bool_t WelsMdInterJudgeBGDPskipFalse (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- BOOL_T* bKeepSkip);
+bool WelsMdInterJudgeBGDPskip (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool* bKeepSkip);
+bool WelsMdInterJudgeBGDPskipFalse (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool* bKeepSkip);
-void WelsMdInterUpdateBGDInfo (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t kbCollocatedPredFlag,
+void WelsMdInterUpdateBGDInfo (SDqLayer* pCurLayer, SMB* pCurMb, const bool kbCollocatedPredFlag,
const int32_t kiRefPictureType);
-void WelsMdInterUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t kbCollocatedPredFlag,
+void WelsMdInterUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool kbCollocatedPredFlag,
const int32_t kiRefPictureType);
-bool_t WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- BOOL_T bTrySkip);
+bool WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool bTrySkip);
void WelsMdInterUpdatePskip (SDqLayer* pCurDqLayer, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache);
void WelsMdInterDecidedPskip (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache);
@@ -96,7 +96,7 @@
const SWelsMD* kpMd);
void WelsMdInterSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
- SMbCache* pMbCache, const BOOL_T kbSkip);
+ SMbCache* pMbCache, const bool kbSkip);
void WelsMdIntraSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
//end of: both used in BL and EL
--- a/codec/encoder/core/inc/svc_enc_frame.h
+++ b/codec/encoder/core/inc/svc_enc_frame.h
@@ -84,7 +84,7 @@
int16_t iMbWidth; // MB width of this picture, equal to pSps.iMbWidth
int16_t iMbHeight; // MB height of this picture, equal to pSps.iMbHeight;
- bool_t bBaseLayerAvailableFlag; // whether base layer is available for prediction?
+ bool bBaseLayerAvailableFlag; // whether base layer is available for prediction?
uint8_t iLoopFilterDisableIdc; // 0: on, 1: off, 2: on except for slice boundaries
int8_t iLoopFilterAlphaC0Offset;// AlphaOffset: valid range [-6, 6], default 0
int8_t iLoopFilterBetaOffset; // BetaOffset: valid range [-6, 6], default 0
@@ -91,7 +91,7 @@
uint8_t uiDisableInterLayerDeblockingFilterIdc;
int8_t iInterLayerSliceAlphaC0Offset;
int8_t iInterLayerSliceBetaOffset;
- bool_t bDeblockingParallelFlag; //parallel_deblocking_flag
+ bool bDeblockingParallelFlag; //parallel_deblocking_flag
SPicture* pRefPic; // reference picture pointer
SPicture* pDecPic; // reconstruction picture pointer for layer
--- a/codec/encoder/core/inc/svc_enc_golomb.h
+++ b/codec/encoder/core/inc/svc_enc_golomb.h
@@ -237,7 +237,7 @@
}
-static inline BOOL_T BsCheckByteAlign (SBitStringAux* pBs) {+static inline bool BsCheckByteAlign (SBitStringAux* pBs) {return ! (pBs->iLeftBits & 0x7);
}
--- a/codec/encoder/core/inc/svc_enc_slice_segment.h
+++ b/codec/encoder/core/inc/svc_enc_slice_segment.h
@@ -136,7 +136,7 @@
*/
int32_t InitSlicePEncCtx (SSliceCtx* pSliceCtx,
CMemoryAlign* pMa,
- bool_t bFmoUseFlag,
+ bool bFmoUseFlag,
int32_t iMbWidth,
int32_t iMbHeight,
SMulSliceOption* pMulSliceOption,
@@ -212,9 +212,9 @@
//checking valid para
int32_t DynamicMaxSliceNumConstraint (uint32_t uiMaximumNum, int32_t uiConsumedNum, uint32_t uiDulplicateTimes);
-bool_t CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
-bool_t CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
-bool_t CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg);
+bool CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
+bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
+bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg);
void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, int32_t* pSliceNum);
void GomValidCheckSliceMbNum (const int32_t kiMbWidth, const int32_t kiMbHeight, SSliceArgument* pSliceArg);
--- a/codec/encoder/core/inc/svc_encode_mb.h
+++ b/codec/encoder/core/inc/svc_encode_mb.h
@@ -57,8 +57,8 @@
void WelsEncRecUV (SWelsFuncPtrList* func, SMB* pCurMb, SMbCache* pMbCache, int16_t* pRs, int32_t iUV);
void WelsRecPskip (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SMB* pCurMb, SMbCache* pMbCache);
-BOOL_T WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache);
-BOOL_T WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV);
+bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache);
+bool WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV);
}
#endif
--- a/codec/encoder/core/inc/svc_encode_slice.h
+++ b/codec/encoder/core/inc/svc_encode_slice.h
@@ -72,8 +72,8 @@
//===================MB-level encode====================//
//encapsulation func: store base rec, highest Dependency Layer(only one quality) rec, single layer rec
-void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag);
-void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag);
+void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag);
+void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag);
//encapsulation func: store base rec, highest Dependency Layer(only one quality) rec, single layer rec
void WelsISliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice); // for intra non-dynamic slice
@@ -83,7 +83,7 @@
void WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice);
void WelsCodeOneSlice (sWelsEncCtx* pEncCtx, const int32_t kiSliceIdx,
- const int32_t/*EWelsNalUnitType*/ keNalType/*, bool_t bNewLayer*/);
+ const int32_t/*EWelsNalUnitType*/ keNalType/*, bool bNewLayer*/);
void WelsInitSliceEncodingFuncs (uint32_t uiCpuFlag);
@@ -99,7 +99,7 @@
const int32_t kiSliceFirstMbXY); // for inter dynamic slice
-BOOL_T DynSlcJudgeSliceBoundaryStepBack (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+bool DynSlcJudgeSliceBoundaryStepBack (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
SDynamicSlicingStack* pDss);
}
#endif //SVC_ENCODE_SLICE_H__
--- a/codec/encoder/core/inc/svc_motion_estimate.h
+++ b/codec/encoder/core/inc/svc_motion_estimate.h
@@ -127,7 +127,7 @@
void WelsMotionEstimateIterativeSearch (SWelsFuncPtrList* pFuncList, SWelsME* pMe, const int32_t kiStrideEnc,
const int32_t kiStrideRef, uint8_t* pRef);
-bool_t WelsMeSadCostSelect (int32_t* pSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
+bool WelsMeSadCostSelect (int32_t* pSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
const int32_t kiDy, int32_t* pIx, int32_t* pIy);
}
--- a/codec/encoder/core/inc/utils.h
+++ b/codec/encoder/core/inc/utils.h
@@ -65,7 +65,7 @@
* Function pointer declaration for various tool sets
*/
// wels log output
-typedef void (*PWelsLogCallbackFunc) (void* pCtx, const int32_t iLevel, const str_t* kpFmt, va_list argv);
+typedef void (*PWelsLogCallbackFunc) (void* pCtx, const int32_t iLevel, const char* kpFmt, va_list argv);
// wels psnr calc
typedef float (*PWelsPsnrFunc) (const void* kpTarPic,
@@ -78,13 +78,13 @@
extern PWelsLogCallbackFunc wlog;
#ifdef __GNUC__
-extern void WelsLog (void* pCtx, int32_t iLevel, const str_t* kpFmt, ...) __attribute__ ((__format__ (__printf__, 3,
+extern void WelsLog (void* pCtx, int32_t iLevel, const char* kpFmt, ...) __attribute__ ((__format__ (__printf__, 3,
4)));
#else
-extern void WelsLog (void* pCtx, int32_t iLevel, const str_t* kpFmt, ...);
+extern void WelsLog (void* pCtx, int32_t iLevel, const char* kpFmt, ...);
#endif
-extern const str_t* g_sWelsLogTags[];
+extern const char* g_sWelsLogTags[];
/*!
*************************************************************************************
@@ -100,8 +100,8 @@
* \note N/A
*************************************************************************************
*/
-void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, va_list argv);
-void WelsLogNil (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, va_list argv);
+void WelsLogDefault (void* pCtx, const int32_t kiLevel, const char* kpFmtStr, va_list argv);
+void WelsLogNil (void* pCtx, const int32_t kiLevel, const char* kpFmtStr, va_list argv);
/*!
@@ -155,7 +155,7 @@
* \note N/A
*************************************************************************************
*/
-void WelsReopenTraceFile (void* pCtx, str_t* pCurPath);
+void WelsReopenTraceFile (void* pCtx, char* pCurPath);
/*
* PSNR calculation routines
--- a/codec/encoder/core/inc/wels_common_basis.h
+++ b/codec/encoder/core/inc/wels_common_basis.h
@@ -199,7 +199,7 @@
typedef struct TagParaSetOffsetVariable {int32_t iParaSetIdDelta[MAX_DQ_LAYER_NUM/*+1*/]; //mark delta between SPS_ID_in_bs and sps_id_in_encoder, can be minus, for each dq-layer
//need not extra +1 due no MGS and FMO case so far
-bool_t bUsedParaSetIdInBs[MAX_PPS_COUNT]; //mark the used SPS_ID with 1
+bool bUsedParaSetIdInBs[MAX_PPS_COUNT]; //mark the used SPS_ID with 1
uint32_t uiNextParaSetIdToUseInBs; //mark the next SPS_ID_in_bs, for all layers
} SParaSetOffsetVariable;
@@ -208,12 +208,12 @@
SParaSetOffsetVariable
sParaSetOffsetVariable[PARA_SET_TYPE]; //PARA_SET_TYPE=3; paraset_type = 0: AVC_SPS; =1: Subset_SPS; =2: PPS
//in PSO design, "bPpsIdMappingIntoSubsetsps" uses the current para of current IDR period
-bool_t
+bool
bPpsIdMappingIntoSubsetsps[MAX_DQ_LAYER_NUM/*+1*/]; // need not extra +1 due no MGS and FMO case so far
uint16_t
uiIdrPicId; // IDR picture id: [0, 65535], this one is used for LTR!! Can we just NOT put this into the SParaSetOffset structure?!!
#if _DEBUG
-bool_t bEnableSpsPpsIdAddition;
+bool bEnableSpsPpsIdAddition;
#endif
} SParaSetOffset;
@@ -311,7 +311,7 @@
#define MB_TYPE_UNAVAILABLE 0xFF000000
#define REF_NOT_AVAIL -2
#define REF_NOT_IN_LIST -1 //intra
-#define REF_PIC_REORDER_DEFAULT TRUE
+#define REF_PIC_REORDER_DEFAULT true
#define IS_INTRA4x4(type) ( MB_TYPE_INTRA4x4 == (type) )
#define IS_INTRA16x16(type) ( MB_TYPE_INTRA16x16 == (type) )
--- a/codec/encoder/core/inc/wels_const.h
+++ b/codec/encoder/core/inc/wels_const.h
@@ -44,7 +44,7 @@
// Miscellaneous sizing infos
#ifndef MAX_FNAME_LEN
-#define MAX_FNAME_LEN 256 // maximal length of file name in str_t size
+#define MAX_FNAME_LEN 256 // maximal length of file name in char size
#endif//MAX_FNAME_LEN
#ifndef WELS_LOG_BUF_SIZE
--- a/codec/encoder/core/inc/wels_func_ptr_def.h
+++ b/codec/encoder/core/inc/wels_func_ptr_def.h
@@ -110,7 +110,7 @@
typedef int32_t (*PIntraFineMdFunc) (void* pEncCtx, void* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
typedef void (*PInterFineMdFunc) (void* pEncCtx, void* pWelsMd, SSlice* slice, SMB* pCurMb, int32_t bestCost);
-typedef BOOL_T (*PInterMdFirstIntraModeFunc) (void* pEncCtx, void* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+typedef bool (*PInterMdFirstIntraModeFunc) (void* pEncCtx, void* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
typedef void (*PMotionSearchFunc) (SWelsFuncPtrList* pFuncList, void* pCurDqLayer, void* pMe,
void* pSlice); // here after reset all function pointers, will set as right parameter type
@@ -117,12 +117,12 @@
typedef void (*PFillInterNeighborCacheFunc) (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth, int8_t* pVaaBgMbFlag);
typedef void (*PAccumulateSadFunc) (uint32_t* pSumDiff, int32_t* pGomForegroundBlockNum, int32_t* iSad8x8,
int8_t* pVaaBgMbFlag);//for RC
-typedef BOOL_T (*PDynamicSlicingStepBackFunc) (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+typedef bool (*PDynamicSlicingStepBackFunc) (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
SDynamicSlicingStack* pDynamicSlicingStack); // 2010.8.17
-typedef bool_t (*PInterMdBackgroundDecisionFunc) (void* pEncCtx, void* pWelsMd, SSlice* slice, SMB* pCurMb,
- SMbCache* pMbCache, BOOL_T* pKeepPskip);
-typedef void (*PInterMdBackgroundInfoUpdateFunc) (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t bFlag,
+typedef bool (*PInterMdBackgroundDecisionFunc) (void* pEncCtx, void* pWelsMd, SSlice* slice, SMB* pCurMb,
+ SMbCache* pMbCache, bool* pKeepPskip);
+typedef void (*PInterMdBackgroundInfoUpdateFunc) (SDqLayer* pCurLayer, SMB* pCurMb, const bool bFlag,
const int32_t kiRefPictureType);
typedef void (*PInterMdFunc) (void* pEncCtx, void* pWelsMd, SSlice* slice, SMB* pCurMb, SMbCache* pMbCache);
--- a/codec/encoder/core/inc/wels_preprocess.h
+++ b/codec/encoder/core/inc/wels_preprocess.h
@@ -79,8 +79,8 @@
uint8_t uiValidLongTermPicIdx;
uint8_t uiMarkLongTermPicIdx;
- bool_t bSceneChangeFlag;
- bool_t bIdrPeriodFlag;
+ bool bSceneChangeFlag;
+ bool bIdrPeriodFlag;
} SVAAFrameInfo;
class CWelsLib {@@ -92,7 +92,7 @@
int32_t DestroyIface (void* pEncCtx);
protected:
- void* QueryFunction (const str_t* pName);
+ void* QueryFunction (const char* pName);
private:
void* m_pVpLib;
@@ -119,16 +119,16 @@
int32_t MultiLayerPreprocess (void* pEncCtx, const SSourcePicture** kppSrcPicList, const int32_t kiSpatialNum);
void BilateralDenoising (SPicture* pSrc, const int32_t iWidth, const int32_t iHeight);
- bool_t DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture);
+ bool DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture);
int32_t DownsamplePadding (SPicture* pSrc, SPicture* pDstPic, int32_t iSrcWidth, int32_t iSrcHeight,
int32_t iShrinkWidth, int32_t iShrinkHeight, int32_t iTargetWidth, int32_t iTargetHeight);
- void VaaCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool_t bCalculateSQDiff,
- bool_t bCalculateVar, bool_t bCalculateBGD);
- void BackgroundDetection (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool_t bDetectFlag);
+ void VaaCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool bCalculateSQDiff,
+ bool bCalculateVar, bool bCalculateBGD);
+ void BackgroundDetection (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool bDetectFlag);
void AdaptiveQuantCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture);
void AnalyzePictureComplexity (void* pCtx, SPicture* pCurPicture, SPicture* pRefPicture,
- const int32_t kiDependencyId, const bool_t kbCalculateBGD);
+ const int32_t kiDependencyId, const bool kbCalculateBGD);
void Padding (uint8_t* pSrcY, uint8_t* pSrcU, uint8_t* pSrcV, int32_t iStrideY, int32_t iStrideUV,
int32_t iActualWidth, int32_t iPaddingWidth, int32_t iActualHeight, int32_t iPaddingHeight);
void SetRefMbType (void* pCtx, uint32_t** pRefMbTypeArray, int32_t iRefPicType);
@@ -144,8 +144,8 @@
IWelsVP* m_pInterfaceVp;
CWelsLib* m_pEncLib;
void* m_pEncCtx;
- bool_t m_bInitDone;
- bool_t m_bOfficialBranch;
+ bool m_bInitDone;
+ bool m_bOfficialBranch;
};
}
--- a/codec/encoder/core/src/au_set.cpp
+++ b/codec/encoder/core/src/au_set.cpp
@@ -262,7 +262,7 @@
int32_t WelsWritePpsSyntax (SWelsPPS* pPps, SBitStringAux* pBitStringAux, SParaSetOffset* sPSOVector) {SBitStringAux* pLocalBitStringAux = pBitStringAux;
- bool_t bUsedSubset = sPSOVector->bPpsIdMappingIntoSubsetsps[pPps->iPpsId];
+ bool bUsedSubset = sPSOVector->bPpsIdMappingIntoSubsetsps[pPps->iPpsId];
int32_t iParameterSetType = (bUsedSubset ? PARA_SET_TYPE_SUBSETSPS : PARA_SET_TYPE_AVCSPS);
BsWriteUE (pLocalBitStringAux, pPps->iPpsId +
@@ -348,7 +348,7 @@
return 0;
}
-static inline bool_t WelsGetPaddingOffset (int32_t iActualWidth, int32_t iActualHeight, int32_t iWidth,
+static inline bool WelsGetPaddingOffset (int32_t iActualWidth, int32_t iActualHeight, int32_t iWidth,
int32_t iHeight, SCropOffset& pOffset) {if ((iWidth < iActualWidth) || (iHeight < iActualHeight))
return false;
@@ -367,7 +367,7 @@
int32_t WelsInitSps (SWelsSPS* pSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,
const int32_t kiNumRefFrame,
- const uint32_t kuiSpsId, const bool_t kbEnableFrameCropping, bool_t bEnableRc) {+ const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc) {memset (pSps, 0, sizeof (SWelsSPS));
pSps->uiSpsId = kuiSpsId;
@@ -409,7 +409,7 @@
int32_t WelsInitSubsetSps (SSubsetSps* pSubsetSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,
const int32_t kiNumRefFrame,
- const uint32_t kuiSpsId, const bool_t kbEnableFrameCropping, bool_t bEnableRc) {+ const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc) {SWelsSPS* pSps = &pSubsetSps->pSps;
memset (pSubsetSps, 0, sizeof (SSubsetSps));
@@ -431,8 +431,8 @@
SWelsSPS* pSps,
SSubsetSps* pSubsetSps,
const uint32_t kuiPpsId,
- const bool_t kbDeblockingFilterPresentFlag,
- const bool_t kbUsingSubsetSps) {+ const bool kbDeblockingFilterPresentFlag,
+ const bool kbUsingSubsetSps) {SWelsSPS* pUsedSps = NULL;
if (pPps == NULL || (pSps == NULL && pSubsetSps == NULL))
return 1;
--- a/codec/encoder/core/src/deblocking.cpp
+++ b/codec/encoder/core/src/deblocking.cpp
@@ -395,8 +395,8 @@
int32_t iMbX = pCurMb->iMbX;
int32_t iMbY = pCurMb->iMbY;
- BOOL_T bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};- BOOL_T bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};+ bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};+ bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc];
@@ -481,8 +481,8 @@
int32_t iMbX = pCurMb->iMbX;
int32_t iMbY = pCurMb->iMbY;
- BOOL_T bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};- BOOL_T bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};+ bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};+ bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc];
@@ -536,8 +536,8 @@
int32_t iMbX = pCurMb->iMbX;
int32_t iMbY = pCurMb->iMbY;
- BOOL_T bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};- BOOL_T bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};+ bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};+ bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc];
@@ -592,8 +592,8 @@
int32_t iMbX = pCurMb->iMbX;
int32_t iMbY = pCurMb->iMbY;
- BOOL_T bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};- BOOL_T bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};+ bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};+ bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc];
--- a/codec/encoder/core/src/encoder.cpp
+++ b/codec/encoder/core/src/encoder.cpp
@@ -135,7 +135,7 @@
}
-void WelsInitBGDFunc (SWelsFuncPtrList* pFuncList, const bool_t kbEnableBackgroundDetection) {+void WelsInitBGDFunc (SWelsFuncPtrList* pFuncList, const bool kbEnableBackgroundDetection) { if (kbEnableBackgroundDetection) {pFuncList->pfInterMdBackgroundDecision = WelsMdInterJudgeBGDPskip;
pFuncList->pfInterMdBackgroundInfoUpdate = WelsMdInterUpdateBGDInfo;
@@ -283,7 +283,7 @@
EFrameType DecideFrameType (sWelsEncCtx* pEncCtx, const int8_t kiSpatialNum) {SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam;
EFrameType iFrameType = WELS_FRAME_TYPE_AUTO;
- bool_t bSceneChangeFlag = false;
+ bool bSceneChangeFlag = false;
// perform scene change detection
if ((!pSvcParam->bEnableSceneChangeDetect) || pEncCtx->pVaa->bIdrPeriodFlag ||
@@ -314,9 +314,9 @@
* \brief Dump reconstruction for dependency layer
*/
-extern "C" void DumpDependencyRec (SPicture* pCurPicture, const str_t* kpFileName, const int8_t kiDid) {+extern "C" void DumpDependencyRec (SPicture* pCurPicture, const char* kpFileName, const int8_t kiDid) {WelsFileHandle* pDumpRecFile = NULL;
- static bool_t bDependencyRecFlag[MAX_DEPENDENCY_LAYER] = {0};+ static bool bDependencyRecFlag[MAX_DEPENDENCY_LAYER] = {0};int32_t iWrittenSize = 0;
if (NULL == pCurPicture || NULL == kpFileName || kiDid >= MAX_DEPENDENCY_LAYER)
@@ -326,7 +326,7 @@
if (strlen (kpFileName) > 0) // confirmed_safe_unsafe_usage
pDumpRecFile = WelsFopen (kpFileName, "ab");
else {- str_t sDependencyRecFileName[16] = {0};+ char sDependencyRecFileName[16] = {0};WelsSnprintf (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage
pDumpRecFile = WelsFopen (sDependencyRecFileName, "ab");
}
@@ -336,7 +336,7 @@
if (strlen (kpFileName) > 0) { // confirmed_safe_unsafe_usagepDumpRecFile = WelsFopen (kpFileName, "wb");
} else {- str_t sDependencyRecFileName[16] = {0};+ char sDependencyRecFileName[16] = {0};WelsSnprintf (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage
pDumpRecFile = WelsFopen (sDependencyRecFileName, "wb");
}
@@ -382,9 +382,9 @@
* \brief Dump the reconstruction pictures
*/
-void DumpRecFrame (SPicture* pCurPicture, const str_t* kpFileName) {+void DumpRecFrame (SPicture* pCurPicture, const char* kpFileName) {WelsFileHandle* pDumpRecFile = NULL;
- static bool_t bRecFlag = false;
+ static bool bRecFlag = false;
int32_t iWrittenSize = 0;
if (NULL == pCurPicture || NULL == kpFileName)
--- a/codec/encoder/core/src/encoder_data_tables.cpp
+++ b/codec/encoder/core/src/encoder_data_tables.cpp
@@ -86,7 +86,7 @@
// extern at mb_cache.h
-const str_t* g_sWelsLogTags[] = {+const char* g_sWelsLogTags[] = {"ERR",
"WARN",
"INFO",
--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -636,10 +636,10 @@
&pEnc->pRefIndexBlock4x4[MB_BLOCK8x8_NUM * kiOffset]);
for (iIdx = 0; iIdx < iMbNum; iIdx++) {- BOOL_T bLeft;
- BOOL_T bTop;
- BOOL_T bLeftTop;
- BOOL_T bRightTop;
+ bool bLeft;
+ bool bTop;
+ bool bLeftTop;
+ bool bRightTop;
int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
uint8_t uiSliceIdc;
@@ -740,7 +740,7 @@
WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pMemPredBlk4));
pMbCache->pBufferInterPredMe = (uint8_t*)pMa->WelsMalloc (4 * 640 * sizeof (uint8_t), "pMbCache->pBufferInterPredMe");
WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pBufferInterPredMe));
- pMbCache->pPrevIntra4x4PredModeFlag = (bool_t*)pMa->WelsMalloc (16 * sizeof (bool_t),
+ pMbCache->pPrevIntra4x4PredModeFlag = (bool*)pMa->WelsMalloc (16 * sizeof (bool),
"pMbCache->pPrevIntra4x4PredModeFlag");
WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pPrevIntra4x4PredModeFlag));
pMbCache->pRemIntra4x4PredModeFlag = (int8_t*)pMa->WelsMalloc (16 * sizeof (int8_t),
@@ -1000,7 +1000,7 @@
iDlayerIndex = 0;
while (iDlayerIndex < iDlayerCount) {SDqIdc* pDqIdc = & (*ppCtx)->pDqIdcMap[iDlayerIndex];
- const bool_t bUseSubsetSps = (iDlayerIndex > BASE_DEPENDENCY_ID);
+ const bool bUseSubsetSps = (iDlayerIndex > BASE_DEPENDENCY_ID);
SDLayerParam* pDlayerParam = &pParam->sDependencyLayers[iDlayerIndex];
pDqIdc->uiSpatialId = iDlayerIndex;
@@ -1120,7 +1120,7 @@
// Adaptive size_cs, size_fdec by implementation dependency
iTemporalIdx = 0;
while (iTemporalIdx < iCntTid) {- const bool_t kbBaseTemporalFlag = (iTemporalIdx == 0);
+ const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
iSpatialIdx = 0;
while (iSpatialIdx < kiNumSpatialLayers) {@@ -1153,7 +1153,7 @@
iTemporalIdx = 0;
while (iTemporalIdx < iCntTid) {- const bool_t kbBaseTemporalFlag = (iTemporalIdx == 0);
+ const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
iSpatialIdx = 0;
while (iSpatialIdx < iCountLayersNeedCs[kbBaseTemporalFlag]) {@@ -1172,13 +1172,13 @@
}
iTemporalIdx = 0;
while (iTemporalIdx < iCntTid) {- const bool_t kbBaseTemporalFlag = (iTemporalIdx == 0);
+ const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
iSpatialIdx = 0;
while (iSpatialIdx < kiNumSpatialLayers) {int32_t iMatchIndex = 0;
- bool_t bInMap = false;
- bool_t bMatchFlag = false;
+ bool bInMap = false;
+ bool bMatchFlag = false;
i = 0;
while (i < iCountLayersNeedCs[kbBaseTemporalFlag]) {@@ -1667,7 +1667,7 @@
while (ilayer < pParam->iNumDependencyLayer) {SDqLayer* pDq = pCtx->ppDqLayerList[ilayer];
SDLayerParam* pDlp = &pCtx->pSvcParam->sDependencyLayers[ilayer];
- const BOOL_T kbIsDynamicSlicing = (SM_DYN_SLICE == pDlp->sMso.uiSliceMode);
+ const bool kbIsDynamicSlicing = (SM_DYN_SLICE == pDlp->sMso.uiSliceMode);
// pDq layers
if (NULL != pDq) {@@ -2082,7 +2082,7 @@
// for logs
#ifdef ENABLE_TRACE_FILE
if (wlog == WelsLogDefault) {- str_t fname[MAX_FNAME_LEN] = {0};+ char fname[MAX_FNAME_LEN] = {0};WelsSnprintf (fname, MAX_FNAME_LEN, "wels_svc_encoder_trace.txt");
@@ -2312,10 +2312,10 @@
const int32_t kiMbXY = pMb->iMbXY;
const int32_t kiMbX = pMb->iMbX;
const int32_t kiMbY = pMb->iMbY;
- BOOL_T bLeft;
- BOOL_T bTop;
- BOOL_T bLeftTop;
- BOOL_T bRightTop;
+ bool bLeft;
+ bool bTop;
+ bool bLeftTop;
+ bool bRightTop;
int32_t uiSliceIdc;
int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
@@ -2550,7 +2550,7 @@
SSlice* pBaseSlice = &pCurDq->sLayerInfo.pSliceInLayer[0];
SSlice* pSlice = NULL;
const uint8_t kiCurDid = pCtx->uiDependencyId;
- const bool_t kbUseSubsetSpsFlag = (kiCurDid > BASE_DEPENDENCY_ID);
+ const bool kbUseSubsetSpsFlag = (kiCurDid > BASE_DEPENDENCY_ID);
SDLayerParam* fDlp = &pParam->sDependencyLayers[kiCurDid];
SNalUnitHeaderExt* pNalHdExt = &pCurDq->sLayerInfo.sNalHeaderExt;
SNalUnitHeader* pNalHd = &pNalHdExt->sNalHeader;
@@ -2638,7 +2638,7 @@
void PreprocessSliceCoding (sWelsEncCtx* pCtx) {SDqLayer* pCurLayer = pCtx->pCurDqLayer;
- const bool_t kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
+ const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
/* function pointers conditional assignment under sWelsEncCtx, layer_mb_enc_rec (in stack) is exclusive */
@@ -2766,7 +2766,7 @@
const int32_t kiEncId = kiCurEncoderParaSetId;
const uint32_t kuiPrevIdInBs = sParaSetOffsetVariable->iParaSetIdDelta[kiEncId] + kiEncId;//mark current_id
- const bool_t* kpUsedIdPointer = &sParaSetOffsetVariable->bUsedParaSetIdInBs[0];
+ const bool* kpUsedIdPointer = &sParaSetOffsetVariable->bUsedParaSetIdInBs[0];
uint32_t uiNextIdInBs = sParaSetOffsetVariable->uiNextParaSetIdToUseInBs;
#if _DEBUG
@@ -2817,7 +2817,7 @@
while (iIdx < pCtx->iSpsNum) {SDqIdc* pDqIdc = &pCtx->pDqIdcMap[iIdx];
const int32_t kiDid = pDqIdc->uiSpatialId;
- const bool_t kbUsingSubsetSps = (kiDid > BASE_DEPENDENCY_ID);
+ const bool kbUsingSubsetSps = (kiDid > BASE_DEPENDENCY_ID);
iNal = pCtx->pOut->iNalIndex;
@@ -3009,7 +3009,7 @@
// uiSliceIdx: 0 1 2 3 4 5 6 7 8 9 10
iCheckingIdx = 0;
while (true) {- bool_t bMatchFlag = false;
+ bool bMatchFlag = false;
iPartitionIdx = 0;
while (iPartitionIdx < kiPartitionCnt) {const int32_t coded_slice_cnt = pCurDq->pNumSliceCodedOfPartition[iPartitionIdx];
@@ -3124,7 +3124,7 @@
EWelsNalRefIdc eNalRefIdc = NRI_PRI_LOWEST;
int8_t iCurDid = 0;
int8_t iCurTid = 0;
- bool_t bAvcBased = false;
+ bool bAvcBased = false;
#if defined(ENABLE_PSNR_CALC)
float snr_y = .0f, snr_u = .0f, snr_v = .0f;
#endif//ENABLE_PSNR_CALC
@@ -3359,7 +3359,7 @@
pCtx->iActiveThreadsNum = iSliceCount;
// to fire slice coding threads
err = FiredSliceThreads (&pCtx->pSliceThreading->pThreadPEncCtx[0], &pCtx->pSliceThreading->pReadySliceCodingEvent[0],
- pLayerBsInfo, iSliceCount, pCtx->pCurDqLayer->pSliceEncCtx, FALSE);
+ pLayerBsInfo, iSliceCount, pCtx->pCurDqLayer->pSliceEncCtx, false);
if (err) {WelsLog (pCtx, WELS_LOG_ERROR,
"[MT] WelsEncoderEncodeExt(), FiredSliceThreads return(%d) failed and exit encoding frame, iCountThreadsNum= %d, iSliceCount= %d, uiSliceMode= %d, iMultipleThreadIdc= %d!!\n",
@@ -3418,7 +3418,7 @@
iNumThreadsRunning = iNumThreadsScheduled;
// to fire slice coding threads
err = FiredSliceThreads (&pCtx->pSliceThreading->pThreadPEncCtx[0], &pCtx->pSliceThreading->pReadySliceCodingEvent[0],
- pLayerBsInfo, iNumThreadsRunning, pCtx->pCurDqLayer->pSliceEncCtx, FALSE);
+ pLayerBsInfo, iNumThreadsRunning, pCtx->pCurDqLayer->pSliceEncCtx, false);
if (err) {WelsLog (pCtx, WELS_LOG_ERROR,
"[MT] WelsEncoderEncodeExt(), FiredSliceThreads return(%d) failed and exit encoding frame, iCountThreadsNum= %d, iSliceCount= %d, uiSliceMode= %d, iMultipleThreadIdc= %d!!\n",
@@ -3510,7 +3510,7 @@
// to fire slice coding threads
err = FiredSliceThreads (&pCtx->pSliceThreading->pThreadPEncCtx[0], &pCtx->pSliceThreading->pReadySliceCodingEvent[0],
- pLayerBsInfo, kiPartitionCnt, pCtx->pCurDqLayer->pSliceEncCtx, TRUE);
+ pLayerBsInfo, kiPartitionCnt, pCtx->pCurDqLayer->pSliceEncCtx, true);
if (err) {WelsLog (pCtx, WELS_LOG_ERROR,
"[MT] WelsEncoderEncodeExt(), FiredSliceThreads return(%d) failed and exit encoding frame, iCountThreadsNum= %d, iSliceCount= %d, uiSliceMode= %d, iMultipleThreadIdc= %d!!\n",
@@ -3531,7 +3531,7 @@
} else // for non-dynamic-slicing mode single threading branch..
#endif//MT_ENABLED
{- const bool_t bNeedPrefix = pCtx->bNeedPrefixNalFlag;
+ const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag;
int32_t iSliceIdx = 0;
iSliceCount = GetCurrentSliceNum (pCtx->pCurDqLayer->pSliceEncCtx);
@@ -3810,7 +3810,7 @@
SWelsSvcCodingParam* pOldParam = NULL;
int32_t iReturn = 0;
int8_t iIndexD = 0;
- bool_t bNeedReset = false;
+ bool bNeedReset = false;
if (NULL == ppCtx || NULL == *ppCtx || NULL == pNewParam) return 1;
@@ -4006,7 +4006,7 @@
int32_t iAnyMbLeftInPartition = iEndMbInPartition - iFirstMbInPartition;
const EWelsNalUnitType keNalType = pCtx->eNalType;
const EWelsNalRefIdc keNalRefIdc = pCtx->eNalPriority;
- const bool_t kbNeedPrefix = pCtx->bNeedPrefixNalFlag;
+ const bool kbNeedPrefix = pCtx->bNeedPrefixNalFlag;
//init
{--- a/codec/encoder/core/src/expand_pic.cpp
+++ b/codec/encoder/core/src/expand_pic.cpp
@@ -147,7 +147,7 @@
pExpLuma (pPicY, pPic->iLineSize[0], kiWidthY, kiHeightY);
if (kiWidthUV >= 16) {// fix coding picture size as 16x16
- const bool_t kbChrAligned = /*(iWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+iWidthUV) & 15
+ const bool kbChrAligned = /*(iWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+iWidthUV) & 15
pExpChrom[kbChrAligned] (pPicCb, pPic->iLineSize[1], kiWidthUV, kiHeightUV);
pExpChrom[kbChrAligned] (pPicCr, pPic->iLineSize[2], kiWidthUV, kiHeightUV);
} else {--- a/codec/encoder/core/src/md.cpp
+++ b/codec/encoder/core/src/md.cpp
@@ -494,7 +494,7 @@
#endif//X86_ASM
}
-BOOL_T MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb) {+bool MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb) {SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
const int32_t kiLineSize = pCurDqLayer->iEncStride[0];
@@ -878,7 +878,7 @@
}
-void PredictSadSkip (int8_t* pRefIndexCache, bool_t* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
+void PredictSadSkip (int8_t* pRefIndexCache, bool* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
int32_t* iSadPredSkip) {const int32_t kiRefB = pRefIndexCache[1];//top g_uiCache12_8x8RefIdx[0] - 4
int32_t iRefC = pRefIndexCache[5];//top-right g_uiCache12_8x8RefIdx[0] - 2
--- a/codec/encoder/core/src/memory_align.cpp
+++ b/codec/encoder/core/src/memory_align.cpp
@@ -66,7 +66,7 @@
#endif//MEMORY_CHECK
}
-void* CMemoryAlign::WelsMallocz (const uint32_t kuiSize, const str_t* kpTag) {+void* CMemoryAlign::WelsMallocz (const uint32_t kuiSize, const char* kpTag) {void* pPointer = WelsMalloc (kuiSize, kpTag);
if (NULL == pPointer) {return NULL;
@@ -77,7 +77,7 @@
return pPointer;
}
-void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) {+void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const char* kpTag) {const int32_t kiSizeOfVoidPointer = sizeof (void**);
const int32_t kiSizeOfInt = sizeof (int32_t);
const int32_t kiAlignedBytes = m_nCacheLineSize - 1;
@@ -114,7 +114,7 @@
return pAlignedBuffer;
}
-void CMemoryAlign::WelsFree (void* pPointer, const str_t* kpTag) {+void CMemoryAlign::WelsFree (void* pPointer, const char* kpTag) { if (pPointer) {#ifdef MEMORY_MONITOR
const int32_t kiMemoryLength = * ((int32_t*) ((uint8_t*)pPointer - sizeof (void**) - sizeof (
--- a/codec/encoder/core/src/nal_encap.cpp
+++ b/codec/encoder/core/src/nal_encap.cpp
@@ -222,7 +222,7 @@
* \brief write prefix nal
*/
int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t kiNalRefIdc,
- const bool_t kbIdrFlag) {+ const bool kbIdrFlag) { if (0 < kiNalRefIdc) {BsWriteOneBit (pBitStringAux, false/*bStoreRefBasePicFlag*/);
BsWriteOneBit (pBitStringAux, false);
--- a/codec/encoder/core/src/picture_handle.cpp
+++ b/codec/encoder/core/src/picture_handle.cpp
@@ -47,7 +47,7 @@
* \pram need_expand need borders expanding
* \return successful if effective picture pointer returned, otherwise failed with NULL
*/
-SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth , const int32_t kiHeight, bool_t bNeedMbInfo) {+SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth , const int32_t kiHeight, bool bNeedMbInfo) {SPicture* pPic = NULL;
int32_t iPicWidth = 0;
int32_t iPicHeight = 0;
--- a/codec/encoder/core/src/property.cpp
+++ b/codec/encoder/core/src/property.cpp
@@ -58,7 +58,7 @@
* \param iSize size of pBuffer overall
* \return actual size of pBuffer used; 0 returned in failure
*/
-int32_t GetCodeName (str_t* pBuf, int32_t iSize) {+int32_t GetCodeName (char* pBuf, int32_t iSize) {int32_t iLen = 0;
if (NULL == pBuf)
@@ -79,7 +79,7 @@
* \param iSize size of pBuffer overall
* \return actual size of pBuffer used; 0 returned in failure
*/
-int32_t GetLibName (str_t* pBuf, int32_t iSize) {+int32_t GetLibName (char* pBuf, int32_t iSize) {int32_t iLen = 0;
if (NULL == pBuf)
@@ -100,7 +100,7 @@
* \param iSize size of pBuffer overall
* \return actual size of pBuffer used; 0 returned in failure
*/
-int32_t GetVerNum (str_t* pBuf, int32_t iSize) {+int32_t GetVerNum (char* pBuf, int32_t iSize) {int32_t iLen = 0;
if (NULL == pBuf)
@@ -121,7 +121,7 @@
* \param iSize size of pBuffer overall
* \return actual size of pBuffer used; 0 returned in failure
*/
-int32_t GetIdentInfo (str_t* pBuf, int32_t iSize) {+int32_t GetIdentInfo (char* pBuf, int32_t iSize) {int32_t iLen = 0;
if (NULL == pBuf)
--- a/codec/encoder/core/src/ratectl.cpp
+++ b/codec/encoder/core/src/ratectl.cpp
@@ -108,7 +108,7 @@
int32_t j = 0;
int32_t iMbWidth = 0;
- BOOL_T bMultiSliceMode = FALSE;
+ bool bMultiSliceMode = false;
int32_t iGomRowMode0 = 1, iGomRowMode1 = 1;
#ifdef _TEST_TEMP_RC_
fp_test_rc = fopen ("testRC.dat", "w");@@ -293,7 +293,7 @@
RcInitVGop (pEncCtx);
}
-bool_t RcJudgeBitrateFpsUpdate (sWelsEncCtx* pEncCtx) {+bool RcJudgeBitrateFpsUpdate (sWelsEncCtx* pEncCtx) {int32_t iCurDid = pEncCtx->uiDependencyId;
SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[iCurDid];
SDLayerParam* pDLayerParam = &pEncCtx->pSvcParam->sDependencyLayers[iCurDid];
--- a/codec/encoder/core/src/ref_list_mgr_svc.cpp
+++ b/codec/encoder/core/src/ref_list_mgr_svc.cpp
@@ -55,7 +55,7 @@
* reset LTR marking , recovery ,feedback state to default
*/
void ResetLtrState (SLTRState* pLtr) {- pLtr->bReceivedT0LostFlag = FALSE;
+ pLtr->bReceivedT0LostFlag = false;
pLtr->iLastRecoverFrameNum = 0;
pLtr->iLastCorFrameNumDec = -1;
pLtr->iCurFrameNumInDec = -1;
@@ -63,8 +63,8 @@
// LTR mark
pLtr->iLTRMarkMode = LTR_DIRECT_MARK;
pLtr->iLTRMarkSuccessNum = 0; //successful marked num
- pLtr->bLTRMarkingFlag = FALSE; //decide whether current frame marked as LTR
- pLtr->bLTRMarkEnable = FALSE; //when LTR is confirmed and the interval is no smaller than the marking period
+ pLtr->bLTRMarkingFlag = false; //decide whether current frame marked as LTR
+ pLtr->bLTRMarkEnable = false; //when LTR is confirmed and the interval is no smaller than the marking period
pLtr->iCurLtrIdx = 0;
pLtr->iLastLtrIdx = 0;
pLtr->uiLtrMarkInterval = 0;
@@ -165,7 +165,7 @@
pLongRefList[i]->iLongTermPicNum, pLongRefList[i]->iFrameNum);
SetUnref (pLongRefList[i]);
DeleteLTRFromLongList (pCtx, i);
- pLtr->bLTRMarkEnable = TRUE;
+ pLtr->bLTRMarkEnable = true;
if (pRefList->uiLongRefCount == 0) {pCtx->bEncCurFrmAsIdrFlag = true;
}
@@ -178,7 +178,7 @@
pLongRefList[i]->iLongTermPicNum, pLongRefList[i]->iFrameNum);
SetUnref (pLongRefList[i]);
DeleteLTRFromLongList (pCtx, i);
- pLtr->bLTRMarkEnable = TRUE;
+ pLtr->bLTRMarkEnable = true;
if (pRefList->uiLongRefCount == 0) {pCtx->bEncCurFrmAsIdrFlag = true;
}
@@ -221,7 +221,7 @@
pLtr->iCurLtrIdx = (pLtr->iCurLtrIdx+1)%LONG_TERM_REF_NUM;
pLtr->iLTRMarkMode = (pLtr->iLTRMarkSuccessNum >= (LONG_TERM_REF_NUM)) ? (LTR_DELAY_MARK) : (LTR_DIRECT_MARK);
WelsLog (pCtx, WELS_LOG_WARNING, "LTR mark mode =%d", pLtr->iLTRMarkMode);
- pLtr->bLTRMarkEnable = TRUE;
+ pLtr->bLTRMarkEnable = true;
break;
}
}
@@ -235,7 +235,7 @@
}
}
pLtr->uiLtrMarkState = NO_LTR_MARKING_FEEDBACK;
- pLtr->bLTRMarkEnable = TRUE;
+ pLtr->bLTRMarkEnable = true;
if (pLtr->iLTRMarkSuccessNum == 0) {pCtx->bEncCurFrmAsIdrFlag = true; // no LTR , means IDR recieve failed, force next frame IDR
@@ -254,7 +254,7 @@
int32_t iMaxFrameNumPlus1 = (1 << pCtx->pSps->uiLog2MaxFrameNum);
int32_t i = 0;
int32_t j = 0;
- bool_t bMoveLtrFromShortToLong = false;
+ bool bMoveLtrFromShortToLong = false;
if (pCtx->eSliceType == I_SLICE) {i = 0;
@@ -324,7 +324,7 @@
/*
* update reference picture list
*/
-BOOL_T WelsUpdateRefList (sWelsEncCtx* pCtx) {+bool WelsUpdateRefList (sWelsEncCtx* pCtx) {SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
SDLayerParam* pParamD = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
@@ -339,10 +339,10 @@
uint32_t i = 0;
// Need update pRef list in case store base layer or target dependency layer construction
if (NULL == pCtx->pCurDqLayer)
- return FALSE;
+ return false;
if (NULL == pRefList || NULL == pRefList->pRef[0] || NULL == pRefList->pRef[kiSwapIdx])
- return FALSE;
+ return false;
if (NULL != pCtx->pDecPic) {#if !defined(ENABLE_FRAME_DUMP) // to save complexity, 1/6/2009
@@ -373,8 +373,8 @@
DeleteInvalidLTR (pCtx);
HandleLTRMarkFeedback (pCtx);
- pLtr->bReceivedT0LostFlag = FALSE; // reset to false due to the recovery is finished
- pLtr->bLTRMarkingFlag = FALSE;
+ pLtr->bReceivedT0LostFlag = false; // reset to false due to the recovery is finished
+ pLtr->bLTRMarkingFlag = false;
++pLtr->uiLtrMarkInterval;
}
@@ -394,7 +394,7 @@
pLtr->iCurLtrIdx = (pLtr->iCurLtrIdx+1)%LONG_TERM_REF_NUM;
pLtr->iLTRMarkSuccessNum = 1; //IDR default suceess
- pLtr->bLTRMarkEnable = TRUE;
+ pLtr->bLTRMarkEnable = true;
pLtr->uiLtrMarkInterval = 0;
pCtx->pVaa->uiValidLongTermPicIdx = 0;
@@ -402,10 +402,10 @@
}
}
PrefetchNextBuffer (pCtx);
- return TRUE;
+ return true;
}
-bool_t CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx) {+bool CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx) {SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
SPicture** pLongRefList = pRefList->pLongRefList;
@@ -417,11 +417,11 @@
if ((pCtx->iFrameNum == pLongRefList[i]->iFrameNum && pLtr->iLTRMarkMode == LTR_DIRECT_MARK) ||
(CompareFrameNum (pCtx->iFrameNum + iGoPFrameNumInterval, pLongRefList[i]->iFrameNum,
iMaxFrameNumPlus1) == FRAME_NUM_EQUAL && pLtr->iLTRMarkMode == LTR_DELAY_MARK)) {- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
void WelsMarkPic (sWelsEncCtx* pCtx) {SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
@@ -432,12 +432,12 @@
if (pCtx->pSvcParam->bEnableLongTermReference && pLtr->bLTRMarkEnable && pCtx->uiTemporalId == 0) {if (!pLtr->bReceivedT0LostFlag && pLtr->uiLtrMarkInterval > pCtx->pSvcParam->uiLtrMarkPeriod
&& CheckCurMarkFrameNumUsed (pCtx)) {- pLtr->bLTRMarkingFlag = TRUE;
- pLtr->bLTRMarkEnable = FALSE;
+ pLtr->bLTRMarkingFlag = true;
+ pLtr->bLTRMarkEnable = false;
pLtr->uiLtrMarkInterval = 0;
pLtr->iLastLtrIdx = pLtr->iCurLtrIdx;
} else {- pLtr->bLTRMarkingFlag = FALSE;
+ pLtr->bLTRMarkingFlag = false;
}
}
@@ -478,10 +478,10 @@
if (pRequest->uiFeedbackType == LTR_RECOVERY_REQUEST && pRequest->uiIDRPicId == pCtx->sPSOVector.uiIdrPicId) { if (pRequest->iLastCorrectFrameNum == -1) {pCtx->bEncCurFrmAsIdrFlag = true;
- return TRUE;
+ return true;
} else if (pRequest->iCurrentFrameNum == -1) {pLtr->bReceivedT0LostFlag = true;
- return TRUE;
+ return true;
} else if ((CompareFrameNum (pLtr->iLastRecoverFrameNum , pRequest->iLastCorrectFrameNum,
iMaxFrameNumPlus1) & (FRAME_NUM_EQUAL | FRAME_NUM_SMALLER)) // t0 lost
|| ((CompareFrameNum (pLtr->iLastRecoverFrameNum , pRequest->iCurrentFrameNum,
@@ -502,9 +502,9 @@
, pRequest->uiFeedbackType, pRequest->uiIDRPicId, pRequest->iCurrentFrameNum, pRequest->iLastCorrectFrameNum);
}
} else if (!pCtx->pSvcParam->bEnableLongTermReference) {- pCtx->bEncCurFrmAsIdrFlag = TRUE;
+ pCtx->bEncCurFrmAsIdrFlag = true;
}
- return TRUE;
+ return true;
}
void FilterLTRMarkingFeedback (sWelsEncCtx* pCtx, SLTRMarkingFeedback* pLTRMarkingFeedback) {SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
@@ -532,7 +532,7 @@
/*
* build reference picture list
*/
-BOOL_T WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t iPOC) {+bool WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t iPOC) {SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
const int32_t kiNumRef = pCtx->pSvcParam->iNumRefFrame;
@@ -576,7 +576,7 @@
if (pCtx->iNumRef0 > kiNumRef)
pCtx->iNumRef0 = kiNumRef;
- return (pCtx->iNumRef0 > 0 || pCtx->eSliceType == I_SLICE) ? (TRUE) : (FALSE);
+ return (pCtx->iNumRef0 > 0 || pCtx->eSliceType == I_SLICE) ? (true) : (false);
}
/*
--- a/codec/encoder/core/src/slice_multi_threading.cpp
+++ b/codec/encoder/core/src/slice_multi_threading.cpp
@@ -81,10 +81,10 @@
const int32_t kiMbXY = pMb->iMbXY;
const int32_t kiMbX = pMb->iMbX;
const int32_t kiMbY = pMb->iMbY;
- BOOL_T bLeft;
- BOOL_T bTop;
- BOOL_T bLeftTop;
- BOOL_T bRightTop;
+ bool bLeft;
+ bool bTop;
+ bool bLeftTop;
+ bool bRightTop;
int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
iLeftXY = kiMbXY - 1;
@@ -438,7 +438,7 @@
iIdx = 0;
while (iIdx < iThreadNum) {#if defined(__GNUC__) && !defined(_WIN32) // for posix threading
- str_t name[SEM_NAME_MAX] = {0};+ char name[SEM_NAME_MAX] = {0};WELS_THREAD_ERROR_CODE err = 0;
#endif//__GNUC__
pSmt->pThreadPEncCtx[iIdx].pWelsPEncCtx = (void*) (*ppCtx);
@@ -568,7 +568,7 @@
WelsEventDestroy (&pSmt->pFinUpdateMbListEvent[iIdx]);
#endif//DYNAMIC_SLICE_ASSIGN && TRY_SLICING_BALANCE
#else
- str_t ename[SEM_NAME_MAX] = {0};+ char ename[SEM_NAME_MAX] = {0};// length of semaphore name should be system constrained at least on mac 10.7
WelsSnprintf (ename, SEM_NAME_MAX, "sc%d%p", iIdx, (void*) (*ppCtx));
WelsEventClose (pSmt->pSliceCodedEvent[iIdx], ename);
@@ -688,7 +688,7 @@
SWelsSvcCodingParam* pCodingParam = pCtx->pSvcParam;
SDLayerParam* pDlp = &pCodingParam->sDependencyLayers[pCtx->uiDependencyId];
SWelsSliceBs* pSliceBs = NULL;
- const BOOL_T kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE);
+ const bool kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE);
int32_t iLayerSize = 0;
int32_t iNalIdxBase = pLbi->iNalCount;
int32_t iSliceIdx = 0;
@@ -897,7 +897,7 @@
int32_t iSliceIdx = -1;
int32_t iThreadIdx = -1;
int32_t iEventIdx = -1;
- bool_t bNeedPrefix = false;
+ bool bNeedPrefix = false;
EWelsNalUnitType eNalType = NAL_UNIT_UNSPEC_0;
EWelsNalRefIdc eNalRefIdc = NRI_PRI_LOWEST;
@@ -946,7 +946,7 @@
if (pParamD->sMso.uiSliceMode != SM_DYN_SLICE) {int64_t iSliceStart = 0;
- bool_t bDsaFlag = false;
+ bool bDsaFlag = false;
iSliceIdx = pPrivateData->iSliceIndex;
pSlice = &pCurDq->sLayerInfo.pSliceInLayer[iSliceIdx];
pSliceBs = &pEncPEncCtx->pSliceBs[iSliceIdx];
@@ -967,7 +967,7 @@
InitBits (&pSliceBs->sBsWrite, pSliceBs->pBsBuffer, pSliceBs->uiSize);
#if MT_DEBUG_BS_WR
- pSliceBs->bSliceCodedFlag = FALSE;
+ pSliceBs->bSliceCodedFlag = false;
#endif//MT_DEBUG_BS_WR
if (bNeedPrefix) {@@ -1041,7 +1041,7 @@
#endif//SLICE_INFO_OUTPUT
#if MT_DEBUG_BS_WR
- pSliceBs->bSliceCodedFlag = TRUE;
+ pSliceBs->bSliceCodedFlag = true;
#endif//MT_DEBUG_BS_WR
#ifdef _WIN32
@@ -1219,7 +1219,7 @@
if (dwAffinityMask & dwProcessAffinity) { // check if cpu is availabledw = SetThreadAffinityMask (pCtx->pSliceThreading->pThreadHandles[iIdx], dwAffinityMask); //1 << iIdx
if (dw == 0) {- str_t str[64] = {0};+ char str[64] = {0};WelsSnprintf (str, 64, "SetThreadAffinityMask iIdx:%d", iIdx);
}
}
@@ -1252,10 +1252,10 @@
#ifdef _WIN32
int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLbi,
- const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const BOOL_T bIsDynamicSlicingMode)
+ const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool bIsDynamicSlicingMode)
#else
int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** pEventsList, SLayerBSInfo* pLbi,
- const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const BOOL_T bIsDynamicSlicingMode)
+ const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool bIsDynamicSlicingMode)
#endif//WIN32
{int32_t iEndMbIdx = 0;
@@ -1376,7 +1376,7 @@
int32_t iNeedAdj = 1;
// uiSliceMode of referencing spatial should be SM_FIXEDSLCNUM_SLICE
// if using spatial base layer for complexity estimation
- const BOOL_T kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0)
+ const bool kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0)
&& (pCtx->pSvcParam->sDependencyLayers[iCurDid - 1].sMso.uiSliceMode == SM_FIXEDSLCNUM_SLICE
&& pCtx->pSvcParam->iMultipleThreadIdc >= pCtx->pSvcParam->sDependencyLayers[iCurDid -
1].sMso.sSliceArgument.iSliceNum);
--- a/codec/encoder/core/src/svc_base_layer_md.cpp
+++ b/codec/encoder/core/src/svc_base_layer_md.cpp
@@ -446,7 +446,7 @@
const uint8_t* kpAvailMode;
int32_t i, j, iCoordinateX, iCoordinateY, iIdxStrideEnc, iIdxStrideDec;
int32_t lambda[2] = {iLambda << 2, iLambda};- bool_t* pPrevIntra4x4PredModeFlag = pMbCache->pPrevIntra4x4PredModeFlag;
+ bool* pPrevIntra4x4PredModeFlag = pMbCache->pPrevIntra4x4PredModeFlag;
int8_t* pRemIntra4x4PredModeFlag = pMbCache->pRemIntra4x4PredModeFlag;
const uint8_t* kpIntra4x4AvailCount = &g_kiIntra4AvailCount[0];
const uint8_t* kpCache48CountScan4 = &g_kuiCache48CountScan4Idx[0];
@@ -578,7 +578,7 @@
int32_t i, j, iCoordinateX, iCoordinateY, iIdxStrideEnc, iIdxStrideDec;
int32_t iCostH, iCostV, iCostVR, iCostHD, iCostVL, iCostHU, iBestModeFake;
int32_t lambda[2] = {iLambda << 2, iLambda};- bool_t* pPrevIntra4x4PredModeFlag = pMbCache->pPrevIntra4x4PredModeFlag;
+ bool* pPrevIntra4x4PredModeFlag = pMbCache->pPrevIntra4x4PredModeFlag;
int8_t* pRemIntra4x4PredModeFlag = pMbCache->pRemIntra4x4PredModeFlag;
const uint8_t* kpIntra4x4AvailCount = &g_kiIntra4AvailCount[0];
const uint8_t* kpCache48CountScan4 = &g_kuiCache48CountScan4Idx[0];
@@ -1235,7 +1235,7 @@
}
void WelsMdBackgroundMbEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice,
- bool_t bSkipMbFlag) {+ bool bSkipMbFlag) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pEnc;
SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
SWelsMD* pWelsMd = (SWelsMD*)pMd;
@@ -1307,7 +1307,7 @@
pFunc->pfCopy8x8Aligned (pMbCache->SPicData.pCsMb[2], pCurDqLayer->iCsStride[1], pMbCache->pMemPredChroma + 64, 8);
}
-BOOL_T WelsMdPSkipEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache) {+bool WelsMdPSkipEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pEnc;
SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
SWelsMD* pWelsMd = (SWelsMD*)pMd;
@@ -1342,15 +1342,15 @@
SMVUnitXY sQpelMvp = { sMvp.iMvX >> 2, sMvp.iMvY >> 2 };n = (pCurMb->iMbX << 4) + sQpelMvp.iMvX;
if (n < -29)
- return FALSE;
+ return false;
else if (n > (int32_t) ((pCurLayer->iMbWidth << 4) + 12))
- return FALSE;
+ return false;
n = (pCurMb->iMbY << 4) + sQpelMvp.iMvY;
if (n < -29)
- return FALSE;
+ return false;
else if (n > (int32_t) ((pCurLayer->iMbHeight << 4) + 12))
- return FALSE;
+ return false;
//luma
pRefLuma += sQpelMvp.iMvY * iLineSizeY + sQpelMvp.iMvX;
@@ -1395,7 +1395,7 @@
pCurMb->sP16x16Mv = sMvp;
pCurLayer->pDecPic->sMvList[pCurMb->iMbXY] = sMvp;
- return TRUE;
+ return true;
}
WelsDctMb (pMbCache->pCoeffLevel, pEncMb, iEncStride, pDstLuma, pEncCtx->pFuncList->pfDctFourT4);
@@ -1428,11 +1428,11 @@
pCurMb->sP16x16Mv = sMvp;
pCurLayer->pDecPic->sMvList[pCurMb->iMbXY] = sMvp;
- return TRUE;
+ return true;
}
}
}
- return FALSE;
+ return false;
}
const int32_t g_kiPixStrideIdx8x8[4] = { 0, ME_REFINE_BUF_WIDTH_BLK8,@@ -1586,7 +1586,7 @@
pWelsMd->iCostLuma = iBestSatdCost;
}
-BOOL_T WelsMdFirstIntraMode (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache) {+bool WelsMdFirstIntraMode (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pEnc;
SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
SWelsMD* pWelsMd = (SWelsMD*)pMd;
@@ -1611,10 +1611,10 @@
WelsIMbChromaEncode (pEncCtx, pCurMb, pMbCache); //add pEnc&rec to MD--2010.3.15
pCurMb->pSadCost[0] = 0;
- return TRUE; //intra_mb_type is best
+ return true; //intra_mb_type is best
}
- return FALSE;
+ return false;
}
void WelsMdInterMb (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pUnused) {@@ -1625,13 +1625,13 @@
const uint32_t kuiNeighborAvail = pCurMb->uiNeighborAvail;
const int32_t kiMbWidth = pCurDqLayer->iMbWidth;
const SMB* top_mb = pCurMb - kiMbWidth;
- const bool_t bMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
- const bool_t bMbTopAvailPskip = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (top_mb->uiMbType) : false);
- const bool_t bMbTopLeftAvailPskip = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((top_mb - 1)->uiMbType) : false);
- const bool_t bMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((top_mb + 1)->uiMbType) : false);
- BOOL_T bTrySkip = bMbLeftAvailPskip || bMbTopAvailPskip || bMbTopLeftAvailPskip || bMbTopRightAvailPskip;
- BOOL_T bKeepSkip = bMbLeftAvailPskip && bMbTopAvailPskip && bMbTopRightAvailPskip;
- BOOL_T bSkip = FALSE;
+ const bool bMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
+ const bool bMbTopAvailPskip = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (top_mb->uiMbType) : false);
+ const bool bMbTopLeftAvailPskip = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((top_mb - 1)->uiMbType) : false);
+ const bool bMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((top_mb + 1)->uiMbType) : false);
+ bool bTrySkip = bMbLeftAvailPskip || bMbTopAvailPskip || bMbTopLeftAvailPskip || bMbTopRightAvailPskip;
+ bool bKeepSkip = bMbLeftAvailPskip && bMbTopAvailPskip && bMbTopRightAvailPskip;
+ bool bSkip = false;
if (pEncCtx->pFuncList->pfInterMdBackgroundDecision (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, &bKeepSkip)) {return;
@@ -1661,9 +1661,9 @@
//////
// try the ordinary Pskip
//////
-bool_t WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- BOOL_T bTrySkip) {- bool_t bRet = true;
+bool WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool bTrySkip) {+ bool bRet = true;
if (((pEncCtx->pRefPic->iPictureType == P_SLICE) && (pMbCache->uiRefMbType == MB_TYPE_SKIP
|| pMbCache->uiRefMbType == MB_TYPE_BACKGROUND)) ||
bTrySkip) {@@ -1743,8 +1743,8 @@
//////
// try the BGD Pskip
//////
-bool_t WelsMdInterJudgeBGDPskip (void* pCtx, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- BOOL_T* bKeepSkip) {+bool WelsMdInterJudgeBGDPskip (void* pCtx, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool* bKeepSkip) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
SWelsMD* pWelsMd = (SWelsMD*)pMd;
@@ -1775,8 +1775,8 @@
return false;
}
-bool_t WelsMdInterJudgeBGDPskipFalse (void* pCtx, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- BOOL_T* bKeepSkip) {+bool WelsMdInterJudgeBGDPskipFalse (void* pCtx, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool* bKeepSkip) {return false;
}
@@ -1785,7 +1785,7 @@
//////
// update BGD related info
//////
-void WelsMdInterUpdateBGDInfo (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t bCollocatedPredFlag,
+void WelsMdInterUpdateBGDInfo (SDqLayer* pCurLayer, SMB* pCurMb, const bool bCollocatedPredFlag,
const int32_t iRefPictureType) {uint8_t* pTargetRefMbQpList = (pCurLayer->pDecPic->pRefMbQp);
const int32_t kiMbXY = pCurMb->iMbXY;
@@ -1802,7 +1802,7 @@
}
}
-void WelsMdInterUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t bCollocatedPredFlag,
+void WelsMdInterUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool bCollocatedPredFlag,
const int32_t iRefPictureType) {}
@@ -1820,9 +1820,9 @@
}
void WelsMdInterSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
- SMbCache* pMbCache, const BOOL_T bSkip) {+ SMbCache* pMbCache, const bool bSkip) {//step 2: Intra
- const BOOL_T kbTrySkip = pEncCtx->pFuncList->pfFirstIntraMode (pEncCtx, pWelsMd, pCurMb, pMbCache);
+ const bool kbTrySkip = pEncCtx->pFuncList->pfFirstIntraMode (pEncCtx, pWelsMd, pCurMb, pMbCache);
if (kbTrySkip)
return;
--- a/codec/encoder/core/src/svc_enc_slice_segment.cpp
+++ b/codec/encoder/core/src/svc_enc_slice_segment.cpp
@@ -121,7 +121,7 @@
*/
//slice parameter check for SM_FIXEDSLCNUM_SLICE
-bool_t CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {+bool CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {int32_t* pSlicesAssignList = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
const uint32_t kuiSliceNum = pSliceArg->iSliceNum;
uint32_t uiSliceIdx = 0;
@@ -141,7 +141,7 @@
}
//slice parameter check for SM_ROWMB_SLICE
-bool_t CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg) {+bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg) {int32_t* pSlicesAssignList = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
const uint32_t kuiSliceNum = pSliceArg->iSliceNum;
uint32_t uiSliceIdx = 0;
@@ -157,7 +157,7 @@
}
//slice parameter check for SM_RASTER_SLICE
-bool_t CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {+bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {int32_t* pSlicesAssignList = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
int32_t iActualSliceCount = 0;
@@ -494,7 +494,7 @@
*/
int32_t InitSlicePEncCtx (SSliceCtx* pSliceCtx,
CMemoryAlign* pMa,
- bool_t bFmoUseFlag,
+ bool bFmoUseFlag,
int32_t iMbWidth,
int32_t iMbHeight,
SMulSliceOption* pMso,
--- a/codec/encoder/core/src/svc_encode_mb.cpp
+++ b/codec/encoder/core/src/svc_encode_mb.cpp
@@ -325,7 +325,7 @@
pFuncList->pfSetMemZeroSize8 (pCurMb->pNonZeroCount, 24);
}
-BOOL_T WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {+bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {int32_t iSingleCtrMb = 0;
int16_t* pRes = pMbCache->pCoeffLevel;
const uint8_t kuiQp = pCurMb->uiLumaQp;
@@ -339,20 +339,20 @@
pEncCtx->pFuncList->pfQuantizationFour4x4Max (pRes, pFF, pMF, (int16_t*)aMax);
for (j = 0; j < 4; j++) {- if (aMax[j] > 1) return FALSE; // iSingleCtrMb += 9, can't be P_SKIP
+ if (aMax[j] > 1) return false; // iSingleCtrMb += 9, can't be P_SKIP
else if (aMax[j] == 1) {pEncCtx->pFuncList->pfScan4x4 (pBlock, pRes); //
iSingleCtrMb += pEncCtx->pFuncList->pfCalculateSingleCtr4x4 (pBlock);
}
- if (iSingleCtrMb >= 6) return FALSE; //from JVT-O079
+ if (iSingleCtrMb >= 6) return false; //from JVT-O079
pRes += 16;
pBlock += 16;
}
}
- return TRUE;
+ return true;
}
-BOOL_T WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV) {+bool WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV) {int16_t* pRes = ((iUV == 1) ? & (pMbCache->pCoeffLevel[256]) : & (pMbCache->pCoeffLevel[256 + 64]));
const uint8_t kuiQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp +
@@ -362,7 +362,7 @@
const int16_t* pFF = g_kiQuantInterFF[kuiQp];
if (pEncCtx->pFuncList->pfQuantizationHadamard2x2Skip (pRes, pFF[0] << 1, pMF[0]>>1))
- return FALSE;
+ return false;
else {uint16_t aMax[4], j;
int32_t iSingleCtrMb = 0;
@@ -370,16 +370,16 @@
pEncCtx->pFuncList->pfQuantizationFour4x4Max (pRes, pFF, pMF, (int16_t*)aMax);
for (j = 0; j < 4; j++) {- if (aMax[j] > 1) return FALSE; // iSingleCtrMb += 9, can't be P_SKIP
+ if (aMax[j] > 1) return false; // iSingleCtrMb += 9, can't be P_SKIP
else if (aMax[j] == 1) {pEncCtx->pFuncList->pfScan4x4Ac (pBlock, pRes);
iSingleCtrMb += pEncCtx->pFuncList->pfCalculateSingleCtr4x4 (pBlock);
}
- if (iSingleCtrMb >= 7) return FALSE; //from JVT-O079
+ if (iSingleCtrMb >= 7) return false; //from JVT-O079
pRes += 16;
pBlock += 16;
}
- return TRUE;
+ return true;
}
}
--- a/codec/encoder/core/src/svc_encode_slice.cpp
+++ b/codec/encoder/core/src/svc_encode_slice.cpp
@@ -598,7 +598,7 @@
//encapsulate two kinds of reconstruction:
// first. store base or highest Dependency Layer with only one quality (without CS RS reconstruction)
// second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer)
-void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag) { //pMd + encoding+void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag) { //pMd + encodingconst SSliceHeaderExt* kpShExt = &pSlice->sSliceHeaderExt;
const SSliceHeader* kpSh = &kpShExt->sSliceHeader;
const int32_t kiSliceFirstMbXY = kpSh->iFirstMbInSlice;
@@ -613,7 +613,7 @@
WelsMdInterMbLoop (pEncCtx, pSlice, &sMd, kiSliceFirstMbXY);
}
-void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag) {+void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag) {const SSliceHeaderExt* kpShExt = &pSlice->sSliceHeaderExt;
const SSliceHeader* kpSh = &kpShExt->sSliceHeader;
const int32_t kiSliceFirstMbXY = kpSh->iFirstMbInSlice;
@@ -631,8 +631,8 @@
void WelsCodePSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) {//pSlice-level init should be outside and before this function
SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
- const bool_t kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
- const bool_t kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer ==
+ const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
+ const bool kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer ==
(pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1);
//MD switch
@@ -649,8 +649,8 @@
void WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) {//pSlice-level init should be outside and before this function
SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
- const bool_t kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
- const bool_t kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer ==
+ const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
+ const bool kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer ==
(pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1);
//MD switch
@@ -738,10 +738,10 @@
const int32_t kiMbXY = pMb->iMbXY;
const int32_t kiMbX = pMb->iMbX;
const int32_t kiMbY = pMb->iMbY;
- BOOL_T bLeft;
- BOOL_T bTop;
- BOOL_T bLeftTop;
- BOOL_T bRightTop;
+ bool bLeft;
+ bool bTop;
+ bool bLeftTop;
+ bool bRightTop;
int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
const uint8_t kuiSliceIdc = WelsMbToSliceIdc (pSliceCtx, kiMbXY);
@@ -819,7 +819,7 @@
UpdateMbNeighbourInfoForNextSlice (pSliceCtx, pMbList, iFirstMbIdxOfNextSlice, kiLastMbIdxInPartition);
}
-BOOL_T DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+bool DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
SDynamicSlicingStack* pDss) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
SSlice* pCurSlice = (SSlice*)pSlice;
@@ -830,12 +830,12 @@
const int32_t kiPartitaionId = pCurSlice->uiSliceIdx % kiActiveThreadsNum;
const int32_t kiLastMbIdxInPartition = pEncCtx->pCurDqLayer->pLastMbIdxOfPartition[kiPartitaionId];
- const BOOL_T kbCurMbNotFirstMbOfCurSlice = (pSliceCtx->pOverallMbMap[iCurMbIdx] ==
+ const bool kbCurMbNotFirstMbOfCurSlice = (pSliceCtx->pOverallMbMap[iCurMbIdx] ==
pSliceCtx->pOverallMbMap[iCurMbIdx - 1]);
- const BOOL_T kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition;
- const BOOL_T kbSliceNumNotExceedConstraint = pSliceCtx->iSliceNumInFrame <
+ const bool kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition;
+ const bool kbSliceNumNotExceedConstraint = pSliceCtx->iSliceNumInFrame <
pSliceCtx->iMaxSliceNumConstraint; /*tmp choice to avoid complex memory operation, 100520, to be modify*/
- const BOOL_T kbSliceNumReachConstraint = (pSliceCtx->iSliceNumInFrame ==
+ const bool kbSliceNumReachConstraint = (pSliceCtx->iSliceNumInFrame ==
pSliceCtx->iMaxSliceNumConstraint);
if (pCurSlice->bDynamicSlicingSliceSizeCtrlFlag)
@@ -874,7 +874,7 @@
WelsMutexUnlock (&pEncCtx->pSliceThreading->mutexSliceNumUpdate);
#endif//MT_ENABLED
- return TRUE;
+ return true;
}
if (
@@ -896,7 +896,7 @@
WelsMutexUnlock (&pEncCtx->pSliceThreading->mutexSliceNumUpdate);
#endif//MT_ENABLED
- return FALSE;
+ return false;
}
///////////////
--- a/codec/encoder/core/src/svc_mode_decision.cpp
+++ b/codec/encoder/core/src/svc_mode_decision.cpp
@@ -55,15 +55,15 @@
const uint32_t kuiNeighborAvail = pCurMb->uiNeighborAvail;
const int32_t kiMbWidth = pCurDqLayer->iMbWidth;
const SMB* kpTopMb = pCurMb - kiMbWidth;
- const bool_t kbMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
- const bool_t kbMbTopAvailPskip = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (kpTopMb->uiMbType) : false);
- const bool_t kbMbTopLeftAvailPskip = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((kpTopMb - 1)->uiMbType) : false);
- const bool_t kbMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((
+ const bool kbMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
+ const bool kbMbTopAvailPskip = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (kpTopMb->uiMbType) : false);
+ const bool kbMbTopLeftAvailPskip = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((kpTopMb - 1)->uiMbType) : false);
+ const bool kbMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((
kpTopMb + 1)->uiMbType) : false);
- BOOL_T bTrySkip = kbMbLeftAvailPskip | kbMbTopAvailPskip | kbMbTopLeftAvailPskip | kbMbTopRightAvailPskip;
- BOOL_T bKeepSkip = kbMbLeftAvailPskip & kbMbTopAvailPskip & kbMbTopRightAvailPskip;
- BOOL_T bSkip = FALSE;
+ bool bTrySkip = kbMbLeftAvailPskip | kbMbTopAvailPskip | kbMbTopLeftAvailPskip | kbMbTopRightAvailPskip;
+ bool bKeepSkip = kbMbLeftAvailPskip & kbMbTopAvailPskip & kbMbTopRightAvailPskip;
+ bool bSkip = false;
if (pEncCtx->pFuncList->pfInterMdBackgroundDecision (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, &bKeepSkip)) {return;
--- a/codec/encoder/core/src/svc_motion_estimate.cpp
+++ b/codec/encoder/core/src/svc_motion_estimate.cpp
@@ -155,7 +155,7 @@
}
}
-bool_t WelsMeSadCostSelect (int32_t* iSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
+bool WelsMeSadCostSelect (int32_t* iSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
const int32_t kiDy, int32_t* pIx, int32_t* pIy) {int32_t iTempSadCost[4];
int32_t iInputSadCost = *pBestCost;
@@ -213,7 +213,7 @@
int32_t iX, iY;
- const bool_t kbIsBestCostWorse = WelsMeSadCostSelect (iSadCosts, kpMvdCost, &iBestCost, iMvDx, iMvDy, &iX, &iY);
+ const bool kbIsBestCostWorse = WelsMeSadCostSelect (iSadCosts, kpMvdCost, &iBestCost, iMvDx, iMvDy, &iX, &iY);
if (kbIsBestCostWorse)
break;
--- a/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
+++ b/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
@@ -68,7 +68,7 @@
int32_t i = 0;
SMVUnitXY sMvd[2];
- bool_t* pPredFlag;
+ bool* pPredFlag;
int8_t* pRemMode;
int32_t iMbOffset = 0;
@@ -176,7 +176,7 @@
int32_t iNumRefIdxl0ActiveMinus1 = pSliceHeadExt->sSliceHeader.uiNumRefIdxL0Active - 1;
int32_t i;
- bool_t bSubRef0 = false;
+ bool bSubRef0 = false;
const uint8_t* kpScan4 = & (g_kuiMbCountScan4Idx[0]);
/* mb type */
--- a/codec/encoder/core/src/utils.cpp
+++ b/codec/encoder/core/src/utils.cpp
@@ -57,8 +57,8 @@
namespace WelsSVCEnc {-void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, va_list argv);
-void WelsLogNil (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, va_list argv);
+void WelsLogDefault (void* pCtx, const int32_t kiLevel, const char* kpFmtStr, va_list argv);
+void WelsLogNil (void* pCtx, const int32_t kiLevel, const char* kpFmtStr, va_list argv);
float WelsCalcPsnr (const void* kpTarPic,
const int32_t kiTarStride,
@@ -86,10 +86,10 @@
* \param kiLevel log iLevel
* \return tag of log iLevel
*/
-static inline str_t* GetLogTag (const int32_t kiLevel, int32_t* pBit) {+static inline char* GetLogTag (const int32_t kiLevel, int32_t* pBit) {int32_t iShift = 0;
int32_t iVal = 0;
- bool_t bFound = false;
+ bool bFound = false;
if (kiLevel <= 0 || kiLevel > (1 << (WELS_LOG_LEVEL_COUNT - 1)) || NULL == pBit)
return NULL;
@@ -107,7 +107,7 @@
if (bFound) {*pBit = iShift;
- return (str_t*)g_sWelsLogTags[iShift];
+ return (char*)g_sWelsLogTags[iShift];
}
return NULL;
}
@@ -126,7 +126,7 @@
* \note N/A
*************************************************************************************
*/
-void WelsLogDefault (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, va_list argv) {+void WelsLogDefault (void* pCtx, const int32_t kiLevel, const char* kpFmtStr, va_list argv) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
iWelsLogLevel iVal = (kiLevel & g_iLevelLog);
@@ -133,7 +133,7 @@
if (0 == iVal || NULL == pEncCtx) { // such iLevel not enabledreturn;
} else {- str_t pBuf[WELS_LOG_BUF_SIZE + 1] = {0};+ char pBuf[WELS_LOG_BUF_SIZE + 1] = {0};const int32_t kiBufSize = sizeof (pBuf) / sizeof (pBuf[0]) - 1;
int32_t iCurUsed = 0;
int32_t iBufUsed = 0;
@@ -205,7 +205,7 @@
// fixed stack corruption issue on vs2008
if (iBufLeft > 0) {int32_t i_shift = 0;
- str_t* pStr = NULL;
+ char* pStr = NULL;
pStr = GetLogTag (kiLevel, &i_shift);
if (NULL != pStr) {iCurUsed = WelsSnprintf (&pBuf[iBufUsed], iBufLeft, "%s ", pStr);
@@ -242,7 +242,7 @@
#endif//ENABLE_TRACE_FILE
}
}
-void WelsLogNil (void* pCtx, const int32_t kiLevel, const str_t* kpFmtStr, va_list argv) {+void WelsLogNil (void* pCtx, const int32_t kiLevel, const char* kpFmtStr, va_list argv) {// NULL implementation
}
@@ -258,7 +258,7 @@
* \note N/A
*************************************************************************************
*/
-void WelsReopenTraceFile (void* pCtx, str_t* pCurPath) {+void WelsReopenTraceFile (void* pCtx, char* pCurPath) {#ifdef ENABLE_TRACE_FILE
sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
if (wlog == WelsLogDefault) {@@ -330,11 +330,11 @@
wlog = _log;
}
-void WelsLogCall (void* pCtx, int32_t iLevel, const str_t* kpFmt, va_list vl) {+void WelsLogCall (void* pCtx, int32_t iLevel, const char* kpFmt, va_list vl) {wlog (pCtx, iLevel, kpFmt, vl);
}
-void WelsLog (void* pCtx, int32_t iLevel, const str_t* kpFmt, ...) {+void WelsLog (void* pCtx, int32_t iLevel, const char* kpFmt, ...) {va_list vl;
va_start (vl, kpFmt);
WelsLogCall (pCtx, iLevel, kpFmt, vl);
--- a/codec/encoder/core/src/wels_preprocess.cpp
+++ b/codec/encoder/core/src/wels_preprocess.cpp
@@ -60,7 +60,7 @@
typedef EResult (WELSAPI* pfnDestroyVpInterface) (void*, int);
int32_t WelsInitScaledPic (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic, CMemoryAlign* pMemoryAlign);
-bool_t JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic);
+bool JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic);
void FreeScaledPic (Scaled_Picture* pScaledPic, CMemoryAlign* pMemoryAlign);
//******* table definition ***********************************************************************//
@@ -86,14 +86,14 @@
#ifndef NO_DYNAMIC_VP
#if defined(_WIN32)
- const str_t WelsVPLib[] = "welsvp.dll";
+ const char WelsVPLib[] = "welsvp.dll";
HMODULE shModule = LoadLibrary (WelsVPLib);
if (!shModule)
WelsLog (pEncCtx, WELS_LOG_ERROR, "welsvp load lib dynamic failed module=%x\n", shModule);
#elif defined(MACOS)
- const str_t WelsVPLib[] = "welsvp.bundle";
- str_t pCurPath[256];
+ const char WelsVPLib[] = "welsvp.bundle";
+ char pCurPath[256];
GetCurrentModulePath (pCurPath, 256);
strlcat (pCurPath, WelsVPLib, 256);
CFBundleRef shModule = LoadBundle (pCurPath);
@@ -101,7 +101,7 @@
WelsLog (pEncCtx, WELS_LOG_ERROR, "welsvp load lib dynamic failed module=%x\n", shModule);
#elif defined(__GNUC__)
- const str_t WelsVPLib[] = "./libwelsvp.so";
+ const char WelsVPLib[] = "./libwelsvp.so";
void* shModule = NULL;
shModule = dlopen (WelsVPLib, RTLD_LAZY);
if (shModule == NULL)
@@ -132,7 +132,7 @@
#endif
}
-void* CWelsLib::QueryFunction (const str_t* pName) {+void* CWelsLib::QueryFunction (const char* pName) {void* pFunc = NULL;
#ifndef NO_DYNAMIC_VP
@@ -208,7 +208,7 @@
m_pInterfaceVp = NULL;
m_pEncLib = NULL;
m_bInitDone = false;
- m_bOfficialBranch = FALSE;
+ m_bOfficialBranch = false;
m_pEncCtx = pEncCtx;
memset (&m_sScaledPicture, 0, sizeof (m_sScaledPicture));
}
@@ -281,12 +281,12 @@
for (int32_t i = 0; i < iNumDependencyLayer; i++) {if (pSvcParam->sDependencyLayers[i].iFrameWidth != pic_queue[i]->iPicWidth ||
pSvcParam->sDependencyLayers[i].iFrameHeight != pic_queue[i]->iPicHeight) {- m_bOfficialBranch = TRUE;
+ m_bOfficialBranch = true;
break;
}
}
}
- m_bInitDone = TRUE;
+ m_bInitDone = true;
}
if (m_pInterfaceVp == NULL)
@@ -313,8 +313,8 @@
int32_t CWelsPreProcess::WelsPreprocessStep3 (void* pCtx, const int32_t kiDidx) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam;
- bool_t bNeededMbAq = (pSvcParam->bEnableAdaptiveQuant && (pEncCtx->eSliceType == P_SLICE));
- bool_t bCalculateBGD = (pEncCtx->eSliceType == P_SLICE && pSvcParam->bEnableBackgroundDetection);
+ bool bNeededMbAq = (pSvcParam->bEnableAdaptiveQuant && (pEncCtx->eSliceType == P_SLICE));
+ bool bCalculateBGD = (pEncCtx->eSliceType == P_SLICE && pSvcParam->bEnableBackgroundDetection);
int32_t iCurTemporalIdx = pEncCtx->uiSpatialLayersInTemporal[kiDidx] - 1;
@@ -327,8 +327,8 @@
SPicture* pRefPic = pEncCtx->pSpatialPic[kiDidx][iRefTemporalIdx];
{SPicture* pLastPic = m_pLastSpatialPicture[kiDidx][0];
- bool_t bCalculateSQDiff = ((pLastPic->pData[0] == pRefPic->pData[0]) && bNeededMbAq);
- bool_t bCalculateVar = (pSvcParam->iRCMode == RC_MODE1 && pEncCtx->eSliceType == I_SLICE);
+ bool bCalculateSQDiff = ((pLastPic->pData[0] == pRefPic->pData[0]) && bNeededMbAq);
+ bool bCalculateVar = (pSvcParam->iRCMode == RC_MODE1 && pEncCtx->eSliceType == I_SLICE);
VaaCalculation (pEncCtx->pVaa, pCurPic, pRefPic, bCalculateSQDiff, bCalculateVar, bCalculateBGD);
}
@@ -517,12 +517,12 @@
/*!
* \brief Whether input picture need be scaled?
*/
-bool_t JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPicture) {+bool JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPicture) {const int32_t kiInputPicWidth = pParam->SUsedPicRect.iWidth;
const int32_t kiInputPicHeight = pParam->SUsedPicRect.iHeight;
const int32_t kiDstPicWidth = pParam->sDependencyLayers[pParam->iNumDependencyLayer - 1].iActualWidth;
const int32_t kiDstPicHeight = pParam->sDependencyLayers[pParam->iNumDependencyLayer - 1].iActualHeight;
- bool_t bNeedDownsampling = true;
+ bool bNeedDownsampling = true;
int32_t iSpatialIdx = pParam->iNumDependencyLayer - 1;
@@ -551,7 +551,7 @@
}
int32_t WelsInitScaledPic (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPicture, CMemoryAlign* pMemoryAlign) {- bool_t bInputPicNeedScaling = JudgeNeedOfScaling (pParam, pScaledPicture);
+ bool bInputPicNeedScaling = JudgeNeedOfScaling (pParam, pScaledPicture);
if (bInputPicNeedScaling) {pScaledPicture->pScaledInputPicture = AllocPicture (pMemoryAlign, pParam->SUsedPicRect.iWidth,
pParam->SUsedPicRect.iHeight, false);
@@ -611,8 +611,8 @@
m_pInterfaceVp->Process (iMethodIdx, &sSrcPixMap, NULL);
}
-bool_t CWelsPreProcess::DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture) {- bool_t bSceneChangeFlag = false;
+bool CWelsPreProcess::DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture) {+ bool bSceneChangeFlag = false;
int32_t iMethodIdx = METHOD_SCENE_CHANGE_DETECTION;
SSceneChangeResult sSceneChangeDetectResult = {0}; SPixMap sSrcPixMap = {0};@@ -688,7 +688,7 @@
//*********************************************************************************************************/
void CWelsPreProcess::VaaCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture,
- bool_t bCalculateSQDiff, bool_t bCalculateVar, bool_t bCalculateBGD) {+ bool bCalculateSQDiff, bool bCalculateVar, bool bCalculateBGD) {pVaaInfo->sVaaCalcInfo.pCurY = pCurPicture->pData[0];
pVaaInfo->sVaaCalcInfo.pRefY = pRefPicture->pData[0];
{@@ -722,7 +722,7 @@
}
void CWelsPreProcess::BackgroundDetection (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture,
- bool_t bDetectFlag) {+ bool bDetectFlag) { if (bDetectFlag) {pVaaInfo->iPicWidth = pCurPicture->iWidthInPixel;
pVaaInfo->iPicHeight = pCurPicture->iHeightInPixel;
@@ -834,7 +834,7 @@
void CWelsPreProcess::AnalyzePictureComplexity (void* pCtx, SPicture* pCurPicture, SPicture* pRefPicture,
- const int32_t kiDependencyId, const bool_t bCalculateBGD) {+ const int32_t kiDependencyId, const bool bCalculateBGD) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam;
SVAAFrameInfo* pVaaInfo = pEncCtx->pVaa;
--- a/codec/encoder/plus/inc/welsCodecTrace.h
+++ b/codec/encoder/plus/inc/welsCodecTrace.h
@@ -36,7 +36,7 @@
#include <stdarg.h>
#include "typedefs.h"
-typedef int32_t (*CM_WELS_TRACE) (const str_t* format, ...);
+typedef int32_t (*CM_WELS_TRACE) (const char* format, ...);
class welsCodecTrace {public:
@@ -43,8 +43,8 @@
welsCodecTrace();
~welsCodecTrace();
- static void TraceString (int32_t iLevel, const str_t* kpStrFormat);
- static void CODEC_TRACE (void* pIgnore, const int32_t kiLevel, const str_t* kpStrFormat, va_list vl);
+ static void TraceString (int32_t iLevel, const char* kpStrFormat);
+ static void CODEC_TRACE (void* pIgnore, const int32_t kiLevel, const char* kpStrFormat, va_list vl);
void SetTraceLevel (const int32_t kiLevel);
int32_t WelsTraceModuleIsExist();
--- a/codec/encoder/plus/inc/welsEncoderExt.h
+++ b/codec/encoder/plus/inc/welsEncoderExt.h
@@ -114,12 +114,12 @@
int32_t m_iMaxPicHeight;
int32_t m_iCspInternal;
- BOOL_T m_bInitialFlag;
+ bool m_bInitialFlag;
#ifdef OUTPUT_BIT_STREAM
FILE* m_pFileBs;
FILE* m_pFileBsSize;
- BOOL_T m_bSwitch;
+ bool m_bSwitch;
int32_t m_iSwitchTimes;
#endif//OUTPUT_BIT_STREAM
--- a/codec/encoder/plus/src/welsCodecTrace.cpp
+++ b/codec/encoder/plus/src/welsCodecTrace.cpp
@@ -86,7 +86,7 @@
return m_WelsTraceExistFlag;
}
-void welsCodecTrace::TraceString (int32_t iLevel, const str_t* str) {+void welsCodecTrace::TraceString (int32_t iLevel, const char* str) { switch (iLevel) {case WELS_LOG_ERROR:
if (m_fpErrorTrace)
@@ -113,13 +113,13 @@
#define MAX_LOG_SIZE 1024
-void welsCodecTrace::CODEC_TRACE (void* ignore, const int32_t iLevel, const str_t* Str_Format, va_list vl) {+void welsCodecTrace::CODEC_TRACE (void* ignore, const int32_t iLevel, const char* Str_Format, va_list vl) {// if(g_traceLevel < iLevel)
if (m_iTraceLevel < iLevel) {return;
}
- str_t pBuf[MAX_LOG_SIZE] = {0};+ char pBuf[MAX_LOG_SIZE] = {0}; const int32_t len = strlen ("[ENCODER]: "); // confirmed_safe_unsafe_usage--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -68,18 +68,18 @@
m_iMaxPicWidth (0),
m_iMaxPicHeight (0),
m_iCspInternal (0),
- m_bInitialFlag (FALSE) {+ m_bInitialFlag (false) {#ifdef REC_FRAME_COUNT
int32_t m_uiCountFrameNum = 0;
#endif//REC_FRAME_COUNT
#ifdef OUTPUT_BIT_STREAM
- str_t strStreamFileName[1024] = { 0 }; //for .264+ char strStreamFileName[1024] = { 0 }; //for .264int32_t iBufferUsed = 0;
int32_t iBufferLeft = 1023;
int32_t iCurUsed;
- str_t strLenFileName[1024] = { 0 }; //for .len+ char strLenFileName[1024] = { 0 }; //for .lenint32_t iBufferUsedSize = 0;
int32_t iBufferLeftSize = 1023;
int32_t iCurUsedSize;
@@ -135,7 +135,7 @@
m_pFileBs = WelsFopen (strStreamFileName, "wb");
m_pFileBsSize = WelsFopen (strLenFileName, "wb");
- m_bSwitch = FALSE;
+ m_bSwitch = false;
m_iSwitchTimes = 0;
#endif//OUTPUT_BIT_STREAM
@@ -171,7 +171,7 @@
WelsFclose (m_pFileBsSize);
m_pFileBsSize = NULL;
}
- m_bSwitch = FALSE;
+ m_bSwitch = false;
m_iSwitchTimes = 0;
#endif//OUTPUT_BIT_STREAM
@@ -414,7 +414,7 @@
}
m_iCspInternal = iColorspace;
- m_bInitialFlag = TRUE;
+ m_bInitialFlag = true;
return cmResultSuccess;
}
@@ -458,7 +458,7 @@
m_pEncContext = NULL;
}
- m_bInitialFlag = FALSE;
+ m_bInitialFlag = false;
return 0;
}
@@ -578,7 +578,7 @@
WelsFclose (m_pFileBsSize);
m_pFileBsSize = NULL;
}
- str_t strStreamFileName[128] = {0};+ char strStreamFileName[128] = {0};int32_t iLen = WelsSnprintf (strStreamFileName, 128, "adj%d_w%d.264", m_iSwitchTimes,
m_pEncContext->pSvcParam->iActualPicWidth);
m_pFileBs = WelsFopen (strStreamFileName, "wb");
@@ -587,7 +587,7 @@
m_pFileBsSize = WelsFopen (strStreamFileName, "wb");
- m_bSwitch = FALSE;
+ m_bSwitch = false;
}
for (i = 0; i < pBsInfo->iLayerNum; i++) {@@ -665,7 +665,7 @@
return cmInitParaError;
}
- if (NULL == m_pEncContext || FALSE == m_bInitialFlag) {+ if (NULL == m_pEncContext || false == m_bInitialFlag) {return cmInitExpected;
}
@@ -783,7 +783,7 @@
if (sEncodingParam.sSpatialLayers[sEncodingParam.iSpatialLayerNum - 1].iVideoWidth !=
m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iNumDependencyLayer - 1].iFrameWidth) {++ m_iSwitchTimes;
- m_bSwitch = TRUE;
+ m_bSwitch = true;
}
#endif//OUTPUT_BIT_STREAM
if (sEncodingParam.iSpatialLayerNum < 1
@@ -887,7 +887,7 @@
}
break;
case ENCODER_OPTION_ENABLE_SSEI: {- bool_t iValue = * ((bool_t*)pOption);
+ bool iValue = * ((bool*)pOption);
m_pEncContext->pSvcParam->bEnableSSEI = iValue;
WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable SSEI = %d \n",
m_pEncContext->pSvcParam->bEnableSSEI);
@@ -894,7 +894,7 @@
}
break;
case ENCODER_OPTION_ENABLE_PREFIX_NAL_ADDING: {- bool_t iValue = * ((bool_t*)pOption);
+ bool iValue = * ((bool*)pOption);
m_pEncContext->pSvcParam->bPrefixNalAddingCtrl = iValue;
WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption bPrefixNalAddingCtrl = %d \n",
m_pEncContext->pSvcParam->bPrefixNalAddingCtrl);
@@ -901,7 +901,7 @@
}
break;
case ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION: {- bool_t iValue = * ((bool_t*)pOption);
+ bool iValue = * ((bool*)pOption);
m_pEncContext->pSvcParam->bEnableSpsPpsIdAddition = iValue;
WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable SPS/PPS ID = %d \n",
@@ -910,7 +910,7 @@
break;
case ENCODER_OPTION_CURRENT_PATH: { if (m_pEncContext->pSvcParam != NULL) {- str_t* path = static_cast<str_t*> (pOption);
+ char* path = static_cast<char*> (pOption);
m_pEncContext->pSvcParam->pCurPath = path;
}
}
@@ -926,7 +926,7 @@
if (NULL == pOption) {return cmInitParaError;
}
- if (NULL == m_pEncContext || FALSE == m_bInitialFlag) {+ if (NULL == m_pEncContext || false == m_bInitialFlag) {return cmInitExpected;
}
@@ -991,7 +991,7 @@
void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) {#ifdef DUMP_SRC_PICTURE
FILE* pFile = NULL;
- str_t strFileName[256] = {0};+ char strFileName[256] = {0};const int32_t iDataLength = m_iMaxPicWidth * m_iMaxPicHeight;
WelsStrncpy (strFileName, 256, "pic_in_"); // confirmed_safe_unsafe_usage
--- a/codec/processing/src/backgrounddetection/BackgroundDetection.cpp
+++ b/codec/processing/src/backgrounddetection/BackgroundDetection.cpp
@@ -201,7 +201,7 @@
return WELS_ABS (ASD);
}
-inline bool_t CBackgroundDetection::ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
+inline bool CBackgroundDetection::ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
SBackgroundOU* pOUNeighbours[]) {SBackgroundOU* pOU_L = pOUNeighbours[0];
SBackgroundOU* pOU_R = pOUNeighbours[1];
@@ -234,7 +234,7 @@
return 0;
}
-inline bool_t CBackgroundDetection::ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags,
+inline bool CBackgroundDetection::ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags,
int32_t iStartSamplePos, int32_t iPicStrideUV, vBGDParam* pBgdParam) { static const int8_t kaOUPos[4] = {OU_LEFT, OU_RIGHT, OU_TOP, OU_BOTTOM}; int32_t aEdgeOffset[4] = {0, BGD_OU_SIZE_UV - 1, 0, iPicStrideUV* (BGD_OU_SIZE_UV - 1)};--- a/codec/processing/src/backgrounddetection/BackgroundDetection.h
+++ b/codec/processing/src/backgrounddetection/BackgroundDetection.h
@@ -83,9 +83,9 @@
inline SBackgroundOU* AllocateOUArrayMemory (int32_t iWidth, int32_t iHeight);
inline void FreeOUArrayMemory();
inline int32_t CalculateAsdChromaEdge (uint8_t* pOriRef, uint8_t* pOriCur, int32_t iStride);
- inline bool_t ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
+ inline bool ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
SBackgroundOU* pOUNeighbours[]); //Foreground_Dilation_2_3_Luma
- inline bool_t ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags, int32_t iStartSamplePos,
+ inline bool ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags, int32_t iStartSamplePos,
int32_t iPicStrideUV, vBGDParam* pBgdParam);//Foreground_Dilation_2_3_Chroma
inline void ForegroundDilation (SBackgroundOU* pBackgroundOU, SBackgroundOU* pOUNeighbours[], vBGDParam* pBgdParam,
int32_t iChromaSampleStartPos);
--- a/codec/processing/src/common/WelsFrameWork.cpp
+++ b/codec/processing/src/common/WelsFrameWork.cpp
@@ -220,8 +220,8 @@
return eReturn;
}
-bool_t CVpFrameWork::CheckValid (EMethods eMethod, SPixMap& pSrcPixMap, SPixMap& pDstPixMap) {- bool_t eReturn = FALSE;
+bool CVpFrameWork::CheckValid (EMethods eMethod, SPixMap& pSrcPixMap, SPixMap& pDstPixMap) {+ bool eReturn = false;
if (eMethod == METHOD_NULL)
goto exit;
@@ -253,7 +253,7 @@
|| pDstPixMap.sRect.iRectLeft >= pDstPixMap.sRect.iRectWidth || pDstPixMap.sRect.iRectWidth > pDstPixMap.iStride[0])
goto exit;
}
- eReturn = TRUE;
+ eReturn = true;
exit:
return eReturn;
--- a/codec/processing/src/common/WelsFrameWork.h
+++ b/codec/processing/src/common/WelsFrameWork.h
@@ -62,7 +62,7 @@
m_eMethod = METHOD_NULL;
m_eFormat = VIDEO_FORMAT_I420;
m_iIndex = 0;
- m_bInit = FALSE;
+ m_bInit = false;
};
virtual ~IStrategy() {}@@ -92,7 +92,7 @@
EMethods m_eMethod;
EVideoFormat m_eFormat;
int32_t m_iIndex;
- bool_t m_bInit;
+ bool m_bInit;
};
class CVpFrameWork : public IWelsVP {@@ -116,7 +116,7 @@
EResult SpecialFeature (int32_t iType, void* pIn, void* pOut);
private:
- bool_t CheckValid (EMethods eMethod, SPixMap& sSrc, SPixMap& sDst);
+ bool CheckValid (EMethods eMethod, SPixMap& sSrc, SPixMap& sDst);
IStrategy* CreateStrategy (EMethods eMethod, int32_t iCpuFlag);
private:
--- a/codec/processing/src/common/memory.cpp
+++ b/codec/processing/src/common/memory.cpp
@@ -35,7 +35,7 @@
WELSVP_NAMESPACE_BEGIN
/////////////////////////////////////////////////////////////////////////////////
-void* WelsMalloc (const uint32_t kuiSize, str_t* pTag) {+void* WelsMalloc (const uint32_t kuiSize, char* pTag) {const int32_t kiSizeVoidPointer = sizeof (void**);
const int32_t kiSizeInt32 = sizeof (int32_t);
const int32_t kiAlignedBytes = ALIGNBYTES - 1;
@@ -59,7 +59,7 @@
/////////////////////////////////////////////////////////////////////////////
-void WelsFree (void* pPointer, str_t* pTag) {+void WelsFree (void* pPointer, char* pTag) { if (pPointer) {::free (* (((void**) pPointer) - 1));
}
@@ -67,7 +67,7 @@
/////////////////////////////////////////////////////////////////////////////
-void* InternalReallocate (void* pPointer, const uint32_t kuiSize, str_t* pTag) {+void* InternalReallocate (void* pPointer, const uint32_t kuiSize, char* pTag) {uint32_t iOldSize = 0;
uint8_t* pNew = NULL;
if (pPointer != NULL)
@@ -91,7 +91,7 @@
/////////////////////////////////////////////////////////////////////////////
-void* WelsRealloc (void* pPointer, uint32_t* pRealSize, const uint32_t kuiSize, str_t* pTag) {+void* WelsRealloc (void* pPointer, uint32_t* pRealSize, const uint32_t kuiSize, char* pTag) {const uint32_t kuiOldSize = *pRealSize;
uint32_t kuiNewSize = 0;
void* pLocalPointer = NULL;
--- a/codec/processing/src/common/memory.h
+++ b/codec/processing/src/common/memory.h
@@ -70,7 +70,7 @@
* \note N/A
*************************************************************************************
*/
-void* WelsMalloc (const uint32_t kuiSize, str_t* pTag = NULL);
+void* WelsMalloc (const uint32_t kuiSize, char* pTag = NULL);
/*!
*************************************************************************************
@@ -84,7 +84,7 @@
* \note N/A
*************************************************************************************
*/
-void WelsFree (void* pPointer, str_t* pTag = NULL);
+void WelsFree (void* pPointer, char* pTag = NULL);
/*!
*************************************************************************************
@@ -100,7 +100,7 @@
* \note N/A
*************************************************************************************
*/
-void* WelsRealloc (void* pPointer, uint32_t* pRealSize, const uint32_t kuiSize, str_t* pTag = NULL);
+void* WelsRealloc (void* pPointer, uint32_t* pRealSize, const uint32_t kuiSize, char* pTag = NULL);
//////////////////////////////////////////////////////////////////////////////////////
WELSVP_NAMESPACE_END
--- a/codec/processing/src/common/typedef.h
+++ b/codec/processing/src/common/typedef.h
@@ -73,14 +73,6 @@
#endif
-typedef char str_t ; // [comment]: specific use plain char only for character parameters
-typedef bool bool_t ;
-
-enum {- FALSE = 0,
- TRUE = !FALSE
-};
-
WELSVP_NAMESPACE_END
#endif