Unified · Split
| @@ -150,7 +150,7 @@ void EncoderInterfaceTest::InitializeParamExt() { · 149 unmodified lines | ||
| 150 | 150 | |
| 151 | 151 | TEST_F (EncoderInterfaceTest, EncoderOptionSetTest) { |
| 152 | 152 | int iResult, iValue, iReturn; |
| 153 | − float fValue, fReturn; | |
| 153 | + float fFrameRate, fReturn; | |
| 154 | 154 | int uiTraceLevel = WELS_LOG_QUIET; |
| 155 | 155 | |
| 156 | 156 | pPtrEnc->SetOption (ENCODER_OPTION_TRACE_LEVEL, &uiTraceLevel); |
| @@ -195,17 +195,17 @@ TEST_F (EncoderInterfaceTest, EncoderOptionSetTest) { · 38 unmodified lines | ||
| 195 | 195 | pSrcPic->uiTimeStamp += 30; |
| 196 | 196 | |
| 197 | 197 | eOptionId = ENCODER_OPTION_FRAME_RATE; |
| 198 | − fValue = static_cast<float> (rand() % 100 - 5); | |
| 199 | − iResult = pPtrEnc->SetOption (eOptionId, &fValue); | |
| 198 | + fFrameRate = static_cast<float> (rand() % 100 - 5); | |
| 199 | + iResult = pPtrEnc->SetOption (eOptionId, &fFrameRate); | |
| 200 | 200 | |
| 201 | − if (fValue <= 0) | |
| 201 | + if (fFrameRate <= 0) | |
| 202 | 202 | EXPECT_EQ (iResult, static_cast<int> (cmInitParaError)); |
| 203 | 203 | else { |
| 204 | 204 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 205 | 205 | |
| 206 | 206 | iResult = pPtrEnc->GetOption (eOptionId, &fReturn); |
| 207 | 207 | EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess)); |
| 208 | − EXPECT_EQ (WELS_CLIP3 (fValue, 1, 60), fReturn); | |
| 208 | + EXPECT_EQ (WELS_CLIP3 (fFrameRate, 1, 60), fReturn); | |
| 209 | 209 | } |
| 210 | 210 | PrepareOneSrcFrame(); |
| 211 | 211 | iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi); |
| @@ -240,7 +240,7 @@ TEST_F (EncoderInterfaceTest, EncoderOptionSetTest) { · 28 unmodified lines | ||
| 240 | 240 | sInfo.iLayer = SPATIAL_LAYER_0; |
| 241 | 241 | iResult = pPtrEnc->SetOption (eOptionId, &sInfo); |
| 242 | 242 | pPtrEnc->GetOption (ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, pParamExt); |
| 243 | − if (sInfo.iBitrate <= 0) | |
| 243 | + if (sInfo.iBitrate <= 0 || pParamExt->sSpatialLayers[sInfo.iLayer].iSpatialBitrate <= (int) (fFrameRate + 0.5f)) | |
| 244 | 244 | EXPECT_EQ (iResult, static_cast<int> (cmInitParaError)); |
| 245 | 245 | else if (pParamExt->sSpatialLayers[sInfo.iLayer].iSpatialBitrate > |
| 246 | 246 | pParamExt->sSpatialLayers[sInfo.iLayer].iMaxSpatialBitrate) { |