From patchwork Sun Apr 9 12:25:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 41033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1541082pzb; Sun, 9 Apr 2023 05:26:21 -0700 (PDT) X-Google-Smtp-Source: AKy350ZC69RPFBM3FTN/v6NeseAQS5Zc2xufvk7A+6RvD6RSiLP4R0uquTeEMTbisQiQYQRjqReC X-Received: by 2002:a17:907:60d0:b0:933:3a22:8513 with SMTP id hv16-20020a17090760d000b009333a228513mr5675778ejc.53.1681043180921; Sun, 09 Apr 2023 05:26:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681043180; cv=none; d=google.com; s=arc-20160816; b=SwasZA/x4pmMGA7ZKX1UfamH5OCxEnO95TbikShW7T0icJ/TMZi96TPyHKC93eSzOc cDhiqiFFu9SCB1UfEMg+pjdZ6SDI7A1oxx5rXv6bCfN+YS7+qCsLL2sHDVz2pOeYrm/U Zy+yGV2isRH6Kw5fQX5h36mwu5F46B0ybwRjPudYigNRApUn1d67Gy8irrbMsb+vvMox FhUmEgbVIYfup0pi527fVSu7Aw5l68RvWg+MUqgoQdA6rJDWw1aWCaACfy8t7MOkLtsM ixvfjB0Slp/CXz5O/SGBPrTkcwqEgzdI7KYkgk+7YH/Tyzh+Pka8+2QsAJXa+3DUN3UI Sghw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=wyOG6QtJivbfyroh7hn+ZHQLJ0OUUq+ZhYX2iQEjjkE=; b=H/nK2oEiR/xcHyF9so9iqKNH6k2COU/dnqbVuj5ujWaIf3DTBlhJLtTtHm5sdVB3R+ SkriJbS/C2L21OgeLiET/TzBPvI5U/ydk/qLxYL5o32l1enHlhTJHIMPQgPBfJqY986M JJavnxDhgIJgL4Jdc2LjbdnFpgRyAXxR5R0DgAJ/lDyhrcIDFjtWWQZE9Sf8Kl4VAAS8 eIBsJfGEedDa5HZLbvyReq4emYr+Lw+FAaeyDUvarKJsDXRh4jiwlaOg8El7zMugCdyU Q3mL5rLnrGu9hCgz9bbPnR9B+r7JMxlFtPnW+vnyvVBOABkTmf6u0NUjA71RZiUnsIRk wNPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=EW4pB2FM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq5-20020a1709073f0500b00931cb794c92si8945192ejc.15.2023.04.09.05.26.20; Sun, 09 Apr 2023 05:26:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=EW4pB2FM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B405F68BA58; Sun, 9 Apr 2023 15:26:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out-2.mta1.migadu.com (out-2.mta1.migadu.com [95.215.58.2]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 042FF688068 for ; Sun, 9 Apr 2023 15:26:08 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1681043166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8bl9KwAneQc4Ce/eyIDDMjjpjgVMV3lvXtHD9G3VFsU=; b=EW4pB2FMIv4/4HIH3YQ4flv2fAx5KG8ZrqQbggkoD8QwYmJnM9I74rpcb1vgZz6T14DK9o 6jZUUri3RffLYRRfSsnUKEOUqxvGSMxpsKY9a765koz0Os2iIriA43dOiBjFnq/gBhvsSy u4A5ISb4LLHIIzQW8XzbpJhRL/x8PnPqL/YvZht282gH/Lop3k6mJzs1Hg1fxeC48mnuEx LPl0ZxWZQVmoqB6V2Ahz8lGEFzOpD+o7U6+w123xdjg/DCCEmcwrASRzGqBKwscBFAMiiq 3RPfjW5hFWq1scGsxowoR+kDkf0DixEGEiSucpcRn5//eDtyif8BaZgA9Pm41Q== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Apr 2023 22:25:41 +1000 Message-Id: <20230409122543.223974-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/brenderpix: remove support for type 18 pixelmaps X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QyRtoU+dJpKy In BRender version 1.1.2, type 18 was a vendor extension, and is not YA8. In 1.3.2, type 18 is BR_PMT_RGBA_4444, for which there's no AV_PIXFMT_* equivalent. Remove it for now, rather than continuing to decode incorrectly. --- libavcodec/brenderpix.c | 4 ---- tests/fate/image.mak | 3 --- 2 files changed, 7 deletions(-) diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c index e95ab3d4af..67b89689e7 100644 --- a/libavcodec/brenderpix.c +++ b/libavcodec/brenderpix.c @@ -195,10 +195,6 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame, avctx->pix_fmt = AV_PIX_FMT_ARGB; bytes_pp = 4; break; - case 18: - avctx->pix_fmt = AV_PIX_FMT_YA8; - bytes_pp = 2; - break; default: avpriv_request_sample(avctx, "Format %d", hdr.format); return AVERROR_PATCHWELCOME; diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 42dd90feaa..564a326076 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -22,9 +22,6 @@ fate-brenderpix-defpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/bre FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX, SCALE_FILTER) += fate-brenderpix-intpal fate-brenderpix-intpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/testtex.pix -pix_fmt rgb24 -vf scale -FATE_BRENDERPIX += fate-brenderpix-y400a -fate-brenderpix-y400a: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/gears.pix - FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX) FATE_IMAGE_FRAMECRC += $(FATE_BRENDERPIX-yes) fate-brenderpix: $(FATE_BRENDERPIX-yes)