Showing the changes to test/api/encode_decode_api_test.cpp (1 of 7 files). Show all
Unified · Split
| @@ -3459,13 +3459,12 @@ static const EncodeOptionParam kOptionParamArray[] = { · 3458 unmodified lines | ||
| 3459 | 3459 | {true, false, true, 30, 110, 296, 50, SM_DYN_SLICE, 500, 7.5, 1, ""}, |
| 3460 | 3460 | {true, false, true, 30, 104, 416, 44, SM_DYN_SLICE, 500, 7.5, 1, ""}, |
| 3461 | 3461 | {true, false, true, 30, 16, 16, 2, SM_DYN_SLICE, 500, 7.5, 1, ""}, |
| 3462 | − // enable the following when all random input is supported | |
| 3463 | − //{true, true, true, 30, 600, 460, 1, SM_DYN_SLICE, 450, 15.0, 1, ""}, | |
| 3464 | − //{true, true, true, 30, 340, 96, 24, SM_DYN_SLICE, 1000, 30.0, 1, ""}, | |
| 3465 | − //{true, true, true, 30, 140, 196, 51, SM_DYN_SLICE, 500, 7.5, 1, ""}, | |
| 3466 | − //{true, true, true, 30, 110, 296, 50, SM_DYN_SLICE, 500, 7.5, 1, ""}, | |
| 3467 | − //{true, true, true, 30, 104, 416, 44, SM_DYN_SLICE, 500, 7.5, 1, ""}, | |
| 3468 | − //{true, true, true, 30, 16, 16, 2, SM_DYN_SLICE, 500, 7.5, 1, ""}, | |
| 3462 | + {true, true, true, 30, 600, 460, 1, SM_DYN_SLICE, 450, 15.0, 1, ""}, | |
| 3463 | + {true, true, true, 30, 340, 96, 24, SM_DYN_SLICE, 1000, 30.0, 1, ""}, | |
| 3464 | + {true, true, true, 30, 140, 196, 51, SM_DYN_SLICE, 500, 7.5, 1, ""}, | |
| 3465 | + {true, true, true, 30, 110, 296, 50, SM_DYN_SLICE, 500, 7.5, 1, ""}, | |
| 3466 | + {true, true, true, 30, 104, 416, 44, SM_DYN_SLICE, 500, 7.5, 1, ""}, | |
| 3467 | + {true, true, true, 30, 16, 16, 2, SM_DYN_SLICE, 500, 7.5, 1, ""}, | |
| 3469 | 3468 | {false, false, true, 3, 4096, 2304, 2, SM_SINGLE_SLICE, 0, 7.5, 1, ""}, // large picture size |
| 3470 | 3469 | {false, true, false, 30, 32, 16, 2, SM_DYN_SLICE, 500, 7.5, 1, ""}, |
| 3471 | 3470 | {false, true, false, 30, 600, 460, 1, SM_DYN_SLICE, 450, 15.0, 4, ""}, |
| @@ -3474,8 +3473,7 @@ static const EncodeOptionParam kOptionParamArray[] = { · 2 unmodified lines | ||
| 3474 | 3473 | {false, true, false, 30, 110, 296, 50, SM_DYN_SLICE, 500, 7.5, 2, ""}, |
| 3475 | 3474 | {false, true, false, 30, 104, 416, 44, SM_DYN_SLICE, 500, 7.5, 2, ""}, |
| 3476 | 3475 | {false, true, false, 30, 16, 16, 2, SM_DYN_SLICE, 500, 7.5, 3, ""}, |
| 3477 | − //{false, true, false, 30, 32, 16, 2, SM_DYN_SLICE, 500, 7.5, 3, ""}, | |
| 3478 | − //disable the above for now, enable when multi-thread error is correctly handled | |
| 3476 | + {false, true, false, 30, 32, 16, 2, SM_DYN_SLICE, 500, 7.5, 3, ""}, | |
| 3479 | 3477 | }; |
| 3480 | 3478 | |
| 3481 | 3479 | class EncodeTestAPI : public ::testing::TestWithParam<EncodeOptionParam>, public ::EncodeDecodeTestAPIBase { |
| @@ -3543,6 +3541,12 @@ TEST_P (EncodeTestAPI, SetEncOptionSize) { · 61 unmodified lines | ||
| 3543 | 3541 | int iIdx = 0; |
| 3544 | 3542 | int iLen; |
| 3545 | 3543 | unsigned char* pData[3] = { NULL }; |
| 3544 | + | |
| 3545 | + //FIXME: remove this after the multi-thread case is correctly handled in encoder | |
| 3546 | + if (p.iThreads>1 && SM_DYN_SLICE == p.eSliceMode) { | |
| 3547 | + p.bAllRandom = false; | |
| 3548 | + } | |
| 3549 | + | |
| 3546 | 3550 | while (iIdx <= p.iNumframes) { |
| 3547 | 3551 | EncodeOneFrameRandom (0, p.bAllRandom); |
| 3548 | 3552 | encToDecData (info, iLen); |