This avoids ifdefs at each place the macro is used.
Showing the changes to codec/encoder/core/src/encoder.cpp (1 of 5 files). Show all
Unified · Split
| @@ -324,39 +324,29 @@ extern "C" void DumpDependencyRec (SPicture* pCurPicture, const str_t* kpFileNam · 323 unmodified lines | |||
| 324 | 324 | ||
| 325 | if (bDependencyRecFlag[kiDid]) { | 325 | if (bDependencyRecFlag[kiDid]) { |
| 326 | if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) // confirmed_safe_unsafe_usage | 326 | if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) // confirmed_safe_unsafe_usage |
| 327 | #if defined(__GNUC__) || (defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER<1500)) | 327 | pDumpRecFile = WelsFopen (kpFileName, "ab"); |
| 328 | pDumpRecFile = FOPEN (kpFileName, "ab"); | ||
| 329 | #elif defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 | ||
| 330 | FOPEN (&pDumpRecFile, kpFileName, "ab"); | ||
| 331 | #endif//__GNUC__.. | ||
| 332 | else { | 328 | else { |
| 333 | str_t sDependencyRecFileName[16] = {0}; | 329 | str_t sDependencyRecFileName[16] = {0}; |
| 334 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 | 330 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 |
| 335 | SNPRINTF (sDependencyRecFileName, 16, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage | 331 | SNPRINTF (sDependencyRecFileName, 16, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage |
| 336 | FOPEN (&pDumpRecFile, sDependencyRecFileName, "ab"); | ||
| 337 | #else | 332 | #else |
| 338 | SNPRINTF (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage | 333 | SNPRINTF (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage |
| 339 | pDumpRecFile = FOPEN (sDependencyRecFileName, "ab"); | ||
| 340 | #endif//WIN32.. | 334 | #endif//WIN32.. |
| 335 | pDumpRecFile = WelsFopen (sDependencyRecFileName, "ab"); | ||
| 341 | } | 336 | } |
| 342 | if (NULL != pDumpRecFile) | 337 | if (NULL != pDumpRecFile) |
| 343 | fseek (pDumpRecFile, 0, SEEK_END); | 338 | fseek (pDumpRecFile, 0, SEEK_END); |
| 344 | } else { | 339 | } else { |
| 345 | if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage | 340 | if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage |
| 346 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 | 341 | pDumpRecFile = WelsFopen (kpFileName, "wb"); |
| 347 | FOPEN (&pDumpRecFile, kpFileName, "wb"); | ||
| 348 | #else | ||
| 349 | pDumpRecFile = FOPEN (kpFileName, "wb"); | ||
| 350 | #endif//WIN32.. | ||
| 351 | } else { | 342 | } else { |
| 352 | str_t sDependencyRecFileName[16] = {0}; | 343 | str_t sDependencyRecFileName[16] = {0}; |
| 353 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 | 344 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 |
| 354 | SNPRINTF (sDependencyRecFileName, 16, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage | 345 | SNPRINTF (sDependencyRecFileName, 16, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage |
| 355 | FOPEN (&pDumpRecFile, sDependencyRecFileName, "wb"); | ||
| 356 | #else | 346 | #else |
| 357 | SNPRINTF (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage | 347 | SNPRINTF (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage |
| 358 | pDumpRecFile = FOPEN (sDependencyRecFileName, "wb"); | ||
| 359 | #endif//WIN32.. | 348 | #endif//WIN32.. |
| 349 | pDumpRecFile = WelsFopen (sDependencyRecFileName, "wb"); | ||
| 360 | } | 350 | } |
| 361 | bDependencyRecFlag[kiDid] = true; | 351 | bDependencyRecFlag[kiDid] = true; |
| 362 | } | 352 | } |
| @@ -410,33 +400,17 @@ void DumpRecFrame (SPicture* pCurPicture, const str_t* kpFileName) { · 47 unmodified lines | |||
| 410 | 400 | ||
| 411 | if (bRecFlag) { | 401 | if (bRecFlag) { |
| 412 | if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage | 402 | if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage |
| 413 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 | 403 | pDumpRecFile = WelsFopen (kpFileName, "ab"); |
| 414 | FOPEN (&pDumpRecFile, kpFileName, "ab"); | ||
| 415 | #else | ||
| 416 | pDumpRecFile = FOPEN (kpFileName, "ab"); | ||
| 417 | #endif//WIN32 | ||
| 418 | } else { | 404 | } else { |
| 419 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 | 405 | pDumpRecFile = WelsFopen ("rec.yuv", "ab"); |
| 420 | FOPEN (&pDumpRecFile, "rec.yuv", "ab"); | ||
| 421 | #else | ||
| 422 | pDumpRecFile = FOPEN ("rec.yuv", "ab"); | ||
| 423 | #endif//WIN32 | ||
| 424 | } | 406 | } |
| 425 | if (NULL != pDumpRecFile) | 407 | if (NULL != pDumpRecFile) |
| 426 | fseek (pDumpRecFile, 0, SEEK_END); | 408 | fseek (pDumpRecFile, 0, SEEK_END); |
| 427 | } else { | 409 | } else { |
| 428 | if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage | 410 | if (STRNLEN (kpFileName, MAX_FNAME_LEN) > 0) { // confirmed_safe_unsafe_usage |
| 429 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 | 411 | pDumpRecFile = WelsFopen (kpFileName, "wb"); |
| 430 | FOPEN (&pDumpRecFile, kpFileName, "wb"); | ||
| 431 | #else | ||
| 432 | pDumpRecFile = FOPEN (kpFileName, "wb"); | ||
| 433 | #endif//WIN32 | ||
| 434 | } else { | 412 | } else { |
| 435 | #if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 | 413 | pDumpRecFile = WelsFopen ("rec.yuv", "wb"); |
| 436 | FOPEN (&pDumpRecFile, "rec.yuv", "wb"); | ||
| 437 | #else | ||
| 438 | pDumpRecFile = FOPEN ("rec.yuv", "wb"); | ||
| 439 | #endif//WIN32.. | ||
| 440 | } | 414 | } |
| 441 | bRecFlag = true; | 415 | bRecFlag = true; |
| 442 | } | 416 | } |