History

change void* to explicit type definition

ruil2 committed 12 years ago

Commit 1ffcd361 parent fa138e87 files · +22 −23Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 7 files). Show all

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+13−13
@@ -527,7 +527,7 @@ static inline int32_t AcquireLayersNals (sWelsEncCtx** ppCtx, SWelsSvcCodingPara · 526 unmodified lines
527527 iCountNumNals += kiNumOfSlice;
528528 assert (iCountNumNals - iOrgNumNals <= MAX_NAL_UNITS_IN_LAYER);
529529 if (kiNumOfSlice > MAX_SLICES_NUM) {
530− WelsLog (*ppCtx, WELS_LOG_ERROR,
530+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_ERROR,
531531 "AcquireLayersNals(), num_of_slice(%d) > MAX_SLICES_NUM(%d) per (iDid= %d, qid= %d) settings!\n",
532532 kiNumOfSlice, MAX_SLICES_NUM, iDIndex, 0);
533533 return 1;
@@ -535,7 +535,7 @@ static inline int32_t AcquireLayersNals (sWelsEncCtx** ppCtx, SWelsSvcCodingPara · 1 unmodified line
535535 }
536536
537537 if (iCountNumNals - iOrgNumNals > MAX_NAL_UNITS_IN_LAYER) {
538− WelsLog (*ppCtx, WELS_LOG_ERROR,
538+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_ERROR,
539539 "AcquireLayersNals(), num_of_nals(%d) > MAX_NAL_UNITS_IN_LAYER(%d) per (iDid= %d, qid= %d) settings!\n",
540540 (iCountNumNals - iOrgNumNals), MAX_NAL_UNITS_IN_LAYER, iDIndex, 0);
541541 return 1;
@@ -551,7 +551,7 @@ static inline int32_t AcquireLayersNals (sWelsEncCtx** ppCtx, SWelsSvcCodingPara · 9 unmodified lines
551551
552552 // to check number of layers / nals / slices dependencies, 12/8/2010
553553 if (iCountNumLayers > MAX_LAYER_NUM_OF_FRAME) {
554− WelsLog (*ppCtx, WELS_LOG_ERROR, "AcquireLayersNals(), iCountNumLayers(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
554+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_ERROR, "AcquireLayersNals(), iCountNumLayers(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
555555 iCountNumLayers, MAX_LAYER_NUM_OF_FRAME);
556556 return 1;
557557 }
@@ -955,7 +955,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) { · 397 unmodified lines
955955 & (pDlayerParam->sSliceCfg),
956956 pPps);
957957 if (iResult) {
958− WelsLog (*ppCtx, WELS_LOG_WARNING, "InitDqLayers(), InitSlicePEncCtx failed(%d)!", iResult);
958+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING, "InitDqLayers(), InitSlicePEncCtx failed(%d)!", iResult);
959959 FreeMemorySvc (ppCtx);
960960 return 1;
961961 }
@@ -1285,14 +1285,14 @@ int32_t RequestMemorySvc (sWelsEncCtx** ppCtx) { · 323 unmodified lines
12851285 int32_t iTargetSpatialBsSize = 0;
12861286
12871287 if (kiNumDependencyLayers < 1 || kiNumDependencyLayers > MAX_DEPENDENCY_LAYER) {
1288− WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc() failed due to invalid iNumDependencyLayers(%d)!\n",
1288+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc() failed due to invalid iNumDependencyLayers(%d)!\n",
12891289 kiNumDependencyLayers);
12901290 FreeMemorySvc (ppCtx);
12911291 return 1;
12921292 }
12931293
12941294 if (pParam->uiGopSize == 0 || (pParam->uiIntraPeriod && ((pParam->uiIntraPeriod % pParam->uiGopSize) != 0))) {
1295− WelsLog (*ppCtx, WELS_LOG_WARNING,
1295+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING,
12961296 "RequestMemorySvc() failed due to invalid uiIntraPeriod(%d) (=multipler of uiGopSize(%d)!",
12971297 pParam->uiIntraPeriod, pParam->uiGopSize);
12981298 FreeMemorySvc (ppCtx);
@@ -1306,7 +1306,7 @@ int32_t RequestMemorySvc (sWelsEncCtx** ppCtx) { · 7 unmodified lines
13061306
13071307 iResult = AcquireLayersNals (ppCtx, pParam, &iCountLayers, &iCountNals);
13081308 if (iResult) {
1309− WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), AcquireLayersNals failed(%d)!", iResult);
1309+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), AcquireLayersNals failed(%d)!", iResult);
13101310 FreeMemorySvc (ppCtx);
13111311 return 1;
13121312 }
@@ -1359,7 +1359,7 @@ int32_t RequestMemorySvc (sWelsEncCtx** ppCtx) { · 46 unmodified lines
13591359
13601360 // for pSlice bs buffers
13611361 if (pParam->iMultipleThreadIdc > 1 && RequestMtResource (ppCtx, pParam, iCountBsLen, iTargetSpatialBsSize)) {
1362− WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMtResource failed!");
1362+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMtResource failed!");
13631363 FreeMemorySvc (ppCtx);
13641364 return 1;
13651365 }
@@ -1406,7 +1406,7 @@ int32_t RequestMemorySvc (sWelsEncCtx** ppCtx) { · 40 unmodified lines
14061406
14071407 // stride tables
14081408 if (AllocStrideTables (ppCtx, kiNumDependencyLayers)) {
1409− WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), AllocStrideTables failed!");
1409+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), AllocStrideTables failed!");
14101410 FreeMemorySvc (ppCtx);
14111411 return 1;
14121412 }
@@ -1422,7 +1422,7 @@ int32_t RequestMemorySvc (sWelsEncCtx** ppCtx) { · 9 unmodified lines
14221422 (*ppCtx)->pVaa = (SVAAFrameInfoExt*)pMa->WelsMallocz (sizeof (SVAAFrameInfoExt), "pVaa");
14231423 WELS_VERIFY_RETURN_PROC_IF (1, (NULL == (*ppCtx)->pVaa), FreeMemorySvc (ppCtx))
14241424 if (RequestMemoryVaaScreen ((*ppCtx)->pVaa, pMa, (*ppCtx)->pSvcParam->iMaxNumRefFrame, iCountMaxMbNum << 2)) {
1425− WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMemoryVaaScreen failed!");
1425+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMemoryVaaScreen failed!");
14261426 FreeMemorySvc (ppCtx);
14271427 return 1;
14281428 }
@@ -1471,13 +1471,13 @@ int32_t RequestMemorySvc (sWelsEncCtx** ppCtx) { · 42 unmodified lines
14711471
14721472 iResult = InitDqLayers (ppCtx);
14731473 if (iResult) {
1474− WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), InitDqLayers failed(%d)!", iResult);
1474+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), InitDqLayers failed(%d)!", iResult);
14751475 FreeMemorySvc (ppCtx);
14761476 return iResult;
14771477 }
14781478
14791479 if (InitMbListD (ppCtx)) {
1480− WelsLog (*ppCtx, WELS_LOG_WARNING, "RequestMemorySvc(), InitMbListD failed!");
1480+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), InitMbListD failed!");
14811481 FreeMemorySvc (ppCtx);
14821482 return 1;
14831483 }
@@ -1757,7 +1757,7 @@ void FreeMemorySvc (sWelsEncCtx** ppCtx) { · 273 unmodified lines
17571757 #endif//MEMORY_MONITOR
17581758
17591759 if ((*ppCtx)->pMemAlign != NULL) {
1760− WelsLog (*ppCtx, WELS_LOG_INFO, "FreeMemorySvc(), verify memory usage (%d bytes) after free..\n",
1760+ WelsLog (&(*ppCtx)->sLogCtx, WELS_LOG_INFO, "FreeMemorySvc(), verify memory usage (%d bytes) after free..\n",
17611761 (*ppCtx)->pMemAlign->WelsGetMemoryUsage());
17621762 delete (*ppCtx)->pMemAlign;
17631763 (*ppCtx)->pMemAlign = NULL;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t