shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #242 from mstorsjo/simplify-debug-file-locations

Simplify debugging code by always writing trace files to the current directory

--- a/codec/decoder/core/src/mem_align.cpp

+++ b/codec/decoder/core/src/mem_align.cpp

@@ -53,8 +53,8 @@

 #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) {

--- a/codec/encoder/core/inc/param_svc.h

+++ b/codec/encoder/core/inc/param_svc.h

@@ -113,10 +113,6 @@

 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

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -2085,8 +2085,7 @@

   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+");

--- a/codec/encoder/core/src/slice_multi_threading.cpp

+++ b/codec/encoder/core/src/slice_multi_threading.cpp

@@ -428,11 +428,7 @@

     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)

--- a/codec/encoder/core/src/utils.cpp

+++ b/codec/encoder/core/src/utils.cpp

@@ -264,7 +264,6 @@

 #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) {

       WelsFclose (pEncCtx->pFileLog);

@@ -274,14 +273,7 @@

     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

 }

--- a/codec/encoder/plus/src/welsEncoderExt.cpp

+++ b/codec/encoder/plus/src/welsEncoderExt.cpp

@@ -407,20 +407,6 @@

     InitPic (m_pSrcPicList[i], iColorspace, m_iMaxPicWidth, m_iMaxPicHeight);

   }

-#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

-

-#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();