History

Remove the FOPEN macro, use WelsFopen instead

This avoids ifdefs at each place the macro is used.

Martin Storsjö committed 12 years ago

Commit c174dcd1 parent 33fe2b55 files · +22 −118Browse files

Unified · Split

5 files
  1. codec/common/crt_util_safe_x.h +0 −3
  2. codec/encoder/core/src/encoder.cpp +8 −34
  3. codec/encoder/core/src/encoder_ext.cpp +1 −11
  4. codec/encoder/core/src/utils.cpp +1 −6
  5. codec/encoder/plus/src/welsEncoderExt.cpp +12 −64
codec/common/crt_util_safe_x.h+0−3
@@ -427,7 +427,6 @@ static __inline int wels_strnlen_s (const char* dest, int dmax) { · 426 unmodified lines
427427 #define STRCAT strcat_s
428428 #define STRNLEN strnlen_s
429429 #define VSPRINTF vsprintf_s
430−#define FOPEN fopen_s
431430 #else // mainly for VC6
432431 #define SNPRINTF _snprintf
433432 #define LOCALTIME localtime
@@ -436,7 +435,6 @@ static __inline int wels_strnlen_s (const char* dest, int dmax) { · 2 unmodified lines
436435 #define STRCAT wels_strcat_s // override s.t.r.c.a.t here for safe
437436 #define STRNLEN wels_strnlen_s // override s.t.r.n.l.e.n here for safe
438437 #define VSPRINTF vsprintf
439−#define FOPEN fopen
440438 #endif//_MSC_VER >= 1500
441439
442440 #else//__GNUC__
@@ -447,7 +445,6 @@ static __inline int wels_strnlen_s (const char* dest, int dmax) { · 4 unmodified lines
447445 #define STRCAT wels_strcat_s // override s.t.r.c.a.t here for safe
448446 #define STRNLEN wels_strnlen_s // override s.t.r.n.l.e.n here for safe
449447 #define VSPRINTF vsprintf
450−#define FOPEN fopen
451448
452449 #endif//WIN32
453450
codec/encoder/core/src/encoder.cpp+8−34
@@ -324,39 +324,29 @@ extern "C" void DumpDependencyRec (SPicture* pCurPicture, const str_t* kpFileNam · 323 unmodified lines
324324
325325 if (bDependencyRecFlag[kiDid]) {
326326 if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) // confirmed_safe_unsafe_usage
327−#if defined(__GNUC__) || (defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER<1500))
328− pDumpRecFile = FOPEN (kpFileName, "ab");
329−#elif defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008
330− FOPEN (&pDumpRecFile, kpFileName, "ab");
331−#endif//__GNUC__..
327+ pDumpRecFile = WelsFopen (kpFileName, "ab");
332328 else {
333329 str_t sDependencyRecFileName[16] = {0};
334330 #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008
335331 SNPRINTF (sDependencyRecFileName, 16, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage
336− FOPEN (&pDumpRecFile, sDependencyRecFileName, "ab");
337332 #else
338333 SNPRINTF (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage
339− pDumpRecFile = FOPEN (sDependencyRecFileName, "ab");
340334 #endif//WIN32..
335+ pDumpRecFile = WelsFopen (sDependencyRecFileName, "ab");
341336 }
342337 if (NULL != pDumpRecFile)
343338 fseek (pDumpRecFile, 0, SEEK_END);
344339 } else {
345340 if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage
346−#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008
347− FOPEN (&pDumpRecFile, kpFileName, "wb");
348−#else
349− pDumpRecFile = FOPEN (kpFileName, "wb");
350−#endif//WIN32..
341+ pDumpRecFile = WelsFopen (kpFileName, "wb");
351342 } else {
352343 str_t sDependencyRecFileName[16] = {0};
353344 #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008
354345 SNPRINTF (sDependencyRecFileName, 16, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage
355− FOPEN (&pDumpRecFile, sDependencyRecFileName, "wb");
356346 #else
357347 SNPRINTF (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage
358− pDumpRecFile = FOPEN (sDependencyRecFileName, "wb");
359348 #endif//WIN32..
349+ pDumpRecFile = WelsFopen (sDependencyRecFileName, "wb");
360350 }
361351 bDependencyRecFlag[kiDid] = true;
362352 }
@@ -410,33 +400,17 @@ void DumpRecFrame (SPicture* pCurPicture, const str_t* kpFileName) { · 47 unmodified lines
410400
411401 if (bRecFlag) {
412402 if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage
413−#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008
414− FOPEN (&pDumpRecFile, kpFileName, "ab");
415−#else
416− pDumpRecFile = FOPEN (kpFileName, "ab");
417−#endif//WIN32
403+ pDumpRecFile = WelsFopen (kpFileName, "ab");
418404 } else {
419−#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008
420− FOPEN (&pDumpRecFile, "rec.yuv", "ab");
421−#else
422− pDumpRecFile = FOPEN ("rec.yuv", "ab");
423−#endif//WIN32
405+ pDumpRecFile = WelsFopen ("rec.yuv", "ab");
424406 }
425407 if (NULL != pDumpRecFile)
426408 fseek (pDumpRecFile, 0, SEEK_END);
427409 } else {
428410 if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage
429−#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008
430− FOPEN (&pDumpRecFile, kpFileName, "wb");
431−#else
432− pDumpRecFile = FOPEN (kpFileName, "wb");
433−#endif//WIN32
411+ pDumpRecFile = WelsFopen (kpFileName, "wb");
434412 } else {
435−#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008
436− FOPEN (&pDumpRecFile, "rec.yuv", "wb");
437−#else
438− pDumpRecFile = FOPEN ("rec.yuv", "wb");
439−#endif//WIN32..
413+ pDumpRecFile = WelsFopen ("rec.yuv", "wb");
440414 }
441415 bRecFlag = true;
442416 }
codec/encoder/core/src/encoder_ext.cpp+1−11
@@ -2100,17 +2100,7 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar · 2099 unmodified lines
21002100 #endif//_MSC_VER
21012101
21022102
2103−#if defined(__GNUC__)
2104− pCtx->pFileLog = FOPEN (fname, "wt+");
2105−#else//WIN32
2106−#if defined(_WIN32) && defined(_MSC_VER)
2107−#if _MSC_VER >= 1500
2108− FOPEN (&pCtx->pFileLog, fname, "wt+");
2109−#else
2110− pCtx->pFileLog = FOPEN (fname, "wt+");
2111−#endif//_MSC_VER>=1500
2112−#endif//WIN32 && _MSC_VER
2113−#endif//__GNUC__
2103+ pCtx->pFileLog = WelsFopen (fname, "wt+");
21142104 pCtx->uiSizeLog = 0;
21152105 }
21162106 #endif//ENABLE_TRACE_FILE
codec/encoder/core/src/utils.cpp+1−6
@@ -332,16 +332,11 @@ void WelsReopenTraceFile (void* pCtx, str_t* pCurPath) { · 331 unmodified lines
332332 STRNCPY (strTraceFile, MAX_FNAME_LEN, pCurPath, len); // confirmed_safe_unsafe_usage
333333 #ifdef __GNUC__
334334 STRCAT (strTraceFile, MAX_FNAME_LEN - len, "/wels_encoder_trace.txt"); // confirmed_safe_unsafe_usage
335− pEncCtx->pFileLog = FOPEN (strTraceFile, "wt+"); // confirmed_safe_unsafe_usage
336335 #elif _WIN32
337336 STRCAT (strTraceFile, MAX_FNAME_LEN - len, "\\wels_encoder_trace.txt"); // confirmed_safe_unsafe_usage
338−#if _MSC_VER >= 1500
339− FOPEN (&pEncCtx->pFileLog, strTraceFile, "wt+"); // confirmed_safe_unsafe_usage
340−#else
341− pEncCtx->pFileLog = FOPEN (strTraceFile, "wt+"); // confirmed_safe_unsafe_usage
342−#endif//_MSC_VER>=1500
343337 #else
344338 #endif//__GNUC__
339+ pEncCtx->pFileLog = WelsFopen (strTraceFile, "wt+"); // confirmed_safe_unsafe_usage
345340 }
346341 #endif//ENABLE_TRACE_FILE
347342 }
codec/encoder/plus/src/welsEncoderExt.cpp+12−64
@@ -214,20 +214,8 @@ CWelsH264SVCEncoder::CWelsH264SVCEncoder() · 213 unmodified lines
214214 }
215215 }
216216
217−#if defined(__GNUC__)
218− m_pFileBs = FOPEN (strStreamFileName, "wb");
219− m_pFileBsSize = FOPEN (strLenFileName, "wb");
220−#else
221−#if defined(_MSC_VER)
222−#if _MSC_VER>=1500
223− FOPEN (&m_pFileBs, strStreamFileName, "wb");
224− FOPEN (&m_pFileBsSize, strLenFileName, "wb");
225−#else
226− m_pFileBs = FOPEN (strStreamFileName, "wb");
227− m_pFileBsSize = FOPEN (strLenFileName, "wb");
228−#endif//_MSC_VER>=1500
229−#endif//_MSC_VER
230−#endif//__GNUC__
217+ m_pFileBs = WelsFopen (strStreamFileName, "wb");
218+ m_pFileBsSize = WelsFopen (strLenFileName, "wb");
231219
232220 m_bSwitch = FALSE;
233221 m_iSwitchTimes = 0;
@@ -697,10 +685,10 @@ int CWelsH264SVCEncoder::EncodeFrame2 (const SSourcePicture** pSrcPicList, int · 463 unmodified lines
697685
698686 int32_t iLen = SNPRINTF (strStreamFileName, 128, "%sadj%d_w%d.264", m_pEncContext->sTracePath, m_iSwitchTimes,
699687 m_pEncContext->pSvcParam->iActualPicWidth);
700− m_pFileBs = FOPEN (strStreamFileName, "wb");
688+ m_pFileBs = WelsFopen (strStreamFileName, "wb");
701689 SNPRINTF (strStreamFileName, 128, "%sadj%d_w%d_size.iLen", m_pEncContext->sTracePath, m_iSwitchTimes,
702690 m_pEncContext->pSvcParam->iActualPicWidth);
703− m_pFileBsSize = FOPEN (strStreamFileName, "wb");
691+ m_pFileBsSize = WelsFopen (strStreamFileName, "wb");
704692
705693 #else//__GNUC__
706694
@@ -708,16 +696,16 @@ int CWelsH264SVCEncoder::EncodeFrame2 (const SSourcePicture** pSrcPicList, int · 1 unmodified line
708696 #if _MSC_VER>=1500
709697 int32_t iLen = SNPRINTF (strStreamFileName, 128, 128, "adj%d_w%d.264", m_iSwitchTimes,
710698 m_pEncContext->pSvcParam->iActualPicWidth);
711− FOPEN (&m_pFileBs, strStreamFileName, "wb");
699+ m_pFileBs = WelsFopen (strStreamFileName, "wb");
712700 SNPRINTF (strStreamFileName, 128, 128, "adj%d_w%d_size.iLen", m_iSwitchTimes,
713701 m_pEncContext->pSvcParam->iActualPicWidth);
714− FOPEN (&m_pFileBsSize, strStreamFileName, "wb");
702+ m_pFileBsSize = WelsFopen (strStreamFileName, "wb");
715703 #else
716704 int32_t iLen = SNPRINTF (strStreamFileName, 128, "adj%d_w%d.264", m_iSwitchTimes,
717705 m_pEncContext->pSvcParam->iActualPicWidth);
718− m_pFileBs = FOPEN (strStreamFileName, "wb");
706+ m_pFileBs = WelsFopen (strStreamFileName, "wb");
719707 SNPRINTF (strStreamFileName, 128, "adj%d_w%d_size.iLen", m_iSwitchTimes, m_pEncContext->pSvcParam->iActualPicWidth);
720− m_pFileBsSize = FOPEN (strStreamFileName, "wb");
708+ m_pFileBsSize = WelsFopen (strStreamFileName, "wb");
721709 #endif//_MSC_VER>=1500
722710 #endif//_MSC_VER
723711
@@ -1145,17 +1133,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 421 unmodified lines
11451133 case videoFormatI420:
11461134 case videoFormatYV12:
11471135 STRCAT (strFileName, 256, "yuv"); // confirmed_safe_unsafe_usage
1148−#if defined(__GNUC__)
1149− pFile = FOPEN (strFileName, "ab+");
1150−#else
1151−#if defined(_MSC_VER)
1152−#if _MSC_VER>=1500
1153− FOPEN (&pFile, strFileName, "ab+");
1154−#else
1155− pFile = FOPEN (strFileName, "ab+");
1156−#endif//_MSC_VER>=1500
1157−#endif//_MSC_VER
1158−#endif//__GNUC__
1136+ pFile = WelsFopen (strFileName, "ab+");
11591137 // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_I420, m_iCspInternal= 0x%x\n", m_iCspInternal);
11601138 if (NULL != pFile) {
11611139 fwrite (pSrc, sizeof (uint8_t), (iDataLength * 3) >> 1, pFile);
@@ -1165,17 +1143,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 3 unmodified lines
11651143 break;
11661144 case videoFormatRGB:
11671145 STRCAT (strFileName, 256, "rgb"); // confirmed_safe_unsafe_usage
1168−#if defined(__GNUC__)
1169− pFile = FOPEN (strFileName, "ab+");
1170−#else
1171−#if defined(_MSC_VER)
1172−#if _MSC_VER>=1500
1173− FOPEN (&pFile, strFileName, "ab+");
1174−#else
1175− pFile = FOPEN (strFileName, "ab+");
1176−#endif//_MSC_VER>=1500
1177−#endif//_MSC_VER
1178−#endif//__GNUC__
1146+ pFile = WelsFopen (strFileName, "ab+");
11791147 if (NULL != pFile) {
11801148 fwrite (pSrc, sizeof (uint8_t), iDataLength * 3, pFile);
11811149 fflush (pFile);
@@ -1183,17 +1151,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 1 unmodified line
11831151 }
11841152 case videoFormatBGR:
11851153 STRCAT (strFileName, 256, "bgr"); // confirmed_safe_unsafe_usage
1186−#if defined(__GNUC__)
1187− pFile = FOPEN (strFileName, "ab+");
1188−#else
1189−#if defined(_MSC_VER)
1190−#if _MSC_VER>=1500
1191− FOPEN (&pFile, strFileName, "ab+");
1192−#else
1193− pFile = FOPEN (strFileName, "ab+");
1194−#endif//_MSC_VER>=1500
1195−#endif//_MSC_VER
1196−#endif//__GNUC__
1154+ pFile = WelsFopen (strFileName, "ab+");
11971155 // WelsLog( m_pEncContext, WELS_LOG_INFO, "WELS_CSP_BGR, m_iCspInternal= 0x%x\n", m_iCspInternal);
11981156 if (NULL != pFile) {
11991157 fwrite (pSrc, sizeof (uint8_t), iDataLength * 3, pFile);
@@ -1203,17 +1161,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) { · 3 unmodified lines
12031161 break;
12041162 case videoFormatYUY2:
12051163 STRCAT (strFileName, 256, "yuy2"); // confirmed_safe_unsafe_usage
1206−#if defined(__GNUC__)
1207− pFile = FOPEN (strFileName, "ab+");
1208−#else
1209−#if defined(_MSC_VER)
1210−#if _MSC_VER>=1500
1211− FOPEN (&pFile, strFileName, "ab+");
1212−#else
1213− pFile = FOPEN (strFileName, "ab+");
1214−#endif//_MSC_VER>=1500
1215−#endif//_MSC_VER
1216−#endif//__GNUC__
1164+ pFile = WelsFopen (strFileName, "ab+");
12171165 if (NULL != pFile) {
12181166 fwrite (pSrc, sizeof (uint8_t), (CALC_BI_STRIDE (m_iMaxPicWidth, 16)) * m_iMaxPicHeight, pFile);
12191167 fflush (pFile);

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