From 771ff739b6e601d261fe01b86492c17c64ca6c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 27 Jan 2014 22:05:38 +0200 Subject: [PATCH 1/2] Simplify debugging code - always write debug trace files to the cur directory This reduces the amount of platform ifdefs. --- codec/decoder/core/src/mem_align.cpp | 4 ++-- codec/encoder/core/src/slice_multi_threading.cpp | 6 +----- codec/encoder/core/src/utils.cpp | 10 +--------- codec/encoder/plus/src/welsEncoderExt.cpp | 11 +---------- 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/codec/decoder/core/src/mem_align.cpp b/codec/decoder/core/src/mem_align.cpp index b0dc5eb4..55d9103c 100644 --- a/codec/decoder/core/src/mem_align.cpp +++ b/codec/decoder/core/src/mem_align.cpp @@ -53,8 +53,8 @@ void_t* WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) { #ifdef MEMORY_CHECK if (pMemCheckMalloc == NULL) { - pMemCheckMalloc = WelsFopen (".\\mem_check_malloc.txt", "at+"); - pMemCheckFree = WelsFopen (".\\mem_check_free.txt", "at+"); + pMemCheckMalloc = WelsFopen ("mem_check_malloc.txt", "at+"); + pMemCheckFree = WelsFopen ("mem_check_free.txt", "at+"); } if (kpTag != NULL) { diff --git a/codec/encoder/core/src/slice_multi_threading.cpp b/codec/encoder/core/src/slice_multi_threading.cpp index 84d6e95e..9e5750ab 100644 --- a/codec/encoder/core/src/slice_multi_threading.cpp +++ b/codec/encoder/core/src/slice_multi_threading.cpp @@ -428,11 +428,7 @@ int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPara fclose (pSmt->pFSliceDiff); pSmt->pFSliceDiff = NULL; } -#ifdef _WIN32 - pSmt->pFSliceDiff = fopen (".\\slice_time.txt", "wt+"); -#else - pSmt->pFSliceDiff = fopen ("/tmp/slice_time.txt", "wt+"); -#endif//_WIN32 + pSmt->pFSliceDiff = fopen ("slice_time.txt", "wt+"); #endif//MT_DEBUG #if defined(ENABLE_TRACE_MT) diff --git a/codec/encoder/core/src/utils.cpp b/codec/encoder/core/src/utils.cpp index 2cf21ab1..34af3d7b 100644 --- a/codec/encoder/core/src/utils.cpp +++ b/codec/encoder/core/src/utils.cpp @@ -264,7 +264,6 @@ void WelsReopenTraceFile (void* pCtx, str_t* pCurPath) { #ifdef ENABLE_TRACE_FILE sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx; if (wlog == WelsLogDefault) { - str_t strTraceFile[MAX_FNAME_LEN] = {0}; int32_t len = 0; if (pEncCtx->pFileLog != NULL) { 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 if (len >= MAX_FNAME_LEN) return; - STRNCPY (strTraceFile, MAX_FNAME_LEN, pCurPath, len); // 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 + pEncCtx->pFileLog = WelsFopen ("wels_encoder_trace.txt", "wt+"); // confirmed_safe_unsafe_usage } #endif//ENABLE_TRACE_FILE } diff --git a/codec/encoder/plus/src/welsEncoderExt.cpp b/codec/encoder/plus/src/welsEncoderExt.cpp index be76534a..4c8ce151 100644 --- a/codec/encoder/plus/src/welsEncoderExt.cpp +++ b/codec/encoder/plus/src/welsEncoderExt.cpp @@ -408,16 +408,7 @@ int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) { } #if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE) - str_t fpath[MAX_FNAME_LEN] = {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 + pCfg->sTracePath[0] = '\0'; #endif //#if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE) From 98614924e2d899872d44451d63f32ba0b1599c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 27 Jan 2014 22:07:05 +0200 Subject: [PATCH 2/2] Remove the now meaningless field sTracePath --- codec/encoder/core/inc/param_svc.h | 4 ---- codec/encoder/core/src/encoder_ext.cpp | 3 +-- codec/encoder/plus/src/welsEncoderExt.cpp | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/codec/encoder/core/inc/param_svc.h b/codec/encoder/core/inc/param_svc.h index a003878d..db70654e 100644 --- a/codec/encoder/core/inc/param_svc.h +++ b/codec/encoder/core/inc/param_svc.h @@ -113,10 +113,6 @@ typedef struct TagWelsSvcCodingParam { SDLayerParam sDependencyLayers[MAX_DEPENDENCY_LAYER]; /* General */ -#ifdef ENABLE_TRACE_FILE -str_t sTracePath[MAX_FNAME_LEN]; // log file for wels encoder -#endif - uint32_t uiGopSize; // GOP size (at maximal frame rate: 16) uint32_t uiIntraPeriod; // intra period (multiple of GOP size as desired) int32_t iNumRefFrame; // number of reference frame used diff --git a/codec/encoder/core/src/encoder_ext.cpp b/codec/encoder/core/src/encoder_ext.cpp index 70c6c396..ee1f769a 100644 --- a/codec/encoder/core/src/encoder_ext.cpp +++ b/codec/encoder/core/src/encoder_ext.cpp @@ -2085,8 +2085,7 @@ int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingPar if (wlog == WelsLogDefault) { str_t fname[MAX_FNAME_LEN] = {0}; - WelsSnprintf (fname, MAX_FNAME_LEN, "%swels_svc_encoder_trace.txt", - pCodingParam->sTracePath); // confirmed_safe_unsafe_usage + WelsSnprintf (fname, MAX_FNAME_LEN, "wels_svc_encoder_trace.txt"); pCtx->pFileLog = WelsFopen (fname, "wt+"); diff --git a/codec/encoder/plus/src/welsEncoderExt.cpp b/codec/encoder/plus/src/welsEncoderExt.cpp index 4c8ce151..1166a85a 100644 --- a/codec/encoder/plus/src/welsEncoderExt.cpp +++ b/codec/encoder/plus/src/welsEncoderExt.cpp @@ -407,11 +407,6 @@ int CWelsH264SVCEncoder::Initialize2 (void* argv, const INIT_TYPE iInitType) { InitPic (m_pSrcPicList[i], iColorspace, m_iMaxPicWidth, m_iMaxPicHeight); } -#if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE) - pCfg->sTracePath[0] = '\0'; - -#endif //#if defined(OUTPUT_BIT_STREAM) || defined(ENABLE_TRACE_FILE) - if (WelsInitEncoderExt (&m_pEncContext, pCfg)) { WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), WelsInitEncoderExt failed.\n"); Uninitialize();