Showing the changes to test/encoder/EncUT_ParameterSetStrategy.cpp (1 of 7 files). Show all
Unified · Split
| @@ -73,18 +73,18 @@ TEST_F (ParameterSetStrategyTest, FindExistingSps) { · 72 unmodified lines | |||
| 73 | pDlayerParam = & (sParam1.sSpatialLayers[iDlayerIndex]); | 73 | pDlayerParam = & (sParam1.sSpatialLayers[iDlayerIndex]); |
| 74 | iRet = WelsInitSps (m_pSpsArrayPointer, pDlayerParam, &sParam1.sDependencyLayers[iDlayerIndex], sParam1.uiIntraPeriod, | 74 | iRet = WelsInitSps (m_pSpsArrayPointer, pDlayerParam, &sParam1.sDependencyLayers[iDlayerIndex], sParam1.uiIntraPeriod, |
| 75 | sParam1.iMaxNumRefFrame, | 75 | sParam1.iMaxNumRefFrame, |
| 76 | iCurSpsId, sParam1.bEnableFrameCroppingFlag, sParam1.iRCMode != RC_OFF_MODE, iDlayerCount); | 76 | iCurSpsId, sParam1.bEnableFrameCroppingFlag, sParam1.iRCMode != RC_OFF_MODE, iDlayerCount, false); |
| 77 | 77 | ||
| 78 | // try finding #0 | 78 | // try finding #0 |
| 79 | iFoundId = FindExistingSps (&sParam1, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, | 79 | iFoundId = FindExistingSps (&sParam1, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, |
| 80 | m_pSpsArray, m_pSubsetArray); | 80 | m_pSpsArray, m_pSubsetArray, false); |
| 81 | EXPECT_EQ (iFoundId, iCurSpsId); | 81 | EXPECT_EQ (iFoundId, iCurSpsId); |
| 82 | 82 | ||
| 83 | // try not finding | 83 | // try not finding |
| 84 | SWelsSvcCodingParam sParam2 = sParam1; | 84 | SWelsSvcCodingParam sParam2 = sParam1; |
| 85 | sParam2.iMaxNumRefFrame ++; | 85 | sParam2.iMaxNumRefFrame ++; |
| 86 | iFoundId = FindExistingSps (&sParam2, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, | 86 | iFoundId = FindExistingSps (&sParam2, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, |
| 87 | m_pSpsArray, m_pSubsetArray); | 87 | m_pSpsArray, m_pSubsetArray, false); |
| 88 | EXPECT_EQ (iFoundId, INVALID_ID); | 88 | EXPECT_EQ (iFoundId, INVALID_ID); |
| 89 | 89 | ||
| 90 | // add new sps | 90 | // add new sps |
| @@ -93,17 +93,17 @@ TEST_F (ParameterSetStrategyTest, FindExistingSps) { · 2 unmodified lines | |||
| 93 | pDlayerParam = & (sParam2.sSpatialLayers[iDlayerIndex]); | 93 | pDlayerParam = & (sParam2.sSpatialLayers[iDlayerIndex]); |
| 94 | iRet = WelsInitSps (m_pSpsArrayPointer, pDlayerParam, &sParam2.sDependencyLayers[iDlayerIndex], sParam2.uiIntraPeriod, | 94 | iRet = WelsInitSps (m_pSpsArrayPointer, pDlayerParam, &sParam2.sDependencyLayers[iDlayerIndex], sParam2.uiIntraPeriod, |
| 95 | sParam2.iMaxNumRefFrame, | 95 | sParam2.iMaxNumRefFrame, |
| 96 | iCurSpsId, sParam2.bEnableFrameCroppingFlag, sParam2.iRCMode != RC_OFF_MODE, iDlayerCount); | 96 | iCurSpsId, sParam2.bEnableFrameCroppingFlag, sParam2.iRCMode != RC_OFF_MODE, iDlayerCount, false); |
| 97 | iCurSpsInUse = 2; | 97 | iCurSpsInUse = 2; |
| 98 | 98 | ||
| 99 | // try finding #1 | 99 | // try finding #1 |
| 100 | iFoundId = FindExistingSps (&sParam2, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, | 100 | iFoundId = FindExistingSps (&sParam2, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, |
| 101 | m_pSpsArray, m_pSubsetArray); | 101 | m_pSpsArray, m_pSubsetArray, false); |
| 102 | EXPECT_EQ (iFoundId, iCurSpsId); | 102 | EXPECT_EQ (iFoundId, iCurSpsId); |
| 103 | 103 | ||
| 104 | // try finding #0 | 104 | // try finding #0 |
| 105 | iFoundId = FindExistingSps (&sParam1, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, | 105 | iFoundId = FindExistingSps (&sParam1, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, |
| 106 | m_pSpsArray, m_pSubsetArray); | 106 | m_pSpsArray, m_pSubsetArray, false); |
| 107 | EXPECT_EQ (iFoundId, 0); | 107 | EXPECT_EQ (iFoundId, 0); |
| 108 | 108 | ||
| 109 | // try not finding | 109 | // try not finding |
| @@ -115,7 +115,7 @@ TEST_F (ParameterSetStrategyTest, FindExistingSps) { · 5 unmodified lines | |||
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | iFoundId = FindExistingSps (&sParam2, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, | 117 | iFoundId = FindExistingSps (&sParam2, bUseSubsetSps, iDlayerIndex, iDlayerCount, iCurSpsInUse, |
| 118 | m_pSpsArray, m_pSubsetArray); | 118 | m_pSpsArray, m_pSubsetArray, false); |
| 119 | EXPECT_EQ (iFoundId, INVALID_ID); | 119 | EXPECT_EQ (iFoundId, INVALID_ID); |
| 120 | (void) iRet; // Not using iRet at the moment | 120 | (void) iRet; // Not using iRet at the moment |
| 121 | } | 121 | } |