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

Merge pull request #1613 from sijchen/fix_ut2

Browse Source 
[UT] encoder log level adjustment
This commit is contained in:
ruil2 2014-12-11 16:29:34 +08:00
commit 3be8ae7a4e
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/api/BaseEncoderTest.cpp
View File

@ -63,6 +63,9 @@ void BaseEncoderTest::SetUp() {
int rv = WelsCreateSVCEncoder (&encoder_);
ASSERT_EQ (0, rv);
ASSERT_TRUE (encoder_ != NULL);
unsigned int uiTraceLevel = WELS_LOG_ERROR;
encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);
}
void BaseEncoderTest::TearDown() {

12
test/api/encode_decode_api_test.cpp
View File

@ -1071,7 +1071,7 @@ TEST_P (EncodeDecodeTestAPI, InOutTimeStamp) {
memset (&dstBufInfo_, 0, sizeof (SBufferInfo));
dstBufInfo_.uiInBsTimeStamp = uiEncTimeStamp;
rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction
if(dstBufInfo_.iBufferStatus == 1) {
if (dstBufInfo_.iBufferStatus == 1) {
EXPECT_EQ (uiEncTimeStamp, dstBufInfo_.uiOutYuvTimeStamp);
}
iIdx++;
@ -2064,11 +2064,14 @@ TEST_F (EncodeDecodeTestAPI, SetOptionEncParamExt) {
int iSliceNum = 1;
encoder_->GetDefaultParams (&param_);
prepareParam (iSpatialLayerNum, iSliceNum, iWidth, iHeight, fFrameRate);
int rv = encoder_->InitializeExt (&param_);
ASSERT_TRUE (rv == cmResultSuccess);
int32_t iTraceLevel = WELS_LOG_QUIET;
encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
int iTraceLevel = WELS_LOG_QUIET;
rv = encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
ASSERT_TRUE (rv == cmResultSuccess);
for (int i = 0; i < iEncFrameNum; i++) {
int iResult;
int len = 0;
@ -2304,7 +2307,8 @@ TEST_F (DecodeCrashTestAPI, DecoderCrashTest) {
} while (1); //while (iLoopRound<100);
fclose (f);
#else
} while (uiLoopRound < 10);
}
while (uiLoopRound < 10);
#endif
}

3
test/encoder/EncUT_EncoderExt.cpp
View File

@ -29,6 +29,9 @@ class EncoderInterfaceTest : public ::testing::Test {
ASSERT_EQ (0, rv);
ASSERT_TRUE (pPtrEnc != NULL);
unsigned int uiTraceLevel = WELS_LOG_ERROR;
pPtrEnc->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);
pParamExt = new SEncParamExt();
ASSERT_TRUE (pParamExt != NULL);