Merge pull request #1613 from sijchen/fix_ut2

[UT] encoder log level adjustment

ruil2 committed 11 years ago

Commit 3be8ae72 parents 5ff55a6 f1a7a1a3 files · +14 −4Browse files

Unified · Split

3 files

@@ -63,6 +63,9 @@ void BaseEncoderTest::SetUp() { · 62 unmodified lines
63	int rv = WelsCreateSVCEncoder (&encoder_);	63	int rv = WelsCreateSVCEncoder (&encoder_);
64	ASSERT_EQ (0, rv);	64	ASSERT_EQ (0, rv);
65	ASSERT_TRUE (encoder_ != NULL);	65	ASSERT_TRUE (encoder_ != NULL);
		66
		67	unsigned int uiTraceLevel = WELS_LOG_ERROR;
		68	encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);
66	}	69	}
67		70
68	void BaseEncoderTest::TearDown() {	71	void BaseEncoderTest::TearDown() {

     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++;
   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;
+  int iTraceLevel = WELS_LOG_QUIET;
-  encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
+  rv = encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
+  ASSERT_TRUE (rv == cmResultSuccess);
   for (int i = 0; i < iEncFrameNum; i++) {
     int iResult;
     int len = 0;
   } while (1); //while (iLoopRound<100);
   fclose (f);
 #else
-  } while (uiLoopRound < 10);
+  }
+  while (uiLoopRound < 10);
 #endif
 }

@@ -29,6 +29,9 @@ class EncoderInterfaceTest : public ::testing::Test { · 28 unmodified lines
29	ASSERT_EQ (0, rv);	29	ASSERT_EQ (0, rv);
30	ASSERT_TRUE (pPtrEnc != NULL);	30	ASSERT_TRUE (pPtrEnc != NULL);
31		31
		32	unsigned int uiTraceLevel = WELS_LOG_ERROR;
		33	pPtrEnc->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel);
		34
32	pParamExt = new SEncParamExt();	35	pParamExt = new SEncParamExt();
33	ASSERT_TRUE (pParamExt != NULL);	36	ASSERT_TRUE (pParamExt != NULL);
34		37

Keyboard shortcuts