History

Merge pull request #1333 from huili2/print_ver_master

modify version info in enc/dec

ruil2 committed 12 years ago

Commit 4fc144b2 parents d63172d 1b1ea2b2 files · +9 −3Browse files

Unified · Split

2 files
  1. codec/decoder/plus/src/welsDecoderExt.cpp +5 −2
  2. codec/encoder/plus/src/welsEncoderExt.cpp +4 −1
codec/decoder/plus/src/welsDecoderExt.cpp+5−2
@@ -227,7 +227,8 @@ void CWelsDecoder::UninitDecoder (void) { · 226 unmodified lines
227227 // the return value of this function is not suitable, it need report failure info to upper layer.
228228 void CWelsDecoder::InitDecoder (void) {
229229
230− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::init_decoder()..");
230+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::init_decoder(), openh264 codec version = %s",
231+ VERSION_NUMBER);
231232
232233 m_pDecContext = (PWelsDecoderContext)WelsMalloc (sizeof (SWelsDecoderContext), "m_pDecContext");
233234
@@ -278,6 +279,8 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) { · 44 unmodified lines
278279 if (m_pWelsTrace) {
279280 WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);
280281 m_pWelsTrace->SetTraceCallback (callback);
282+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::SetOption(), openh264 codec version = %s.",
283+ VERSION_NUMBER);
281284 }
282285 return cmResultSuccess;
283286 } else if (eOptID == DECODER_OPTION_TRACE_CALLBACK_CONTEXT) {
@@ -480,7 +483,7 @@ using namespace WelsDec; · 196 unmodified lines
480483 * WelsGetDecoderCapability
481484 * @return: DecCapability information
482485 */
483−int WelsGetDecoderCapability(SDecoderCapability* pDecCapability) {
486+int WelsGetDecoderCapability (SDecoderCapability* pDecCapability) {
484487 memset (pDecCapability, 0, sizeof (SDecoderCapability));
485488 pDecCapability->iProfileIdc = 66; //Baseline
486489 pDecCapability->iProfileIop = 0xE0; //11100000b
codec/encoder/plus/src/welsEncoderExt.cpp+4−1
@@ -363,7 +363,8 @@ int32_t CWelsH264SVCEncoder::Uninitialize() { · 362 unmodified lines
363363 return 0;
364364 }
365365
366− WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize()..");
366+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize(), openh264 codec version = %s.",
367+ VERSION_NUMBER);
367368
368369 #ifdef REC_FRAME_COUNT
369370 WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
@@ -861,6 +862,8 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 491 unmodified lines
861862 if (m_pWelsTrace) {
862863 WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);
863864 m_pWelsTrace->SetTraceCallback (callback);
865+ WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::SetOption(), openh264 codec version = %s.",
866+ VERSION_NUMBER);
864867 }
865868 }
866869 break;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t