This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 9f0dded48def7b9fed94f968e5d70968541c2bcb Author: Niklas Haas <[email protected]> AuthorDate: Tue Mar 31 16:11:27 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Thu Apr 16 23:24:55 2026 +0200 swscale/ops_chain: check for exact linear mask match Makes this logic a lot simpler and less brittle. We can trivially adjust the list of linear masks that are required, whenever it changes as a result of any future modifications. Signed-off-by: Niklas Haas <[email protected]> --- libswscale/ops_chain.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/libswscale/ops_chain.c b/libswscale/ops_chain.c index abc2683f4e..7c9f4e853a 100644 --- a/libswscale/ops_chain.c +++ b/libswscale/ops_chain.c @@ -68,10 +68,6 @@ int ff_sws_op_chain_append(SwsOpChain *chain, SwsFuncPtr func, * Likewise, if `ref->comps` has any components marked as unused, they must be * marked as unused in `ops` as well. * - * For SWS_OP_LINEAR, `ref->linear.mask` must be a strict superset of - * `op->linear.mask`, but may not contain any columns explicitly ignored by - * `op->comps.unused`. - * * For unfiltered SWS_OP_READ/SWS_OP_WRITE, SWS_OP_SWAP_BYTES and * SWS_OP_SWIZZLE, the exact type is not checked, just the size. * @@ -172,17 +168,8 @@ static int op_match(const SwsOp *op, const SwsOpEntry *entry) av_assert1(entry->flexible); break; case SWS_OP_LINEAR: - /* All required elements must be present */ - if (op->lin.mask & ~entry->linear_mask) + if (op->lin.mask != entry->linear_mask) return 0; - /* To avoid operating on possibly undefined memory, filter out - * implementations that operate on more input components */ - for (int i = 0; i < 4; i++) { - if ((entry->linear_mask & SWS_MASK_COL(i)) && op->comps.unused[i]) - return 0; - } - /* Prioritize smaller implementations */ - score += av_popcount(SWS_MASK_ALL ^ entry->linear_mask); return score; case SWS_OP_SCALE: return av_cmp_q(op->scale.factor, entry->scale) ? 0 : score; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
