MSVC warns when comparing integers with booleans in with the gtest assertion macros.
Showing the changes to test/api/encode_decode_api_test.cpp (1 of 3 files). Show all
Unified · Split
| @@ -1594,7 +1594,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificFrameChange) { · 1593 unmodified lines | |||
| 1594 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); //no output | 1594 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); //no output |
| 1595 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction | 1595 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction |
| 1596 | //Ref picture is ECed, so current status is ECed, when EC disable, NO output | 1596 | //Ref picture is ECed, so current status is ECed, when EC disable, NO output |
| 1597 | EXPECT_TRUE (rv & 32); | 1597 | EXPECT_TRUE ((rv & 32) != 0); |
| 1598 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); | 1598 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); |
| 1599 | iIdx++; | 1599 | iIdx++; |
| 1600 | 1600 | ||
| @@ -1689,10 +1689,10 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificSliceChange_IDRLoss) { · 88 unmodified lines | |||
| 1689 | decoder_->GetOption (DECODER_OPTION_ERROR_CON_IDC, &uiGet); | 1689 | decoder_->GetOption (DECODER_OPTION_ERROR_CON_IDC, &uiGet); |
| 1690 | EXPECT_EQ (uiGet, (uint32_t) ERROR_CON_SLICE_COPY); | 1690 | EXPECT_EQ (uiGet, (uint32_t) ERROR_CON_SLICE_COPY); |
| 1691 | rv = decoder_->DecodeFrame2 (info.sLayerInfo[0].pBsBuf, len, pData, &dstBufInfo_); | 1691 | rv = decoder_->DecodeFrame2 (info.sLayerInfo[0].pBsBuf, len, pData, &dstBufInfo_); |
| 1692 | EXPECT_TRUE (rv & 32); //parse correct, but reconstruct ECed | 1692 | EXPECT_TRUE ((rv & 32) != 0); //parse correct, but reconstruct ECed |
| 1693 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 1); //ECed output for frame 0 | 1693 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 1); //ECed output for frame 0 |
| 1694 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //ECed status, reconstruction current frame 1 | 1694 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //ECed status, reconstruction current frame 1 |
| 1695 | EXPECT_TRUE (rv & 32); //decoder ECed status | 1695 | EXPECT_TRUE ((rv & 32) != 0); //decoder ECed status |
| 1696 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 1); //ECed output for frame 1 | 1696 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 1); //ECed output for frame 1 |
| 1697 | iIdx++; | 1697 | iIdx++; |
| 1698 | 1698 | ||
| @@ -1713,7 +1713,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificSliceChange_IDRLoss) { · 14 unmodified lines | |||
| 1713 | EXPECT_EQ (rv, 0); //parse correct | 1713 | EXPECT_EQ (rv, 0); //parse correct |
| 1714 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction | 1714 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction |
| 1715 | // Ref picture is ECed, so reconstructed picture is ECed | 1715 | // Ref picture is ECed, so reconstructed picture is ECed |
| 1716 | EXPECT_TRUE (rv & 32); | 1716 | EXPECT_TRUE ((rv & 32) != 0); |
| 1717 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); | 1717 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); |
| 1718 | iIdx++; | 1718 | iIdx++; |
| 1719 | 1719 | ||
| @@ -1734,7 +1734,7 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificSliceChange_IDRLoss) { · 14 unmodified lines | |||
| 1734 | EXPECT_EQ (rv, 0); //parse correct | 1734 | EXPECT_EQ (rv, 0); //parse correct |
| 1735 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); | 1735 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); |
| 1736 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction | 1736 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction |
| 1737 | EXPECT_TRUE (rv & 32); | 1737 | EXPECT_TRUE ((rv & 32) != 0); |
| 1738 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); //slice loss | 1738 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); //slice loss |
| 1739 | iIdx++; | 1739 | iIdx++; |
| 1740 | 1740 | ||
| @@ -1858,10 +1858,10 @@ TEST_F (EncodeDecodeTestAPI, SetOptionECIDC_SpecificSliceChange_IDRNoLoss) { · 117 unmodified lines | |||
| 1858 | decoder_->GetOption (DECODER_OPTION_ERROR_CON_IDC, &uiGet); | 1858 | decoder_->GetOption (DECODER_OPTION_ERROR_CON_IDC, &uiGet); |
| 1859 | EXPECT_EQ (uiGet, (uint32_t) ERROR_CON_SLICE_COPY); | 1859 | EXPECT_EQ (uiGet, (uint32_t) ERROR_CON_SLICE_COPY); |
| 1860 | rv = decoder_->DecodeFrame2 (info.sLayerInfo[0].pBsBuf, len, pData, &dstBufInfo_); | 1860 | rv = decoder_->DecodeFrame2 (info.sLayerInfo[0].pBsBuf, len, pData, &dstBufInfo_); |
| 1861 | EXPECT_TRUE (rv & 32); //parse OK but frame 2 ECed | 1861 | EXPECT_TRUE ((rv & 32) != 0); //parse OK but frame 2 ECed |
| 1862 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 1); //slice loss but ECed output Frame 2 | 1862 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 1); //slice loss but ECed output Frame 2 |
| 1863 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction | 1863 | rv = decoder_->DecodeFrame2 (NULL, 0, pData, &dstBufInfo_); //reconstruction |
| 1864 | EXPECT_TRUE (rv & 32); | 1864 | EXPECT_TRUE ((rv & 32) != 0); |
| 1865 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); //slice loss | 1865 | EXPECT_EQ (dstBufInfo_.iBufferStatus, 0); //slice loss |
| 1866 | iIdx++; | 1866 | iIdx++; |
| 1867 | 1867 | ||