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) From patchwork Sun Apr 9 12:25:42 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: 41034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1541156pzb; Sun, 9 Apr 2023 05:26:33 -0700 (PDT) X-Google-Smtp-Source: AKy350bvJ0aY6WPDPdp5G/pMrzkzsEsOTEtLOpfM0sozxtM5Ma7zLruj5gW6/BTaULuXCV4tCRzk X-Received: by 2002:a50:fa8e:0:b0:4ea:a9b0:a511 with SMTP id w14-20020a50fa8e000000b004eaa9b0a511mr2936028edr.37.1681043192938; Sun, 09 Apr 2023 05:26:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681043192; cv=none; d=google.com; s=arc-20160816; b=qp8No6kf9IIKLUNyRZe6xgcacVMmAyDQGMTj7TgGCukRPvdxyyCK2fSUC4mNv3+3pq ObKMAhk7vk3js5sXpLz8NLu0HbboP4fp41rwevunsveWOPReseI/QAxYw/GsT+EmheQN qIv3lC/gT+n/XAhooI2W6tRr+NyK+POhubXShBIE93aSSzHIvNxCCm+LWTUkPJMjHyON hc/1Tn+pSl2bVyvRcRQ5VXDTpOrlIZeVZ2obTwLTsDzIRNJT7EVSuUAoC8C4a67vapU4 rmlhKgZ5zc1tCR9SLqJch1qwubeD8OxsfO3SPJLJgHn1Qo/Lzs/Axjric6DYQpNwsMEB Lvag== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=kSW0kZb8toLmtaRO0YFS0kxssUIfAKLWVrpZkoo3zSE=; b=0ZJ2RNoe4d8J2Zzdo5rHswq0P2IhfKaJLnJv7P0kmH5AYaJ1O/ZZ2YFShPIy/Uj35g MUPb5fgGnjkQAjmz/C61yf7jcP3AJ9aoLchCJr+l8fbex+nu2+trFesr4Gi3ZW+Gx1+0 wCC5Mv1OlXvXdg+JgPkfeDG2HXQYt8JcUbEYd0z3XnJe9H8HDhUvoSbaJ2u5zHdGiOtB LSnPRNGYBvlHaBn3n/Ew5DOPtYlX1/tstN4MZl6ITQP+HnrEWiig6x+tb0IFGye0DMDa wWEgfN0rkM3n23e2ibg23U7PxqmChr5knvgUa4YtG1ZDQKEx8eKWPe252+B3btUXmoZ+ XKvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=Pv+ERNsk; 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 a1-20020aa7d901000000b00504a265fea1si317196edr.450.2023.04.09.05.26.32; Sun, 09 Apr 2023 05:26:32 -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=Pv+ERNsk; 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 E975F68BAA6; Sun, 9 Apr 2023 15:26:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out-49.mta1.migadu.com (out-49.mta1.migadu.com [95.215.58.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88904688068 for ; Sun, 9 Apr 2023 15:26:09 +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=1681043168; 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: in-reply-to:in-reply-to:references:references; bh=1ts5C4hjzrFqbz82YwXUdq+rD6LJBYn/9w4x+4FuZms=; b=Pv+ERNskrSJ30GI0IBI3yTSSfYBC2Kt6WJKlrvXIqJOHqj+0/aa7s4Kzhk0xM+dODGsfQY WZxcXPZu+gI6waho5dHyueD+/SWRznH7myi34BxFf6v14nSha9/2N3pbaYPOfaxaGGzS1L OvDSDKNDwiNKcaZCo+rbmjHbuO5VeoauOAHhYjCLENlxDEuJLXRBsp/PB7g7YXouHg+lp1 kgWZUyqLhCZIu66KUAQ0xtjCmZZediVgu/FaaZnXLCBa9E3JzWFFBsi/IqMN1CGhiOgI05 Z/SLCEfv23qz/p7c7D9xhnUA02e+bcuQUWNjDDi7hQr6IDWdvlafd7ToDlMPrg== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Apr 2023 22:25:42 +1000 Message-Id: <20230409122543.223974-2-zane@zanevaniperen.com> In-Reply-To: <20230409122543.223974-1-zane@zanevaniperen.com> References: <20230409122543.223974-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/brenderpix: support BGR555BE (type 17) 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: PFdGXSluYXWS --- libavcodec/brenderpix.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c index 67b89689e7..52765f0c00 100644 --- a/libavcodec/brenderpix.c +++ b/libavcodec/brenderpix.c @@ -195,6 +195,10 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame, avctx->pix_fmt = AV_PIX_FMT_ARGB; bytes_pp = 4; break; + case 17: + avctx->pix_fmt = AV_PIX_FMT_BGR555BE; + bytes_pp = 2; + break; default: avpriv_request_sample(avctx, "Format %d", hdr.format); return AVERROR_PATCHWELCOME; From patchwork Sun Apr 9 12:25:43 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: 41035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1541222pzb; Sun, 9 Apr 2023 05:26:42 -0700 (PDT) X-Google-Smtp-Source: AKy350by04QNo61N7SOOXYsF38hD/G+rbHpknSeWrIXkYRK9uFXizROV6iuwDq3dZjtXhDCZlFpK X-Received: by 2002:a17:907:c60e:b0:94a:44ee:68d7 with SMTP id ud14-20020a170907c60e00b0094a44ee68d7mr3216169ejc.72.1681043202469; Sun, 09 Apr 2023 05:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681043202; cv=none; d=google.com; s=arc-20160816; b=JDm/7MYnA7/PbN7qXX9y50DYhlhRfyfvJWgHadJBrXFotnf0+UKzZOgqNsgSRuh6eI ROW4YgAjDNi01yXVjjQM8Am5baMwyKuzhEdGrCm+TK3LoUYquuwAdGOnVeU9R8C3rxgS dvk/s+ogxrTb7sikuo4tc4meG3cOj8mZqU9lvTgGqoKuSuh4xIEqUg0/439naKpaY6Hx csl3otNO49FsvVzMlu2V/AmDd1Ql3rYVjghVMd71PQcLc1KQQBrDRc7W0c336I5HlbqQ Sd7zmUKDwtRqoHbdW6JpaTvRlJOvrzMlGd17uhtZD6uxTCuQYkWrbL+hsXJrhxfVTxy3 4d1g== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=GhlQvqlBvtpAqoZ73ycahUfFpvN496sRzsK3CrU3dsI=; b=Ro2wRgpWiYB8N6+Kl3Q4srkpEmxFXHf6J1xNl6kWxNBNUWdMYYKcmR7sRXqexS6Rrb SQlCGQDbg1gAaivcU/OlY3ditd4A9atwQFNW6NYH+Z27bGuCWruRpQK+5VH46tXrnPQT +/9Wj8O5VXz02//GYIm0zCPcDzdeENjNQYnB9nqO7YeqKfunkfxJ3VODR7V8LI6KzJ/D wBI54RWLQmhuLiG58ffQCBX0yduymlcd+R7JlUUQtSKiuZ74zp0XwEI6bRCT1HmPLusb bXN0+TBGPRZOSUv8m/dFtsOfD9M8MnSbc+IP33Zx53HSNMfFwK3XztQuyxrahxL4nQ3s EhZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=JlF2GBc7; 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 j5-20020a1709062a0500b0092bf128c4e5si7404589eje.192.2023.04.09.05.26.42; Sun, 09 Apr 2023 05:26:42 -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=JlF2GBc7; 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 DE26868B74D; Sun, 9 Apr 2023 15:26:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out-49.mta1.migadu.com (out-49.mta1.migadu.com [95.215.58.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7BE268BA7B for ; Sun, 9 Apr 2023 15:26:10 +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=1681043170; 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: in-reply-to:in-reply-to:references:references; bh=9o2ZKBRvOLm1ciyPk+/sdzdYGqg+fLkHn7T3TBZ57K0=; b=JlF2GBc7HRt/76ZnGA6sRqYWU/PYW5829O44ch9LE4yzwJOtrKyqaX17YCdq+J/Zv9qyQZ E+UKQYjoLDIp5qp1yr5sADQ4EMtXoYTuAZtbP4asibASW9jnZrTIcvcKxA4FGTuseRBczB GxI2LUewb+vZX9gMMFSpA33DqNzk+OSBalAUqpUN+9RNC/aa7/xBIXYPXGNzDmohQ6TURi WzuCeilCYoj3bdfVnND5jV7eLM5y7liHolfS7Fop7QkHRuj6rqYd3+tot8u6x1Q4ph1jLs IYAsuJMMtECvAYgfuIJHbvh5h6j9mfU5WlGFggaMtc7UAYVh0WSNXC+ASOrS1A== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Apr 2023 22:25:43 +1000 Message-Id: <20230409122543.223974-3-zane@zanevaniperen.com> In-Reply-To: <20230409122543.223974-1-zane@zanevaniperen.com> References: <20230409122543.223974-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/brenderpix: use BR_PMT_* defines for pixelmap types 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: vS9hTqZv9G0H Taken from the BRender source tree at [1]. [1]: https://github.com/crocguy0688/CrocDE-BRender/blob/master/brender/inc/pixelmap.h#L19 --- libavcodec/brenderpix.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c index 52765f0c00..baadc08c7f 100644 --- a/libavcodec/brenderpix.c +++ b/libavcodec/brenderpix.c @@ -32,6 +32,20 @@ #define HEADER2_CHUNK 0x3D #define IMAGE_DATA_CHUNK 0x21 +/* + * BRender pixelmap constants taken from inc/pixelmap.h + * https://github.com/crocguy0688/CrocDE-BRender/blob/e605abee4e96e4492f2f8c7ea5e5e5bd31bcd1e3/brender/inc/pixelmap.h + */ +enum { + BR_PMT_INDEX_8 = 3, + BR_PMT_RGB_555 = 4, + BR_PMT_RGB_565 = 5, + BR_PMT_RGB_888 = 6, + BR_PMT_RGBX_888 = 7, + BR_PMT_RGBA_8888 = 8, + BR_PMT_BGR_555 = 17, +}; + /* In 8-bit colour mode, 256 colours are available at any time. Which 256 * colours are available is determined by the contents of the hardware palette * (or CLUT). In this case, the palette supplied with BRender (std.pal) has @@ -171,31 +185,31 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame, return ret; } switch (hdr.format) { - case 3: + case BR_PMT_INDEX_8: avctx->pix_fmt = AV_PIX_FMT_PAL8; bytes_pp = 1; break; - case 4: + case BR_PMT_RGB_555: avctx->pix_fmt = AV_PIX_FMT_RGB555BE; bytes_pp = 2; break; - case 5: + case BR_PMT_RGB_565: avctx->pix_fmt = AV_PIX_FMT_RGB565BE; bytes_pp = 2; break; - case 6: + case BR_PMT_RGB_888: avctx->pix_fmt = AV_PIX_FMT_RGB24; bytes_pp = 3; break; - case 7: + case BR_PMT_RGBX_888: avctx->pix_fmt = AV_PIX_FMT_0RGB; bytes_pp = 4; break; - case 8: // ARGB + case BR_PMT_RGBA_8888: /* It says RGBA, but it's actually ARGB. */ avctx->pix_fmt = AV_PIX_FMT_ARGB; bytes_pp = 4; break; - case 17: + case BR_PMT_BGR_555: avctx->pix_fmt = AV_PIX_FMT_BGR555BE; bytes_pp = 2; break;