Skip to content

Commit f642e53

Browse files
committed
fix(av1,hevc): stop av1 probes from clobbering hevc results
The encoder probes for AV1 capabilities were referencing hevc variables. As a result some of them were making incorrect tests, and would have overwritten HEVC probe results if they failed.
1 parent 790d70f commit f642e53

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/video.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3248,12 +3248,12 @@ namespace video {
32483248
if (active_av1_mode == 5 && !encoder->av1[encoder_t::DYNAMIC_RANGE] && !encoder->av1[encoder_t::DYNAMIC_RANGE_YUV444]) {
32493249
BOOST_LOG(warning) << "Encoder ["sv << encoder->name << "] does not support AV1 Main10 Rext10_444 on this system"sv;
32503250
active_av1_mode = 0;
3251-
} else if (active_hevc_mode == 4 && !encoder->av1[encoder_t::DYNAMIC_RANGE_YUV444]) {
3251+
} else if (active_av1_mode == 4 && !encoder->av1[encoder_t::DYNAMIC_RANGE_YUV444]) {
32523252
BOOST_LOG(warning) << "Encoder ["sv << encoder->name << "] does not support AV1 Rext10_444 on this system"sv;
3253-
active_hevc_mode = 0;
3254-
} else if (active_hevc_mode == 3 && !encoder->hevc[encoder_t::DYNAMIC_RANGE]) {
3253+
active_av1_mode = 0;
3254+
} else if (active_av1_mode == 3 && !encoder->av1[encoder_t::DYNAMIC_RANGE]) {
32553255
BOOST_LOG(warning) << "Encoder ["sv << encoder->name << "] does not support AV1 Main10 on this system"sv;
3256-
active_hevc_mode = 0;
3256+
active_av1_mode = 0;
32573257
} else if (active_av1_mode == 2 && !encoder->av1[encoder_t::PASSED]) {
32583258
BOOST_LOG(warning) << "Encoder ["sv << encoder->name << "] does not support AV1 on this system"sv;
32593259
active_av1_mode = 0;

0 commit comments

Comments
 (0)