Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 73 files). Show all
Unified · Split
| @@ -2072,7 +2072,7 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 2071 unmodified lines | ||
| 2072 | 2072 | #if defined(__GNUC__) |
| 2073 | 2073 | pCtx->pFileLog = FOPEN (fname, "wt+"); |
| 2074 | 2074 | #else//WIN32 |
| 2075 | −#if defined(WIN32) && defined(_MSC_VER) | |
| 2075 | +#if defined(_WIN32) && defined(_MSC_VER) | |
| 2076 | 2076 | #if _MSC_VER >= 1500 |
| 2077 | 2077 | FOPEN (&pCtx->pFileLog, fname, "wt+"); |
| 2078 | 2078 | #else |
| @@ -2236,7 +2236,7 @@ void WelsUninitEncoderExt (sWelsEncCtx** ppCtx) { · 157 unmodified lines | ||
| 2236 | 2236 | const int32_t iThreadCount = (*ppCtx)->pSvcParam->iCountThreadsNum; |
| 2237 | 2237 | int32_t iThreadIdx = 0; |
| 2238 | 2238 | |
| 2239 | −#if defined(WIN32) | |
| 2239 | +#if defined(_WIN32) | |
| 2240 | 2240 | if ((*ppCtx)->pSliceThreading->pExitEncodeEvent != NULL) { |
| 2241 | 2241 | do { |
| 2242 | 2242 | if ((*ppCtx)->pSliceThreading->pThreadHandles[iThreadIdx] != NULL) // iThreadIdx is already created successfully |
| @@ -3351,7 +3351,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur · 1108 unmodified lines | ||
| 3351 | 3351 | t_bs_append = WelsTime() - t_bs_append; |
| 3352 | 3352 | if (pCtx->pSliceThreading->pFSliceDiff) { |
| 3353 | 3353 | fprintf (pCtx->pSliceThreading->pFSliceDiff, |
| 3354 | −#if defined(WIN32) | |
| 3354 | +#if defined(_WIN32) | |
| 3355 | 3355 | "%6I64d us consumed at AppendSliceToFrameBs() for coding_idx: %d iDid: %d qid: %d\n", |
| 3356 | 3356 | #else |
| 3357 | 3357 | "%6lld us consumed at AppendSliceToFrameBs() for coding_idx: %d iDid: %d qid: %d\n", |
| @@ -3391,7 +3391,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur · 33 unmodified lines | ||
| 3391 | 3391 | while (1) { |
| 3392 | 3392 | if (iIndexOfSliceToBeCoded >= iSliceCount && iNumThreadsRunning <= 0) |
| 3393 | 3393 | break; |
| 3394 | −#ifdef WIN32 | |
| 3394 | +#ifdef _WIN32 | |
| 3395 | 3395 | WELS_THREAD_ERROR_CODE lwait = 0; |
| 3396 | 3396 | int32_t iEventId = -1; |
| 3397 | 3397 | |
| @@ -3440,7 +3440,7 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, void* pDst, const SSourcePictur · 42 unmodified lines | ||
| 3440 | 3440 | } else { |
| 3441 | 3441 | iNumThreadsRunning = 0; |
| 3442 | 3442 | } |
| 3443 | −#endif//WIN32 | |
| 3443 | +#endif//_WIN32 | |
| 3444 | 3444 | }//while(1) |
| 3445 | 3445 | |
| 3446 | 3446 | // all slices are finished coding here |