improve error logging in UT
This commit is contained in:
parent
9b442b3d44
commit
3c085aec79
@ -487,13 +487,9 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTest) {
|
|||||||
GetValidEncParamBase (&sEncParamBase);
|
GetValidEncParamBase (&sEncParamBase);
|
||||||
|
|
||||||
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
||||||
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
|
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
|
||||||
if (iResult != cmResultSuccess) {
|
", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
|
||||||
fprintf (stderr, "Unexpected ParamBase? \
|
sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
|
||||||
iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
|
|
||||||
sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
|
|
||||||
sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
PrepareOneSrcFrame();
|
PrepareOneSrcFrame();
|
||||||
|
|
||||||
@ -510,13 +506,9 @@ TEST_F (EncoderInterfaceTest, BaseParamSettingTest) {
|
|||||||
GetValidEncParamBase (&sEncParamBase);
|
GetValidEncParamBase (&sEncParamBase);
|
||||||
|
|
||||||
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
||||||
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
|
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
|
||||||
if (iResult != cmResultSuccess) {
|
", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
|
||||||
fprintf (stderr, "Unexpected ParamBase? \
|
sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
|
||||||
iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
|
|
||||||
sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
|
|
||||||
sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
PrepareOneSrcFrame();
|
PrepareOneSrcFrame();
|
||||||
|
|
||||||
@ -626,13 +618,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrame) {
|
|||||||
GetValidEncParamBase (&sEncParamBase);
|
GetValidEncParamBase (&sEncParamBase);
|
||||||
|
|
||||||
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
||||||
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
|
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
|
||||||
if (iResult != cmResultSuccess) {
|
", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
|
||||||
fprintf (stderr, "Unexpected ParamBase? \
|
sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
|
||||||
iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
|
|
||||||
sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
|
|
||||||
sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
PrepareOneSrcFrame();
|
PrepareOneSrcFrame();
|
||||||
|
|
||||||
@ -676,13 +664,9 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrameWithTemporal) {
|
|||||||
sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2;
|
sEncParamExt.iTemporalLayerNum = (iTargetTemporalLayerNum > 2) ? iTargetTemporalLayerNum : 2;
|
||||||
|
|
||||||
int iResult = pPtrEnc->InitializeExt (&sEncParamExt);
|
int iResult = pPtrEnc->InitializeExt (&sEncParamExt);
|
||||||
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
|
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType <<
|
||||||
if (iResult != cmResultSuccess) {
|
", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " <<
|
||||||
fprintf (stderr, "Unexpected ParamBase? \
|
sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate;
|
||||||
iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
|
|
||||||
sEncParamExt.iUsageType, sEncParamExt.iPicWidth, sEncParamExt.iPicHeight,
|
|
||||||
sEncParamExt.iTargetBitrate, sEncParamExt.iRCMode, sEncParamExt.fMaxFrameRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
PrepareOneSrcFrame();
|
PrepareOneSrcFrame();
|
||||||
|
|
||||||
@ -708,13 +692,9 @@ TEST_F (EncoderInterfaceTest, EncodeParameterSets) {
|
|||||||
GetValidEncParamBase (&sEncParamBase);
|
GetValidEncParamBase (&sEncParamBase);
|
||||||
|
|
||||||
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
||||||
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
|
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
|
||||||
if (iResult != cmResultSuccess) {
|
", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
|
||||||
fprintf (stderr, "Unexpected ParamBase? \
|
sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
|
||||||
iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
|
|
||||||
sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
|
|
||||||
sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
|
|
||||||
}
|
|
||||||
PrepareOneSrcFrame();
|
PrepareOneSrcFrame();
|
||||||
EncodeOneIDRandP (pPtrEnc);
|
EncodeOneIDRandP (pPtrEnc);
|
||||||
|
|
||||||
@ -797,13 +777,9 @@ TEST_F (EncoderInterfaceTest, GetStatistics) {
|
|||||||
GetValidEncParamBase (&sEncParamBase);
|
GetValidEncParamBase (&sEncParamBase);
|
||||||
|
|
||||||
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
||||||
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
|
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
|
||||||
if (iResult != cmResultSuccess) {
|
", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
|
||||||
fprintf (stderr, "Unexpected ParamBase? \
|
sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
|
||||||
iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
|
|
||||||
sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
|
|
||||||
sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
PrepareOneSrcFrame();
|
PrepareOneSrcFrame();
|
||||||
EncodeOneIDRandP (pPtrEnc);
|
EncodeOneIDRandP (pPtrEnc);
|
||||||
@ -864,13 +840,9 @@ TEST_F (EncoderInterfaceTest, FrameSizeCheck) {
|
|||||||
GetValidEncParamBase (&sEncParamBase);
|
GetValidEncParamBase (&sEncParamBase);
|
||||||
|
|
||||||
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
int iResult = pPtrEnc->Initialize (&sEncParamBase);
|
||||||
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
|
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamBase.iUsageType <<
|
||||||
if (iResult != cmResultSuccess) {
|
", iPicWidth = " << sEncParamBase.iPicWidth << ", iPicHeight = " << sEncParamBase.iPicHeight << ", iTargetBitrate = " <<
|
||||||
fprintf (stderr, "Unexpected ParamBase? \
|
sEncParamBase.iTargetBitrate << ", fMaxFrameRate = " << sEncParamBase.fMaxFrameRate;
|
||||||
iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
|
|
||||||
sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
|
|
||||||
sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
PrepareOneSrcFrame();
|
PrepareOneSrcFrame();
|
||||||
iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
|
iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
|
||||||
@ -921,13 +893,9 @@ TEST_F (EncoderInterfaceTest, SkipFrameCheck) {
|
|||||||
pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight;
|
pParamExt->iPicHeight = sEncParamExt.sSpatialLayers[0].iVideoHeight;
|
||||||
|
|
||||||
iResult = pPtrEnc->InitializeExt (&sEncParamExt);
|
iResult = pPtrEnc->InitializeExt (&sEncParamExt);
|
||||||
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
|
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)) << "iUsageType = " << sEncParamExt.iUsageType <<
|
||||||
if (iResult != cmResultSuccess) {
|
", iPicWidth = " << sEncParamExt.iPicWidth << ", iPicHeight = " << sEncParamExt.iPicHeight << ", iTargetBitrate = " <<
|
||||||
fprintf (stderr, "Unexpected sEncParamExt? \
|
sEncParamExt.iTargetBitrate << ", fMaxFrameRate = " << sEncParamExt.fMaxFrameRate;
|
||||||
iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
|
|
||||||
sEncParamExt.iUsageType, sEncParamExt.iPicWidth, sEncParamExt.iPicHeight,
|
|
||||||
sEncParamExt.iTargetBitrate, sEncParamExt.iRCMode, sEncParamExt.fMaxFrameRate);
|
|
||||||
}
|
|
||||||
|
|
||||||
int iInterval = 300;
|
int iInterval = 300;
|
||||||
iResult = pPtrEnc->SetOption (ENCODER_OPTION_STATISTICS_LOG_INTERVAL, &iInterval);
|
iResult = pPtrEnc->SetOption (ENCODER_OPTION_STATISTICS_LOG_INTERVAL, &iInterval);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user