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

Merge pull request #1595 from ruil2/update_2

Browse Source 
should not set WELS_LOG_ERROR level in encoder initilization.
This commit is contained in:
sijchen 2014-12-08 11:01:19 +08:00
commit c2d585761a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/api/svc/codec_app_def.h
View File

@ -328,7 +328,7 @@ enum {
WELS_LOG_DETAIL = 1 << 4, ///< per packet/frame log WELS_LOG_DETAIL = 1 << 4, ///< per packet/frame log
WELS_LOG_RESV = 1 << 5, ///< resversed log iLevel WELS_LOG_RESV = 1 << 5, ///< resversed log iLevel
WELS_LOG_LEVEL_COUNT = 6, WELS_LOG_LEVEL_COUNT = 6,
WELS_LOG_DEFAULT = WELS_LOG_DEBUG ///< default log iLevel in Wels codec WELS_LOG_DEFAULT = WELS_LOG_INFO ///< default log iLevel in Wels codec
}; };
/** /**

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

@ -166,8 +166,6 @@ void CWelsH264SVCEncoder::InitEncoder (void) {
if (m_pWelsTrace == NULL) { if (m_pWelsTrace == NULL) {
return; return;
} }
m_pWelsTrace->SetTraceLevel (WELS_LOG_ERROR);
WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::InitEncoder(), openh264 codec version = %s", WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::InitEncoder(), openh264 codec version = %s",
VERSION_NUMBER); VERSION_NUMBER);
} }

5
test/api/encode_decode_api_test.cpp
View File

@ -1276,12 +1276,13 @@ TEST_P (EncodeDecodeTestAPI, SetOption_Trace) {
pFunc = TestOutPutTrace; pFunc = TestOutPutTrace;
pTraceInfo = &sTrace; pTraceInfo = &sTrace;
sTrace.iTarLevel = iTraceLevel; sTrace.iTarLevel = iTraceLevel;
encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
encoder_->SetOption (ENCODER_OPTION_TRACE_CALLBACK, &pFunc); encoder_->SetOption (ENCODER_OPTION_TRACE_CALLBACK, &pFunc);
encoder_->SetOption (ENCODER_OPTION_TRACE_CALLBACK_CONTEXT, &pTraceInfo); encoder_->SetOption (ENCODER_OPTION_TRACE_CALLBACK_CONTEXT, &pTraceInfo);
decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK, &pFunc); decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK, &pFunc);
decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK_CONTEXT, &pTraceInfo); decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK_CONTEXT, &pTraceInfo);
encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
int32_t iSpsPpsIdAddition = 1; int32_t iSpsPpsIdAddition = 1;
encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition); encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);