generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify debugging code - always write debug trace files to the cur directory

Browse Source 
This reduces the amount of platform ifdefs.
This commit is contained in:
Martin Storsjö 2014-01-27 22:05:38 +02:00
parent e17e664e1a
commit 771ff739b6
4 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/decoder/core/src/mem_align.cpp
View File

@ -53,8 +53,8 @@ void_t* WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) {
#ifdef MEMORY_CHECK #ifdef MEMORY_CHECK
if (pMemCheckMalloc == NULL) { if (pMemCheckMalloc == NULL) {
pMemCheckMalloc = WelsFopen (".\\mem_check_malloc.txt", "at+"); pMemCheckMalloc = WelsFopen ("mem_check_malloc.txt", "at+");
pMemCheckFree = WelsFopen (".\\mem_check_free.txt", "at+"); pMemCheckFree = WelsFopen ("mem_check_free.txt", "at+");
} }
if (kpTag != NULL) { if (kpTag != NULL) {

6
codec/encoder/core/src/slice_multi_threading.cpp
View File

@ -428,11 +428,7 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara
fclose (pSmt->pFSliceDiff); fclose (pSmt->pFSliceDiff);
pSmt->pFSliceDiff = NULL; pSmt->pFSliceDiff = NULL;
} }
#ifdef _WIN32 pSmt->pFSliceDiff = fopen ("slice_time.txt", "wt+");
pSmt->pFSliceDiff = fopen (".\\slice_time.txt", "wt+");
#else
pSmt->pFSliceDiff = fopen ("/tmp/slice_time.txt", "wt+");
#endif//_WIN32
#endif//MT_DEBUG #endif//MT_DEBUG
#if defined(ENABLE_TRACE_MT) #if defined(ENABLE_TRACE_MT)

10
codec/encoder/core/src/utils.cpp
View File

@ -264,7 +264,6 @@ void WelsReopenTraceFile (void* pCtx, str_t* pCurPath) {
#ifdef ENABLE_TRACE_FILE #ifdef ENABLE_TRACE_FILE
sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx; sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
if (wlog == WelsLogDefault) { if (wlog == WelsLogDefault) {
str_t strTraceFile[MAX_FNAME_LEN] = {0};
int32_t len = 0; int32_t len = 0;
if (pEncCtx->pFileLog != NULL) { if (pEncCtx->pFileLog != NULL) {
fclose (pEncCtx->pFileLog); fclose (pEncCtx->pFileLog);
@ -274,14 +273,7 @@ void WelsReopenTraceFile (void* pCtx, str_t* pCurPath) {
len = STRNLEN (pCurPath, MAX_FNAME_LEN - 1); // confirmed_safe_unsafe_usage len = STRNLEN (pCurPath, MAX_FNAME_LEN - 1); // confirmed_safe_unsafe_usage
if (len >= MAX_FNAME_LEN) if (len >= MAX_FNAME_LEN)
return; return;
STRNCPY (strTraceFile, MAX_FNAME_LEN, pCurPath, len); // confirmed_safe_unsafe_usage pEncCtx->pFileLog = WelsFopen ("wels_encoder_trace.txt", "wt+"); // confirmed_safe_unsafe_usage
#ifdef __GNUC__
STRCAT (strTraceFile, MAX_FNAME_LEN - len, "/wels_encoder_trace.txt"); // confirmed_safe_unsafe_usage
#elif _WIN32
STRCAT (strTraceFile, MAX_FNAME_LEN - len, "\\wels_encoder_trace.txt"); // confirmed_safe_unsafe_usage
#else
#endif//__GNUC__
pEncCtx->pFileLog = WelsFopen (strTraceFile, "wt+"); // confirmed_safe_unsafe_usage
} }
#endif//ENABLE_TRACE_FILE #endif//ENABLE_TRACE_FILE
} }

11
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -408,16 +408,7 @@ int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) {
} }
#if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE) #if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE)
str_t fpath[MAX_FNAME_LEN] = {0}; pCfg->sTracePath[0] = '\0';
#if defined(__GNUC__)
WelsSnprintf (fpath, MAX_FNAME_LEN, "/tmp/"); // confirmed_safe_unsafe_usage
#else//__GNUC__
WelsSnprintf (fpath, MAX_FNAME_LEN, ".\\"); // confirmed_safe_unsafe_usage
#endif //__GNUC__
strcpy (pCfg->sTracePath, fpath); // confirmed_safe_unsafe_usage
#endif //#if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE) #endif //#if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE)