generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add casts to avoid warnings about comparison between signed and unsigned

Browse Source
This commit is contained in:
Martin Storsjö 2014-10-23 14:20:38 +03:00
parent 94a1d4426e
commit 57aae73d4c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -599,8 +599,8 @@ void CWelsH264SVCEncoder::UpdateStatistics (const int64_t kiCurrentFrameTs, EVid
int32_t iMaxDid = m_pEncContext->pSvcParam->iSpatialLayerNum - 1;
if ((0 != pStatistics->uWidth && 0 != pStatistics->uHeight)
&& (pStatistics->uWidth != m_pEncContext->pSvcParam->sDependencyLayers[iMaxDid].iActualWidth
|| pStatistics->uHeight != m_pEncContext->pSvcParam->sDependencyLayers[iMaxDid].iActualHeight)) {
&& (pStatistics->uWidth != (unsigned int) m_pEncContext->pSvcParam->sDependencyLayers[iMaxDid].iActualWidth
|| pStatistics->uHeight != (unsigned int) m_pEncContext->pSvcParam->sDependencyLayers[iMaxDid].iActualHeight)) {
pStatistics->uiResolutionChangeTimes ++;
}
pStatistics->uWidth = m_pEncContext->pSvcParam->sDependencyLayers[iMaxDid].iActualWidth;

22
test/encoder/EncUT_EncoderExt.cpp
View File

@ -681,12 +681,12 @@ TEST_F (EncoderInterfaceTest, GetStatistics) {
SEncoderStatistics sEncoderStatistics;
iResult = pPtrEnc->GetOption (ENCODER_OPTION_GET_STATISTICS, &sEncoderStatistics);
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
EXPECT_EQ (sEncoderStatistics.uiInputFrameCount, 2);
EXPECT_EQ (sEncoderStatistics.uIDRSentNum, 1);
EXPECT_EQ (sEncoderStatistics.uiResolutionChangeTimes, 0);
EXPECT_EQ (sEncoderStatistics.uiInputFrameCount, static_cast<unsigned int> (2));
EXPECT_EQ (sEncoderStatistics.uIDRSentNum, static_cast<unsigned int> (1));
EXPECT_EQ (sEncoderStatistics.uiResolutionChangeTimes, static_cast<unsigned int> (0));
EXPECT_EQ (sEncoderStatistics.uWidth, sEncParamBase.iPicWidth);
EXPECT_EQ (sEncoderStatistics.uHeight, sEncParamBase.iPicHeight);
EXPECT_EQ (sEncoderStatistics.uWidth, static_cast<unsigned int> (sEncParamBase.iPicWidth));
EXPECT_EQ (sEncoderStatistics.uHeight, static_cast<unsigned int> (sEncParamBase.iPicHeight));
// try param change
// 1, get the existing
@ -711,12 +711,12 @@ TEST_F (EncoderInterfaceTest, GetStatistics) {
iResult = pPtrEnc->GetOption (ENCODER_OPTION_GET_STATISTICS, &sEncoderStatistics);
EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
EXPECT_EQ (sEncoderStatistics.uiInputFrameCount, 3);
EXPECT_EQ (sEncoderStatistics.uIDRSentNum, 2);
EXPECT_EQ (sEncoderStatistics.uiResolutionChangeTimes, knownResolutionChangeTimes);
EXPECT_EQ (sEncoderStatistics.uiInputFrameCount, static_cast<unsigned int> (3));
EXPECT_EQ (sEncoderStatistics.uIDRSentNum, static_cast<unsigned int> (2));
EXPECT_EQ (sEncoderStatistics.uiResolutionChangeTimes, static_cast<unsigned int> (knownResolutionChangeTimes));
EXPECT_EQ (sEncoderStatistics.uWidth, sEncParamBase.iPicWidth);
EXPECT_EQ (sEncoderStatistics.uHeight, sEncParamBase.iPicHeight);
EXPECT_EQ (sEncoderStatistics.uWidth, static_cast<unsigned int> (sEncParamBase.iPicWidth));
EXPECT_EQ (sEncoderStatistics.uHeight, static_cast<unsigned int> (sEncParamBase.iPicHeight));
// 4, change log interval
int32_t iInterval = 0;
@ -740,4 +740,4 @@ TEST_F (EncoderInterfaceTest, GetStatistics) {
// finish
pPtrEnc->Uninitialize();
}
}