shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1595 from ruil2/update_2

should not set WELS_LOG_ERROR level in encoder initilization.

--- a/codec/api/svc/codec_app_def.h

+++ b/codec/api/svc/codec_app_def.h

@@ -328,7 +328,7 @@

   WELS_LOG_DETAIL      = 1 << 4,        ///< per packet/frame log

   WELS_LOG_RESV        = 1 << 5,        ///< resversed log iLevel

   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

 };

 /**

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

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

@@ -166,8 +166,6 @@

   if (m_pWelsTrace == NULL) {

     return;

   }

-

-  m_pWelsTrace->SetTraceLevel (WELS_LOG_ERROR);

   WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::InitEncoder(), openh264 codec version = %s",

            VERSION_NUMBER);

 }

--- a/test/api/encode_decode_api_test.cpp

+++ b/test/api/encode_decode_api_test.cpp

@@ -1276,12 +1276,13 @@

   pFunc = TestOutPutTrace;

   pTraceInfo = &sTrace;

   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_CONTEXT, &pTraceInfo);

   decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK, &pFunc);

   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;

   encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);