Showing the changes to test/api/encode_options_test.cpp (1 of 3 files). Show all
Unified · Split
| @@ -1973,9 +1973,6 @@ TEST_F (EncodeDecodeTestAPI, ProfileLevelSetting) { · 1972 unmodified lines | |||
| 1973 | if ((iEncProfileIdc != PRO_BASELINE) && (iEncProfileIdc != PRO_MAIN) && (iEncProfileIdc != PRO_HIGH)) { | 1973 | if ((iEncProfileIdc != PRO_BASELINE) && (iEncProfileIdc != PRO_MAIN) && (iEncProfileIdc != PRO_HIGH)) { |
| 1974 | iEncProfileIdc = PRO_BASELINE; | 1974 | iEncProfileIdc = PRO_BASELINE; |
| 1975 | } | 1975 | } |
| 1976 | if ((iEncProfileIdc == PRO_BASELINE) && (sParam.iEntropyCodingModeFlag == 1)) | ||
| 1977 | iEncProfileIdc = PRO_MAIN; | ||
| 1978 | |||
| 1979 | 1976 | ||
| 1980 | ASSERT_TRUE (iDecProfileIdc == iEncProfileIdc) << "enc_profile = " << iEncProfileIdc << " dec_profile = " << | 1977 | ASSERT_TRUE (iDecProfileIdc == iEncProfileIdc) << "enc_profile = " << iEncProfileIdc << " dec_profile = " << |
| 1981 | iDecProfileIdc; | 1978 | iDecProfileIdc; |
| @@ -2036,9 +2033,6 @@ TEST_F (EncodeDecodeTestAPI, ProfileLevelSetting) { · 54 unmodified lines | |||
| 2036 | if ((iEncProfileIdc != PRO_BASELINE) && (iEncProfileIdc != PRO_MAIN) && (iEncProfileIdc != PRO_HIGH)) { | 2033 | if ((iEncProfileIdc != PRO_BASELINE) && (iEncProfileIdc != PRO_MAIN) && (iEncProfileIdc != PRO_HIGH)) { |
| 2037 | iEncProfileIdc = PRO_BASELINE; | 2034 | iEncProfileIdc = PRO_BASELINE; |
| 2038 | } | 2035 | } |
| 2039 | if ((iEncProfileIdc == PRO_BASELINE) && (sParam.iEntropyCodingModeFlag == 1)) | ||
| 2040 | iEncProfileIdc = PRO_MAIN; | ||
| 2041 | |||
| 2042 | 2036 | ||
| 2043 | ASSERT_TRUE (iDecProfileIdc == iEncProfileIdc) << "enc_profile = " << iEncProfileIdc << " dec_profile = " << | 2037 | ASSERT_TRUE (iDecProfileIdc == iEncProfileIdc) << "enc_profile = " << iEncProfileIdc << " dec_profile = " << |
| 2044 | iDecProfileIdc; | 2038 | iDecProfileIdc; |