add this log for codec

huili2 committed 11 years ago

Commit 3e57fdc1 parent 5ff55a66 files · +13 −5Browse files

Unified · Split

6 files

@@ -54,6 +54,7 @@ typedef void (PWelsLogCallbackFunc) (void pCtx, const int32_t iLevel, const ch · 53 unmodified lines
54	54	typedef struct TagLogContext {
55	55	PWelsLogCallbackFunc pfLog;
56	56	void* pLogCtx;
	57	+ void* pCodecInstance;
57	58	} SLogContext;
58	59
59	60

@@ -44,6 +44,7 @@ class welsCodecTrace { · 43 unmodified lines
44	44	welsCodecTrace();
45	45	~welsCodecTrace();
46	46
	47	+ void SetCodecInstance (void* pCodecInstance);
47	48	void SetTraceLevel (const int32_t kiLevel);
48	49	void SetTraceCallback (WelsTraceCallback func);
49	50	void SetTraceCallbackContext (void* pCtx);

@@ -53,19 +53,19 @@ void WelsLog (SLogContext* logCtx, int32_t iLevel, const char* kpFmt, ...) { · 52 unmodified lines
53	53	char pTraceTag[MAX_LOG_SIZE];
54	54	switch (iLevel) {
55	55	case WELS_LOG_ERROR:
56		− WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] Error:");
	56	+ WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Error:", logCtx->pCodecInstance);
57	57	break;
58	58	case WELS_LOG_WARNING:
59		− WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] Warning:");
	59	+ WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Warning:", logCtx->pCodecInstance);
60	60	break;
61	61	case WELS_LOG_INFO:
62		− WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] Info:");
	62	+ WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Info:", logCtx->pCodecInstance);
63	63	break;
64	64	case WELS_LOG_DEBUG:
65		− WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] Debug:");
	65	+ WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Debug:", logCtx->pCodecInstance);
66	66	break;
67	67	default:
68		− WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] Detail:");
	68	+ WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Detail:", logCtx->pCodecInstance);
69	69	break;
70	70	}
71	71	WelsStrcat (pTraceTag, MAX_LOG_SIZE, kpFmt);

@@ -83,6 +83,10 @@ void welsCodecTrace::CodecTrace (const int32_t iLevel, const char* Str_Format, v · 82 unmodified lines
83	83	}
84	84	}
85	85
	86	+void welsCodecTrace::SetCodecInstance (void* pCodecInstance) {
	87	+ m_sLogCtx.pCodecInstance = pCodecInstance;
	88	+}
	89	+
86	90	void welsCodecTrace::SetTraceLevel (const int32_t iLevel) {
87	91	if (iLevel >= 0)
88	92	m_iTraceLevel = iLevel;

@@ -104,6 +104,7 @@ CWelsDecoder::CWelsDecoder (void) · 103 unmodified lines
104	104
105	105	m_pWelsTrace = new welsCodecTrace();
106	106	if (m_pWelsTrace != NULL) {
	107	+ m_pWelsTrace->SetCodecInstance (this);
107	108	m_pWelsTrace->SetTraceLevel (WELS_LOG_ERROR);
108	109
109	110	WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::CWelsDecoder() entry");

@@ -166,6 +166,7 @@ void CWelsH264SVCEncoder::InitEncoder (void) { · 165 unmodified lines
166	166	if (m_pWelsTrace == NULL) {
167	167	return;
168	168	}
	169	+ m_pWelsTrace->SetCodecInstance (this);
169	170	}
170	171
171	172	/* Interfaces override from ISVCEncoder */

Keyboard shortcuts