History

Merge pull request #1469 from shihuade/APIUTV1.5.2

refactor --for BaseEncoderTest

sijchen committed 12 years ago

Commit c7b50512 parents 07bf80b 54c24df5 files · +113 −63Browse files

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

Unified · Split

test/api/encode_decode_api_test.cpp+2−3
@@ -231,7 +231,7 @@ void EncodeDecodeTestAPI::RandomParamExtCombination() { · 230 unmodified lines
231 param_.bEnableFrameCroppingFlag = (rand() % 2 == 0) ? false : true;231 param_.bEnableFrameCroppingFlag = (rand() % 2 == 0) ? false : true;
232 param_.bEnableSceneChangeDetect = (rand() % 2 == 0) ? false : true;232 param_.bEnableSceneChangeDetect = (rand() % 2 == 0) ? false : true;
233 233
234//for rc234 //for rc
235 param_.iRCMode = static_cast<RC_MODES> (rand() % RC_MODE_RANGE - 1);235 param_.iRCMode = static_cast<RC_MODES> (rand() % RC_MODE_RANGE - 1);
236 param_.iMaxBitrate = rand() % BIT_RATE_RANGE;236 param_.iMaxBitrate = rand() % BIT_RATE_RANGE;
237 param_.iTargetBitrate = rand() % BIT_RATE_RANGE;237 param_.iTargetBitrate = rand() % BIT_RATE_RANGE;
@@ -283,7 +283,7 @@ void EncodeDecodeTestAPI::ValidateParamExtCombination() { · 45 unmodified lines
283 uiGOPSize = 1 << (param_.iTemporalLayerNum - 1);283 uiGOPSize = 1 << (param_.iTemporalLayerNum - 1);
284 param_.uiIntraPeriod -= param_.uiIntraPeriod % uiGOPSize;284 param_.uiIntraPeriod -= param_.uiIntraPeriod % uiGOPSize;
285 285
286//RefNum286 //RefNum
287 int32_t iRefUpperBound = (param_.iUsageType == CAMERA_VIDEO_REAL_TIME) ?287 int32_t iRefUpperBound = (param_.iUsageType == CAMERA_VIDEO_REAL_TIME) ?
288 MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA : MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN;288 MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA : MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN;
289 param_.iNumRefFrame = WELS_CLIP3 (param_.iNumRefFrame, MIN_REF_PIC_COUNT, iRefUpperBound);289 param_.iNumRefFrame = WELS_CLIP3 (param_.iNumRefFrame, MIN_REF_PIC_COUNT, iRefUpperBound);
@@ -1999,7 +1999,6 @@ TEST_F (EncodeDecodeTestAPI, SetOptionEncParamExt) { · 1709 unmodified lines
1999 int32_t iTraceLevel = WELS_LOG_QUIET;1999 int32_t iTraceLevel = WELS_LOG_QUIET;
2000 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);2000 encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel);
2001 for (int i = 0; i < iEncFrameNum; i++) {2001 for (int i = 0; i < iEncFrameNum; i++) {
2002 //for (int i = 0; i < 9; i++) {
2003 int iResult;2002 int iResult;
2004 int len = 0;2003 int len = 0;
2005 unsigned char* pData[3] = { NULL };2004 unsigned char* pData[3] = { NULL };

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