Make sure that pOptions is initialized to the parameters that the codec actually uses, not the ones that we initially tried to set. When calling SetOption to update the codec parameters, this may cause a reset of the whole codec if e.g. the number of threads differs from what is set within the codec itself. If the number of threads was changed by the codec internally when inited (e.g. changed from 0 to 1), WelsEncoderParamAdjust may think the whole codec needs to be reset. This fixes running EncoderInterfaceTest.TemporalLayerSettingTest on machines where the detected number of cores is 1.
Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 1 file). Show all
Unified · Split
| @@ -163,10 +163,11 @@ TEST_F (EncoderInterfaceTest, TemporalLayerSettingTest) { · 162 unmodified lines | ||
| 163 | 163 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 164 | 164 | EXPECT_EQ (sFbi.eFrameType, static_cast<int> (videoFrameTypeP)); |
| 165 | 165 | |
| 166 | − memcpy (pOption, pParamExt, sizeof (SEncParamExt)); | |
| 166 | + ENCODER_OPTION eOptionId = ENCODER_OPTION_SVC_ENCODE_PARAM_EXT; | |
| 167 | + iResult = pPtrEnc->GetOption (eOptionId, pOption); | |
| 168 | + EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); | |
| 167 | 169 | pOption ->iTemporalLayerNum = 4; |
| 168 | 170 | |
| 169 | − ENCODER_OPTION eOptionId = ENCODER_OPTION_SVC_ENCODE_PARAM_EXT; | |
| 170 | 171 | iResult = pPtrEnc->SetOption (eOptionId, pOption); |
| 171 | 172 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 172 | 173 | |