Showing the changes to test/api/encode_options_test.cpp (1 of 6 files). Show all
Unified · Split
| @@ -910,7 +910,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING3) { · 909 unmodified lines | |||
| 910 | 910 | ||
| 911 | // step#2: set strategy for success | 911 | // step#2: set strategy for success |
| 912 | int32_t iNewStra = SPS_PPS_LISTING; | 912 | int32_t iNewStra = SPS_PPS_LISTING; |
| 913 | rv = encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iNewStra); | 913 | rv = encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iNewStra); |
| 914 | ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv << " iNewStra=" << iNewStra; | 914 | ASSERT_TRUE (rv == cmResultSuccess) << "rv = " << rv << " iNewStra=" << iNewStra; |
| 915 | 915 | ||
| 916 | // step#3: setting new strategy, SHOULD encounter ERROR | 916 | // step#3: setting new strategy, SHOULD encounter ERROR |
| @@ -918,7 +918,7 @@ TEST_F (EncodeDecodeTestAPI, ParameterSetStrategy_SPS_PPS_LISTING3) { · 1 unmodified line | |||
| 918 | rv = encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &TraceLevel); | 918 | rv = encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &TraceLevel); |
| 919 | ASSERT_TRUE (rv == cmResultSuccess); | 919 | ASSERT_TRUE (rv == cmResultSuccess); |
| 920 | iNewStra = CONSTANT_ID; | 920 | iNewStra = CONSTANT_ID; |
| 921 | rv = encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iNewStra); | 921 | rv = encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iNewStra); |
| 922 | ASSERT_TRUE (rv != cmResultSuccess); | 922 | ASSERT_TRUE (rv != cmResultSuccess); |
| 923 | 923 | ||
| 924 | EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc); | 924 | EncDecOneFrame (sParam2.iPicWidth, sParam2.iPicHeight, iEncFrameNum++, fEnc); |
| @@ -1371,7 +1371,7 @@ TEST_P (EncodeTestAPI, SetEncOptionSize) { · 446 unmodified lines | |||
| 1371 | 1371 | ||
| 1372 | 1372 | ||
| 1373 | int32_t iSpsPpsIdAddition = 1; | 1373 | int32_t iSpsPpsIdAddition = 1; |
| 1374 | encoder_->SetOption (ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION, &iSpsPpsIdAddition); | 1374 | encoder_->SetOption (ENCODER_OPTION_SPS_PPS_ID_STRATEGY, &iSpsPpsIdAddition); |
| 1375 | int32_t iIDRPeriod = (int32_t) pow (2.0f, (param_.iTemporalLayerNum - 1)) * ((rand() % 5) + 1); | 1375 | int32_t iIDRPeriod = (int32_t) pow (2.0f, (param_.iTemporalLayerNum - 1)) * ((rand() % 5) + 1); |
| 1376 | encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod); | 1376 | encoder_->SetOption (ENCODER_OPTION_IDR_INTERVAL, &iIDRPeriod); |
| 1377 | int iIdx = 0; | 1377 | int iIdx = 0; |