1. should not set WELS_LOG_ERROR level in encoder initilization. 2.fix UT bug

ruil2 committed 11 years ago

Commit 56c895f1 parent ea93f392 files · +3 −4Browse files

Showing the changes to test/api/encode_decode_api_test.cpp (1 of 2 files). Show all

Unified · Split

test/api/encode_decode_api_test.cpp+3−2

@@ -1276,12 +1276,13 @@ TEST_P (EncodeDecodeTestAPI, SetOption_Trace) { · 1275 unmodified lines
1276	pFunc = TestOutPutTrace;	1276	pFunc = TestOutPutTrace;
1277	pTraceInfo = &sTrace;	1277	pTraceInfo = &sTrace;
1278	sTrace.iTarLevel = iTraceLevel;	1278	sTrace.iTarLevel = iTraceLevel;
		1279	encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
		1280	decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
1279	encoder_->SetOption (ENCODER_OPTION_TRACE_CALLBACK, &pFunc);	1281	encoder_->SetOption (ENCODER_OPTION_TRACE_CALLBACK, &pFunc);
1280	encoder_->SetOption (ENCODER_OPTION_TRACE_CALLBACK_CONTEXT, &pTraceInfo);	1282	encoder_->SetOption (ENCODER_OPTION_TRACE_CALLBACK_CONTEXT, &pTraceInfo);
1281	decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK, &pFunc);	1283	decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK, &pFunc);
1282	decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK_CONTEXT, &pTraceInfo);	1284	decoder_->SetOption (DECODER_OPTION_TRACE_CALLBACK_CONTEXT, &pTraceInfo);
1283	encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);	1285
1284	decoder_->SetOption (DECODER_OPTION_TRACE_LEVEL, &iTraceLevel);
1285		1286
1286	int32_t iSpsPpsIdAddition = 1;	1287	int32_t iSpsPpsIdAddition = 1;
1287	encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);	1288	encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition);