From patchwork Mon Oct 7 12:29:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52091 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp1888177vqg; Mon, 7 Oct 2024 05:30:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXNe1oOkCNWP/F9Q52fVXVr9QDhATq4b87GV6U54mgwfYXhuluTQqNIA1JE4iQVfxPjaF0sricu2spSz6VQcyoM@gmail.com X-Google-Smtp-Source: AGHT+IEYmcVn44pc3F40sxAz9N8gZYAf/OZUNvW4n7SJ4Gr8h/VvsArJdfUIC4BvAJ3FkDyzqaZV X-Received: by 2002:a05:6512:b96:b0:539:9527:3d59 with SMTP id 2adb3069b0e04-539ab9f0f7dmr5773314e87.52.1728304230463; Mon, 07 Oct 2024 05:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728304230; cv=none; d=google.com; s=arc-20240605; b=YTHRUvyoLb/A+15o4g2jcLbdIfzPGap7Qi2vYoADR90IQMnT6wDZdLjDMMlBcBc4LP cM03c7iuWMVwMArb89oxE+P1vntZTDtiPgMSsAPOyB2wrHdiVskBTMLN7kQr00Tj/hJK aFQIkARVBUCkZqr8LP2Js+VvOoJabVyZPxDKXjM4AjVijEUC3+BqPv3bdNshpk3+SaMo YoOcKvYt17rZkg5uEq7cnxBqyZBUr6b/QwiZIdCYndhEbfg0mFUoZ3YoiClie1fxUZ28 MXzFrpbG4AXZ4mhkKO9RHsiRQQJoNaz1B9LGhSsseVIZUgyTtkJF/c/2EUZa4AC+idrh 4tqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=EZiInfjGVEmRfMTQ5f7FHNnVDMjWHzDJPwfUE8VbA/4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=IexaVSVWlV8LlsIHRDBw8OirplUI+ZW5JW9YUvfeV6oEIpVeV9vNp39xQU1j9s9gps OKD25K77Eq0MXUMtl7lhzqSg2lZge0nQeImxHIspN/UWAadoTQEq+lyXt72N7ghDJzT8 /1ZgJqIPs23PTCOL2l2PIKvTgKFjJqOYFRxvFqneT5a4O2d2OB4/sONH3c+40d5xT2+R nYbWma2MCUiynH6iIJQPvmOn8nJ0iUh9z4N7RUKK0DxQsd0u/C3q5mKoCELkKv5zrdSR VcK3CM42PyhKHExgkE5eP5PPrRfWkNhala7ifLOCZbWA7L0BsClu6gBSdhwey6oUycPy 7vfQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="MnaCi7/q"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-539afec2eb1si1881887e87.106.2024.10.07.05.30.28; Mon, 07 Oct 2024 05:30:30 -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=@gmail.com header.s=20230601 header.b="MnaCi7/q"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BC6D68D786; Mon, 7 Oct 2024 15:30:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2049068CB23 for ; Mon, 7 Oct 2024 15:30:17 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-71de9e1f431so2109033b3a.3 for ; Mon, 07 Oct 2024 05:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304214; x=1728909014; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=12VaKCQsXoUO9BdQfUfjdddYbN79xbFXM9RYWCQV7ic=; b=MnaCi7/q+djT2ObhWno/68abHfFU+FOPPwGZP8f/A8edcD2x7mbwJ1x2Lu9XW6x2a7 fVCrcvp1lnKf9XpAjUApWz9Rfb9otw3Ml2t4e0QGZcFmYV0pCEmnWi9W0LctOQnCYGdg HPc0MPt0FaRhfyCrQEmmjqCyK0fYECsRTtJAh07nOAyFKB5WGwaaefq0nHeVrmx4F6dQ 315LCLn9eKGv6hY6HftVN7AvjTL+nZxl0YUc/YDJUmg1lZnxwfmYRvO77yWVmHiYNX2n 853BgjuuZdzsUUx6BSnGoXa0AiQ2WYGKwURS/Bih80Qfd+kxgYVlazQwwZUwCIglLo9p Fs6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304214; x=1728909014; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=12VaKCQsXoUO9BdQfUfjdddYbN79xbFXM9RYWCQV7ic=; b=X4Ktwn7qYhDPHQ0UDjCiIXPnXca5fjDlrqqL77LVul+nl8r8ENi+zx98lR6Sn1fvCO BDL3S3WG88nbICbS7Fp/1hXXC1uU4nfizEJEcJUfTf+lOmrL9wfvSecspoCPO5Qufd0R YIZ9rpMLXvKEqTqXrE/FEEDy+Jn3MeTdoQhK9MGFPKEOT5AAzkcTgBci9y4Aqhhj0ZOO TXNWgF7iQl5rGlHJUY18A9HI2flEZXm2GGNcH11ItpOzaz3ZVF/qlkv5LqK2d8eJYkUd KchohRY2B1TF0+4W0pmd9mVcri7FJtlBGd324vsKMEaDViVLu5yqPClTZpfW3w3wkc+B 7afA== X-Gm-Message-State: AOJu0YxijaXmF+ay2DJbFAnK3oTDuotozHYJTvFFpNbSpsyl+YDPa0lz tccup10lFhIDw9PfPNfCAPTGZ9slsgCzDuOwIa+6fAHYFMt9a1eshLypyQ== X-Received: by 2002:a05:6a20:6f07:b0:1d2:f0e2:4ad6 with SMTP id adf61e73a8af0-1d6dfa3b314mr15716104637.18.1728304214074; Mon, 07 Oct 2024 05:30:14 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:36 -0300 Message-ID: <20241007122955.309-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/20] swscale/output: add missing yuv2packed1 and yuv2packed2 support for VUY{X, A} 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: vc2ShGw4G+Nl Signed-off-by: James Almer --- FATE tests don't seem to trigger this. libswscale/output.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/libswscale/output.c b/libswscale/output.c index 31921a3cce..e5d555f76f 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2668,6 +2668,110 @@ yuv2xv36le_X_c(SwsContext *c, const int16_t *lumFilter, } } +static void +yuv2vuyX_1_c(SwsContext *c, const int16_t *buf0, + const int16_t *ubuf[2], const int16_t *vbuf[2], + const int16_t *abuf0, uint8_t *dest, int dstW, + int uvalpha, int y) +{ + int hasAlpha = !!abuf0; + int i; + + if (uvalpha < 2048) { + for (i = 0; i < dstW; i++) { + int Y = (buf0[i] + 64) >> 7; + int U = (ubuf[0][i] + 64) >> 7; + int V = (vbuf[0][i] + 64) >> 7; + int A = 255; + + if (Y & 0x100) + Y = av_clip_uint8(Y); + if (U & 0x100) + U = av_clip_uint8(U); + if (V & 0x100) + V = av_clip_uint8(V); + + if (hasAlpha) { + A = (abuf0[i] + 64) >> 7; + if (A & 0x100) + A = av_clip_uint8(A); + } + + dest[i * 2 ] = Y; + dest[i * 2 + 1] = A; + } + } else { + for (i = 0; i < dstW; i++) { + int Y = (buf0[i] + 64) >> 7; + int U = (ubuf[0][i] + ubuf[1][i] + 128) >> 8; + int V = (vbuf[0][i] + vbuf[1][i] + 128) >> 8; + int A = 255; + + if (Y & 0x100) + Y = av_clip_uint8(Y); + if (U & 0x100) + U = av_clip_uint8(U); + if (V & 0x100) + V = av_clip_uint8(V); + + if (hasAlpha) { + A = (abuf0[i] + 64) >> 7; + if (A & 0x100) + A = av_clip_uint8(A); + } + + dest[4 * i ] = V; + dest[4 * i + 1] = U; + dest[4 * i + 2] = Y; + dest[4 * i + 3] = A; + } + } +} + +static void +yuv2vuyX_2_c(SwsContext *c, const int16_t *buf[2], + const int16_t *ubuf[2], const int16_t *vbuf[2], + const int16_t *abuf[2], uint8_t *dest, int dstW, + int yalpha, int uvalpha, int y) +{ + int hasAlpha = abuf && abuf[0] && abuf[1]; + const int16_t *buf0 = buf[0], *buf1 = buf[1], + *ubuf0 = ubuf[0], *ubuf1 = ubuf[1], + *vbuf0 = vbuf[0], *vbuf1 = vbuf[1], + *abuf0 = hasAlpha ? abuf[0] : NULL, + *abuf1 = hasAlpha ? abuf[1] : NULL; + int yalpha1 = 4096 - yalpha; + int uvalpha1 = 4096 - uvalpha; + int i; + + av_assert2(yalpha <= 4096U); + av_assert2(uvalpha <= 4096U); + + for (i = 0; i < dstW; i++) { + int Y = (buf0[i] * yalpha1 + buf1[i] * yalpha) >> 19; + int U = (ubuf0[i] * uvalpha1 + ubuf1[i] * uvalpha) >> 19; + int V = (vbuf0[i] * uvalpha1 + vbuf1[i] * uvalpha) >> 19; + int A = 255; + + if (Y & 0x100) + Y = av_clip_uint8(Y); + if (U & 0x100) + U = av_clip_uint8(U); + if (V & 0x100) + V = av_clip_uint8(V); + + if (hasAlpha) { + A = (abuf0[i] * yalpha1 + abuf1[i] * yalpha) >> 19; + A = av_clip_uint8(A); + } + + dest[4 * i ] = V; + dest[4 * i + 1] = U; + dest[4 * i + 2] = Y; + dest[4 * i + 3] = A; + } +} + static void yuv2vuyX_X_c(SwsContext *c, const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize, @@ -3275,6 +3379,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, break; case AV_PIX_FMT_VUYA: case AV_PIX_FMT_VUYX: + *yuv2packed1 = yuv2vuyX_1_c; + *yuv2packed2 = yuv2vuyX_2_c; *yuv2packedX = yuv2vuyX_X_c; break; case AV_PIX_FMT_XV30LE: From patchwork Mon Oct 7 12:29:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52109 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp5203vqy; Mon, 7 Oct 2024 14:26:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXy6U+OpuYgGsZ96/q0su6BCmLLrZvFR6rnJYvwMQ3eqCwQCYsrE4Twb88EMkmSRzxy6Dap52tC1FI0pzr0ieEV@gmail.com X-Google-Smtp-Source: AGHT+IFDHdp+T0nIblJoZb10aeLfp8c2igmgf33GBqOI8fFH23aVBWgHJOIxJRaBTPzH7Z/C2Vkb X-Received: by 2002:a17:907:9282:b0:a8d:3338:a497 with SMTP id a640c23a62f3a-a991bce40f4mr1406156766b.4.1728336365787; Mon, 07 Oct 2024 14:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728336365; cv=none; d=google.com; s=arc-20240605; b=DiXMM+DzlU76/ckx32BYSTl1fgT8dYKIxzkdpA1KXwrUdOWuqqeA39TCt8TiWZe6xl RiexP/KM6F1xSO6OZ6BI060+apKOZorVvYdLW8+Nne6uasQlPczyvxlgBjww0LR/woK5 LKtF0qGxLXRCgSTS++Ov3ajV3+Y43tSCsWF6A0S5vFFawf+8cfU2TB2kmIiuO2z+3A6m hwiD+Uamu+wN3QK5b8VrEdK1iX0l05r8gM1sJ7lhH1V9R85+xIAeF/TFEeAnHbypV4wJ Kh2x25zsllUt4I3iDuVIcuea0l8kTwPFIUpdbllyuBpy8pI1woHHcdsnGnnZtGinJr8y 4Akg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=OgPobid2VYeCCrmKZLnAeBEmnPxSs0UbT5IvUUrotL8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=OoaPN3MUQ71pPPnjYj6n9bRSU3M83yPghJmiiUYYvb4VHXPRJMhyrwo14dROSAxrto 6JKpx9vTdL9o1zne6eP+yqpYJkwMu0LN895sdzEew6sDtdJnzV3XXOnz9zIdyZS3o2dU C1SJCDz99IPNru12ycR6XW7G6WI84DX7+IdWIRMJiJGeWyJuQx0HEVQZ3Ol9w/bUon/C In/n9ojTwYwAhSyE964xFDSNlHC3Wo2SZ487hrqW7j9hIfuW5nI6EB2EfwXH0an3INQ9 3BQLC5evRj8RDWVLzn5LoAHkOmF2pXR1MAXuXHbHCdRfMUtxxSDbPeh6pdH8FxAgHJ+h 49FA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=J4yV1IK3; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a992e57df10si514639066b.201.2024.10.07.14.26.05; Mon, 07 Oct 2024 14:26:05 -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=@gmail.com header.s=20230601 header.b=J4yV1IK3; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B686668DB43; Mon, 7 Oct 2024 15:30:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 174AF68DAA8 for ; Mon, 7 Oct 2024 15:30:18 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-71def715ebdso1702253b3a.2 for ; Mon, 07 Oct 2024 05:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304216; x=1728909016; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sYGqKTXGfn8RzhISGE2GusTmG2WmXkKp1uGlkyLirjE=; b=J4yV1IK3Qhfx7tkf3mxo6MKH823EexSgR3B9T5pGVJdYSWUNYyTsd1I/IdIc1Jrm2X 0G/e+1Y48MqfOlHpavQ/MGiPK1X1Vr4se7Tg7E+zO53YwfPA3f+Bt0Hs0H02gfgWUjH3 Zzb+1CqGmpIQxVR0enD5hyRlLQeFJRAmhnHVIYBbgZCjY8SORKdKQ47il7nAAEPL+KdZ ZpuzvmHxZpMRU+suT6vsgO9fRSdWuD8aGs6XgocXdmosnr2V23auSHo9o7i2HW8oUoyv nA/nLPWC20g50j02bblZwmtQB6Dxc0Kbe8DHiu+motwjXSeyUOT+qiNzQ6UUqeDaDWDE /ezg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304216; x=1728909016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sYGqKTXGfn8RzhISGE2GusTmG2WmXkKp1uGlkyLirjE=; b=TWkOUxlGqb+3I6/pa4LU1GQpaNPNxt55P9ofm7YIpw/tgdVSKfKkGMosITmC7/JfD+ 4n0IJdpZFMSeLvGlQ2OUNOVmImHI2+QjgPz5tpAY3aJY9trvduIZu1S74MdJWo9Fo5Zs +e/o9xadwFbkYVmLezW7efszgw4wUPCsOWPQe4Yn8MLeY4VJogDgonPVY8h6KOJOmZ2R 2PVXa6108MZTG2HcSmrsp3QQ4br0KPGv4GVWiCxgvLhCqTN+WkkF9gZttb7yUCRz83DN 2pth4/dYxGNM9A/36Woz0w0yuUU2UaB2WOF4jWPKIhkz5g2Dgz4qbleawk1/PVugKN/j xWaw== X-Gm-Message-State: AOJu0Yx5sKbi0hIDsgAo+mLO+C+GwAOgYFk9evHdve3QF/ZMUwO8BTAi eIckpFVCFBcSvS/HPR+NcutGEadcWogdo8u2PXsxjmlOKxJ9MEEJI/FsoA== X-Received: by 2002:a05:6a00:ace:b0:70d:2a4d:2edc with SMTP id d2e1a72fcca58-71de2439790mr18339533b3a.20.1728304215876; Mon, 07 Oct 2024 05:30:15 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:37 -0300 Message-ID: <20241007122955.309-2-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/20] avutil/pixfmt: add AYUV pixel format 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: pKY4ZCnwFfgl This maps to the 4444AYpCbCr8 pixel format as defined by Apple, which is ordered A Y’ Cb Cr. Signed-off-by: James Almer --- libavutil/pixdesc.c | 13 +++++++++++++ libavutil/pixfmt.h | 2 ++ libavutil/tests/pixfmt_best.c | 1 + tests/ref/fate/imgutils | 2 ++ tests/ref/fate/pixfmt_best | 2 +- tests/ref/fate/sws-pixdesc-query | 3 +++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 1c0bcf2232..588a5845c9 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2119,6 +2119,19 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "cuda", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_AYUV] = { + .name = "ayuv", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 4, 1, 0, 8 }, /* Y */ + { 0, 4, 2, 0, 8 }, /* U */ + { 0, 4, 3, 0, 8 }, /* V */ + { 0, 4, 0, 0, 8 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_ALPHA, + }, [AV_PIX_FMT_AYUV64LE] = { .name = "ayuv64le", .nb_components = 4, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index a7f50e1690..e305bba78c 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -439,6 +439,8 @@ enum AVPixelFormat { */ AV_PIX_FMT_D3D12, + AV_PIX_FMT_AYUV, ///< packed AYUV 4:4:4, 32bpp (1 Cr & Cb sample per 1x1 Y & A samples), AYUVAYUV... + AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; diff --git a/libavutil/tests/pixfmt_best.c b/libavutil/tests/pixfmt_best.c index d71b3cc2e8..24e55c4f23 100644 --- a/libavutil/tests/pixfmt_best.c +++ b/libavutil/tests/pixfmt_best.c @@ -135,6 +135,7 @@ int main(void) TEST(AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV422P); TEST(AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P); TEST(AV_PIX_FMT_VUYA, AV_PIX_FMT_YUV444P); + TEST(AV_PIX_FMT_AYUV, AV_PIX_FMT_YUV444P); TEST(AV_PIX_FMT_AYUV64, AV_PIX_FMT_YUV444P16); TEST(AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24); TEST(AV_PIX_FMT_ABGR, AV_PIX_FMT_RGB24); diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index fb2ed6d158..da764b38e5 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -269,6 +269,7 @@ p412be planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 p412le planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 0 0, plane_offsets: 6144 0 0, total_size: 18432 gbrap14be planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 6144 6144, plane_offsets: 6144 6144 6144, total_size: 24576 gbrap14le planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 6144 6144, plane_offsets: 6144 6144 6144, total_size: 24576 +ayuv planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 image_fill_black tests yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af @@ -485,3 +486,4 @@ p412be total_size: 18432, black_unknown_crc: 0x26991800, black_tv_cr p412le total_size: 18432, black_unknown_crc: 0x4028ac30, black_tv_crc: 0x4028ac30, black_pc_crc: 0xab7c7698 gbrap14be total_size: 24576, black_unknown_crc: 0x4ec0d987, black_tv_crc: 0x4ec0d987, black_pc_crc: 0x4ec0d987 gbrap14le total_size: 24576, black_unknown_crc: 0x13bde353, black_tv_crc: 0x13bde353, black_pc_crc: 0x13bde353 +ayuv total_size: 12288, black_unknown_crc: 0xcc44368b, black_tv_crc: 0xcc44368b, black_pc_crc: 0x1e04c638 diff --git a/tests/ref/fate/pixfmt_best b/tests/ref/fate/pixfmt_best index 1bdc0e83f0..591fa5c912 100644 --- a/tests/ref/fate/pixfmt_best +++ b/tests/ref/fate/pixfmt_best @@ -1 +1 @@ -106 tests passed, 0 tests failed. +107 tests passed, 0 tests failed. diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index fff93bbf0e..f12f0cbf42 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -218,6 +218,7 @@ isBE: yuva444p9be isYUV: + ayuv ayuv64be ayuv64le nv12 @@ -702,6 +703,7 @@ AnyRGB: x2rgb10le ALPHA: + ayuv ayuv64be ayuv64le bgr32 @@ -761,6 +763,7 @@ ALPHA: Packed: 0bgr 0rgb + ayuv ayuv64be ayuv64le bayer_bggr16be From patchwork Mon Oct 7 12:29:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52107 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp2172601vqg; Mon, 7 Oct 2024 13:16:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV/l8YyGm+3wEwuF2lswSJi3OJk3fxFLSkOV/Mti7EhiGDS6/1FnrCp9dWoVLQj+C3ONHcxE5b4KD1qy5KJpLbV@gmail.com X-Google-Smtp-Source: AGHT+IGyEhv3ONrq0wQZs9cMzYxcshpmGG0FKRK7r2Zm+dQmR5pv8Gb943gc2JzpGty2XlaVMQ+E X-Received: by 2002:a17:907:ea7:b0:a99:5ee8:93d0 with SMTP id a640c23a62f3a-a995ee893e8mr249525866b.27.1728332178816; Mon, 07 Oct 2024 13:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728332178; cv=none; d=google.com; s=arc-20240605; b=R8JAxt+mBYRsTsm63JAmD6EadxMVcRllNTXTSKroNav3OuKwH8kMyNXGAnrY1HL7f1 HR++t+ggY5MKgFP302z6m+8RQycaZS6MQBjVI0eBzjGaNVh6ldmbkGkQq50NXtICiZPE 0APw0+9WNjZ1NmwZvEzq1BOLsZZdc8ixP11rYc5dOI4Dh+6VXAVGVimoR4MW5o+Gyyps M8jSXYH9xLhC6ZwTgaSRSbR+dLICwZp3HZwNGKD8bI3UgcRyS6OMrPKgqLZstuXz8Bqb o7rem/ztoxAOSdKC65nc4RBz5Wg9KTja7sEX/OMOIfdcjk1heGcTeS/9waa0oczPPm8k PMDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=n6vf0nN4nd8kDmOI8mJCLn2ruymSJQMIlDa0bzACvXQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=PZ4o46zqucnj8fSSqM7tj+8cUJBXX7j9hvs6wVptMVTHff/l6sztQtwnNYBBx38qAH 5LSzFoXlQOkRwXAkGWYGSdIZMRD/9/CYrjDhhyYAxs7trZ4zsWNhHgDXiungT6w9VPdW 10mKtU4t5CPf3Qw8/3wMd5ascetka3VZHN6UM3xH0BCY3i4Bv/MI/nBncYv0X67Pkfqm TMaHu5C24tTwytaiushRoy3AF1l9g4Xgo3kDaIhsvh23/nPZDyxJQiCrf0U85EdNjJlg qg7WAj80zFFUIvp35nrLu+6mx+zx9cihYoru30D8LrkRfl2IASNTrCJUbB14u6Te3wKB 5S3g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="S9/l3kK7"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a994a7d2b22si333564966b.168.2024.10.07.13.16.18; Mon, 07 Oct 2024 13:16:18 -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=@gmail.com header.s=20230601 header.b="S9/l3kK7"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05FAF68DB45; Mon, 7 Oct 2024 15:30:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC8B668DB57 for ; Mon, 7 Oct 2024 15:30:19 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-7e9fdad5af8so965928a12.3 for ; Mon, 07 Oct 2024 05:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304218; x=1728909018; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=A9jOmSG7FeJ7n/PV2RBAOYq+I8AT9l45GJkDWtQrs6c=; b=S9/l3kK71INMjUrq8NrNmDAA+wjbp666mj/yQOLOWUyRctpmph4oP3TZyMl5+Y6HXx 0xnaaTPgNwWUJ8wtLsp/kA8kjMrCZIThg3a+zmbdvs8B3erQjRPgWp/AqTw96T5D7bpE nakmYTJZqC8j9dhZKUPVCytPGEepyQ2ZA4TZYQFSGp6s+aEi+YTIa/UhBtreXO0dKFQt KglAJVRtKlBqkMKVg2pPX6ga5S4/L0KiJmdsy2KgoEWbufglb4sfXSSWHBMEZ2MQ+Ekk 9P9lUozN9I4CRSNhnrgTz3LuDEK1WjOXLE3mP919Pp9IPQdencbTAyLdqRzGVhDGhfcT F8YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304218; x=1728909018; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A9jOmSG7FeJ7n/PV2RBAOYq+I8AT9l45GJkDWtQrs6c=; b=DYzgICAUrFOm0IuqeSDvcRoSu7xS8XbkQa0iLZyQyF9EpZBSgo007da8evWHtiTsaP Jgi8WpdL7U/qrVVjg2qI4DrMfOWcLM5lBfQU6Ej0NVfnDa2k7mSpcC4sswnUFeIdIWz8 ih5VfUchCcPxE5vzV/kMZJQ2MpuwDM6NcXda5gewg7PYRcThpWNW58RC/uALP67r6J56 C7q7aS0zJjoSKOQ1gRirh8yLUT3dpMd5OAtBMz5xNlFt7mqNrISvFX1JAGGnBeGojoIH R6slAtZ3cdlgMxD19tuaEblGCsRion5Ob9wMPCPSvSLqhPNQGorhumP2XtkU7DwdTGFA /EHA== X-Gm-Message-State: AOJu0YyYeo7z8shvzj6z/Fplc1iNS206wEP6hOR2QKoYCSx5WyB6ZveC zSLVS9WwlBwiIbu8NAvAosEaRVjG/NYh4kT+a7Me1gNMSBfLvN4iCgDTIw== X-Received: by 2002:a05:6a21:670f:b0:1cf:3a2c:e3fe with SMTP id adf61e73a8af0-1d6dfacdc5cmr18769344637.32.1728304217590; Mon, 07 Oct 2024 05:30:17 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:17 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:38 -0300 Message-ID: <20241007122955.309-3-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/20] avutil/pixfmt: add UYVA pixel format 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: 9LtLvkKLaOu0 This maps to the 4444YpCbCrA8 pixel format as defined by Apple, which is ordered Cb Y' Cr A. Signed-off-by: James Almer --- libavutil/pixdesc.c | 13 +++++++++++++ libavutil/pixfmt.h | 2 ++ libavutil/tests/pixfmt_best.c | 1 + tests/ref/fate/imgutils | 2 ++ tests/ref/fate/pixfmt_best | 2 +- tests/ref/fate/sws-pixdesc-query | 3 +++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 588a5845c9..ab336433da 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2119,6 +2119,19 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "cuda", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_UYVA] = { + .name = "uyva", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 4, 1, 0, 8 }, /* Y */ + { 0, 4, 0, 0, 8 }, /* U */ + { 0, 4, 2, 0, 8 }, /* V */ + { 0, 4, 3, 0, 8 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_ALPHA, + }, [AV_PIX_FMT_AYUV] = { .name = "ayuv", .nb_components = 4, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index e305bba78c..6d624108ef 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -441,6 +441,8 @@ enum AVPixelFormat { AV_PIX_FMT_AYUV, ///< packed AYUV 4:4:4, 32bpp (1 Cr & Cb sample per 1x1 Y & A samples), AYUVAYUV... + AV_PIX_FMT_UYVA, ///< packed UYVA 4:4:4, 32bpp (1 Cr & Cb sample per 1x1 Y & A samples), UYVAUYVA... + AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; diff --git a/libavutil/tests/pixfmt_best.c b/libavutil/tests/pixfmt_best.c index 24e55c4f23..94666740d9 100644 --- a/libavutil/tests/pixfmt_best.c +++ b/libavutil/tests/pixfmt_best.c @@ -136,6 +136,7 @@ int main(void) TEST(AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P); TEST(AV_PIX_FMT_VUYA, AV_PIX_FMT_YUV444P); TEST(AV_PIX_FMT_AYUV, AV_PIX_FMT_YUV444P); + TEST(AV_PIX_FMT_UYVA, AV_PIX_FMT_YUV444P); TEST(AV_PIX_FMT_AYUV64, AV_PIX_FMT_YUV444P16); TEST(AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24); TEST(AV_PIX_FMT_ABGR, AV_PIX_FMT_RGB24); diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index da764b38e5..03121e45fe 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -270,6 +270,7 @@ p412le planes: 2, linesizes: 128 256 0 0, plane_sizes: 6144 12288 gbrap14be planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 6144 6144, plane_offsets: 6144 6144 6144, total_size: 24576 gbrap14le planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 6144 6144, plane_offsets: 6144 6144 6144, total_size: 24576 ayuv planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 +uyva planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 image_fill_black tests yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af @@ -487,3 +488,4 @@ p412le total_size: 18432, black_unknown_crc: 0x4028ac30, black_tv_cr gbrap14be total_size: 24576, black_unknown_crc: 0x4ec0d987, black_tv_crc: 0x4ec0d987, black_pc_crc: 0x4ec0d987 gbrap14le total_size: 24576, black_unknown_crc: 0x13bde353, black_tv_crc: 0x13bde353, black_pc_crc: 0x13bde353 ayuv total_size: 12288, black_unknown_crc: 0xcc44368b, black_tv_crc: 0xcc44368b, black_pc_crc: 0x1e04c638 +uyva total_size: 12288, black_unknown_crc: 0xdd657297, black_tv_crc: 0xdd657297, black_pc_crc: 0x0f258224 diff --git a/tests/ref/fate/pixfmt_best b/tests/ref/fate/pixfmt_best index 591fa5c912..3a2ba35238 100644 --- a/tests/ref/fate/pixfmt_best +++ b/tests/ref/fate/pixfmt_best @@ -1 +1 @@ -107 tests passed, 0 tests failed. +108 tests passed, 0 tests failed. diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index f12f0cbf42..8b7f7875f4 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -246,6 +246,7 @@ isYUV: p412le p416be p416le + uyva uyvy422 uyyvyy411 vuya @@ -730,6 +731,7 @@ ALPHA: rgbaf16le rgbaf32be rgbaf32le + uyva vuya ya16be ya16le @@ -821,6 +823,7 @@ Packed: rgbaf32le rgbf32be rgbf32le + uyva uyvy422 uyyvyy411 vuya From patchwork Mon Oct 7 12:29:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52092 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp1888569vqg; Mon, 7 Oct 2024 05:31:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVyZNKtxczLIbU5PbjSvjZi5ThTYPuSiZXDiKWv4003h5TsMTnZuHqplV2J/UaZPWb6K3S+gKbT3xri5OQcy3Q@gmail.com X-Google-Smtp-Source: AGHT+IEK2yqfjVv2pNs43HV717nvqi2Wj5j7jQBAYYr6w7Xm2PJc2RWGsEc9q90Rh0LSG97FD+bd X-Received: by 2002:a2e:be0b:0:b0:2ef:2cdb:5055 with SMTP id 38308e7fff4ca-2faf3c1d92emr51555871fa.20.1728304261767; Mon, 07 Oct 2024 05:31:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728304261; cv=none; d=google.com; s=arc-20240605; b=AohvryM5mJWHIPth7ssx0VaOPpcRLDs0NtubIRlx2NDQ4uJ9LvdDE+kWSFyyoCUt11 hzQdWFrQizYKu/tNNTcQaMKn5IsykuO9SDf4NvX70oLVGWCVFuDUTTh7jUCJpSsrPe1q AjzboESOqcN05f2hH038Q1y3w56YlXfvRrNoXA4mBRf3UrMRswnhGUTHdjy7XLqmCki5 cFweSFd9TEGh4zrFZ7D+ji9J/qBGaHDAFp+KFwBXHvK8I+VChYXUlekF49NQmVT0rvlU 3C63F8O8niLREUFBr7PGWoKBRzw1LB6U8XHzq7OdftmJQM3bfCdtLj7Y5fEyb7xhERo/ Q9Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=kpI3Ey3dDO5RLJyZ34tj7kVeicyA6BhY/usNzA0plnI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ie02+jU5KyGRece18bbZ2GUHC+4WDq0s/RtndrBa3eAJgkAOPRyHZFxsodxJKyEyYR hu3NowQ1LETbY5xjOXgM/y2TQWUaK2UvSYrlFPXzjhzI0lww83IdoXSlNp1J9XcwJFsX Fot+OpTn0Nhh9IUH8a6SIuNsxIbdLYQHS+cr8NUaACYgmkxVeihx7PvNVGLUN4dyiJmV ZnsFW1rblrB9GJgaiCjrYhZ1aUYpPPXeUJuVxcpTvZ2mtRr8mMATC0/FCC47BTO/4lfs 7wqOm7+ZyBggctBkcPVI85akTwlkAyk+PgSCP1fufI4no3bXz75ZcQ9x4+zVgaBqvc7B D79Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=TlRqYoK0; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2faf9b3a532si17482381fa.521.2024.10.07.05.31.01; Mon, 07 Oct 2024 05:31:01 -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=@gmail.com header.s=20230601 header.b=TlRqYoK0; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6613068DB4D; Mon, 7 Oct 2024 15:30:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5671D68DB4B for ; Mon, 7 Oct 2024 15:30:21 +0300 (EEST) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3e3b79b4858so2408814b6e.2 for ; Mon, 07 Oct 2024 05:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304219; x=1728909019; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lUgLEtwYppnu7U4OsfGyB3nBllmKNaJXmM5L4nIqQlI=; b=TlRqYoK0/QbmmlBxw3NvnPNNuBhuwkpnK4fM0SD/soCg+eGyRXcfxWd47emsl0fT5A Z5S+P986KA8cIXnp3vXmbVjUh5BXaZCsnokzta8WbjkTTaZxob4/9ia56MycgTGhTF/K SMSPcfXXojk+BI3YqsjdZAQrv3NIuydQSTeiSberSCGWfUPE0rMkKcfgUL/BYFnuJUOs ETWiqW4XSj4rfKjvag+8ukrurWdRRwN4E1RgE+qZKwuX7BI7EPQ9cttPLle9Inlx7rZD mKw3KS20dkHcNB4W+qcGFx882bT6R9C1VXWObwtRgkRR8wt5Jbcp2pc/kr3mG9w47+6/ bnBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304219; x=1728909019; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lUgLEtwYppnu7U4OsfGyB3nBllmKNaJXmM5L4nIqQlI=; b=jZvu8qjZ+H2km4PyqL8uYiipSuxiLMyGqxIcTITfFVaPcYAWgEzGtoiHBQ3/2/cOnx dBpVgbHsZUO9dQIxrzmcONsWAEwNwl51olGOvM1F7QNwNNahZHq5oJX5I9zD2jna58W6 W2+lWwLo+j9RfkmlHc6WKSC4DWZ2U7I47eM2ukweHXB0OucFzA0zHxxwaoHCkiPPCx1H MdnByDEf95qgvuXUM2gU8cD2pPkxHTqBIUpv9E93nui27T9afWzJUJ1xusfPNpgjm620 +8aI08MiIerMKC0fiZm81gPsntB7WPtWkuvM2agfuNmTlp7BrwvH3lGTfVO6sxBlSYpx 1YRg== X-Gm-Message-State: AOJu0YyjuAgzUiqSUaxdVkSDmebszb4+z2kM0NisaeqM+zhkNSpMF1cJ vgUyg/UhEFbGFdRJnfNgxjrV7cAMEoiZXd/Ypzg62HKUM6ilQm8YJKt7Bg== X-Received: by 2002:a05:6808:21a2:b0:3d9:222e:40ac with SMTP id 5614622812f47-3e3c188d531mr8796296b6e.44.1728304219003; Mon, 07 Oct 2024 05:30:19 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:39 -0300 Message-ID: <20241007122955.309-4-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/20] avutil/pixfmt: add VYU444 pixel format 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: mIFNZRoYRvjS This maps to the 444YpCbCr8 pixel format as defined by Apple, which is ordered Cr Y' Cb. Signed-off-by: James Almer --- libavutil/pixdesc.c | 11 +++++++++++ libavutil/pixfmt.h | 2 ++ libavutil/tests/pixfmt_best.c | 1 + tests/ref/fate/imgutils | 2 ++ tests/ref/fate/pixfmt_best | 2 +- tests/ref/fate/sws-pixdesc-query | 3 +++ 6 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index ab336433da..deff74d8a6 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2119,6 +2119,17 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "cuda", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_VYU444] = { + .name = "vyu444", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 3, 1, 0, 8 }, /* Y */ + { 0, 3, 2, 0, 8 }, /* U */ + { 0, 3, 0, 0, 8 }, /* V */ + }, + }, [AV_PIX_FMT_UYVA] = { .name = "uyva", .nb_components = 4, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 6d624108ef..cbdab31df4 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -443,6 +443,8 @@ enum AVPixelFormat { AV_PIX_FMT_UYVA, ///< packed UYVA 4:4:4, 32bpp (1 Cr & Cb sample per 1x1 Y & A samples), UYVAUYVA... + AV_PIX_FMT_VYU444, ///< packed VYU 4:4:4, 24bpp (1 Cr & Cb sample per 1x1 Y), VYUVYU... + AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; diff --git a/libavutil/tests/pixfmt_best.c b/libavutil/tests/pixfmt_best.c index 94666740d9..fe04e26689 100644 --- a/libavutil/tests/pixfmt_best.c +++ b/libavutil/tests/pixfmt_best.c @@ -121,6 +121,7 @@ int main(void) TEST(AV_PIX_FMT_NV24, AV_PIX_FMT_YUV444P); TEST(AV_PIX_FMT_YUYV422, AV_PIX_FMT_YUV422P); TEST(AV_PIX_FMT_UYVY422, AV_PIX_FMT_YUV422P); + TEST(AV_PIX_FMT_VYU444, AV_PIX_FMT_YUV444P); TEST(AV_PIX_FMT_BGR565, AV_PIX_FMT_RGB565); TEST(AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24); TEST(AV_PIX_FMT_GBRP, AV_PIX_FMT_RGB24); diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index 03121e45fe..4197005a3f 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -271,6 +271,7 @@ gbrap14be planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 gbrap14le planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 6144 6144, plane_offsets: 6144 6144 6144, total_size: 24576 ayuv planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 uyva planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 +vyu444 planes: 1, linesizes: 192 0 0 0, plane_sizes: 9216 0 0 0, plane_offsets: 0 0 0, total_size: 9216 image_fill_black tests yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af @@ -489,3 +490,4 @@ gbrap14be total_size: 24576, black_unknown_crc: 0x4ec0d987, black_tv_cr gbrap14le total_size: 24576, black_unknown_crc: 0x13bde353, black_tv_crc: 0x13bde353, black_pc_crc: 0x13bde353 ayuv total_size: 12288, black_unknown_crc: 0xcc44368b, black_tv_crc: 0xcc44368b, black_pc_crc: 0x1e04c638 uyva total_size: 12288, black_unknown_crc: 0xdd657297, black_tv_crc: 0xdd657297, black_pc_crc: 0x0f258224 +vyu444 total_size: 9216, black_unknown_crc: 0x575e6fb1, black_tv_crc: 0x575e6fb1, black_pc_crc: 0x16564599 diff --git a/tests/ref/fate/pixfmt_best b/tests/ref/fate/pixfmt_best index 3a2ba35238..72486587c6 100644 --- a/tests/ref/fate/pixfmt_best +++ b/tests/ref/fate/pixfmt_best @@ -1 +1 @@ -108 tests passed, 0 tests failed. +109 tests passed, 0 tests failed. diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index 8b7f7875f4..e1b2ac999a 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -251,6 +251,7 @@ isYUV: uyyvyy411 vuya vuyx + vyu444 xv30be xv30le xv36be @@ -828,6 +829,7 @@ Packed: uyyvyy411 vuya vuyx + vyu444 x2bgr10be x2bgr10le x2rgb10be @@ -1090,5 +1092,6 @@ SwappedChroma: nv42 vuya vuyx + vyu444 yvyu422 From patchwork Mon Oct 7 12:29:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52105 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp2172512vqg; Mon, 7 Oct 2024 13:16:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVDTxbyEbAPaLZsoJ9nezzOvKM2b9KwgV3Kl4RnhrBfkyJy+mpkVrRm5ZknbNnwtmO3JrcBYjJMtx3ep9kmluUF@gmail.com X-Google-Smtp-Source: AGHT+IEXEs7GwC6zX8hA9852m/y23TqrGzyzOm7u26tyunRwaLJq5xnoj9vE9gCSfK0fJQtBm6bM X-Received: by 2002:a05:6402:13c2:b0:5c8:9f3c:ea01 with SMTP id 4fb4d7f45d1cf-5c8d2d01097mr12654383a12.2.1728332173821; Mon, 07 Oct 2024 13:16:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728332173; cv=none; d=google.com; s=arc-20240605; b=lz7W5UWzCA20izEMR/Es2NoSOTeMf0jlRsA2nNOpibAg6sFWL+O/0f24kdJJOVCQk8 QT39ol+Mehy3XxvamcxAfilBAOalHrz9ommtZMBa5GHa0u3r7tpMklFSi3Q7q6aYD96n MdpdAg8wLyoK2h9mjo6eY3xMhWIckE5H9lwR4+j88Xlt1SPbRhF/8fUPnFWJ+XanhM/O +kS/UZEKC5nsKtFrj1sWTsCII2ISb3cFPEd0VB/yLZJ0LlXv+EBxjz3FXNPBEUbgwsgJ i1CzlHEcxuYYUp3A1gy5HmbBxrUuOEEa9n0cUPY3M9HSMGysebWQDHvPgHQJW5v1+qzy CEPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=1MeGX6Cn6dUD1ega1Sqe16CKXumGb5jvW9Vi4YlhRFI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=f4hvmM0KKlELhvgSQstOL7H1/YbGjV4E2pFSZILKBDb6M4S5konGlW+PY9xsf5eI65 3bMdBSlQUdyhfzPN7CuQKqz/d+l68DxKo8+SlUzttVGdgsqg3pqhv+1XhcdVTlPDQgVi 1gPSuoBfVIVeslUcUv9z5u16kx2XwXDO8hm99fshnSb7ygAcTF62UcC3vg4n16GY7u9t Hg7LgthEz96313CuSU0GeZjPKw01mA9HRRSdQCNWuK3A0AsIEqC1Ri0U3RxVEskK7Mhr 3qsJ1cCYURI7FJcJOYyrt1Vk03xGf5jRQmBA+KQbWtrevM5oBHPWxujuJlYAwHK1UhmS xOBw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=HfY+UhE2; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c8eca9a08fsi3464974a12.358.2024.10.07.13.16.13; Mon, 07 Oct 2024 13:16:13 -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=@gmail.com header.s=20230601 header.b=HfY+UhE2; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A49B68DBCD; Mon, 7 Oct 2024 15:30:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E56268DB8F for ; Mon, 7 Oct 2024 15:30:25 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-71e03be0d92so577343b3a.3 for ; Mon, 07 Oct 2024 05:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304223; x=1728909023; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1MXgK12E5FsIOs5QZ6v8HwKIa7WoHVxnrUIcPA8fBAU=; b=HfY+UhE2MhQADMdg6r9IM9kmK9a6QeyExYPLKa0rKa1kW4h05IhT4PzvxwEjEjv+wo soofzs3/Ddm3YdZGsfLy+XrrmjCSK861oX0k/ozlPtrXQ0OGlnrrHDTQ7tWIHtBCVoQK 9+umDVxFjlsJB6u6s8M6qjd8wYpgfVjnmh5lWRCIt4WDJtQaMntfbx1Sdh3rd55fFbkI St6ezqubCDE87WEqUP6bel9Jk9DT+TJYCd2i0ltO6tsB123hlnCfvWc8/l5v+fgOkrmY ayCDzP6yh/2YNt+EAYl7rGKb1L250fESD9H7JluplalMYHDLhy4DR2kem+KD8GQTPK1L IVvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304223; x=1728909023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1MXgK12E5FsIOs5QZ6v8HwKIa7WoHVxnrUIcPA8fBAU=; b=c2k43AwR+yb1pistF7+1crCgO7+KIsoCY7Ryn/VSpElfaVzx/mV9FIC08zBshHXwMp oSLorV7fHXYVgYVuFHqOE1TSomZxYs2n0TbIZ5KepIQYAvZ+a6lMwM3jnOdvOKmPJH/O L37fV/lxpKezuUuSLbSetcyjdDUGQ/Vl7ZTYZV32NVpdrXrMP5z8hIk1DkGsNrFtz1sZ OKRvBkOLi0QeuuOjGlLrxxM5p6/C6GU1qQ4va7a7beGOQMXa9D4a/RGtH3TTOehGhHSY IRa1hKMAJVKiffz7O7FEsbDdA6o7cFjysm79mZ2XWsyYSkgbpDNNRz1cPAiQ/+QGnUAe 72kg== X-Gm-Message-State: AOJu0YwA3pDO9cOfJ4V8P1KNAz+BRikM7x/1v/gNZb2ZUFv/p7H2+nAz MYYCswtB0LJnk48da8lpKiLtQnlr1nq5gNCEZ8cDsqfPr5gN/iolu27fLg== X-Received: by 2002:a05:6a00:ace:b0:70d:2a4d:2edc with SMTP id d2e1a72fcca58-71de2439790mr18340169b3a.20.1728304223424; Mon, 07 Oct 2024 05:30:23 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:42 -0300 Message-ID: <20241007122955.309-7-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/20] swscale/input: add VYU444 input support 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: Y47iJQXC4gVZ Signed-off-by: James Almer --- libswscale/input.c | 24 ++++++++++++++++++++++++ libswscale/utils.c | 1 + 2 files changed, 25 insertions(+) diff --git a/libswscale/input.c b/libswscale/input.c index 3a93ac18e4..fe3e419edc 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -746,6 +746,24 @@ static void read_uyva_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, } } +static void vyuToY_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused0, const uint8_t *unused1, int width, + uint32_t *unused2, void *opq) +{ + int i; + for (i = 0; i < width; i++) + dst[i] = src[i * 3 + 1]; +} + +static void vyuToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src, + const uint8_t *unused1, int width, uint32_t *unused2, void *opq) +{ + int i; + for (i = 0; i < width; i++) { + dstU[i] = src[i * 3 + 2]; + dstV[i] = src[i * 3]; + } +} + static void read_xv30le_Y_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused0, const uint8_t *unused1, int width, uint32_t *unused2, void *opq) { @@ -1336,6 +1354,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_UYVY422: c->chrToYV12 = uyvyToUV_c; break; + case AV_PIX_FMT_VYU444: + c->chrToYV12 = vyuToUV_c; + break; case AV_PIX_FMT_NV12: case AV_PIX_FMT_NV16: case AV_PIX_FMT_NV24: @@ -1899,6 +1920,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_UYVY422: c->lumToYV12 = uyvyToY_c; break; + case AV_PIX_FMT_VYU444: + c->lumToYV12 = vyuToY_c; + break; case AV_PIX_FMT_BGR24: c->lumToYV12 = bgr24ToY_c; break; diff --git a/libswscale/utils.c b/libswscale/utils.c index 2ddc8fa437..28861bde97 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -270,6 +270,7 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_XV36LE] = { 1, 1 }, [AV_PIX_FMT_AYUV] = { 1, 0 }, [AV_PIX_FMT_UYVA] = { 1, 0 }, + [AV_PIX_FMT_VYU444] = { 1, 0 }, }; /** From patchwork Mon Oct 7 12:29:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp123191vqy; Mon, 7 Oct 2024 20:16:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXcHAvKOM04DUu1RrlbrLzSgyETjn61iL01TaYRORnnveDXtsjzjDLa9cNfowBriebegEkea8PEhFOLgW6dhugz@gmail.com X-Google-Smtp-Source: AGHT+IFmnxUW6cKIWI0oJmpnhoqQjUiVchWOmt+P3FYqdxaF6eB29d5e0siUdxgMgmvEUiRyIKUD X-Received: by 2002:a05:651c:990:b0:2f9:e1ce:1276 with SMTP id 38308e7fff4ca-2fb0de9572dmr4928361fa.11.1728357367109; Mon, 07 Oct 2024 20:16:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728357367; cv=none; d=google.com; s=arc-20240605; b=LIDUM8W41K5u87CY8WnstuPI7/wXGD2X0vFq+3h8/Q+/N0yYJgX0kjJssS9nOzZemy qjdnNKwzhvjKvUQ/qEi4KzeGNvBBIQySl5QHlXZHFnCNGxZ/3gkd1WBkFOHoajo+Dc5h 989Ozl00BGZcuxfDLibDO8/kgKnRwt3v3eUAS+O8xdHgA+lrksQotZw24+b1Dr534gVw +LxXNLBzRfslmeSd9Cn4InKsD2l4oyX/PIdCNTTzi8PuIdWv3VcKJdoAb4hAZrVJHwpw LI/uQWo+np5ZJDUogRNtOhWKj2FlcY3O+ZBrbq6Ukeb/zGR1ZQ6aedidhP4oiXDmunX1 r88A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=HGfL6copnFDkKxoccJ78DLjmqTFOHmE2t7JNpOLrnBw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=AmmWo78L2KvFY3KOGnxUahr169waFQvamXnx5eKS7b1lC7YT5xidNeO3j6XtOBxT/K ry7fT6EkRVoHUbXpCm//XDaICddAr434tTwXfhC+M6sGhjkpyda/m074SD6ijAp0CH0G ntXmMwjIBd33HPmzZStBiZuwNxFVpxc+qsJxTEnTdtd8GV4iVqrETmz0f00G5Z45TMjR Aip97uIDw+UB8eMZlb3f2taRLBzoaTAPlrx8Z6BVo2qodHIaoB/mWA4SwRprevlYu8k7 JsHEVQ/6/sdn5Gt5Otaoatl0lTRgbHag33wNUV+EhO+hwmbBo/3BwEU21DoD27xRF2aX 6wjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=TcSksvoz; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2faf9b5edfbsi18715021fa.652.2024.10.07.20.16.06; Mon, 07 Oct 2024 20:16:07 -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=@gmail.com header.s=20230601 header.b=TcSksvoz; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9C5268DC09; Mon, 7 Oct 2024 15:30:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E30968DBAB for ; Mon, 7 Oct 2024 15:30:27 +0300 (EEST) Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3e0402a98caso2291752b6e.3 for ; Mon, 07 Oct 2024 05:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304225; x=1728909025; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mKC+Fo7MQGZXZ9hrGjUbxhCbcbWdoz7E6lejJJ+CefA=; b=TcSksvozMzOrK8uGCqR2qJf7xn/5rSxNU8n4NONca+M+7Ho8qEaRnM7lf757617qjz LP3xoxEtAVXANSUGY+7JpRURgy7Acsxz8wX5WNyi41WHIzOJAU+Jz9eLjHym4C9O+n/2 xq+yj1I+//1/8KoKHCQT8cRzyM2FPJxISHmnPg0SdGtP2NG2y/fPUUIbTyajJOfepGGr 8W8dpxBIIi/Kz6EOy64okp4c1sbUEi9LN/K7JQqKhcWLK62DXOeylLETed59uLCVjStX Z58WZlmtUAff4mfMiQy58o+YRPOsMISRzeEioVhoWwJAT/fx/NOF8S0ANF6O11ybEHlH DOfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304225; x=1728909025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mKC+Fo7MQGZXZ9hrGjUbxhCbcbWdoz7E6lejJJ+CefA=; b=Bt9PMy3EZXimS7t+936By3XLdK86ope0iKaAtPLnLZ4a0iiiu5JRDnkMJeOX0HPMvj rIt92ZBGSeqqM4CIm6xkJfG//Ji0ZEna7xsATI8kN8XrL8jKGq0HYOMBh8hRa5SQAbct LzMt1vqS4mEhVW2SN0nZ0Z5j3b+W4R3rgVvePU5uiMMwSLBqxJ6gtbDzZ8wLpBcf1CHA +OvNlocxgTJmCen5A30dR0/HEkSiEJhps1vlavLbk/3dpPebaPs9rOPmkMwLyzwjwA1B 5aZFCIpuCHXJ2cBqjcZORtTA/+Jv0XvVWQV53QIKHd1M96+CqgGf6T9LRjeppNpHAHub vzNg== X-Gm-Message-State: AOJu0YxONbXa6NIGhMdEzkOh3hMqMwT9lOE3wgAz+uzJDLetewNProeq YEsx9wcAIv2vePQuzo11mXOPYotk9hgLE9oSeZdR7/+Lydrq46gYO7lYRw== X-Received: by 2002:a05:6808:19a2:b0:3e3:a472:ff1f with SMTP id 5614622812f47-3e3c131df50mr8958650b6e.3.1728304224879; Mon, 07 Oct 2024 05:30:24 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:43 -0300 Message-ID: <20241007122955.309-8-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/20] swscale/output: add AYUV output support 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: Ig30LytDRASr Signed-off-by: James Almer --- libswscale/output.c | 56 ++++++++++++++++++++++++ libswscale/utils.c | 2 +- tests/ref/fate/filter-pixdesc-ayuv | 1 + tests/ref/fate/filter-pixfmts-copy | 1 + tests/ref/fate/filter-pixfmts-crop | 1 + tests/ref/fate/filter-pixfmts-field | 1 + tests/ref/fate/filter-pixfmts-fieldorder | 1 + tests/ref/fate/filter-pixfmts-hflip | 1 + tests/ref/fate/filter-pixfmts-il | 1 + tests/ref/fate/filter-pixfmts-null | 1 + tests/ref/fate/filter-pixfmts-pad | 1 + tests/ref/fate/filter-pixfmts-scale | 1 + tests/ref/fate/filter-pixfmts-transpose | 1 + tests/ref/fate/filter-pixfmts-vflip | 1 + 14 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/filter-pixdesc-ayuv diff --git a/libswscale/output.c b/libswscale/output.c index e5d555f76f..4d6b9d553b 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2825,6 +2825,59 @@ yuv2vuyX_X_c(SwsContext *c, const int16_t *lumFilter, } } +static void +yuv2ayuv_X_c(SwsContext *c, const int16_t *lumFilter, + const int16_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, const int16_t **chrUSrc, + const int16_t **chrVSrc, int chrFilterSize, + const int16_t **alpSrc, uint8_t *dest, int dstW, int y) +{ + int i; + + for (i = 0; i < dstW; i++) { + int j; + int Y = 1 << 18, U = 1 << 18; + int V = 1 << 18, A = 255; + + for (j = 0; j < lumFilterSize; j++) + Y += lumSrc[j][i] * lumFilter[j]; + + for (j = 0; j < chrFilterSize; j++) + U += chrUSrc[j][i] * chrFilter[j]; + + for (j = 0; j < chrFilterSize; j++) + V += chrVSrc[j][i] * chrFilter[j]; + + Y >>= 19; + U >>= 19; + V >>= 19; + + if (Y & 0x100) + Y = av_clip_uint8(Y); + if (U & 0x100) + U = av_clip_uint8(U); + if (V & 0x100) + V = av_clip_uint8(V); + + if (alpSrc) { + A = 1 << 18; + + for (j = 0; j < lumFilterSize; j++) + A += alpSrc[j][i] * lumFilter[j]; + + A >>= 19; + + if (A & 0x100) + A = av_clip_uint8(A); + } + + dest[4 * i ] = A; + dest[4 * i + 1] = Y; + dest[4 * i + 2] = U; + dest[4 * i + 3] = V; + } +} + #define output_pixel(pos, val, bits) \ AV_WL16(pos, av_clip_uintp2(val >> shift, bits) << output_shift); @@ -3377,6 +3430,9 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_AYUV64LE: *yuv2packedX = yuv2ayuv64le_X_c; break; + case AV_PIX_FMT_AYUV: + *yuv2packedX = yuv2ayuv_X_c; + break; case AV_PIX_FMT_VUYA: case AV_PIX_FMT_VUYX: *yuv2packed1 = yuv2vuyX_1_c; diff --git a/libswscale/utils.c b/libswscale/utils.c index 28861bde97..a5be311393 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -268,7 +268,7 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_RGBAF16LE] = { 1, 0 }, [AV_PIX_FMT_XV30LE] = { 1, 1 }, [AV_PIX_FMT_XV36LE] = { 1, 1 }, - [AV_PIX_FMT_AYUV] = { 1, 0 }, + [AV_PIX_FMT_AYUV] = { 1, 1 }, [AV_PIX_FMT_UYVA] = { 1, 0 }, [AV_PIX_FMT_VYU444] = { 1, 0 }, }; diff --git a/tests/ref/fate/filter-pixdesc-ayuv b/tests/ref/fate/filter-pixdesc-ayuv new file mode 100644 index 0000000000..178e847222 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-ayuv @@ -0,0 +1 @@ +pixdesc-ayuv a21ac760efdec0065bcf605f4ed75f7f diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 120129dc1e..dc165b5ec5 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -2,6 +2,7 @@ 0rgb 527ef3d164c8fd0700493733959689c2 abgr 023ecf6396d324edb113e4a483b79ba2 argb f003b555ef429222005d33844cca9325 +ayuv eb7e43cfbb961d1e369311d0f58b9f52 ayuv64le 07b9c969dfbe4add4c0626773b151d4f bgr0 6fcd67c8e6cec723dab21c70cf53dc16 bgr24 4cff3814819f02ecf5824edfd768d2b1 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 4731e96fc0..07ded708bc 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -2,6 +2,7 @@ 0rgb 974833c777e6abe6d84dc59af2ca5625 abgr 1d21f5b8a20186ac9dd54459c986a2a7 argb 8b822972049a1e207000763f2564d6e0 +ayuv f2846cdd8fc01820e561fe4d3855938c ayuv64le ab2f7bc8f150af47c42c778e3ea28bce bgr0 38a84849a9198667c348c686802e3b52 bgr24 1dacd8e04bf0eff163e82250d01a9cc7 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 0727d733f2..9e1e06bd80 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -2,6 +2,7 @@ 0rgb e2c35753a2271d1f9455b1809bc0e907 abgr c0eb95959edf5d40ff8af315e62d0f8a argb 6dca4f2987b49b7d63f702d17bace630 +ayuv 6aeadbc3ec2a6ff2bfab9495e7285fed ayuv64le d9836decca6323ba88b3b3d02257c0b6 bgr0 1da3fdbac616b3b410d081e39ed7a1f6 bgr24 573c76d77b1cbe6534ea7c0267dc1b13 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 1d7a98ce11..8f1febf4ad 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -2,6 +2,7 @@ 0rgb 2b0f066cfa0bef378a492875d541de8f abgr 832924b5351361db68dbdbb96c60ae55 argb 80d08e68cb91bc8f2f817516e65f0bd0 +ayuv 61b23fc754d8ca0d6740fa08a0a6ebf2 ayuv64le 84ef6260fe02427da946d4a2207fb54c bgr0 d2c676224ea80ac3ce01afde325ea1a0 bgr24 b7fdbcd10f20e6ea2d40aae0f329f80d diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 43404db154..a49abba15b 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -2,6 +2,7 @@ 0rgb ada57572ee2b35f86edac9b911ce8523 abgr d2da6c3ee72e4a89a7cd011dd08566b2 argb 36cf791c52c5463bfc52a070de54337e +ayuv 122f591eac5669b658c22b09355e4263 ayuv64le 4cedbc38b3d4dcb26cdab170ce6d667b bgr0 66e9fda4e658d73bfe4fc9d792542271 bgr24 db074979bd684ca4547e28681ad3f6ab diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 4a6f15f074..1ac9cf3bd2 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -2,6 +2,7 @@ 0rgb 53efe0182723cd1dedfdbf56357c76f5 abgr 97603869e6248a8e5d8501563a11b114 argb 9e50e6ef02c83f28e97865a1f46ddfcd +ayuv 3dfdbbbf605d83629f3ef4c96210b074 ayuv64le 6f45f683e99ddf4180c7c7f47719efcc bgr0 590dcd1297d1dd4541eea217381db604 bgr24 73afe7b447b083a7c2d682abe8dd451a diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 120129dc1e..dc165b5ec5 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -2,6 +2,7 @@ 0rgb 527ef3d164c8fd0700493733959689c2 abgr 023ecf6396d324edb113e4a483b79ba2 argb f003b555ef429222005d33844cca9325 +ayuv eb7e43cfbb961d1e369311d0f58b9f52 ayuv64le 07b9c969dfbe4add4c0626773b151d4f bgr0 6fcd67c8e6cec723dab21c70cf53dc16 bgr24 4cff3814819f02ecf5824edfd768d2b1 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index abf4fceb46..5d8111b623 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -2,6 +2,7 @@ 0rgb 8e076dd0f8a9f4652595dffe3544f0f0 abgr 52738042432893de555e6a3833172806 argb 2a10108ac524b422b8a2393c064b3eab +ayuv ddb44f03af05b0cb01dced60641a4160 bgr0 025d4d5e5691801ba39bc9de70e39df0 bgr24 f8b65ad845905c7d0c93ca28dfbb826f bgr48le 4564b56dd1f2a9761b8a7a5244ac4c49 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 2052d3f2f0..41a6fe76e7 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -2,6 +2,7 @@ 0rgb 80a58af8c639743307207ab4b69ca863 abgr 63f2eaa8712ea6108985f4a0b83587c9 argb f0e17c71a40643c33a5bcfb481f6d8f8 +ayuv 9992b829065e2ea4a44de3a25766ca9b ayuv64le 59fb016f9874062d0be77cb3920ffed2 bgr0 243d58ca64f97b2f415b4c63cb79f0e1 bgr24 18744aaab4b8bce065a7144dc0ccf921 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 0a395f7e71..bcda0e6460 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -2,6 +2,7 @@ 0rgb cf1bedd0784a3efd3ab00c4e44005c37 abgr 6d6f896f853a6c6f93ee70dba9af3d17 argb 87bbd23debb94d486ac3a6b6c0b005f9 +ayuv fe3d4a2d4d37deb94e6f447edc77f199 ayuv64le e4c07e0d5b333b3bc9eb4f3ce6af3a2c bgr0 df3a6eedd4939ce09a357b655ac2962a bgr24 f9a08135e5d58c0b2a5509c369a88414 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 5ba28917a7..bb8ad46704 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -2,6 +2,7 @@ 0rgb 76b792f8ce8a72925e04294dc2f25b36 abgr 8b94f489e68802d76f1e2844688a4911 argb 3fd6af7ef2364d8aa845d45db289a04a +ayuv 928ac9b09b90dec1d8bc3ecd13b75a60 ayuv64le 558671dd31d0754cfa6344eaf441df78 bgr0 7117438cf000254610f23625265769b5 bgr24 52b2c21cbc166978a38a646c354b6858 From patchwork Mon Oct 7 12:29:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52110 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp5218vqy; Mon, 7 Oct 2024 14:26:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUKkwm2C1v6cP9OvE26vs5TXDrBjywAGXcMf3vWwjHTMrXXwNfI4C3aCHafh434tN+klaEpwQdv0Pepw13K/w5s@gmail.com X-Google-Smtp-Source: AGHT+IHD9G1NCnNWfMhLocjrjH+RqA0U1dU4spvu7nvGeBG8tdbM46Ztd96CYMj8ef9gJlNEO7Jt X-Received: by 2002:a17:907:3f96:b0:a99:4262:cc16 with SMTP id a640c23a62f3a-a994262cce4mr867948666b.27.1728336367133; Mon, 07 Oct 2024 14:26:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728336367; cv=none; d=google.com; s=arc-20240605; b=QpsBxx3NMXbaZKihWJB+IAttjAlA4i7vS7KljCRbseh7arKFm3dAKl30kp4QG7LE+i BTzHox6h3qPS9AKxlJKbia6qvonjqTfdKEPtw8tDa8nePAAprhdZLeZOi43c9EhETdIf gBvnoSPzPWpbZNldhqybCOebE8ywCncB+4fTfPh6RWuzti++ISLZ1Rt9oXH0iTk8b5go +xqM+L+5/tpz5CAaJW3GeBbBaFHnIA5n+6a4G+3lB27V+v/4s71hj2P3nFS2AqDsy5Wj 7RoIOiF1KIirLUgcyMIuDorwwQ26p362iIIqVVoq5HKc28Ld1Hn1IPOyKcFImSWPbPtb y8qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=ftTavvuwmU1lJsZDuHPGAnlyN5JOraJU0B5Kgl9UZws=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=DocfJ2so5L/Aj7xNvMody6Ut9e25eGNQ+UJPbH7CIrLtMezaYPqylwGbVII+FrnUbE K1THZco4sMZFFAv/54ct8EagXwKdOVlrdebPhcb8Gi4lFow3eAu8mNb/7gBFHHJDRB7e tp3y3n+09XAnCu1ySfOWk9sT2TyUs7RjWlbFEkksFvX43XsgaE6l8u29W4jHbPjcn6+4 1KikQXP51+BF514UBvN9xTnqeKZy9oEzS0Y/6X6QRQVn+xnBXQ76iabe3YMcmWEVuwHM Qj3VKLQ23T0knGrQnpW2W8xh7vLev5JRZjWRLPN3QEB30eo9FXmg+aQioLdMxJ8QmrYc dtBg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=GKO+P9Zz; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a99426fff9asi397728766b.81.2024.10.07.14.26.06; Mon, 07 Oct 2024 14:26:07 -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=@gmail.com header.s=20230601 header.b=GKO+P9Zz; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9E3B68DBA3; Mon, 7 Oct 2024 15:30:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA09468DBAB for ; Mon, 7 Oct 2024 15:30:31 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-71dfc78d6ddso1373068b3a.0 for ; Mon, 07 Oct 2024 05:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304230; x=1728909030; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zPtwFIHuip3ul0gzD8KbnwuDkaV03eU8dcUXJBFI9mE=; b=GKO+P9ZzC9pwTf3HhWu2sj1SRmCYLMa+oW2t5dCDJy5lhIzkTGwEEjeYjc5nGXossa XjOJQoGtcMs47ncxAalwUmrxrJ+t6F0q6tt2rlXcySKWGLkx9F8Cf1ZXnRLVrcjfglw+ KIj/h3O9cN8VKME1epzdScU99hvJWLjyNoBVWoKM0PEzyyE6fE33uHBqXXHk6J+0Dlbp uD4XjfLGRk/8aTcyZpCLN4Nlk/hivWg0lUWmjjUlVxJwdQjT4q8au7l9ZhyRw/oR2eY9 Czr5j771/rdKtYzmtwEbezb73ZpXpWgngIUNtyA587V3cfrBbDNOtS2a5dPoadojzqC0 oJUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304230; x=1728909030; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zPtwFIHuip3ul0gzD8KbnwuDkaV03eU8dcUXJBFI9mE=; b=w8BICnIsKAe+nnmq00tXkB3A4MVAiSBXjX8QLFKxMqrVFv/8R+zehh5n8GvnqgTSej Pwc29+kkXxfy1jqxZsC5Xnt0Pk6dqfZfbs3D4V6Iw4pDrjonYfjE6+MqpZZpdiicfdAX ow31rDVi02Qs+kFx4W3TDQS6S+eI0McaZh27f02FreEd8J+1LTDXM0Eigx+wWGSLvODb cBk2Qw2/iOR1cuWEqLooiDqW35IeZ5UyyxZLTCHBrb2OMdfbIQG8A/owjoGzkmet/C1E 5ZcTHYv4WJ0yb43IWbxsPyunx5Fc6lFME83HFRN996SYH8NSM/5bijXjpP3OPkFW/PkA u4nA== X-Gm-Message-State: AOJu0YyzpROBa353KYNoXbbxegou+9tUZNHJeQO65UotKUWQH+haNN0A JB/MWiuVbv7SYaIbFtH9sOoc6rwV4tAnekRKEIjZVUufzkPu3B5YGvE6Yg== X-Received: by 2002:a05:6a00:14c6:b0:717:8d52:643 with SMTP id d2e1a72fcca58-71de23cf2edmr19660974b3a.11.1728304229571; Mon, 07 Oct 2024 05:30:29 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:46 -0300 Message-ID: <20241007122955.309-11-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/20] avformat/riff: map y408 fourcc to RAWVIDEO decoder 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: WyKejnH+Lof8 Signed-off-by: James Almer --- libavcodec/raw.c | 1 + libavformat/riff.c | 1 + tests/ref/fate/filter-pixdesc-ayuv | 2 +- tests/ref/fate/filter-pixfmts-copy | 2 +- tests/ref/fate/filter-pixfmts-crop | 2 +- tests/ref/fate/filter-pixfmts-field | 2 +- tests/ref/fate/filter-pixfmts-fieldorder | 2 +- tests/ref/fate/filter-pixfmts-hflip | 2 +- tests/ref/fate/filter-pixfmts-il | 2 +- tests/ref/fate/filter-pixfmts-null | 2 +- tests/ref/fate/filter-pixfmts-pad | 2 +- tests/ref/fate/filter-pixfmts-scale | 2 +- tests/ref/fate/filter-pixfmts-transpose | 2 +- tests/ref/fate/filter-pixfmts-vflip | 2 +- 14 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index b73b80e5fd..acdd79ded8 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -237,6 +237,7 @@ static const PixelFormatTag raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, { AV_PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, { AV_PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */ + { AV_PIX_FMT_AYUV, MKTAG('y', '4', '0', '8') }, { AV_PIX_FMT_RGB555LE,MKTAG('L', '5', '5', '5') }, { AV_PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') }, { AV_PIX_FMT_RGB565BE,MKTAG('B', '5', '6', '5') }, diff --git a/libavformat/riff.c b/libavformat/riff.c index ca81b4837a..b079b00f6c 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -296,6 +296,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', 'C', 'B') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'F', 'L') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'F', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('y', '4', '0', '8') }, { AV_CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') }, { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, { AV_CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, diff --git a/tests/ref/fate/filter-pixdesc-ayuv b/tests/ref/fate/filter-pixdesc-ayuv index 178e847222..aed45638ef 100644 --- a/tests/ref/fate/filter-pixdesc-ayuv +++ b/tests/ref/fate/filter-pixdesc-ayuv @@ -1 +1 @@ -pixdesc-ayuv a21ac760efdec0065bcf605f4ed75f7f +pixdesc-ayuv 31b8e3c2e1f027af001f774e8a6feae4 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index e538466636..47e4619369 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -2,7 +2,7 @@ 0rgb 527ef3d164c8fd0700493733959689c2 abgr 023ecf6396d324edb113e4a483b79ba2 argb f003b555ef429222005d33844cca9325 -ayuv eb7e43cfbb961d1e369311d0f58b9f52 +ayuv 631859cdc018cd9671482e435a87becc ayuv64le 07b9c969dfbe4add4c0626773b151d4f bgr0 6fcd67c8e6cec723dab21c70cf53dc16 bgr24 4cff3814819f02ecf5824edfd768d2b1 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 37b78ce5ae..a1f9faa450 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -2,7 +2,7 @@ 0rgb 974833c777e6abe6d84dc59af2ca5625 abgr 1d21f5b8a20186ac9dd54459c986a2a7 argb 8b822972049a1e207000763f2564d6e0 -ayuv f2846cdd8fc01820e561fe4d3855938c +ayuv fb7bdb9f775c47099892c0588f5be426 ayuv64le ab2f7bc8f150af47c42c778e3ea28bce bgr0 38a84849a9198667c348c686802e3b52 bgr24 1dacd8e04bf0eff163e82250d01a9cc7 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 0cf92f3c21..67dbff6ea3 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -2,7 +2,7 @@ 0rgb e2c35753a2271d1f9455b1809bc0e907 abgr c0eb95959edf5d40ff8af315e62d0f8a argb 6dca4f2987b49b7d63f702d17bace630 -ayuv 6aeadbc3ec2a6ff2bfab9495e7285fed +ayuv 25f429cbd3c1ac60851d69c262601415 ayuv64le d9836decca6323ba88b3b3d02257c0b6 bgr0 1da3fdbac616b3b410d081e39ed7a1f6 bgr24 573c76d77b1cbe6534ea7c0267dc1b13 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index d902c9087d..745034aba9 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -2,7 +2,7 @@ 0rgb 2b0f066cfa0bef378a492875d541de8f abgr 832924b5351361db68dbdbb96c60ae55 argb 80d08e68cb91bc8f2f817516e65f0bd0 -ayuv 61b23fc754d8ca0d6740fa08a0a6ebf2 +ayuv 7fd34c9bd28c8ac7979eaa41c1a8ab9f ayuv64le 84ef6260fe02427da946d4a2207fb54c bgr0 d2c676224ea80ac3ce01afde325ea1a0 bgr24 b7fdbcd10f20e6ea2d40aae0f329f80d diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 49e2b60d34..a0b1582d5d 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -2,7 +2,7 @@ 0rgb ada57572ee2b35f86edac9b911ce8523 abgr d2da6c3ee72e4a89a7cd011dd08566b2 argb 36cf791c52c5463bfc52a070de54337e -ayuv 122f591eac5669b658c22b09355e4263 +ayuv ae787b7ee2a8b1f4af2335ddca56ff58 ayuv64le 4cedbc38b3d4dcb26cdab170ce6d667b bgr0 66e9fda4e658d73bfe4fc9d792542271 bgr24 db074979bd684ca4547e28681ad3f6ab diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 852c6e126a..45fd5f6f2c 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -2,7 +2,7 @@ 0rgb 53efe0182723cd1dedfdbf56357c76f5 abgr 97603869e6248a8e5d8501563a11b114 argb 9e50e6ef02c83f28e97865a1f46ddfcd -ayuv 3dfdbbbf605d83629f3ef4c96210b074 +ayuv 6e65a0b3bb18e89997dd558a7331df17 ayuv64le 6f45f683e99ddf4180c7c7f47719efcc bgr0 590dcd1297d1dd4541eea217381db604 bgr24 73afe7b447b083a7c2d682abe8dd451a diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index e538466636..47e4619369 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -2,7 +2,7 @@ 0rgb 527ef3d164c8fd0700493733959689c2 abgr 023ecf6396d324edb113e4a483b79ba2 argb f003b555ef429222005d33844cca9325 -ayuv eb7e43cfbb961d1e369311d0f58b9f52 +ayuv 631859cdc018cd9671482e435a87becc ayuv64le 07b9c969dfbe4add4c0626773b151d4f bgr0 6fcd67c8e6cec723dab21c70cf53dc16 bgr24 4cff3814819f02ecf5824edfd768d2b1 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index 086d89e51c..f995db4237 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -2,7 +2,7 @@ 0rgb 8e076dd0f8a9f4652595dffe3544f0f0 abgr 52738042432893de555e6a3833172806 argb 2a10108ac524b422b8a2393c064b3eab -ayuv ddb44f03af05b0cb01dced60641a4160 +ayuv 1c0934c07791c49da33c14f535d73abc bgr0 025d4d5e5691801ba39bc9de70e39df0 bgr24 f8b65ad845905c7d0c93ca28dfbb826f bgr48le 4564b56dd1f2a9761b8a7a5244ac4c49 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 67b1e4b075..51f84a53f3 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -2,7 +2,7 @@ 0rgb 80a58af8c639743307207ab4b69ca863 abgr 63f2eaa8712ea6108985f4a0b83587c9 argb f0e17c71a40643c33a5bcfb481f6d8f8 -ayuv 9992b829065e2ea4a44de3a25766ca9b +ayuv f20a5cc54f6459aad6b5f36ae092da5d ayuv64le 59fb016f9874062d0be77cb3920ffed2 bgr0 243d58ca64f97b2f415b4c63cb79f0e1 bgr24 18744aaab4b8bce065a7144dc0ccf921 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index de7ef24ec8..3698042fc6 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -2,7 +2,7 @@ 0rgb cf1bedd0784a3efd3ab00c4e44005c37 abgr 6d6f896f853a6c6f93ee70dba9af3d17 argb 87bbd23debb94d486ac3a6b6c0b005f9 -ayuv fe3d4a2d4d37deb94e6f447edc77f199 +ayuv ba6a6588737f8ddffd2018d9c667e559 ayuv64le e4c07e0d5b333b3bc9eb4f3ce6af3a2c bgr0 df3a6eedd4939ce09a357b655ac2962a bgr24 f9a08135e5d58c0b2a5509c369a88414 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index b55b6a94b6..c881595d28 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -2,7 +2,7 @@ 0rgb 76b792f8ce8a72925e04294dc2f25b36 abgr 8b94f489e68802d76f1e2844688a4911 argb 3fd6af7ef2364d8aa845d45db289a04a -ayuv 928ac9b09b90dec1d8bc3ecd13b75a60 +ayuv c3bc52cd5ae5094c85bd465a259e2870 ayuv64le 558671dd31d0754cfa6344eaf441df78 bgr0 7117438cf000254610f23625265769b5 bgr24 52b2c21cbc166978a38a646c354b6858 From patchwork Mon Oct 7 12:29:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52114 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp32675vqy; Mon, 7 Oct 2024 15:36:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX4ZDy4frazl5NbD9zPyGA5u4XrHl5avTqFwHSNAtk5dBX7mlTUd3Z1sYHWZODAYB1XowvzD8M8XRboYOkan4+p@gmail.com X-Google-Smtp-Source: AGHT+IHTDkd9H049QO9UznW+bR80bJx7UNqs1lr0OG1XuASxmX9uI2tciGS5mymxZEovbttmBmR2 X-Received: by 2002:a17:907:9809:b0:a99:3f4e:6de8 with SMTP id a640c23a62f3a-a993f4e6e28mr954619266b.64.1728340576644; Mon, 07 Oct 2024 15:36:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728340576; cv=none; d=google.com; s=arc-20240605; b=PYONmEw0b1d6PSjXATtHGNZ2P+zEPobCzlYOVESAuTaMfvkwRy8jft7huSIfRO+FIA 4F5922jBx8AJgt80sqwgacmH90Nsx8G7vdxQ0C7gtFgES95u4Av+GZhSoD87vy8aw117 EPVri2nauwp6JP9WnQpEdANXSXvVftN0lyR89XXRzl2iRBIMSvK2I3Sre5myZfb7QnRV 8LvQtzVkIflUc3JosxNiIMAb1L2taeExYmU9+hFLTvhxBhSINfmxsFZW5xq6BoCQ8yBR intd+Dy6nJ70etQu2fco8XkgZPgXAjKspSaZ3hIlsRIK1ZoBQRy8bgFc5reQkA4Vu2qj Luvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=4efFdhLZ7XeGGFSFC44HcLRF1oYdBbN+O3bi9YK3YGQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=S1et/v6375W6gHja/C2+Oserf2yyq1s3oxC69dLPJlyv4glkIAPlro5+ioB35YQQx/ xZ0Uomj8Ri0McG6MKo/dz6ruNGBIqick1pSIhArJ8x2278ZobtHqYWFvBteXnMZ1iy/v OOplUEkeSxGp5wljRceAff4/324Aua04I8z/4Xz6gJi5UsIC1PrQBWYEa5moWjilIDO4 HbifE2MKj7D7Y1W6WYX2lmLcNJaWauu8wTMgmnKKD4+2MqHB+2vg5eVQTulHARSyMBOE Ieuu/yiKH+nPRd/ZCWY/5l6B11r490n4gSmCp4fLsyIZF6bYI6JvXxmEEqbdJV/aA3kR eQQQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=JeV9+WMN; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a992e57e08fsi476477766b.145.2024.10.07.15.36.09; Mon, 07 Oct 2024 15:36:16 -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=@gmail.com header.s=20230601 header.b=JeV9+WMN; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D65368DC33; Mon, 7 Oct 2024 15:30:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43B2968DBD9 for ; Mon, 7 Oct 2024 15:30:35 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71df468496fso1837215b3a.1 for ; Mon, 07 Oct 2024 05:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304233; x=1728909033; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5GOkkvtAaF/xtKVBbCCpN89e7w6FJgi60U72yvxvzsE=; b=JeV9+WMNieYiHN+uIZA8euzO/opV3EWItpBMuvLsrWH8NsBs+M4nXYqdzYKVYkSUBt tk/mDdMOKUXYkGsG+ap6Bw6cYwcIC/xfEcC0OmV9W0kfwGMrZoIdkNwngpg7oni2kYns wUwl4W3ljxNKqTmuAYiOwqKYTbVK1r6v3GGFwbflje1U95V0mO4vbckqjMzt95mxkZNz SUaDyy8n0Z2pJKQQi62EeyarqJ+ogUgBusDM2kD6Lpdbicyuu2hsMd2ktwzx2dLBgIRk 2N/yw5jr1jhGD7aWH2c19jCBh6UOHIRt6gqm9Z+EHpUSY4aak8fjzDWW+lSMOO2S+sG6 autQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304233; x=1728909033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5GOkkvtAaF/xtKVBbCCpN89e7w6FJgi60U72yvxvzsE=; b=kR+Nn3cutTxFmIpzIHDLprC1M6EoOuJHA2SzMxRjvL04AT9HVOVu8ojmvnNsLx+Q6N t5R916Fv4epFPGd4z1q57l5wJ8s/NAcMl03jy99CSRPDfs9CXv5lZe3qjW7mAAjOabaG zk3g8WEjAd9NYea1DlQLkVkH8qXVC6NtvBT6LJBZjVqYTch/DXgx7RHcoC8nqwLKqXap isoG15r/647EMqGx0PZ2FeOPDjYA9XvHneDMg2niEP7J7SrOns4vlP/icucOb+2drhEg FaY+ydRx4s/F7ASuAxDz1sUxHDIEqi8BZMpKOPAd0Kx9Bq7aMj1Of15NvGIvjn8avzQH p6LA== X-Gm-Message-State: AOJu0YyqxQRAJ26gQUV9YHOyS5nY6UtJ1hHQ4B0fcmHzkzX16ndhoASw aINx+3SpxLGr9lX3FhfkQIVjvmPc8tmq6g5aeu1rNGddWS10lN+EEVUFHQ== X-Received: by 2002:a05:6a20:db0c:b0:1d2:e807:b65b with SMTP id adf61e73a8af0-1d6dfabb7f9mr15519917637.37.1728304232748; Mon, 07 Oct 2024 05:30:32 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:48 -0300 Message-ID: <20241007122955.309-13-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/20] avformat/riff: map v308 fourcc to RAWVIDEO decoder 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: chpqdLFxIw6O There's no need to keep using a custom decoder for this pixel format. Signed-off-by: James Almer --- libavcodec/raw.c | 1 + libavformat/riff.c | 2 +- tests/ref/fate/filter-pixdesc-vyu444 | 2 +- tests/ref/fate/filter-pixfmts-copy | 2 +- tests/ref/fate/filter-pixfmts-crop | 2 +- tests/ref/fate/filter-pixfmts-field | 2 +- tests/ref/fate/filter-pixfmts-fieldorder | 2 +- tests/ref/fate/filter-pixfmts-hflip | 2 +- tests/ref/fate/filter-pixfmts-il | 2 +- tests/ref/fate/filter-pixfmts-null | 2 +- tests/ref/fate/filter-pixfmts-pad | 2 +- tests/ref/fate/filter-pixfmts-scale | 2 +- tests/ref/fate/filter-pixfmts-transpose | 2 +- tests/ref/fate/filter-pixfmts-vflip | 2 +- 14 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 4b77be4157..086823c06e 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -237,6 +237,7 @@ static const PixelFormatTag raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, { AV_PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, { AV_PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */ + { AV_PIX_FMT_VYU444, MKTAG('v', '3', '0', '8') }, { AV_PIX_FMT_UYVA, MKTAG('v', '4', '0', '8') }, { AV_PIX_FMT_AYUV, MKTAG('y', '4', '0', '8') }, { AV_PIX_FMT_RGB555LE,MKTAG('L', '5', '5', '5') }, diff --git a/libavformat/riff.c b/libavformat/riff.c index a88d54e005..f64dfdeb81 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -296,6 +296,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '4', 'C', 'B') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'F', 'L') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'F', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '3', '0', '8') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '4', '0', '8') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('y', '4', '0', '8') }, { AV_CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') }, @@ -303,7 +304,6 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, { AV_CODEC_ID_V210, MKTAG('C', '2', '1', '0') }, - { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, diff --git a/tests/ref/fate/filter-pixdesc-vyu444 b/tests/ref/fate/filter-pixdesc-vyu444 index 7572621e76..a08abee73d 100644 --- a/tests/ref/fate/filter-pixdesc-vyu444 +++ b/tests/ref/fate/filter-pixdesc-vyu444 @@ -1 +1 @@ -pixdesc-vyu444 ae888f94235dd6d122c4fa3aa40f11d0 +pixdesc-vyu444 be62739ab38a49b86c0ed51f21de29e4 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 121bf63a8e..c585b3cbd1 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -101,7 +101,7 @@ uyva 8896d7525f12de08818a01a5d5cf84f1 uyvy422 3bcf3c80047592f2211fae3260b1b65d vuya 3d5e934651cae1ce334001cb1829ad22 vuyx 0af13a42f9d0932c5a9bb6a8a5d1c5ee -vyu444 2b2e6df31f5895340f25d6f67572b113 +vyu444 93912234400a4373b1a6b5c4e4b1a4ef x2bgr10le 550c0d190cf695afa4eaacb644db6b75 x2rgb10le c1e3ac21be04a16bb157b22784524520 xv30le c14b5a953bf3be56346f66ca174a5b1b diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 25971e5b35..4d3b042aa3 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -98,7 +98,7 @@ rgba64le fea8ebfc869b52adf353778f29eac7a7 uyva 03f362ac6a39f25286bc6616111b0752 vuya 76578a705ff3a37559653c1289bd03dd vuyx 615241c5406eb556fca0ad8606c23a02 -vyu444 a6067a24e63385242948dbc4c5a4ab5d +vyu444 5d976b25782ff69e4b3b18453fa1447b x2bgr10le 84de725b85662c362862820dc4a309aa x2rgb10le f4265aca7a67dbfa9354370098ca6f33 xv30le a9edb820819b900a4a897fee4562a4fb diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 7117898f51..8dd6e6149f 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -101,7 +101,7 @@ uyva 147398d2e8d310f915c95863ad192c5e uyvy422 1c49e44ab3f060e85fc4a3a9464f045e vuya f72bcf29d75cd143d0c565f7cc49119a vuyx 3d02eeab336d0a8106f6fdd91be61073 -vyu444 09fcf24f46ed72d51983d87ad3bed864 +vyu444 b139fb4ddaef12a7542a68277211efa7 x2bgr10le dbe21538d7cb1744914f6bd46ec09b55 x2rgb10le a18bc4ae5274e0a8cca9137ecd50c677 xv30le e940366c78efc9e292e9de28cf04dba9 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index c36e382b3f..41c6607ec7 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -90,7 +90,7 @@ uyva ccf5dfd33765dda88c4b4afa2ea31305 uyvy422 75de70e31c435dde878002d3f22b238a vuya a3891d4168ff208948fd0b3ba0910495 vuyx 9e4480c5fcb7c091ec3e517420764ef3 -vyu444 e2e54e73f81389559a972f4049ab8606 +vyu444 3ddab207d561a3ee5efae09e504207f2 x2bgr10le 86474d84f26c5c51d6f75bf7e1de8da8 x2rgb10le cdf6a9e8a8d081aa768c6ae2e6221676 xv30le 25aac48128d94010a3660839500caee5 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index be0161c91a..9fe32c8ea4 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -98,7 +98,7 @@ rgba64le 0c810d8b3a6bca10321788e1cb145340 uyva a8391c24037e2a670196b47bf6a2ca57 vuya 7e530261e7ac4eae4fd616fd7572d0b8 vuyx f1d087284fb1556d76e6def5f94bf273 -vyu444 a9377d852b8263e50987593be7b03c7a +vyu444 7b72337f92a7223fd115265e2f769276 x2bgr10le 827cc659f29378e00c5a7d2c0ada8f9a x2rgb10le d4a8189b65395a88d0a38a7053f3359f xv30le 072aa2b61ce1e764f9d1957e8abee9a9 diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 5f9d34d4e0..b14571ef09 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -100,7 +100,7 @@ uyva d2655e1a1c56bcb48f7c7a6a6270dd93 uyvy422 d6ee3ca43356d08c392382b24b22cda5 vuya b9deab5ba249dd608b709c09255a4932 vuyx 4251d94ee49e6a3cc1c10c09cd331308 -vyu444 cd6598487e9f9e2c7165b656c486eade +vyu444 50e9e24a38afc81541a536d06aab5ebe x2bgr10le 135acaff8318cf9861bb0f7849a9e5e9 x2rgb10le 517fb186f523dc7cdc5c5c6967cfbe94 xv30le 7f6414a3fc700380025c29812e8376a9 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 121bf63a8e..c585b3cbd1 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -101,7 +101,7 @@ uyva 8896d7525f12de08818a01a5d5cf84f1 uyvy422 3bcf3c80047592f2211fae3260b1b65d vuya 3d5e934651cae1ce334001cb1829ad22 vuyx 0af13a42f9d0932c5a9bb6a8a5d1c5ee -vyu444 2b2e6df31f5895340f25d6f67572b113 +vyu444 93912234400a4373b1a6b5c4e4b1a4ef x2bgr10le 550c0d190cf695afa4eaacb644db6b75 x2rgb10le c1e3ac21be04a16bb157b22784524520 xv30le c14b5a953bf3be56346f66ca174a5b1b diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index 3ed65ebced..72571e94ab 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -45,7 +45,7 @@ rgba b157c90191463d34fb3ce77b36c96386 uyva 06271af718417c21d5bc6a992b04c32a vuya 44368c0a758ee68e24ce976e3b1b8535 vuyx ff637b205b78ee581e393124d0f44f5d -vyu444 88fde4581eb7369d7ff28bb27268b169 +vyu444 cf5d49d5c870f9e724fca104f847bfa1 ya16le dfc900a8130a7c5e64201557cbaef50a ya8 5d25e9a7975805d3f0dac516a6132b6e yuv410p cb871dcc1e84a7ef1d21f9237b88cf6e diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 6eeba28a7f..6f26936fbf 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -101,7 +101,7 @@ uyva 2358038be6dac002a6c736e798a3d91c uyvy422 aeb4ba4f9f003ae21f6d18089198244f vuya ffa817e283bf6a0b6fba21b07523ccaa vuyx a6ff68f46c6b4b7595ec91b2a497df8e -vyu444 0e5edaa26029501f05c0693321d60ded +vyu444 d663334119da56e36aca1e8e4eb29a39 x2bgr10le d57b9a99033cc7b65ddd111578f2d385 x2rgb10le d56bdb23fa6a8e12a0b4394987f89935 xv30le afe68d8a47e8460e0164970b1da0c5be diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index d5851f8278..2e78517079 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -90,7 +90,7 @@ rgba64le ad47197774858858ae7b0c177dffa459 uyva cb773ee5a9f8964b9c826d55f9f425a3 vuya 9ece18a345beb17cd19e09e443eca4bf vuyx 46b5b821d7ee6ddedb3ddafd1e5b007c -vyu444 508978bb072eba1bc4636a4abd68dbe2 +vyu444 e70a294738165223928fddc9970b8381 x2bgr10le 4aa774b6d8f6d446a64f1f288e5c97eb x2rgb10le 09cb1d98fe17ad8a6d9d3bec97ddc845 xv30le b1ac5a12f46d32c70acb63f89838ab76 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index c653e8d484..d2e134e974 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -101,7 +101,7 @@ uyva d43e89ba3d5c9274e1948eac8630fcc6 uyvy422 3a237e8376264e0cfa78f8a3fdadec8a vuya fb849f76e56181e005c31fce75d7038c vuyx ed7de87da324b39090a8961dfd56ca5a -vyu444 5a98e2118b75a3804bb80003cf6fa731 +vyu444 815de7c57dc8afafb3de908a4a280582 x2bgr10le 795b66a5fc83cd2cf300aae51c230f80 x2rgb10le 262c502230cf3724f8e2cf4737f18a42 xv30le 7e29ee107a1fabf3c7251f337d4b9fe5 From patchwork Mon Oct 7 12:29:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52099 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp2101258vqg; Mon, 7 Oct 2024 10:56:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVswfraYdmm+LRBmq+IEDr/eqAEp12E02RCPHEkQ7Pyuz67369nLjoiZ/c+auCvguZbqkJNhG/sgqgu2mjwzcsN@gmail.com X-Google-Smtp-Source: AGHT+IFs77BN20uoiI/r+v/IHyhMo9e+S3NEU7xBTrdnNxiAXyN/xRtL22+Mrrj7dQkmnGC6wdsu X-Received: by 2002:a05:6402:34c6:b0:5c9:3f2:15fb with SMTP id 4fb4d7f45d1cf-5c903f216bemr1707399a12.24.1728323764113; Mon, 07 Oct 2024 10:56:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728323764; cv=none; d=google.com; s=arc-20240605; b=g7VPwWHOlYc/MkiXEneIhBSrkbPhmBsQ/47f846jmgsUmFa3dm4z0U1aJLvYQ6xApc DYIn3f0Sde35uD5coLxXCM4c4emZRa9pW8iBVcBa0tJHtNl4sxhl4o12CwbdKZxzviQ6 KZk7ioSIXeYVEXLfpH8b+QZlIaYR/s4G1Ml6dcP/1HqKGRZyuDO3zZ8IhNIrTzoVXGkJ uU8sFIXJr0DXL0AOJ42OrexxkFUdnciISryt9eUw3ZoGlDzaPBhPsVU4wzWz8pSZyJyg zoli04+Ydz5n0lIXQo9GnBbeQ02wcy5cj8pF6p05T2M5Ka2zauFd2c08T24l4+IB8olo CfVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=QRtqFDwf255ZZyz1qIoBmbsx6vFFmMwJVtG20J2+jGA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=EtNN4ThJShfCEYeEF1IeOb2ujb05T1CN2IQUUFTcRkuQoFAdclaMnLJSzXDHir9q51 ZabvjOL0s60ynjnvkW5Sd6grZMHFxIyYyBLw+hnpoPjJ2lrnO5kb/n64/fnwt716DJ3n /vElSIA4vFY6QuXouNyqYiDAMrc1VMZDZa/tETrRl0Nw6IASYeWzVsDTTBlcjR9p7RvD bBZLQMErJEK/SFH0XFxqj3GQeefVcbhhHroSJo+Pk3fIgeZi4Fim9uDVNvHikGap83nB nzHLl32jUdm/IKipXXmtiJWuf8QqoLrlKZwM21AnGIxLr444Ww24P0YVo265lmn2jo7V LSrw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=O4IzzSFd; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c8e05a4ac2si4423524a12.172.2024.10.07.10.56.03; Mon, 07 Oct 2024 10:56:04 -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=@gmail.com header.s=20230601 header.b=O4IzzSFd; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24DBC68DC4A; Mon, 7 Oct 2024 15:30:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E1F268DBA3 for ; Mon, 7 Oct 2024 15:30:36 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-71dfc1124cdso1005351b3a.1 for ; Mon, 07 Oct 2024 05:30:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304234; x=1728909034; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GRMbNQ7hKELwB0JJUl3ci6UuEzYwmXJ/V69bRJph/r8=; b=O4IzzSFdeKooVV6Zjfse1JiBXUkkauJzC2RaNUKmW0MUUsvKMQtJ9/H3fT9En6fG6y JQ0pmtapO1xWA2wIHO66SOAYW498IkYOBt2kQMgS+FfJunmvPPcWdejnGdX6o7VlI4Ua v/IuF1esUwSz54AAS0d8wi+lSx3gLqm2RmojMRkimMshuQcjg2OPhL7Q/BqlJZmDMMg7 4rlXcg06SlOtoRZ2W25EO76AXb2s4moOeDRoLQOz4fk/OOavVfa0XpPrzdlStgRRrEeM bxfWQ8dljQSsLqzqyzK4zJGiS0KvRn4WJ+BRHnfzennd9y7+WSH3HFZ0lHMV7ZpnbKoM BsAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304234; x=1728909034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GRMbNQ7hKELwB0JJUl3ci6UuEzYwmXJ/V69bRJph/r8=; b=XOTjhPdkSTv4z2iwu4GHzUdKjO33LOsY9z0wXFLbJKNPGTwSP0UKewoTDNNoPfgtPQ hCFM5zRQaTybmj5Hu0oarJFL+XvyWfKvFSSrL1Eo/SvKcFciQqMi3amIeXQmBGpVSFPk 6xTUeWX+g1/gmXmphj/m17vqTEyuOtSMWgJRuglFX+U8GQMHj8fVEzeQxiwllCNCx5zn y42qi3uSJokNReGxBDmsL5nEagoIfe1DFKvfTsoTv7Nl2iZjMSHOSjpf7NgI4TwIWMQu zVzA3eF3nH+hk3s0HEtdfFHS92M0vNVzzWAo2kEPR5TYG/s5F5R92mUICzWKRGQsjsDM tRlw== X-Gm-Message-State: AOJu0Yz/9FQabF6SfYOH1LJaMRJP9ItHUTKIRbcjrHZXvZ5fM2CWZivd xGg6OxCQzVZRkfgy4n6seSWaBz/a85XUJAeKwcq7GcAileETxILMOv40Fg== X-Received: by 2002:a05:6a00:1485:b0:717:9340:a9d0 with SMTP id d2e1a72fcca58-71dd5af2697mr27313163b3a.6.1728304234217; Mon, 07 Oct 2024 05:30:34 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:49 -0300 Message-ID: <20241007122955.309-14-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/20] avutil/hwcontext_videotoolbox: add support for AYUV pixel format 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: MJKLVo+yakAl Signed-off-by: James Almer --- Untested libavutil/hwcontext_videotoolbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index 122a61d5e7..1d7dff4a7d 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -53,6 +53,7 @@ static const struct { #ifdef kCFCoreFoundationVersionNumber10_7 { kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange, false, AV_PIX_FMT_NV12 }, { kCVPixelFormatType_420YpCbCr8BiPlanarFullRange, true, AV_PIX_FMT_NV12 }, + { kCVPixelFormatType_4444AYpCbCr8, false, AV_PIX_FMT_AYUV }, { kCVPixelFormatType_4444AYpCbCr16, false, AV_PIX_FMT_AYUV64 }, #endif #if HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE @@ -86,6 +87,7 @@ static const struct { static const enum AVPixelFormat supported_formats[] = { #ifdef kCFCoreFoundationVersionNumber10_7 AV_PIX_FMT_NV12, + AV_PIX_FMT_AYUV, AV_PIX_FMT_AYUV64, #endif AV_PIX_FMT_YUV420P, From patchwork Mon Oct 7 12:29:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp1902692vqg; Mon, 7 Oct 2024 05:56:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWz2dSTgqOfPV6eueCsaxSUEDfY+PbEg3smEUwHDtyC5xPDd9M1DMT/n2ZBFN64Gz4vWT48XKlM5/w8olLEJWSF@gmail.com X-Google-Smtp-Source: AGHT+IHmnRr1V2GPT5oMTWkPIGiXg4qOcdeWeLxkvBDa2p6rviypFWR0BKDULYA5+HBF3lVm3VKs X-Received: by 2002:a2e:5159:0:b0:2f6:5c64:ccc3 with SMTP id 38308e7fff4ca-2faf3c60f58mr46053441fa.16.1728305770078; Mon, 07 Oct 2024 05:56:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728305770; cv=none; d=google.com; s=arc-20240605; b=hvgQ8kPq1QKNCw49rIqmtDsi5OvRtCY6RZRN1IgtO3RxDlLGJziO9ie3gJcNaC4hNT Xa3zJ5DjIbmMJHmbH1tQGHKjxVULbGafhWgZJ4QVIpZ6/woD8xPsSkYLvkTDFtcSn8Ez xWUDH1wm0buQ2yYTAoBcsRoQwHHyx2Wy5RWvQ5fAPBCj2FgQ9VS88pwkQNiXNqXTMAEI HhEB8TIU2CypdEDLsDuTfeb4+3bADvKcYhH6skA/IW6wyMgSceaWDY4s5J18xK+jDZt0 /3V5Xl9n5fQGXgavNMQ4OwbDf4wbG6x5sH1bz/1kRTqyXJQwAWpXe5ZCsWM5IedbLNGC lxhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=8WXhXrLcK/qp/jYpQPWE2MuDnzRadvfVKUJ/5WbaRQs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=BlsxiRDhoMJNYW9X3rrbma4s/E6kXzRfpjorGLVB5O7cnYEGdTKNGSyXwybA23CvKe ITG5/JX/Vvf05D0DBcnVA9Ehv+hJH5V4+Pkrns5CZiN+3q3RK1BnxS5XZF8HVZe39CK3 5ySFPy4H7SfwtCSrKIb4hy1OXK+Nf8XpUs7HshquojM15tUUFakq+nNz8EUiFbYOiqee 3lALWMertNprsDdpcLcqpPv5siQikaLhviZ7+XmSsL5SLbHUUs87b+hz/fff/142Sdhw T5av/plpbrZS2pblXJ9KiRqQdPusYzyvRMXfl+NwwY+C2oW/6xCHv9ePxBB8jgACgL7o QD9A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=fzws8Bbm; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2faf9b31d54si16879541fa.351.2024.10.07.05.56.08; Mon, 07 Oct 2024 05:56:10 -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=@gmail.com header.s=20230601 header.b=fzws8Bbm; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5770D68DC45; Mon, 7 Oct 2024 15:30:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4262968DC1B for ; Mon, 7 Oct 2024 15:30:38 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-71e050190ddso560738b3a.0 for ; Mon, 07 Oct 2024 05:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304235; x=1728909035; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5avjSnSyYzMMZ43uE8EBvMmYHBbgGYYEwpz03g4ViHw=; b=fzws8BbmY8R+ZSJR8ASifwNTb8jp+EfdR4BxF6lYzhQep0mU7DILS8ADzhwQbrzYwy SXnnmFfANWUuz+i3qCwIxYFMczS34KNmfuKpv8btMamNvKjDmpRCNa5Y8IhV1+h4h0Al 3z6Q3+tGbUJ1Ssn3LT7NaWx0FCcjzGvMYKUHpDAfHz5ITOqtpLY9d+OR11j5nNNsZv7n TASr+TTp/4Ek55akYu64Gt4Mza0ITQaEqGpvwXjljnzSE5opbViE3gjEraUbMO1ztIbd NIX1gAWx0CKmd45JLRiU9ZlKfk4SKRTPtxBEcqrl8661sEgamORHMW371VL3nStsff3G 7frg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304235; x=1728909035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5avjSnSyYzMMZ43uE8EBvMmYHBbgGYYEwpz03g4ViHw=; b=wvi3fB/XC9DDvICTgXjcwC3QZC637N/zzPePIu8FVl+eVCRWnjPHoDFkomXTDX0Lxs cJg7I3hoS7tCcbkGnhd+fPBfAsc0jt/eC+VNo2YVZrXudQnMYbR0TeP3mfcqQGAJYPBT jGTFPoovM04MPu0j0mhhojBRSeFOy7O0alpJhIGNPz0ukIj3PdP/cCq2HNE3AO/uRduN LwtS9PhgUsYaMBq7J5xcgY6H+quw/+hgWyWfJecVr3jcav0ldQib7rA9V3K7WFDoB4CH iUTA4AM0JTeS60LslUfFauWnVY7iXlY4iRUFtyV0cqyRBwArFkbdMbKSCjZ8hcjc3k7i xcFA== X-Gm-Message-State: AOJu0YzwLWRp5tz/jIAFPuymWbZlSwUpzxD34fvJUQHhMfJWzmPv8Sge yeOW9Kd6sRZ5fylLVLtlX6K88AmD9Rornnl/odFeJNZjQmeQBTOi3Xrjxg== X-Received: by 2002:a05:6a21:670f:b0:1d2:e90a:f847 with SMTP id adf61e73a8af0-1d6dfacac9amr17759118637.37.1728304235613; Mon, 07 Oct 2024 05:30:35 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:50 -0300 Message-ID: <20241007122955.309-15-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/20] avutil/hwcontext_videotoolbox: add support for UYVA pixel format 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: taImo8uuzyN+ Signed-off-by: James Almer --- Untested libavutil/hwcontext_videotoolbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index 1d7dff4a7d..d77b6168f7 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -53,6 +53,7 @@ static const struct { #ifdef kCFCoreFoundationVersionNumber10_7 { kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange, false, AV_PIX_FMT_NV12 }, { kCVPixelFormatType_420YpCbCr8BiPlanarFullRange, true, AV_PIX_FMT_NV12 }, + { kCVPixelFormatType_4444YpCbCrA8, false, AV_PIX_FMT_UYVA }, { kCVPixelFormatType_4444AYpCbCr8, false, AV_PIX_FMT_AYUV }, { kCVPixelFormatType_4444AYpCbCr16, false, AV_PIX_FMT_AYUV64 }, #endif @@ -88,6 +89,7 @@ static const enum AVPixelFormat supported_formats[] = { #ifdef kCFCoreFoundationVersionNumber10_7 AV_PIX_FMT_NV12, AV_PIX_FMT_AYUV, + AV_PIX_FMT_UYVA, AV_PIX_FMT_AYUV64, #endif AV_PIX_FMT_YUV420P, From patchwork Mon Oct 7 12:29:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52104 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp2172415vqg; Mon, 7 Oct 2024 13:16:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXCYdkB9Ux2rSq2TAsDj2CTMvxKoQbT6HqJdtysi/QAaJpBXxtCWyJ0kQNhRqurlkgBufWb4RrgVq3ysQetkjMe@gmail.com X-Google-Smtp-Source: AGHT+IFqYsGBrjbhDeuEg5eJnh3mjSRFdu1QJ79joJBltyzT5nbnx1VuwF/R6laY9DhuCFpkPNJY X-Received: by 2002:a05:651c:1504:b0:2f6:6074:db71 with SMTP id 38308e7fff4ca-2faf3c16419mr52645601fa.17.1728332168178; Mon, 07 Oct 2024 13:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728332168; cv=none; d=google.com; s=arc-20240605; b=VysPGiIXAMONAEZHJPLRNhaerjSk0kYqqnUPVEcGWNN4uj/G8Pg6Ed5Y2I7dH/WoRr ssrTq5Uxl56hocoyQ0l1USkzOdbb/ncNnRSZ8L6ZBMMiKBOu6I98lPaexj7gcogGck4k sEBJUhOkkowET6YeiD/j3S1fCyOOEcJonqTipYZ68TVxygt7u4NXsGxj+N8ccIjAD2Cu xtAaYQhYUmwgoW/+mb/ptzw1a4WQNvKkUU6+n5pApZHKfMEHLDl8IW0f835KeiLlp/DB pyCtAE3DVUi8Dt65jwi5+M+si4SA36+Kbcax4uAuZJP39DjGifk6Mp+JY9B1ZX3YN2af MEdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=64rpS/mxVXymc/GkaqJUTfhU5lqCUSBLOUaeliOgM/Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=kIbhlrOAqzl5IkQwDDUpjcBaHxWtbKdFE/GHFbSd21zNvDByElsfiwinWXjEzattVx iQ6xwgxgV3l7o2Eh4VvPTPXXwN+bNbWJTyDrsRDMsbggMXk3BiSVpCtpH4uETTGXHjb/ Y0LKCirvfXzf7ROIO2LwNSJjRsEJX1MquMbHHCzJSnLoBXESWeoLZVyJRA5VsMzoquCZ 3b7RA6wpPW78f2u7XH2WQY34nAiaR8a5dmDY5JueBeecA0BdkBp0HTI8kDgzRBMKAYJ8 Y3an6aI5prvto3QIHNobjcj0cxH4qOvCfaSESxgfSwTa70igRbQ28T4zZuOLzvTd54a/ P8wQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=CqFbvJbA; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2faf9b22d58si19962801fa.281.2024.10.07.13.16.07; Mon, 07 Oct 2024 13:16:08 -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=@gmail.com header.s=20230601 header.b=CqFbvJbA; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1332368DC74; Mon, 7 Oct 2024 15:30:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63FE368DBAB for ; Mon, 7 Oct 2024 15:30:39 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-71e05198d1dso490781b3a.1 for ; Mon, 07 Oct 2024 05:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304237; x=1728909037; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Q8GKwtDxNim8qm+DqtZ6gNuycPEcnf9SjNyxS+LaFQo=; b=CqFbvJbAvmLREczleD5zDXB7Teliwi3TpYSt3tGt3+WTPzmHHZx0ELK4N06CajY1dr oXbC/32m8Hhk7/PL7smTE3N1yJXRyrnE4+GquST3Av4OO0Rm58/D8YoUXlGffJWcOrrJ ODRwju5rdOuor+ZVYg08hEmXCQ1YlgnbEx1rMKd0L3zEQlVs1qHdYWpi4Fotf7gBmHkP F7kM4hPUxB2P+I9r3stmMUwhb88dd3s5PyaNAPCfbkfJxZL7HXnis9jDy/DMmcpiu+QM L9c4quwAxhaofLcTr1GRWvP9SO6Qab+PVPttUEtp9Pg2KW9jQ+ajqC9YrJIH4g06xXr6 lEOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304237; x=1728909037; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q8GKwtDxNim8qm+DqtZ6gNuycPEcnf9SjNyxS+LaFQo=; b=SlwwWU7UwbHLsHUDH1z2WblIpP9bFumgzlHtZobYIX/OQUdFEsjn0a3r6u9itMMiKK NusPDecpJI0V9j/5lYmOaFm110VK2YhesKIjwTa4gxa6Bu5a5DfD+46b571DrgqLQfUj Ub4+RopsP9EFivxWSIT+1HFe2JwsGu4m6sDimYT36DW6E4VhQ3+z4m/B7Qbp57KYWYbV JwkIh9o6z7575dGLUKW2e2nMliubj0mIbqDcURJI0Fzvf2sCyU3Us+8kJKfIK11e/sLQ 5aZBzvgmHXz4JJG+CLcs+Qcym6lHkBIQA+9Uh0AqzsmndPy3JsEpbUqlk74I1FFmOHiQ qu4g== X-Gm-Message-State: AOJu0YxhY2mKFdSrDw/UwT9Cypz0nIGJp3JsGjvy+Clv6CmQK9d+8tTV PqH3yinAQ3usVTi12WbF/FIG86H7p+YPPUzeBvkt4LFWbU+M6RuVu/xGQg== X-Received: by 2002:a05:6a00:189c:b0:71e:209:513c with SMTP id d2e1a72fcca58-71e0209529amr6368276b3a.17.1728304237096; Mon, 07 Oct 2024 05:30:37 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:51 -0300 Message-ID: <20241007122955.309-16-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/20] avcodec/videotoolbox: choose AYUV pixel format when ideal 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: w0C5LXxK0r44 Signed-off-by: James Almer --- Untested libavcodec/videotoolbox.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 90c1fbfb10..a606c29ded 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1180,11 +1180,10 @@ static enum AVPixelFormat videotoolbox_best_pixel_format(AVCodecContext *avctx) if (!descriptor) return AV_PIX_FMT_NV12; // same as av_videotoolbox_alloc_context() + depth = descriptor->comp[0].depth; if (descriptor->flags & AV_PIX_FMT_FLAG_ALPHA) - return AV_PIX_FMT_AYUV64; - - depth = descriptor->comp[0].depth; + return (depth > 8) ? AV_PIX_FMT_AYUV64 : AV_PIX_FMT_AYUV; #if HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE if (depth > 10) From patchwork Mon Oct 7 12:29:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52106 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp2172549vqg; Mon, 7 Oct 2024 13:16:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUcYYukaU8XcXwR4xJSLmmGHA8zz7xkvr+NDgpEHhHHhbGKvuV1atTNCcdCMG84XF1t73lwEKEoOr2z6GZGyIQ9@gmail.com X-Google-Smtp-Source: AGHT+IFtfQpnsRGAW9go/m9UtbjHiL3IHlLtE3anHdwKgHyUGT3WjZJOh/0PGJKuQe67keZ9+mK5 X-Received: by 2002:a17:907:7d8c:b0:a99:43e1:21ad with SMTP id a640c23a62f3a-a9943e123e2mr810337566b.45.1728332175868; Mon, 07 Oct 2024 13:16:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728332175; cv=none; d=google.com; s=arc-20240605; b=PJzJQRPuYo8psoHaOMavCRKDAbAdEyJbamR6naVxgfz2DqO6pOKkgU//nFJxEcnlik iofS7bk1qKCs/0QgbK1mp/kDhOCcmJ2IhfkgBkgH5EMQ2UMoSvIeMFbaq2JxJTVbePRW A3s679wNjWKgWiOTlvICs4MjPRvDKHbviJxPORxC4zcZYYS4IgBEBx64lk9kZYurj1Z+ 6VSsmCNHkBX9dxIP/ke1805y/rBBvnFM/x7os/iadAYsD0f5vBsQD7+Q6iJ/LFz85LRm 84tShD5HACWoKvpXzelg9Fai8YUAS2hh7F652ickQWEp8j0BqYmPMfdruq1VBDvHTgla lFTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=/vLl1Mq9KKzIjNNn18qiFt3WwZ7d5nchklzZcYvzhxU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=fqABaPeb9xoFWXKugBrN/vabIoKpqWefc80vynfx2QFudvpNB1lK0Li778isojl5iS XrmJBq23t+X4e3+9/tOir9DKNd/iHH4AZGhcZdA2xiMIzQLQEI8Dg7BMGm45eTdAyiW/ uRT505PsBrNFmroh7RcCBwzyG4KRz567xqKrGBqri33U6bN1MB6F0EWhhuAFwmFjVIBj h6l8og09HkUrzpU7QJybhvuVwzdYw+tG6H8VQXP4QShD4d+12lB/GXs/0jSwL0tV/vLx vrYWZMPBs5MnqwjyPxemYkbTTtoqF31KR2bFO+OdqOxpwsNl3LZs0hkgR7FUWH2Z/CKb Z0zA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Y39DPzGF; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a9945501e88si359218566b.941.2024.10.07.13.16.15; Mon, 07 Oct 2024 13:16:15 -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=@gmail.com header.s=20230601 header.b=Y39DPzGF; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D87568DC7C; Mon, 7 Oct 2024 15:30:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FEC368DC45 for ; Mon, 7 Oct 2024 15:30:40 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-71def715ebdso1702538b3a.2 for ; Mon, 07 Oct 2024 05:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304239; x=1728909039; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TJ148TDi2mr9sJYZUookOoZraVNmTGyRXRFNih40Y/o=; b=Y39DPzGFd5yFM3KeRRJXksXaNO3jxEWPEhGLyLNyL0yMMcRrvirNUOOLlFbKkl7xT2 Y92WHUisaPcB28o13+jzBByZEHohr3YTe+C/co9apnw300lFCHeDCanNzy3+cLiHBJSu YJFjgRddJAsy5EmN2q4U3MgjBB/l/Gilx6ViCCBZUgSwnUfpx+NTAUBK/g9emmGirj8E RBWfMDg/J10oNHGkwlr62V6pjT6gamOudEuBBhNGWCRQg8hoHDhOlk/xnssPKgURh9eH oPtCISb4kLeQB8/cJX7ZPtwirc/N48VCAFMFM61TzNm3LBBxD/y0KN6SVQZWKQZv3l5c ErpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304239; x=1728909039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TJ148TDi2mr9sJYZUookOoZraVNmTGyRXRFNih40Y/o=; b=oKirE6ShKmfZF0KIcCROzrYp2ThixGRnFJjTLBInKHCattrwhxCYHsZmqVe7ezdHhw DRZp3HwJng4cFYxjH85HQFli1yKpeHiHffIPxAfdFLhktNrPpNnrWJ2Zd47f5je8M8Ah DuOqYmaLKbKqaKdO0vKpfCK1IIdYnt9LYpWsRsJ0DC1tuz/QUZNaAijdCdYagOggpL0E 3ycBA4QrTOs9yl1JjREoB2ekMyMVQHaDA5VDNx+OuJvcx5j6ruSAH+PGuE0fjzYDA/ls pUqiUOr5GXE8o8b1c9sTOX1Er+0gwriVxWUE3u6kWYADx1qZHhW3w9X7x0PJ/vUJM18i fm6w== X-Gm-Message-State: AOJu0YyQkXKSgSIoeq+RdsTKYHj09C3hI9kaEXXdk3G7zd+geVPrY9oh TXV+U/vqFx/1OJ3THUHTW4Sd33zRI1MdzSoLL6ZUXehHmoFhxgVzlxKQng== X-Received: by 2002:a05:6a20:4c23:b0:1d6:fb1b:d086 with SMTP id adf61e73a8af0-1d6fb1bd135mr3560046637.42.1728304238524; Mon, 07 Oct 2024 05:30:38 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:52 -0300 Message-ID: <20241007122955.309-17-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/20] avformat/movenc: add support for UYVA pixel format 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: 3N6JPC+YwdtL Signed-off-by: James Almer --- libavformat/isom_tags.c | 1 + libavformat/movenc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 5dd72d570e..836bf14b80 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -33,6 +33,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* uncompressed YUV422 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* uncompressed 8-bit 4:2:2 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2VUY but byte-swapped */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') }, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d20e45cf81..4d8dfe5783 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2612,6 +2612,7 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex int uncompressed_ycbcr = ((track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVY422) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_YUYV422) + || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVA) || track->par->codec_id == AV_CODEC_ID_V308 || track->par->codec_id == AV_CODEC_ID_V408 || track->par->codec_id == AV_CODEC_ID_V410 From patchwork Mon Oct 7 12:29:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp1902711vqg; Mon, 7 Oct 2024 05:56:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUu/MMRJeWCJofK224cLRuuQ6lVslRWh16iaoMAMholEi2VS4uYlf/3NnZJwPKkePRRNc6O2Bt8em4zMFAqL8E8@gmail.com X-Google-Smtp-Source: AGHT+IHUfK5KgETlMCexqip+aa3hjihsU1FkWPb65bvkJU1fvbE2pbGz+n07ew7818hWg/PQsGj9 X-Received: by 2002:a05:6512:39cc:b0:533:508f:edf1 with SMTP id 2adb3069b0e04-539ab9f196dmr4820728e87.60.1728305772058; Mon, 07 Oct 2024 05:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728305772; cv=none; d=google.com; s=arc-20240605; b=LKBk2urZXWVrWzvuGBgsZzIamxqiVn0MBO1ITEIZMtXNnhX8UJaRa5JdWUOt+7quco 1LujHIJpir3WzqDLjiKRsj2Ggheh7Hiy7Y9UAukDGQK/3TfSoB3wDjNIrckD8yHRkdt1 /dvPiTbopc04R3m0lAG5TqSeJW7VysOKlDb4kKyXITusSOG8P/UVb4W48ZYojhoY1JEM mokrwKffA0EgVH7oooeSbVlecWtf//BePMD4y57uc9O6jhEqlxWMS3ma9Nln9Uq5Ktp+ 4otmGkZZ6Ug0LDF+IctnKDutlT+6gfZ89+4WLZWDjH8vrIueLK/wH+Yqx3HAypJ9nBQl 00Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=q+74VoUGI43t3zJqztRx1ByPjTAXRlAK/pFaWuqoeGs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=H0LGP+CqsW4VNOOEx/mtTiaUmGzi5p1R66RopryirkePH2OqwFrgv7y3N3JnJx/hR6 KjmXIhGW1Fss2RRkCHnA+bZEVgeUijyQc2fDUDC2shu8Ha5S9BsZgsMxMCsixXj0aBsj 7y9WG1Vy2yLRq+E4Coh8vUipWdglqgUezhIGolwW3HHufZ8PDjHHVV5AjNzx3dqIGwKc tZnQNxCWnygwZzMAehI4BxNnTaXf3ZtmBkP0BijMddSKTFQGSSS6wYsi1WebhG7zGc62 TelM2nSClzUvDl14JiH0rUp9lT+li2mDqqJcCuXaHIs8ods/mfnFr98BzsPNGTYhsfUA bZ7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Rf+M3mEw; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a993f43c043si361425066b.132.2024.10.07.05.56.11; Mon, 07 Oct 2024 05:56:12 -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=@gmail.com header.s=20230601 header.b=Rf+M3mEw; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7918C68DC7D; Mon, 7 Oct 2024 15:30:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12C5268DC45 for ; Mon, 7 Oct 2024 15:30:41 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71df8585a42so1173041b3a.3 for ; Mon, 07 Oct 2024 05:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304240; x=1728909040; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lzHujkAZp/xc4MJn+4DkVNOrSGdpqaz/AAYglQuhdbM=; b=Rf+M3mEwIyaNhuokOks0lTGvJ/EYMEodoP7436n/4sgkNS00MJk7ErKKn+7juZLvGK 5KF2T3JVL8ndPditSeLPQGfPrkZzqMv17j9mMmuP4v/hcU7S6WC9YGCz0Sk1fqCv4R3n 5Dmio0+52b9CgQo0BdiE3CrRor7+CGIYMwpQdsrR58Y6xlF3BQcAuAA5Of7Cs2+aIWBJ YsYxW6j8twOVpPJUmdCIwNRJgyJx2jgX9rTmOYzi/+vAbQtuJ0VMCsV13KURPgMeEf+h 6PDIQbCszbjhBh2WlBsQkojF2Nk7TXnxB88WQnvMcsNlc4tIovquw7T8mK+2BIW/IiAM aDgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304240; x=1728909040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lzHujkAZp/xc4MJn+4DkVNOrSGdpqaz/AAYglQuhdbM=; b=tIhW9wfb4eOv7zbMjE2Rc6+EXVVUvCScXAtrjhWNZ2fCkGeLaRcxV6aNsP8wv5nrD3 stDDalDGoRV+kIczmmDLdvacqRcYhZ+0v3CSKmUhu+WN4zVZPW6HPobxPHadmaeYEajF /ziJPMlR8oNQ9b1GJM+ZCFJWJnf3zEMSgCui2kyQkZ6WfBtAFT+VkFGTCU2d2+I9AmNd RecRp+T7d4BkSPr0ekejEkrZr3ut+UuadcIswUa+nJAn4bMYsl96uQI0usQrduA8fFL6 a2RRk+mLpj27buI+ihfFmutCSoRfu1qUBdvieC/mFYJOno2TrG1DXucjNosX+J1szEhl 3fwg== X-Gm-Message-State: AOJu0Yy4UY2CkOCzXaiA/RLR55A1k7s1oIQmsNlXBh8TIW5GO7BAdoCg ofzShs//EvIWXhgJhPRgxr8JXM8F8c5z5O0mOhCxXP2DDuODAursvEpHTg== X-Received: by 2002:a05:6a20:e68c:b0:1d6:fb3e:78d2 with SMTP id adf61e73a8af0-1d6fb3ed8f3mr5093277637.42.1728304239934; Mon, 07 Oct 2024 05:30:39 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:53 -0300 Message-ID: <20241007122955.309-18-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/20] avformat/movenc: add support for VYU444 pixel format 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: M7q1m69yQ6x5 Signed-off-by: James Almer --- libavformat/isom_tags.c | 1 + libavformat/movenc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 836bf14b80..1605a669d3 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -33,6 +33,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* uncompressed YUV422 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* uncompressed 8-bit 4:2:2 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2VUY but byte-swapped */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') }, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4d8dfe5783..b1f6b29f8b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2612,6 +2612,7 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex int uncompressed_ycbcr = ((track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVY422) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_YUYV422) + || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_VYU444) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVA) || track->par->codec_id == AV_CODEC_ID_V308 || track->par->codec_id == AV_CODEC_ID_V408 From patchwork Mon Oct 7 12:29:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52115 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp32669vqy; Mon, 7 Oct 2024 15:36:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUjpxch8A8vJ076GAPCvdg4nUEonh61Jl8yl6yFiZg3IT0QiGtiCeVtnt6xZ40gQerZiyuD2qmrkB4TQiXRtqgF@gmail.com X-Google-Smtp-Source: AGHT+IERthw3F+XKljdpSa4cLbWqk/70UE9NH+hHdoogBu9B5qtJC3Zf4kpxeB81VT+Yhr3AMny+ X-Received: by 2002:a17:907:9410:b0:a99:745b:82aa with SMTP id a640c23a62f3a-a99745b84c6mr18139966b.54.1728340576346; Mon, 07 Oct 2024 15:36:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728340576; cv=none; d=google.com; s=arc-20240605; b=kd/iTnWpU86djLl1zr1xRdX/pUNue+AkKOVYFp/IAXcR+qsE9Kxwlaa3B8P94SbxLc I66ykI/znS/PCFbP/KA9IeHOkSsLpTptGRZnXE8ptQT1LbjJ24pOHo4RbVCddeFiu1Pi 3dy+UQUcZ7KZulYs8qwWxC7XImana/iUubxc7CQeTGv1z82MBea6DNTTLauFT0njA+R6 lLgCSGBFDWPpiOIBkK1dRhKGuGTN1ttYJ6tV8PPAIObKluyIAOQC6ejofY2RfZ68XqH7 cSo78g6FSgkgXk0goh+oEHcWVpBG6KbI492J9ZO1VKfWUZeE7sYxAPOrM1gbtKBMhZ0C dEpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=8gHMnjL/Nwgou6K+Ac19g31NmogxLLH/kTY5ACPd4Wg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=O1Yf+nujdvYRKExl9EckptgHx+eiP6U05qWUMapAV2KWTibsZFg7IsvKaXMJgkDT+T VjCDX5JloWWjZP2mYVpENPP1l5gaM6V/hnco11/COGSd02/NpSeuVzPYw16AklVDXz7J xAqJhLnZ5Pa3bek33Uxq3Ksx13XhBPq0l7AJ59ir9R2/CsdRzBvybmLQo780O6UnOAtn EPOmGkyes0QFHErBk49q1UKxvl1Hbde2bcjVZFvzdZ0cJujvy0Sjy+AdAMEVUaFQhzKl bj/9VAQEyVTaqg1T9lMk4VegnSNI0Ela4YPHL5yYI9X8NHC9FusvcoUHRgDQc/QKO4mF DLqA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=QMZ02hFQ; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a992e7759a3si504761366b.319.2024.10.07.15.36.05; Mon, 07 Oct 2024 15:36:16 -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=@gmail.com header.s=20230601 header.b=QMZ02hFQ; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F69668DCAD; Mon, 7 Oct 2024 15:30:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C843668DC74 for ; Mon, 7 Oct 2024 15:30:43 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-7e6cbf6cd1dso2822476a12.3 for ; Mon, 07 Oct 2024 05:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304242; x=1728909042; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GgWjlWA4CTAmij73ZCjIQe9TSqV/kUvhjJSV7jybclI=; b=QMZ02hFQG3byKscKgIwyzJzlxNULebek/3b+wH44z82x6PtLgSKOy+tZLlQIuzmxUu Xi6LE5XffV0BF8u9fyQtykVpPBqv1xQpUPamWnZ69K0kAzozlAlEehpGFuNoTuZfeNSY wS6YEs+rCTKqrukDns+KHwP/rD57NTbFcijp6YaWfnqDYwRvt6FvMrl/5zyDMaCdmzeR jpAf4NxDoeLACKDrrGqRFH613v66/FpJI1VAvqut2sW+/ddMLLc3nPF5on2d+U2uN8iI KvjJ5SyiG+9/z5NVuF2dqOgIWQudoC4d2aIoAy57wyoTnz5hCjQdULau+p/oNLc5XpKV Ug4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304242; x=1728909042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GgWjlWA4CTAmij73ZCjIQe9TSqV/kUvhjJSV7jybclI=; b=Pk26GOF3V4ZEGjWqKmkRBgyve4cYSgJne+N34WC6FKyWhtPe09Xa3ZIyDXpiEdMYhx nF1fSMQz6B2aNRIMrwRc9n/Bzo7nllryYn90dcR25IifC/oG/+ciEYiEqYuRd7tg789M PgDziNxjRFGT9dcjITQ4PVhGDzg9HcKlnC33kELmLuPSwYheaquSG7IAf/iATs/YEiBf 4zMR2iuRf1Kfx2f+kqCN6+jlqwCqXtEdKZ4Qbt8slMvBty5R1CSXVI8uHy51W7213uGN n58da+ioFANHWmrGO5kuPtIv1osZyqQNt6+TUdsC6SdV+XsbVEX7fiB9/2OJzkCTg2n4 1eaw== X-Gm-Message-State: AOJu0YyOqEaERVOQNW60QkRLcaWVdUkgMfgEoVJOUHwYGp7lNlGYZctq bYVtI+xZEIZ4D/unDn//lK0X66tmQNYyVf5LvyL8M6OB7Xzg+Md1SqdbGg== X-Received: by 2002:a05:6a21:3414:b0:1d2:e888:3982 with SMTP id adf61e73a8af0-1d6dfa36971mr14996739637.19.1728304241420; Mon, 07 Oct 2024 05:30:41 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:54 -0300 Message-ID: <20241007122955.309-19-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/20] avcodec: deprecate v408 de/encoder 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: Zjr549e3bd1d The uyva pixel format was recently added, so this lavc workaround is no longer needed. Signed-off-by: James Almer --- libavcodec/allcodecs.c | 2 ++ libavcodec/codec_desc.c | 2 ++ libavcodec/codec_id.h | 2 ++ libavcodec/v408dec.c | 2 ++ libavcodec/v408enc.c | 2 ++ libavcodec/version_major.h | 1 + libavformat/isom_tags.c | 2 ++ libavformat/movenc.c | 2 ++ 8 files changed, 15 insertions(+) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index aa0fc47647..356a78f6e0 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -347,8 +347,10 @@ extern const FFCodec ff_v210_decoder; extern const FFCodec ff_v210x_decoder; extern const FFCodec ff_v308_encoder; extern const FFCodec ff_v308_decoder; +#if FF_API_V408_CODECID extern const FFCodec ff_v408_encoder; extern const FFCodec ff_v408_decoder; +#endif extern const FFCodec ff_v410_encoder; extern const FFCodec ff_v410_decoder; extern const FFCodec ff_vb_decoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 03dea5751a..6018052215 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1484,6 +1484,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#if FF_API_V408_CODECID { .id = AV_CODEC_ID_V408, .type = AVMEDIA_TYPE_VIDEO, @@ -1491,6 +1492,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#endif { .id = AV_CODEC_ID_YUV4, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 0a8d3bed1e..0ab0f6761f 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -255,7 +255,9 @@ enum AVCodecID { AV_CODEC_ID_AVUI, AV_CODEC_ID_TARGA_Y216, AV_CODEC_ID_V308, +#if FF_API_V408_CODECID AV_CODEC_ID_V408, +#endif AV_CODEC_ID_YUV4, AV_CODEC_ID_AVRN, AV_CODEC_ID_CPIA, diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 2433c6de14..4bce5c7b67 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -27,6 +27,8 @@ static av_cold int v408_decode_init(AVCodecContext *avctx) { avctx->pix_fmt = AV_PIX_FMT_YUVA444P; + av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index c173f650ef..bf264de463 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -30,6 +30,8 @@ static av_cold int v408_encode_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = 32; avctx->bit_rate = ff_guess_coded_bitrate(avctx); + av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 63df40e9dd..37f243f868 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -48,5 +48,6 @@ #define FF_API_BUFFER_MIN_SIZE (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_VDPAU_ALLOC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_QUALITY_FACTOR (LIBAVCODEC_VERSION_MAJOR < 62) +#define FF_API_V408_CODECID (LIBAVCODEC_VERSION_MAJOR < 62) #endif /* AVCODEC_VERSION_MAJOR_H */ diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 1605a669d3..d2f8f74e01 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -63,7 +63,9 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* uncompressed 10-bit 4:2:2 */ { AV_CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10-bit 4:2:2 */ { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ +#if FF_API_V408_CODECID { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ +#endif { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */ { AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* uncompressed 12-bit 4:1:1 */ { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b1f6b29f8b..f1312b3022 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2615,7 +2615,9 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_VYU444) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVA) || track->par->codec_id == AV_CODEC_ID_V308 +#if FF_API_V408_CODECID || track->par->codec_id == AV_CODEC_ID_V408 +#endif || track->par->codec_id == AV_CODEC_ID_V410 || track->par->codec_id == AV_CODEC_ID_V210); From patchwork Mon Oct 7 12:29:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52108 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp5202vqy; Mon, 7 Oct 2024 14:26:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1ZT2V6t/uLzuegfPWXQmv2naVCtBq+4EOvcEwG2W2jfcR658yDTPhx5+vvVhlZdTivh6NYDsWlNwZktlqoiF9@gmail.com X-Google-Smtp-Source: AGHT+IE5d+3NhJJEpQ5hcOoVtnDOnar9caKaoQ0mLvlnFWel8IGprHbEC3llefD8itx9KuOOzkXp X-Received: by 2002:a17:907:25c5:b0:a77:f2c5:84b3 with SMTP id a640c23a62f3a-a991bd20afamr1313080466b.22.1728336365676; Mon, 07 Oct 2024 14:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728336365; cv=none; d=google.com; s=arc-20240605; b=hZ6btgIoGkzLyh7I6RyXbn5PTuiJUVix7r94qdIGl6Hrl1Plzhs+1XCmty2/XL6p1f DVz99PeicpcrM4ypdnQ9PPxI4AU2Ojxd52TrLvdU8KikE0KYlz6TgBqckgc1zSOt5ENg i5WGoGLAQJvyt2jEGPpG7gQN1QZVRZs6bHjLYP/xg+67M1AcXoT996lsBLKZJHJBLuY8 vzrOYq6ZCpIQYqCzpS0NFuEOY4EjPILDfE5qNc9WVKKMjV4y+I7rDrjH/v5gN36Q1LiY 02x8wxjZQcy7vCJBadM8mWQPvsuzL4vTc1QQdzF0w5E18/csjz0//tux9FVgwKIggGAP z3+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=m/k2PRttyd49z7f6uDyD7BBreScYL7I+PwVLzCTl4ik=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Aoi+nID9E8gHUmidJtc2ekJKoRWJBXMb/XBYwPshfDZeHit9iZOdJSFJRrFo3vPiwQ dYJDYsNUUngH3GpoeUuNyw0x7YtsyMvO0lSt1KSzkA3xtQwzQLZ3Tpkvq5xAaBhBZ4A6 U6fr8VAlltvWGRbAA/jpWnAbSx4VQlMOtBaVSabqON+x5oiStxNB7azFJDTrKFrbFR5T z/kjKuhvqrkJQdbgdOOkt/7WgMligT945Jna2kPoB9ExvphxFUp1vHGKDO7oxXLl7SN1 FJhArzZYpp/MRvpaX655wVL5ES3WFcgLMNeAdUOn6u6c/cYtxaCA/Rq2hKgPPPQe4h2X OY9w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=L04QCuNq; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a992e57da1csi517873766b.197.2024.10.07.14.26.05; Mon, 07 Oct 2024 14:26:05 -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=@gmail.com header.s=20230601 header.b=L04QCuNq; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D6DF68DCBF; Mon, 7 Oct 2024 15:30:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 258DD68DC7C for ; Mon, 7 Oct 2024 15:30:45 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7e9f355dd5dso713550a12.0 for ; Mon, 07 Oct 2024 05:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304243; x=1728909043; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EOPTIzAn6GczWREdiHG/TkZi9IywJewGE4GXULw9X6Q=; b=L04QCuNq9koKT7THs7odF0zEd+A2WSWeMR31G5kNYsQCKmk5ZCu9odGHFV2ZjuhtIv WyjwfxcK9W0OzBaFROO4BCZG4CGC+paVDoOaT2hdX0+SSKRPhqYX54FmFij+O0uFHWb+ +RkbbxqUlP44H97s546I223Ev9Zq+ZCA9wj2j9o6Y7Dy96U3MZHcBFUiL32+hZkG1MMv XM9BF9ZCbZd5y42I7vhy0o4aQdEJi4gMZxx+MCKvLa1Za7zQ1tMDunpc3NTRYETjy7Ea ZPIc86m683tqHrtu86xnupmwb8p9uGQ6FREUPvJBbHoqHyQNx5ajloSyhR8Xz/SlRb6m aP1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304243; x=1728909043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EOPTIzAn6GczWREdiHG/TkZi9IywJewGE4GXULw9X6Q=; b=JyMYgJ1muKM0syR1VnAJYSoVIgjmHKgvQGyI5qPSoaCeCCmNl8X+97izsXX9ZsMhbQ nFSCjZxU9c48YWBADGcTJaZr6dZleOzTl0yxDkGXF19Y9+2yyG+hpVuBRIA2iYTGRap0 oh0jbYgjuEUISrg6NBvYHkbAn1NTE9c3KZkju7i6gznlB7+MqUpbvwbu4IiJqaryA8rH Bpbjg2ARhp6U1GRQwlsOrl6lVeS6RaVZvDhRGzYnJbQ3zHhiT/7FzmOLx64Dc9+jGabc Ircgdz+Os2+9rN7tCKLldBLoqv1zFfs83RuQRlTrlXe61pNZ+xKc/SEcUk3Ef8A9s2I0 1R/Q== X-Gm-Message-State: AOJu0YwJ7iRQ8KxR8Ltt89bpG+niXUZVlmdITcGH/LPN7xvpkbR35JHj F4GBPyU3qRIpRCi/mY0xNOEubk0o2JtK0fC7Fc4TM/fPqsjehO4CIo9wWA== X-Received: by 2002:a05:6a21:2d84:b0:1d5:10c3:af5a with SMTP id adf61e73a8af0-1d6dfae286emr15687989637.47.1728304242856; Mon, 07 Oct 2024 05:30:42 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:55 -0300 Message-ID: <20241007122955.309-20-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/20] avcodec: deprecate v308 de/encoder 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: BykENH5Ag7ZZ The vyu444 pixel format was recently added, so this lavc workaround is no longer needed. Signed-off-by: James Almer --- libavcodec/allcodecs.c | 2 +- libavcodec/codec_desc.c | 2 +- libavcodec/codec_id.h | 2 +- libavcodec/v308dec.c | 2 ++ libavcodec/v308enc.c | 2 ++ libavformat/isom_tags.c | 2 +- libavformat/movenc.c | 2 +- 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 356a78f6e0..19f7d63c16 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -345,9 +345,9 @@ extern const FFCodec ff_utvideo_decoder; extern const FFCodec ff_v210_encoder; extern const FFCodec ff_v210_decoder; extern const FFCodec ff_v210x_decoder; +#if FF_API_V408_CODECID extern const FFCodec ff_v308_encoder; extern const FFCodec ff_v308_decoder; -#if FF_API_V408_CODECID extern const FFCodec ff_v408_encoder; extern const FFCodec ff_v408_decoder; #endif diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 6018052215..0e9cd669d2 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1477,6 +1477,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#if FF_API_V408_CODECID { .id = AV_CODEC_ID_V308, .type = AVMEDIA_TYPE_VIDEO, @@ -1484,7 +1485,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, -#if FF_API_V408_CODECID { .id = AV_CODEC_ID_V408, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 0ab0f6761f..3608c4b856 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -254,8 +254,8 @@ enum AVCodecID { AV_CODEC_ID_012V, AV_CODEC_ID_AVUI, AV_CODEC_ID_TARGA_Y216, - AV_CODEC_ID_V308, #if FF_API_V408_CODECID + AV_CODEC_ID_V308, AV_CODEC_ID_V408, #endif AV_CODEC_ID_YUV4, diff --git a/libavcodec/v308dec.c b/libavcodec/v308dec.c index b591a79dd2..64876b7e5a 100644 --- a/libavcodec/v308dec.c +++ b/libavcodec/v308dec.c @@ -30,6 +30,8 @@ static av_cold int v308_decode_init(AVCodecContext *avctx) if (avctx->width & 1) av_log(avctx, AV_LOG_WARNING, "v308 requires width to be even.\n"); + av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavcodec/v308enc.c b/libavcodec/v308enc.c index 68f9c3310b..2941ba3f03 100644 --- a/libavcodec/v308enc.c +++ b/libavcodec/v308enc.c @@ -33,6 +33,8 @@ static av_cold int v308_encode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } + av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n"); + avctx->bits_per_coded_sample = 24; avctx->bit_rate = ff_guess_coded_bitrate(avctx); diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index d2f8f74e01..1e3495f0e2 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -62,8 +62,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_AVRP, MKTAG('S', 'U', 'D', 'S') }, /* Avid DS Uncompressed */ { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* uncompressed 10-bit 4:2:2 */ { AV_CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10-bit 4:2:2 */ - { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ #if FF_API_V408_CODECID + { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ #endif { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f1312b3022..301b327bfd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2614,8 +2614,8 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_YUYV422) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_VYU444) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVA) - || track->par->codec_id == AV_CODEC_ID_V308 #if FF_API_V408_CODECID + || track->par->codec_id == AV_CODEC_ID_V308 || track->par->codec_id == AV_CODEC_ID_V408 #endif || track->par->codec_id == AV_CODEC_ID_V410 From patchwork Tue Oct 8 02:53:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52136 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp118604vqy; Mon, 7 Oct 2024 20:01:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5sQxHRsyo9tFQBW8xJv8IAThI5wNrspmHfiKlE2JCRbKbXvBYWC7U6NiyeLH5OrrUkpjagVIKts614gNqvP/R@gmail.com X-Google-Smtp-Source: AGHT+IGG9DnVv8wW+YUOcFgtN6w61/9to1OnO4Hw0DOYPqxRURqfFYHBlytDxZ0qbLgVLKBfLGsk X-Received: by 2002:a05:6402:270d:b0:5c5:b8bc:fcdd with SMTP id 4fb4d7f45d1cf-5c8d2e48f9dmr9813939a12.13.1728356466185; Mon, 07 Oct 2024 20:01:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728356466; cv=none; d=google.com; s=arc-20240605; b=TUoGvEpabuVZBDPX+S/AytsgeBmlZhbikPNBTR9Cvh3+naHG4RH9S1c3OWRIdYgwHW HrdjicamnOmPidjkgyRMFvjDkr4jSA7GGwEE6Tm3Q91HMf/KeEAUpBRmuqjJRoeIJVBg vBXeqeZvhBzS4sEs8qxRyiJOP8E19J6xwIzOABAKLeLdPsYvJloFrjYPJsbm5zC5QjXi 9j15Z2wljUxg5gaqvmoDhPmzK6ymc5nxc/pOPTk0dhYDOXVE7P3V4qUic//R7I+ng+f7 /1jTJo/hX6QEFqs27+Xc3JTd5JropkA3sEvoYM1bOu+JdrbkxaobFjLJA46szECewnG3 awPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=/kNz84LALEmvAfvMGk33+Z+8/Gke19+K17+bnTxKoYc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=K3+uhLkg/YnMM9PaNdOai8o+ny6VfKu3+h4U4F2e0DAOYEi6dDRnL5/tA585rnhose sEsD5EJdxAXO49YgAn+SsYfD5MGXPpSZExJRJAOvgVCxif3dGHUw4+Z5PiRejgWAZzcP qwYvTEah4QBQkuzHIvC9VRxulOd9k8eVz/95NinYdi35czlN1cdE2mPhRgpbwf9RUUxF GxHTkU95iNcQR6MW7KJz51vpLB4dkZ3QbBUTZkkQhZKxhMiKNrmkM2Ex0uKt+kii1s+8 dF6UEkRxTBipCpkD3NUxakjGTtcWPMsjujR3B60z8aUEKDZzOM5+7dkS3C5/fKLcVcKn fpcw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=cqJyjGGP; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c8e05877b4si5055922a12.44.2024.10.07.20.01.05; Mon, 07 Oct 2024 20:01:06 -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=@gmail.com header.s=20230601 header.b=cqJyjGGP; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BF0268D50D; Tue, 8 Oct 2024 05:54:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F0F568D50D for ; Tue, 8 Oct 2024 05:54:20 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20b9b35c7c3so53789215ad.3 for ; Mon, 07 Oct 2024 19:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728356057; x=1728960857; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ODFQR3J1TcqIIUbu36/ZzZXNoA8sjS6l9zY/PiR+1fc=; b=cqJyjGGPBSZnUHEtH3q5PLhYitFhdj1JAO4mYxV3C5hmqmc26ghZ53ZTAyStq4fCQA jY88io40oYbwze/jxiXH99DDVdnue06ImJVasVmn5RcpyWwlpyi7U/ntStbmVrV/V4ug c1AQfhEhn4I8z2xXcto1pcAK1afVyjQKe9bXi2RMHHIoy6cjAgybudq7IxjV4JZTLsli 7ay4rAfbJYlt1IOv1rGZUuWPjHPlGobFhMLe9fpGdxQNmJdkwJ5kbPizpZL5vsF+aWDV hym2inqw20PyChScJo8hPQnFUVakqs/SsIrNe5lck7AgLhI7uE1HRDEmYG4q/MfhIneb OGdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728356057; x=1728960857; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ODFQR3J1TcqIIUbu36/ZzZXNoA8sjS6l9zY/PiR+1fc=; b=Mauv0aNqSygeXS9Ra5bMBjzYYmkGvjWqsOT8JLO1pB+59bnTElf0iJS8Vhsc+ypL4q vZ5sTdh1sCDo/rFR1aK0VySLvW0s/01hIoXYndSyfg87taZLxPCg9Uic9XgmpvOtFAuM W9XN4n2MKOT4zfrDnQ0p8+TgyrGpfCyw+bC6ygwVIVQ6RblQ5DP3GDCHtQg4JswX+k3R 66n/E0MK6Dt3TzwDfID1M3t8Pdusf2EyHKDj4WW1jb+dDjF4qFVA0O9CRCSHrZzNsLdK uaBddTRO5ZziHrkUa5rIvXsN6F2j9Fga1w2o1XJA5IlT+6dqF2oQezcQDmcRAFmS2RFA uTtw== X-Gm-Message-State: AOJu0Yw7AOw9TBRiyMvFXAuOSadDCLemyZ6ypgfFHbx+pK6s5vZq8tEd jTA9vtUINcIVHWoQlGNBzpPlBRwOr8TH9qXjwi1ITk2jXT7mb5yHz2lWlA== X-Received: by 2002:a17:902:e881:b0:20b:861a:25c7 with SMTP id d9443c01a7336-20bff188ac9mr204186005ad.54.1728356057298; Mon, 07 Oct 2024 19:54:17 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c138b047fsm46723775ad.44.2024.10.07.19.54.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 19:54:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 23:53:59 -0300 Message-ID: <20241008025404.47355-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/26] avutil/pixfmt: add V30X pixel format 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: 15ZoRpf1O7n+ This maps to the 444YpCbCr10 pixel format as defined by Apple. Signed-off-by: James Almer --- libavutil/pixdesc.c | 23 +++++++++++++++++++++++ libavutil/pixfmt.h | 4 ++++ tests/ref/fate/imgutils | 4 ++++ tests/ref/fate/sws-pixdesc-query | 7 +++++++ 4 files changed, 38 insertions(+) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index deff74d8a6..f8d6055084 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2727,6 +2727,29 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_BE, }, + [AV_PIX_FMT_V30XLE] = { + .name = "v30xle", + .nb_components = 3, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 4, 1, 4, 10 }, /* Y */ + { 0, 4, 0, 2, 10 }, /* U */ + { 0, 4, 2, 6, 10 }, /* V */ + }, + }, + [AV_PIX_FMT_V30XBE] = { + .name = "v30xbe", + .nb_components= 3, + .log2_chroma_w= 0, + .log2_chroma_h= 0, + .comp = { + { 0, 32, 12, 0, 10 }, /* Y */ + { 0, 32, 2, 0, 10 }, /* U */ + { 0, 32, 22, 0, 10 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_BITSTREAM, + }, [AV_PIX_FMT_RGBF32BE] = { .name = "rgbf32be", .nb_components = 3, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index cbdab31df4..55bdf196fa 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -445,6 +445,9 @@ enum AVPixelFormat { AV_PIX_FMT_VYU444, ///< packed VYU 4:4:4, 24bpp (1 Cr & Cb sample per 1x1 Y), VYUVYU... + AV_PIX_FMT_V30XBE, ///< packed VYUX 4:4:4 like XV30, 32bpp, (msb)10V 10Y 10U 2X(lsb), big-endian + AV_PIX_FMT_V30XLE, ///< packed VYUX 4:4:4 like XV30, 32bpp, (msb)10V 10Y 10U 2X(lsb), little-endian + AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; @@ -539,6 +542,7 @@ enum AVPixelFormat { #define AV_PIX_FMT_Y212 AV_PIX_FMT_NE(Y212BE, Y212LE) #define AV_PIX_FMT_XV30 AV_PIX_FMT_NE(XV30BE, XV30LE) #define AV_PIX_FMT_XV36 AV_PIX_FMT_NE(XV36BE, XV36LE) +#define AV_PIX_FMT_V30X AV_PIX_FMT_NE(V30XBE, V30XLE) #define AV_PIX_FMT_X2RGB10 AV_PIX_FMT_NE(X2RGB10BE, X2RGB10LE) #define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE) diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils index 4197005a3f..fd5a510530 100644 --- a/tests/ref/fate/imgutils +++ b/tests/ref/fate/imgutils @@ -272,6 +272,8 @@ gbrap14le planes: 4, linesizes: 128 128 128 128, plane_sizes: 6144 6144 ayuv planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 uyva planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 vyu444 planes: 1, linesizes: 192 0 0 0, plane_sizes: 9216 0 0 0, plane_offsets: 0 0 0, total_size: 9216 +v30xbe planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 +v30xle planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288 image_fill_black tests yuv420p total_size: 4608, black_unknown_crc: 0xd00f6cc6, black_tv_crc: 0xd00f6cc6, black_pc_crc: 0x234969af @@ -491,3 +493,5 @@ gbrap14le total_size: 24576, black_unknown_crc: 0x13bde353, black_tv_cr ayuv total_size: 12288, black_unknown_crc: 0xcc44368b, black_tv_crc: 0xcc44368b, black_pc_crc: 0x1e04c638 uyva total_size: 12288, black_unknown_crc: 0xdd657297, black_tv_crc: 0xdd657297, black_pc_crc: 0x0f258224 vyu444 total_size: 9216, black_unknown_crc: 0x575e6fb1, black_tv_crc: 0x575e6fb1, black_pc_crc: 0x16564599 +v30xbe total_size: 12288, black_unknown_crc: 0x7108457c, black_tv_crc: 0x7108457c, black_pc_crc: 0xdefcbbe0 +v30xle total_size: 12288, black_unknown_crc: 0xf5b3c795, black_tv_crc: 0xf5b3c795, black_pc_crc: 0x0b56173c diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index e1b2ac999a..f153ed3169 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -75,6 +75,8 @@ isNBPS: p410le p412be p412le + v30xbe + v30xle x2bgr10be x2bgr10le x2rgb10be @@ -180,6 +182,7 @@ isBE: rgbaf16be rgbaf32be rgbf32be + v30xbe x2bgr10be x2rgb10be xv30be @@ -249,6 +252,8 @@ isYUV: uyva uyvy422 uyyvyy411 + v30xbe + v30xle vuya vuyx vyu444 @@ -827,6 +832,8 @@ Packed: uyva uyvy422 uyyvyy411 + v30xbe + v30xle vuya vuyx vyu444 From patchwork Tue Oct 8 02:54:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp117083vqy; Mon, 7 Oct 2024 19:55:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3cm+yteGjmLCPi7GWK4dakFnl8S83N4yFeHors+ztlRiW0JgO5W9nKW88tn4FoDUpoSeceubnIEEsVpb2J2o5@gmail.com X-Google-Smtp-Source: AGHT+IHOkpTYlqxYc3WbvMo0yCW5lFvJ0Ts/5SDdqYZUxkvtncc7mw/jdu/hxbqYZfi3FLjeOJna X-Received: by 2002:a17:906:c114:b0:a99:3ac1:2997 with SMTP id a640c23a62f3a-a993ac12a05mr803480166b.25.1728356100494; Mon, 07 Oct 2024 19:55:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728356100; cv=none; d=google.com; s=arc-20240605; b=XR41nSX9KUFtELkMnDm5gpv+xMeFJtmQy1fhj1vqAIoO5CMUHYoE/p8jzabtWIBvC4 F1BTh7uqekNFx7PQSTWXWE/xrYIaa6JRkpWNlmxLxj6czaS6KFZEUFEcNqLBuce//9S7 FyOPbGGNmg22+yEqfPCU/5dzFlBRB7yX3OyDoq0VaEssuIvJwOxgXE6hLhsUvIblAKhx FG8Ylw8Reaa2DMm0nijTP38NoAknqc9WgGQE14+xwViButGJ8f5IfWliqrKY4hHXXiFi YBMIdZyUG96veTdbE2SGEBJyuq9pAWwMUIGj86+syUVl3ssuLpz0KuymK+xaMhm3ulX5 DJwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=+VG1EeRIt4LhvY4W3RncY/RZ/D5AhhmY28gVsF2k+f4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=RPPiZTwpDKVFWjiJd/0X/75QAvmB3Dw8kT4fydq3rWfV6kJg8qPJUPsjh8R+lAPtr0 wftD5IDWKZDrh1VBrjHm1EHN8xEW7vimxmqvWjgus0mt7KBtfndhhtAwPD6XtVcI09bR TxEa1AW4/6iEH/lak2naMtRRMfS8cskj13zqx5A5/qFnevQ0oh9UnT/A492itrAzZ+z4 ZWcqg6dMRBVk9UgkzGIHtE9tbQ+/dd9aGpRMhBHvTpYFdtSZtEYE0Q/ATFDyfRoc5bj1 sFQHsahIVaRZhcm8lpgx1I2NGoYivgUdp9JLKHL10r24wmMZZ7TPFQA6j57VfTqJd7VK YTPA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="Rz+aVd/G"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a993abf8c35si461706866b.618.2024.10.07.19.55.00; Mon, 07 Oct 2024 19:55:00 -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=@gmail.com header.s=20230601 header.b="Rz+aVd/G"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC18F68DD75; Tue, 8 Oct 2024 05:54:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A5B068DD37 for ; Tue, 8 Oct 2024 05:54:25 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-20ba8d92af9so38350365ad.3 for ; Mon, 07 Oct 2024 19:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728356062; x=1728960862; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vvBMRIF5pUpNWNW4AOBv0txMqLTwL1oEZ3hbti+BFPg=; b=Rz+aVd/Gy7/j6rCJfr+ojMdqMlydvrOz1cPGY8TcnGk8PqShyj86Pe6jjXYQXoGpSz /r0aOQXcI2c+JrR4ZZQDAlPej20jOybWx4XZQhwNkBWF2FnRhG6prxurAJtyH/gxTeV0 f3FlI+ZLiy5asSwrp3b+fFinK8g8MUD/07Mjvc+ZYM+ootso/V4wMNL7qOxCZea4SfV0 JL3fZCeqDXkP8yWkjF0JIEHRvOvOEWpqd3JehoEJzJwihFutMQvTUszOEu55jmg8CnmU uYfJBb7H2srU8D4JVB9kqDYiSw4NjVRXk/I9+ZHiuh65sP2DGX3CDmWlGuDc2TtAzaNF 2a4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728356062; x=1728960862; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vvBMRIF5pUpNWNW4AOBv0txMqLTwL1oEZ3hbti+BFPg=; b=tpopLkjda7UwuS4PLjbBUn0un3zII3EtSVqfNJ8en3BjfRVGKMaagReEnS3uhr1UZx HJiFqk7Xnfoe6iNYO+RiSz1nyQTjdEVgkEB7j571w/lTmZEA/1khCVvY/fHdwzFhMhEx D7UwZmhk3khQBaOBbR3KBOACbghqMtuWx/iQ3ZeDXSeYKYt5LKnq54xG0Ff3yYmIx8jG xXF4Mpc4zHUFg6XYpnaN6Ju77sPvGtdlLx1PnBD/bGdPAPeasfOO16C4OHApkmNZK5Du GlUtOzGWb/GyepaFkPxdNUGLh6HykY6tzS7dMppp1f788YwKzJzlgIUqHHr8sD2l98P2 ce8A== X-Gm-Message-State: AOJu0YwRlQ/2qETkC38m9Ip16+ckPuI8t9OpF66ZV2uIPeY+96YxCISa ulVUX6s5szzDuHaA7GuWtYF0rUvMCfakQ9joS2/Eg06uZyIeiQ6Esee1ig== X-Received: by 2002:a17:902:f541:b0:20b:983c:f095 with SMTP id d9443c01a7336-20bff04cdf0mr193189615ad.51.1728356062401; Mon, 07 Oct 2024 19:54:22 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c138b047fsm46723775ad.44.2024.10.07.19.54.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 19:54:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 23:54:02 -0300 Message-ID: <20241008025404.47355-4-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 24/26] avformat/riff: map v410 fourcc to RAWVIDEO decoder 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: 5tLkDCCZJLzp There's no need to keep using a custom decoder for this pixel format. Signed-off-by: James Almer --- libavcodec/raw.c | 1 + libavformat/riff.c | 1 + tests/ref/fate/filter-pixdesc-v30xle | 2 +- tests/ref/fate/filter-pixfmts-copy | 2 +- tests/ref/fate/filter-pixfmts-crop | 2 +- tests/ref/fate/filter-pixfmts-field | 2 +- tests/ref/fate/filter-pixfmts-fieldorder | 2 +- tests/ref/fate/filter-pixfmts-hflip | 2 +- tests/ref/fate/filter-pixfmts-il | 2 +- tests/ref/fate/filter-pixfmts-null | 2 +- tests/ref/fate/filter-pixfmts-scale | 2 +- tests/ref/fate/filter-pixfmts-transpose | 2 +- tests/ref/fate/filter-pixfmts-vflip | 2 +- 13 files changed, 13 insertions(+), 11 deletions(-) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 086823c06e..adc189b26a 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -239,6 +239,7 @@ static const PixelFormatTag raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */ { AV_PIX_FMT_VYU444, MKTAG('v', '3', '0', '8') }, { AV_PIX_FMT_UYVA, MKTAG('v', '4', '0', '8') }, + { AV_PIX_FMT_V30XLE, MKTAG('v', '4', '1', '0') }, { AV_PIX_FMT_AYUV, MKTAG('y', '4', '0', '8') }, { AV_PIX_FMT_RGB555LE,MKTAG('L', '5', '5', '5') }, { AV_PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') }, diff --git a/libavformat/riff.c b/libavformat/riff.c index 3e87e60e4d..0f5682313e 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -298,6 +298,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('I', '0', 'F', 'B') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '3', '0', '8') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '4', '0', '8') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '4', '1', '0') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('y', '4', '0', '8') }, { AV_CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') }, { AV_CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, diff --git a/tests/ref/fate/filter-pixdesc-v30xle b/tests/ref/fate/filter-pixdesc-v30xle index 7544dba962..d8f7f5881d 100644 --- a/tests/ref/fate/filter-pixdesc-v30xle +++ b/tests/ref/fate/filter-pixdesc-v30xle @@ -1 +1 @@ -pixdesc-v30xle 11ef5c41cd1b0b1be40685e08d806400 +pixdesc-v30xle aba540000233d20ed3da48e361c5058a diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index b3f9a192f4..afe9cc5158 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -99,7 +99,7 @@ rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea rgba64le b91e1d77f799eb92241a2d2d28437b15 uyva 8896d7525f12de08818a01a5d5cf84f1 uyvy422 3bcf3c80047592f2211fae3260b1b65d -v30xle 1e8a98ac92e19c9ae66b5c52502802aa +v30xle bbb1fb47679ea7dc1ab90cc26db8f7d7 vuya 3d5e934651cae1ce334001cb1829ad22 vuyx 0af13a42f9d0932c5a9bb6a8a5d1c5ee vyu444 93912234400a4373b1a6b5c4e4b1a4ef diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 03e3d6fa09..8c1ed3c3f7 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -96,7 +96,7 @@ rgba 9488ac85abceaf99a9309eac5a87697e rgba64be 89910046972ab3c68e2a348302cc8ca9 rgba64le fea8ebfc869b52adf353778f29eac7a7 uyva 03f362ac6a39f25286bc6616111b0752 -v30xle fa8904232b248b08b912a3e427d55052 +v30xle 2c259da6e0329e22c6c68c483f721978 vuya 76578a705ff3a37559653c1289bd03dd vuyx 615241c5406eb556fca0ad8606c23a02 vyu444 5d976b25782ff69e4b3b18453fa1447b diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 7a24cbc8f5..8037e3206c 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -99,7 +99,7 @@ rgba64be 23c8c0edaabe3eaec89ce69633fb0048 rgba64le dfdba4de4a7cac9abf08852666c341d3 uyva 147398d2e8d310f915c95863ad192c5e uyvy422 1c49e44ab3f060e85fc4a3a9464f045e -v30xle 265a463ad722cfaede2fa6cb5e9bf34e +v30xle 337aab325e9bd1247560b22dae767c29 vuya f72bcf29d75cd143d0c565f7cc49119a vuyx 3d02eeab336d0a8106f6fdd91be61073 vyu444 b139fb4ddaef12a7542a68277211efa7 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index fe4a98530f..5d370a92f5 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -88,7 +88,7 @@ rgba64be 5598f44514d122b9a57c5c92c20bbc61 rgba64le b34e6e30621ae579519a2d91a96a0acf uyva ccf5dfd33765dda88c4b4afa2ea31305 uyvy422 75de70e31c435dde878002d3f22b238a -v30xle f256208aff137eac50bcd0bae62f613d +v30xle 6784410248db7458b5b69672182ff33a vuya a3891d4168ff208948fd0b3ba0910495 vuyx 9e4480c5fcb7c091ec3e517420764ef3 vyu444 3ddab207d561a3ee5efae09e504207f2 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 26cb3db3fa..b65857c570 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -96,7 +96,7 @@ rgba 51961c723ea6707e0a410cd3f21f15d3 rgba64be c910444019f4cfbf4d995227af55da8d rgba64le 0c810d8b3a6bca10321788e1cb145340 uyva a8391c24037e2a670196b47bf6a2ca57 -v30xle f445e24215e3d46df60d21b9d3dac486 +v30xle e8c4828e6f236fb66d6e93247299d602 vuya 7e530261e7ac4eae4fd616fd7572d0b8 vuyx f1d087284fb1556d76e6def5f94bf273 vyu444 7b72337f92a7223fd115265e2f769276 diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 6dca4c478f..1905b250f5 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -98,7 +98,7 @@ rgba64be db70d33aa6c06f3e0a1c77bd11284261 rgba64le a8a2daae04374a27219bc1c890204007 uyva d2655e1a1c56bcb48f7c7a6a6270dd93 uyvy422 d6ee3ca43356d08c392382b24b22cda5 -v30xle 10b00eba766e2fa87d9dbd05780cfc23 +v30xle bcd06cb16258e0dab8d894985aaf741d vuya b9deab5ba249dd608b709c09255a4932 vuyx 4251d94ee49e6a3cc1c10c09cd331308 vyu444 50e9e24a38afc81541a536d06aab5ebe diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index b3f9a192f4..afe9cc5158 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -99,7 +99,7 @@ rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea rgba64le b91e1d77f799eb92241a2d2d28437b15 uyva 8896d7525f12de08818a01a5d5cf84f1 uyvy422 3bcf3c80047592f2211fae3260b1b65d -v30xle 1e8a98ac92e19c9ae66b5c52502802aa +v30xle bbb1fb47679ea7dc1ab90cc26db8f7d7 vuya 3d5e934651cae1ce334001cb1829ad22 vuyx 0af13a42f9d0932c5a9bb6a8a5d1c5ee vyu444 93912234400a4373b1a6b5c4e4b1a4ef diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 34e24e106a..599c095a8c 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -99,7 +99,7 @@ rgba64be ee73e57923af984b31cc7795d13929da rgba64le 783d2779adfafe3548bdb671ec0de69e uyva 2358038be6dac002a6c736e798a3d91c uyvy422 aeb4ba4f9f003ae21f6d18089198244f -v30xle f99ff8b463ddcc3178ede41e6a5fb858 +v30xle e003444357d9450ca7fb597ed3a240ce vuya ffa817e283bf6a0b6fba21b07523ccaa vuyx a6ff68f46c6b4b7595ec91b2a497df8e vyu444 d663334119da56e36aca1e8e4eb29a39 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 4ed7aa5c2c..18c2cab212 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -88,7 +88,7 @@ rgba 4d76a9542143752a4ac30f82f88f68f1 rgba64be a60041217f4c0cd796d19d3940a12a41 rgba64le ad47197774858858ae7b0c177dffa459 uyva cb773ee5a9f8964b9c826d55f9f425a3 -v30xle f098d09a47561381f2567c2c76288f8a +v30xle bebf53eba2558a0391be1bba24853803 vuya 9ece18a345beb17cd19e09e443eca4bf vuyx 46b5b821d7ee6ddedb3ddafd1e5b007c vyu444 e70a294738165223928fddc9970b8381 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 2f2fd0295f..2569df0005 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -99,7 +99,7 @@ rgba64be 17e6273323b5779b5f3f775f150c1011 rgba64le 48f45b10503b7dd140329c3dd0d54c98 uyva d43e89ba3d5c9274e1948eac8630fcc6 uyvy422 3a237e8376264e0cfa78f8a3fdadec8a -v30xle 74918a72f86dc3a7c45d5cd528d0d03a +v30xle d076c3c10c4660c7e3672d2f5ddf640d vuya fb849f76e56181e005c31fce75d7038c vuyx ed7de87da324b39090a8961dfd56ca5a vyu444 815de7c57dc8afafb3de908a4a280582 From patchwork Tue Oct 8 02:54:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp117133vqy; Mon, 7 Oct 2024 19:55:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVkrQw3hmOk4xwx6bS1p5F73plgcYwp4tdZ5X8D/Ra4GAuf4NAJ/tUEKUtnV5XkEebjzGgmjORBvPSM/0gcCWyY@gmail.com X-Google-Smtp-Source: AGHT+IEatZ20bHuCR3FO4ChqubRhLfl9QaB+XzJA4+K/7/llUL4W47cfwZRaJ49YQ8OiFbNC+PhU X-Received: by 2002:a05:6402:4404:b0:5c8:9548:f283 with SMTP id 4fb4d7f45d1cf-5c8d2e4571fmr12117151a12.20.1728356111000; Mon, 07 Oct 2024 19:55:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728356110; cv=none; d=google.com; s=arc-20240605; b=Wb2OVWRP8bhx/y3q4Fo7LZKVunCtoyA1SSk4xcdg0zgkxECkpkFgN2+nJGglUSCnAP AKNUyFcpwfb3BTbhCUKdUWWb1+l12f44Noo1uZ1HsqStq0IzNe5qS0QI35G6IxQOFItu 9QDmezTmev6luPnqYXF6hG0Kc9tIWGb3Q/vWHgU/GIJ9UVcAHiUY/eKe+H75zRIG9GLW 3AZA0KuxtaT+e1ujfirqmaSk1pRi0fnrgyDB1a8uW9ky6dsp81QSHqfX6+isJuqGT/e1 o6jwEyckUzVJ7rFL4ojlRFZ+E+OpoVgnLTnv+03m7Wgkp0RpNEijxph8QVRZDF6PUCC4 3eUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Is0wy/sC0RGG0IC+TeWqsRAuc5OYPK7qq4o++t9OLYI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=c0kgt4U/9f7REy9HEXVEoLQ0qHoDXjW7/7ZOdXbAv0SgNJN9RkiZAJ7RhS5pRdR4lt 7fZt6R4vTnrrZJfaCpIklHsSFTNKm17AMiS9D5FmoSQ95TCV/hhZo8+H6nT3+r9t8N33 t2seEDibjiPhNPO23FyAUwb3jKMUHWbDX5VlpzrA8P5461B5Wi9rwi0ktSJjvLB1PoYe QOmYwOQ//H7W9iwfHNZ6vHUAJIOKUt46Id1+hdVUvOZAylGnYV8PPtEHKlmhJwNJQeo5 8mXjMRA+EllD3CguC9NFY3tLsRtepDZb1WUat2rpCenVBVejshndFYXR2e++clE3RH2/ nu9w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=hh4vJK2V; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c8e05f0c7esi5259391a12.434.2024.10.07.19.55.10; Mon, 07 Oct 2024 19:55:10 -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=@gmail.com header.s=20230601 header.b=hh4vJK2V; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CFC568DD8C; Tue, 8 Oct 2024 05:54:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABDC868DD7B for ; Tue, 8 Oct 2024 05:54:26 +0300 (EEST) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-20b49ee353cso48031515ad.2 for ; Mon, 07 Oct 2024 19:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728356064; x=1728960864; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wB+SwpvWXN2tveae01EO4Q+6eniaJWyptVYojyxKdOM=; b=hh4vJK2VMEoAKvsXmxjTUxOIb9t/aUaCryxw6ZV7P21IwzAa5HcGEeExnkNYWg19t9 xhEPmtsxiZ9EfixKIOiRsDbxhe0BYxrD4nzh1Pe+K3vesr5KgSa35qHPqMdKRUFStC5Q SblosY3aVM6KCPstHC+3OL7Tjm4ZoLc2yXGLdh+DsLYPcNJg3euAGVgLwyA+6zNAgYsI FVHG3tKvheMvPJIhqI8JYH0AvTYVkFxXP9gWqVPGDzEmAWRQrh5fIStExBLYrExm69Kc +A7fEhaINC46UpVbOPd18IwVbitobyTw0m2vBVCizIMCUWC+6Ed/UbIGf94yzvexkaeN 4WuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728356064; x=1728960864; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wB+SwpvWXN2tveae01EO4Q+6eniaJWyptVYojyxKdOM=; b=P3AFOPzewsbgGfr9aSZ9KeBCZtwncec5PeZyt8HEvPLyIJbjnKoRzEJAxsTFFn5+l4 89U+tot+1V6gX2CqJFEqNF0c8uvdmOEEZ25LRifU4TEgOXHeU+STaXEm89alS2/DD6gL tT/c+06YLcaX3p/VW5rGVhke2xkQNctlyAZlBVS5Jh7ebTSZZQOexNrvb7QuxFE4NA4o ZUZiE+xwoYtbsnbOSIAdyhFsKnLw5yFaz9nnbaX1Yu/24B30MUblgrI6wc7JoU1SfOEP FXzWSRsWrUrNNgsiiQV/2iOVzHz39SJA7EPwC4pUPcy0lzEPsgoapTD4bQA3UGxVbBHs BGXg== X-Gm-Message-State: AOJu0Yz1UtD/EOLtLkYhnkClcJw64ywOtE15FpFr1yN9BNOQaMaT0sVJ jqqeNSrcRrNlXtgQzHQNag6INok7fzULsvWu612qLm4PVMxhA57AQYt+kQ== X-Received: by 2002:a17:902:ce05:b0:20b:c287:202d with SMTP id d9443c01a7336-20bfef2fa55mr209768175ad.55.1728356064014; Mon, 07 Oct 2024 19:54:24 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c138b047fsm46723775ad.44.2024.10.07.19.54.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 19:54:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 23:54:03 -0300 Message-ID: <20241008025404.47355-5-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 25/26] avformat/movenc: add support for V410 pixel format 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: P41vOZUXibYV Signed-off-by: James Almer --- libavformat/isom_tags.c | 1 + libavformat/movenc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 1e3495f0e2..e999aa7fef 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -35,6 +35,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2VUY but byte-swapped */ { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ + { AV_CODEC_ID_RAWVIDEO, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */ { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') }, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 301b327bfd..8f47e85490 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2614,6 +2614,7 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_YUYV422) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_VYU444) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVA) + || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_V30X) #if FF_API_V408_CODECID || track->par->codec_id == AV_CODEC_ID_V308 || track->par->codec_id == AV_CODEC_ID_V408 From patchwork Tue Oct 8 02:54:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d6ad:0:b0:49d:db80:1cae with SMTP id de13csp9237vqb; Mon, 7 Oct 2024 21:11:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXpxw/KK0cO70s9z+1385lvTbQuLmeyHgchzvxG4BtBTkwyyE6YhaQkp5nTzK7aHwMy+PGkGQ7eJawnk/WYGHs@gmail.com X-Google-Smtp-Source: AGHT+IGUbvQg5q94He8mi3+Y2HnG8UslrzcFDwEPPkXOaNKklUdoTGVEM/FGbMIv1pfhzPX2FcXH X-Received: by 2002:a05:6512:3e02:b0:538:9ef8:881a with SMTP id 2adb3069b0e04-539ab85bf5emr6911988e87.12.1728360666267; Mon, 07 Oct 2024 21:11:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728360666; cv=none; d=google.com; s=arc-20240605; b=alRT0uyl6G2IgVUe/SCWQRqobBDfGIqK8gRYv4I4yqXl/ukDDiZAeLhkccyZ20VG/L JXBLQytz/7W5CRW+9WJVYiXdNcs7NY0vHDavogTZNRGAGZUyZ+43K335/oBXfDeJdqjw vajaKsceLrTylyRLMnoxTtIuUXKFGVFH8BNxSw7FsgG+TOT/ic8Z1+gP2tQqqtgr9avl FkIpI5HAOd/o0GX4p8k6DYBmdXVT9L0F0NNr9ytWEqRNICHu4sdORgFkElszze27exiY EiSZCB4N8a58vEfeCSyTBjSbzPLKeTt1DRBQRyM6x0/6mJk2C3nBpHqxrpi34h7fkuC1 L49Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=u2uztlkxKVYKTKJAkvTrIP0ZZG+MjkcmIeSkfa7QBV0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Ri/sX5e7N5Jz+kbTAma9pGzLMl733C/UKYfJ5vJECnwjgKTLMppovhV9/kpBOXX8AR fjqPLDkUfKw3yquzl4Ueu1ezn1PZXShBtanLm2yTQlfbjLtARiEFNlkgytOWIQtfHHAJ WjFnhGrqznndiqCO5D5dctXGOTnnUQAqK9l18KGNGv4npowghIjtzXjWEPrAjzbMrfn+ B7Kfl9dJ6gEEpTfvtFMwYUoLKLkpTsXJryQgjA6oCYAMfa+4/VvQ+4+eQ1ya+o9msl2y LuPsQoXYepfvJIcBWASTUGNOSWo8MjwhEHc+pFAh7Fw9U84Pl8tWOWF7qkvIJGuUh2mf Gkig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=l221Mgmn; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-539aff25771si2130475e87.374.2024.10.07.21.11.05; Mon, 07 Oct 2024 21:11:06 -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=@gmail.com header.s=20230601 header.b=l221Mgmn; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 934FA68DD9B; Tue, 8 Oct 2024 05:54:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80FD768DD8D for ; Tue, 8 Oct 2024 05:54:28 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-7ea16c7759cso715274a12.1 for ; Mon, 07 Oct 2024 19:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728356065; x=1728960865; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QJaeMw8YKttRjrHD2b5Z8k+4WIrf6//VTt0xYpyVyRU=; b=l221MgmnrMz03oYTHbupWNVxGBP7XM1dI4uiclpJMOTCPomWG2fOLTOtW2YZQqPLj3 XchyLPWsNc6wYDtOQIzo/0dq1W01Jl4+qpZOombd+qJqMUL5of6xcKONl5sLejtdNaJ/ nyfmD2r55RbeGPrmEpQPsA8zkMVUSakOdCEumv+StpeWPdqsu+vlYbimCK7APp4IPESu N6saX5YOZcWZgQlL+1gbkm2OD+jcOWnSVKxNv+/QAK7VdRXeMhNpbhdh6gOgpjQBXZIC diWx+gV05KxPlV1YESUlhj5Qwvqe/mbz7yZLrMUivhk4GA/8HVGrXSlMPSgnwouIcJ1F Xmbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728356065; x=1728960865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QJaeMw8YKttRjrHD2b5Z8k+4WIrf6//VTt0xYpyVyRU=; b=WUA24ePxkNU6prv8Iotos6QrfR5Vqj+yemYbG26H3eqgCcgJhnnLyIzhCCO8yygneh hMPhgGDWTLW12v2PrRVVkKwtmxK2JS2HpYo7GI+i27JWllgjGll3rjTPcx7nmnwOyF9n 4eFiduZbhxIyK+fVOzDnzeHbfFcP4XdFM2qzPs3mB0rTWAsBrbMXSU8+CxD4jCQXu3wD 3z6SZWqc0sNR7YQcGGGDkx74msWq//f3cnPcwqjok8SnyMaM8wio4tPYN3tfuLzlsvn2 2QNNKAJ4GoRCcjgpDa2TDaENCk0hSOrZdM2l823azxumhgL1nakHEW38Dp4XB875bnll QI6A== X-Gm-Message-State: AOJu0YzDRlMsfaZB9Kv4VXuOD+Unw5dMITlk+S4yWQZ/NaU9RTlovff8 Ju07m9wsIexrHzMoNDHBhSLRq2vYzNNocGoCBUbnY9rrKbVhWTXKcSlRDQ== X-Received: by 2002:a05:6a21:3942:b0:1c6:fb66:cfe with SMTP id adf61e73a8af0-1d6dfa44355mr20761258637.21.1728356065490; Mon, 07 Oct 2024 19:54:25 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c138b047fsm46723775ad.44.2024.10.07.19.54.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 19:54:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 23:54:04 -0300 Message-ID: <20241008025404.47355-6-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 26/26] avcodec: deprecate v410 de/encoder 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: occnuqLyJ0wI The V30X pixel format was recently added, so this lavc workaround is no longer needed. Signed-off-by: James Almer --- libavcodec/allcodecs.c | 2 +- libavcodec/codec_desc.c | 2 ++ libavcodec/codec_id.h | 2 ++ libavcodec/v410dec.c | 2 ++ libavcodec/v410enc.c | 2 ++ libavformat/isom_tags.c | 2 +- libavformat/movenc.c | 2 +- libavformat/riff.c | 2 +- 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 19f7d63c16..d69e70a29b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -350,9 +350,9 @@ extern const FFCodec ff_v308_encoder; extern const FFCodec ff_v308_decoder; extern const FFCodec ff_v408_encoder; extern const FFCodec ff_v408_decoder; -#endif extern const FFCodec ff_v410_encoder; extern const FFCodec ff_v410_decoder; +#endif extern const FFCodec ff_vb_decoder; extern const FFCodec ff_vbn_encoder; extern const FFCodec ff_vbn_decoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0e9cd669d2..2c03a466d6 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1146,6 +1146,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Dxtory"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#if FF_API_V408_CODECID { .id = AV_CODEC_ID_V410, .type = AVMEDIA_TYPE_VIDEO, @@ -1153,6 +1154,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#endif { .id = AV_CODEC_ID_XWD, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 3608c4b856..787313ffaf 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -206,7 +206,9 @@ enum AVCodecID { AV_CODEC_ID_BMV_VIDEO, AV_CODEC_ID_VBLE, AV_CODEC_ID_DXTORY, +#if FF_API_V408_CODECID AV_CODEC_ID_V410, +#endif AV_CODEC_ID_XWD, AV_CODEC_ID_CDXL, AV_CODEC_ID_XBM, diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index 04be830ad2..d3747c18e0 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -46,6 +46,8 @@ static av_cold int v410_decode_init(AVCodecContext *avctx) } } + av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index 89ee3a7278..78362ce453 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -37,6 +37,8 @@ static av_cold int v410_encode_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = 32; avctx->bit_rate = ff_guess_coded_bitrate(avctx); + av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index e999aa7fef..a476efb8f1 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -66,8 +66,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { #if FF_API_V408_CODECID { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ -#endif { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */ +#endif { AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* uncompressed 12-bit 4:1:1 */ { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */ { AV_CODEC_ID_TARGA_Y216, MKTAG('Y', '2', '1', '6') }, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8f47e85490..0291710762 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2618,8 +2618,8 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex #if FF_API_V408_CODECID || track->par->codec_id == AV_CODEC_ID_V308 || track->par->codec_id == AV_CODEC_ID_V408 -#endif || track->par->codec_id == AV_CODEC_ID_V410 +#endif || track->par->codec_id == AV_CODEC_ID_V210); avio_wb32(pb, 0); /* size */ diff --git a/libavformat/riff.c b/libavformat/riff.c index 0f5682313e..88c4d6cbe9 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -308,8 +308,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { #if FF_API_V408_CODECID { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, -#endif { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, +#endif { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },