From patchwork Sat Aug 6 23:48:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37168 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1020393pzg; Sat, 6 Aug 2022 16:49:18 -0700 (PDT) X-Google-Smtp-Source: AA6agR7uNnG8s6N2mSk3EGgZ0birxuaF7BK8u/TML5Pwg9QAnkYjmx5maDWiziISpLe8FA1l4dvk X-Received: by 2002:a05:6402:5508:b0:43a:896e:8edd with SMTP id fi8-20020a056402550800b0043a896e8eddmr12289150edb.203.1659829758445; Sat, 06 Aug 2022 16:49:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659829758; cv=none; d=google.com; s=arc-20160816; b=G4Hd8Ua3NHs9rQN9iu3Zy0akMniwVHO+qmjn6+XK8rJqo1A+Se/dA9ILu5OJa+2PJO fHlij/9+peWv/L+SjUW9hHi3udoeZyOTJyxsITaCIZeD+ckCAAXB/ug3l4yRWHZXuk6i YT7Fz2b0Goy3a5VlwSjWFuMYxqHW7DV3ixjFQ7HdOeAgF8037odBPtP+WzLxMXDCE1H1 7LAKj9kyaiJqpFVAYjZVcp/K9TpyFtoJKq9g22sdIWDQXir3EhEZzOCxnYBg4aAm1rrD mynRfBQFFYBHFetK2C+BMj+gGfM0rJDB81Ni5YKqzqr6iF2S7u7CaM0x0dsXMnnMVftR SyXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=u6ph1WKNIRV+f6AXTRijUephRW1WZNaVNfZyAB9u4Y4=; b=rRNM2cgKuvyOmb5VfFpwdf80jkFljN5Hk8VP4Qov0hrNT0IQo+dYLYeITcoYj+SBgL vpEOGTtxpl4+REYRYHl74ujhHQ9xjeCvTWFbdYykouHmspb2ekLAvOjgdDl8PsJbj+ua NMqtvnnROvPGh79iqzMCF7uiUBokpDGLHG1eBg4+0QePZ2qp6AylGg127SUAx+//03lf tPwDGxBWDuOkObpAGpcrlZ38NtBmH/Xox+s8FchgJ4ASbFnk8Ztd4+QcYV2X+kFOqH0a xY//x9tTGWuH1K0BhM3s2eoGnzYMQFrvQTGkevnhmcNq1tceRobGh6fnIrEegkPOD5QG NfgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pc9Vfsqm; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mp31-20020a1709071b1f00b0072f2ce19e49si8071573ejc.10.2022.08.06.16.49.17; Sat, 06 Aug 2022 16:49: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=20210112 header.b=pc9Vfsqm; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9B0268B658; Sun, 7 Aug 2022 02:49:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f49.google.com (mail-ua1-f49.google.com [209.85.222.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BA2968B22C for ; Sun, 7 Aug 2022 02:49:08 +0300 (EEST) Received: by mail-ua1-f49.google.com with SMTP id b4so2321484uaw.11 for ; Sat, 06 Aug 2022 16:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=JWAHmy36Q4OSsl9YeZVhdVfc0OSSo/wVxIu4+sA8FQY=; b=pc9Vfsqm+/vBqHJoygGzGuJRJk4k9HR+fXr80mSmsk3w1xK1R3605ugiciz+0h9VF3 CAY3yS5NIovu6gnuNztzPkr+7XwFOL6BTMBVu4b5v1R6Iti2yRBG/fnA+YdUgNKsSMHd WBWnEuXfZn+81J5s0dVgI0gvbRnJ/PNmka0achhz3TqeV/az6RiA7FEY19who4osFg1v NFeFzgNeJ24iBIZwRFifZPIsJGERtwMW5QXdJ/AxePvyztAob/je3VjKZSSdO8Nh+/l0 nF8S1reo7bwy39odfLq0XzvRC6KNr7fWvmIAnOWs0HeXxyBN8UkvNVJnARmx3UDEA5sR yptQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=JWAHmy36Q4OSsl9YeZVhdVfc0OSSo/wVxIu4+sA8FQY=; b=ALR3mhAoaMsSLTfAQ1zHBdiNewafqMNyOiIXdY3M4s95ebF1fOhfzBOUt0rYqCd8qY +HoSkX0+wB1CvwpafbQlbqwqZ+Z0Anipk64NvEzPAkf93h9XJsAuqwKnjai29gPV36iI WgkEhq9Uqob2S0OEY0SDIDBCiCMRK/Zdq8yIg8vzZmYW4D2+jcI+OSLfdl6CeSWwkqYC EkUzWJ3sAko/t7hEJsCykC4xG/Ck2/o1CZwwMT5sbfUNqvUDFY5PvO5tgIJauHaDIg6t E1UbiahFUlQZaBHGkbDcdMP13JKdWGJ+BSEEeZwOqhm0qpyBRq6oH0q3XccICYdFHSV8 6siA== X-Gm-Message-State: ACgBeo0mKDdZG/GQHrS4KEych0VZo3VkkKF5JD3D6AN7OzOBiXiYKYip imin7vY7QUL0BeteK4GLr3njq6KxQJU= X-Received: by 2002:ab0:2390:0:b0:384:a49:1e8a with SMTP id b16-20020ab02390000000b003840a491e8amr5763141uan.122.1659829745833; Sat, 06 Aug 2022 16:49:05 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id w8-20020ab07288000000b00384293c4199sm6261366uao.23.2022.08.06.16.49.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 16:49:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 20:48:51 -0300 Message-Id: <20220806234851.54869-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] swscale/output: add VUYA 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: K+Q6aGF1c/nN Signed-off-by: James Almer --- libswscale/output.c | 57 ++++++++++++++++++++++++ libswscale/utils.c | 2 +- tests/ref/fate/filter-pixdesc-vuya | 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, 70 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/filter-pixdesc-vuya diff --git a/libswscale/output.c b/libswscale/output.c index 773f3ce059..1b8f35bb4b 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2584,6 +2584,60 @@ yuv2ayuv64le_X_c(SwsContext *c, const int16_t *lumFilter, } } +static void +yuv2vuya_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 hasAlpha = !!alpSrc; + 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 < lumFilterSize; j++) + U += chrUSrc[j][i] * chrFilter[j]; + + for (j = 0; j < lumFilterSize; 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 (hasAlpha) { + 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 ] = V; + dest[4 * i + 1] = U; + dest[4 * i + 2] = Y; + dest[4 * i + 3] = A; + } +} + av_cold void ff_sws_init_output_funcs(SwsContext *c, yuv2planar1_fn *yuv2plane1, yuv2planarX_fn *yuv2planeX, @@ -3086,5 +3140,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_AYUV64LE: *yuv2packedX = yuv2ayuv64le_X_c; break; + case AV_PIX_FMT_VUYA: + *yuv2packedX = yuv2vuya_X_c; + break; } } diff --git a/libswscale/utils.c b/libswscale/utils.c index bc3d1c955c..34503e57f4 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -258,7 +258,7 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_P416BE] = { 1, 1 }, [AV_PIX_FMT_P416LE] = { 1, 1 }, [AV_PIX_FMT_NV16] = { 1, 1 }, - [AV_PIX_FMT_VUYA] = { 1, 0 }, + [AV_PIX_FMT_VUYA] = { 1, 1 }, }; int ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos, diff --git a/tests/ref/fate/filter-pixdesc-vuya b/tests/ref/fate/filter-pixdesc-vuya new file mode 100644 index 0000000000..3285c08c32 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-vuya @@ -0,0 +1 @@ +pixdesc-vuya 6d7d537c388b9d53c3493cd2e0ef4e5c diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 3cd0002e4e..ecdbc24f9e 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -89,6 +89,7 @@ rgba b6e1b441c365e03b5ffdf9b7b68d9a0c rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea rgba64le b91e1d77f799eb92241a2d2d28437b15 uyvy422 3bcf3c80047592f2211fae3260b1b65d +vuya b6dfd3268ed8eb82b5d534c6d0a20188 x2bgr10le 550c0d190cf695afa4eaacb644db6b75 x2rgb10le c1e3ac21be04a16bb157b22784524520 xyz12be a1ef56bf746d71f59669c28e48fc8450 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 1a0f0c79ed..6f18d98a51 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -86,6 +86,7 @@ rgb8 9b364a8f112ad9459fec47a51cc03b30 rgba 9488ac85abceaf99a9309eac5a87697e rgba64be 89910046972ab3c68e2a348302cc8ca9 rgba64le fea8ebfc869b52adf353778f29eac7a7 +vuya dcc42e77d663a3a8920826f4ae1f034e x2bgr10le 84de725b85662c362862820dc4a309aa x2rgb10le f4265aca7a67dbfa9354370098ca6f33 xyz12be cb4571f9aaa7b59f999ef327276104b7 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 27a74eaef3..00331ef139 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -89,6 +89,7 @@ rgba ee616262ca6d67b7ecfba4b36c602ce3 rgba64be 23c8c0edaabe3eaec89ce69633fb0048 rgba64le dfdba4de4a7cac9abf08852666c341d3 uyvy422 1c49e44ab3f060e85fc4a3a9464f045e +vuya 1bb73f6d6f01281ecb5a51c630a132a4 x2bgr10le dbe21538d7cb1744914f6bd46ec09b55 x2rgb10le a18bc4ae5274e0a8cca9137ecd50c677 xyz12be d2fa69ec91d3ed862f2dac3f8e7a3437 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index ab080d1a37..8994ce46a4 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -80,6 +80,7 @@ rgba 1fdf872a087a32cd35b80cc7be399578 rgba64be 5598f44514d122b9a57c5c92c20bbc61 rgba64le b34e6e30621ae579519a2d91a96a0acf uyvy422 75de70e31c435dde878002d3f22b238a +vuya 27c98a542197d55a05e671428ff2832a x2bgr10le 86474d84f26c5c51d6f75bf7e1de8da8 x2rgb10le cdf6a9e8a8d081aa768c6ae2e6221676 xyz12be 15f5cda71de5fef9cec5e75e3833b6bc diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 8c7a9d83c9..19d9965db6 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -86,6 +86,7 @@ rgb8 68a3a575badadd9e4f90226209f11699 rgba 51961c723ea6707e0a410cd3f21f15d3 rgba64be c910444019f4cfbf4d995227af55da8d rgba64le 0c810d8b3a6bca10321788e1cb145340 +vuya 07daf4cfeb79d15428572d22cfdbf472 x2bgr10le 827cc659f29378e00c5a7d2c0ada8f9a x2rgb10le d4a8189b65395a88d0a38a7053f3359f xyz12be 25f90259ff8a226befdaec3dfe82996e diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 15dbe868a6..f55fdebaf6 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -88,6 +88,7 @@ rgba 625d8f4bd39c4bdbf61eb5e4713aecc9 rgba64be db70d33aa6c06f3e0a1c77bd11284261 rgba64le a8a2daae04374a27219bc1c890204007 uyvy422 d6ee3ca43356d08c392382b24b22cda5 +vuya 8c6b0bca3348d0a3cb7dff0717a24b59 x2bgr10le 135acaff8318cf9861bb0f7849a9e5e9 x2rgb10le 517fb186f523dc7cdc5c5c6967cfbe94 xyz12be 7c7d54c55f136cbbc50b18029f3be0b3 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 3cd0002e4e..ecdbc24f9e 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -89,6 +89,7 @@ rgba b6e1b441c365e03b5ffdf9b7b68d9a0c rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea rgba64le b91e1d77f799eb92241a2d2d28437b15 uyvy422 3bcf3c80047592f2211fae3260b1b65d +vuya b6dfd3268ed8eb82b5d534c6d0a20188 x2bgr10le 550c0d190cf695afa4eaacb644db6b75 x2rgb10le c1e3ac21be04a16bb157b22784524520 xyz12be a1ef56bf746d71f59669c28e48fc8450 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index 16949e9672..90c7de0c2e 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -35,6 +35,7 @@ p416le fa4e023d0bf4b03b0ffef3d4d35abf7e rgb0 0984eb985dabbe757ed6beb53db84eff rgb24 17f9e2e0c609009acaf2175c42d4a2a5 rgba b157c90191463d34fb3ce77b36c96386 +vuya 9a4d215c59c3a5c8e364ff882764b40e xyz12le 23dadbbba70b2925ce75fb8ba8080ba3 ya16le 8dbfcb586abf626da7d1aca887a581b9 ya8 495daaca2dcb4f7aeba7652768b41ced diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 95a3f071b8..cdf42f575c 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -89,6 +89,7 @@ rgba 85bb5d03cea1c6e8002ced3373904336 rgba64be ee73e57923af984b31cc7795d13929da rgba64le 783d2779adfafe3548bdb671ec0de69e uyvy422 aeb4ba4f9f003ae21f6d18089198244f +vuya ab4c9c4a6b6946945eeb23e15d0341b0 x2bgr10le d57b9a99033cc7b65ddd111578f2d385 x2rgb10le d56bdb23fa6a8e12a0b4394987f89935 xyz12be c7ba8345998c0141ddc079cdd29b1a40 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 922666cf95..4116718e3f 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -80,6 +80,7 @@ rgb8 c90feb30c3c9391ef5f470209d7b7a15 rgba 4d76a9542143752a4ac30f82f88f68f1 rgba64be a60041217f4c0cd796d19d3940a12a41 rgba64le ad47197774858858ae7b0c177dffa459 +vuya 7ca9ebf75e2f5b6526b0b40a86368999 x2bgr10le 4aa774b6d8f6d446a64f1f288e5c97eb x2rgb10le 09cb1d98fe17ad8a6d9d3bec97ddc845 xyz12be 68e5cba640f6e4ef72dff950e88b5342 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 7af28d3a8f..ce60cdc523 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -89,6 +89,7 @@ rgba c1a5908572737f2ae1e5d8218af65f4b rgba64be 17e6273323b5779b5f3f775f150c1011 rgba64le 48f45b10503b7dd140329c3dd0d54c98 uyvy422 3a237e8376264e0cfa78f8a3fdadec8a +vuya 4086a782b3bba1f6200d6e40c903e3c1 x2bgr10le 795b66a5fc83cd2cf300aae51c230f80 x2rgb10le 262c502230cf3724f8e2cf4737f18a42 xyz12be 810644e008deb231850d779aaa27cc7e From patchwork Sun Aug 7 00:34:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1034883pzg; Sat, 6 Aug 2022 17:35:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR6KHS/hEopoiGn275J51p8xVaRmAY49fcw7TSDXcCIsp5kCC3rdwBopwYr3hIr7ZhFYSSa7 X-Received: by 2002:a17:907:9491:b0:72f:2827:37c3 with SMTP id dm17-20020a170907949100b0072f282737c3mr9384044ejc.306.1659832527118; Sat, 06 Aug 2022 17:35:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659832527; cv=none; d=google.com; s=arc-20160816; b=WjHGJL+L+FKNIKvI+gVBDIhmenpTQ7ixAeb77JuQsyxJevuWuUHvt7ZLphgikDNw07 5QOrje857/d6uP17Ho5ESQcl4GhJVNj3tVGprG/QIFX6L2Isl+IbbAWMgCiXffIqBcDh nOiIrGGZDNxEYr4Na59WD0gIade5y05k7UqY9bzHQu/WNIhTeyvojinvz6/i2MNDh94a DuAiLsvQuylF2Kc3z9pqtn4JpDV18uv99nnXbts8CotC0TnHtJV21j/pygI6bnVPDfUS HixMiffdWOKw/CxTwO6UdNzkS+9tDD3UydRrcw9mW5ckw5GIPL7/wumtpnT99tBywRow URWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=xWVX1aWwrc/QXcgi9i1hSELaC43P+aU18B6Q9DMcVyA=; b=KF7YOKOw46PFmcBX1o/K3RFQUIaMvvgV4wtRmxP+aIJL7oIPi6qg8EStfYDIyT2eYa PLld+8PFSfyJfThmxkZT02pGKSun7ZYHLVw+o1z82PdPdqxpy1rDXgk6cBe+zSbtLLrs FxxIf/80cV3PEr2/HfHJHEUtPeHjOUkOquggF+zU5hsp1fDQ3qYyeA//yV4f0vV/kaRf ezmiwzPERtc643uT/EtUlxuFGO8OrpVdsqWSOy20xae7ZPXJYkX+4BgaGbvIjYk6u1AA CFxxNV+DUg+Z3IESb2hFLOj/4PypQpYkoNr6ZdXJDfwgZxsMRucsEqM64f1TrciCfWuZ tMBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nw4ClFoB; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jg30-20020a170907971e00b0072b325758d7si4811220ejc.427.2022.08.06.17.35.26; Sat, 06 Aug 2022 17:35:27 -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=20210112 header.b=nw4ClFoB; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 759D368B5AE; Sun, 7 Aug 2022 03:35:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f47.google.com (mail-vs1-f47.google.com [209.85.217.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82D7068B2BC for ; Sun, 7 Aug 2022 03:35:16 +0300 (EEST) Received: by mail-vs1-f47.google.com with SMTP id m67so5838914vsc.12 for ; Sat, 06 Aug 2022 17:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=JFdLCumj5fDgKPsPc8lM7qgIOd4SthuQKeW6EDllQuM=; b=nw4ClFoB9g8eimA3juQozIXZrh7laEHKieDQE8LOsTplUthwsqEKwQ9mgKF2BLv7Xl zwRkHpVjLqrs0LPDpcHxAz6A/5l7zDQRj9phu48FutmV+sUz1ipVObV/Y4JfL9+cSQYb +barsGc/gkvY38FEDVt0srKna2/GFXlsPGKDvwJVH1Tfhh7eVMLTMu1AMyvzIFx7ljAT 88DlrtUWxmdaUs2YveLByBZkhckiKcVfC5TQ8nXGj6pHP919pFx8FUS3dmDbl2VSFH7W HTJGGhjPIMcY85h43L2eI690CTu7u+bakGrhjQqRd9jGw0GTkgv+JdCXVTpmYOHdV1JA qD9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=JFdLCumj5fDgKPsPc8lM7qgIOd4SthuQKeW6EDllQuM=; b=lGplhPu2PeQ2QF7vzmDhtQhwYLNfHHhaIf9ocAT6iitpBu/+a3lHuBJbuRYO7PyBXK 714X6pJ7skYg2nOADf+m2HfJ5QIfNqFifbK+TRjbyMQdR9fKZIgXChrvRIfBpTR2aWeT 1AJTrX2/6R6PL4XEDB/YphJC9uTlVEmS4qOKMAb+a9dfWbVjnoc0F0htyNe03OJh5L4i lsAnJEzlhlIN2E1goX/DxLqlX87JiRUUlgs1SZXwYYjeOFw3fUo8ukzwsC03U0ZCQgkw gfEL21aGZe8THMgTP1XenX1EXVd/9kBYyjdDEskK1nZOGyqJ3b47lvb3H1Iu92J47cB5 2DOg== X-Gm-Message-State: ACgBeo1BrleY+6sceyFvKTwnHp2C9BuCf2DXq3ngvTopctY0NGfdAlc0 bvi2RlrOdd8uUDYOaqHUFO4S1nDL/to= X-Received: by 2002:a67:ce08:0:b0:388:4407:b2fa with SMTP id s8-20020a67ce08000000b003884407b2famr5480612vsl.57.1659832514448; Sat, 06 Aug 2022 17:35:14 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id b2-20020ac5c0c2000000b003771f14d2f8sm5736994vkk.3.2022.08.06.17.35.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 17:35:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 21:34:55 -0300 Message-Id: <20220807003456.54933-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220806234851.54869-1-jamrial@gmail.com> References: <20220806234851.54869-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/raw: add VUYA pixel format to raw_pix_fmt_tags 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: QccDszWFx5Sh Signed-off-by: James Almer --- libavcodec/raw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index a371bb36c4..1e5b48d1e0 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -72,6 +72,7 @@ static const PixelFormatTag raw_pix_fmt_tags[] = { { AV_PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, { AV_PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') }, { AV_PIX_FMT_NV21, MKTAG('N', 'V', '2', '1') }, + { AV_PIX_FMT_VUYA, MKTAG('A', 'Y', 'U', 'V') }, /* MS 4:4:4:4 */ /* nut */ { AV_PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) }, From patchwork Sun Aug 7 00:34:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37170 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1034917pzg; Sat, 6 Aug 2022 17:35:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR4wpGJGr2GeGobspnQxAM2Ly+izSLfqpfKjXkgUWGeeeRP3iqniL9GK/ZwQ721aPhDZz75+ X-Received: by 2002:a17:906:9b14:b0:730:984e:a51c with SMTP id eo20-20020a1709069b1400b00730984ea51cmr9444504ejc.435.1659832534472; Sat, 06 Aug 2022 17:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659832534; cv=none; d=google.com; s=arc-20160816; b=MaJt6cM6QzefmbjJ1tBA4kOqfTpAnpISRzdV3Rdc0eiLBk3bj7hEhk90oo7pyo0ZFw ZuQqOG2p6Fh3+tZl+7jUotDoHCfZpm0BctY+i6oWNORxh+LLikegmFt0O7DxGWecA21T 6dgRYbjVzAgB4EgPaaeDQCjMFySBiXTL9ekObwOCWr7g1JN+NJQC/VsU1t3RLIOVM/Th rYSOl+7pJ6rIlFwiIsMJyK97uoxurdI0BVfqcWao81oZ6likHPUbHvb3ir4ijxO63DvJ Vt7zO9EYgTvGhZSpCq0TeTgXZD2+9WQefxJl+IfWl1rKk5Xq/y9zFo0d5YC5bng+a1hC HXWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=X4YWryWgsw6UYbZNiMQuwOapZ86fIxOFrxdsQnTA96w=; b=tMiypArlgDMcN+Asx3s6oZWE1Rf2b1bfyKEZgmlqSWl38YYKifsoZlUZk8T/p5PD42 /qp5bqo0+l/yFWcVyo9br4vg2Eq1ac+aCeKs2Aqje5z8LihoQaQpq+o63Zn09xz7Q6b/ vfSrD3XV2EdC/aX1KKdq9LF2lYFOG7an1MgPN2SUeORza8Sl+UINBqfJMu9jAbSI1XPW q/emWVvfKvh3zALn8ZqrLVsM1CVt7tL3icBIqFCX21tuvcvmzhcEeX0EYXv42FJ3587a gF14XWqSyacbjvutLeKk7DcNykJ45RzNNgDl3L83LPK4zQnaGN7f0q98jPF5mNgncgoM 8bag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SbM2W7vb; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a18-20020aa7cf12000000b0043d56e0c95asi2689875edy.585.2022.08.06.17.35.34; Sat, 06 Aug 2022 17:35:34 -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=20210112 header.b=SbM2W7vb; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B722F68B06F; Sun, 7 Aug 2022 03:35:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f175.google.com (mail-vk1-f175.google.com [209.85.221.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FFA068B06F for ; Sun, 7 Aug 2022 03:35:17 +0300 (EEST) Received: by mail-vk1-f175.google.com with SMTP id n15so2895291vkk.8 for ; Sat, 06 Aug 2022 17:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=AyopbNvxCI6fueBifFKxKwvQ/S46wQUYAWaFb1tR1dA=; b=SbM2W7vb4/A3Y61V+gsOki/VXFm2mcd34KcetnWGWJ8Vf35VQjotlbsFFpFvTPoFIm NkQ0Dt5gpCKYq35FYOMuyAgcBCDaJ/dHX0XdhsaG1pvYtCL3RxFbp8AIShKFqj4fTE/T EBadf0O97joLFwF+sMd7Ig2wqePUDip/mFyfNLMz5EGbLO9bzgSUZ4YhN00LfN9j14ja zXnk9zqo2g/4AUasxbyP+PaGFZ676ugJaNcgfvvO/Ly6iraeyhkcbWBnigDtNgU4zIl0 AwjMoMaTs3wlGrQ264KyxEBAARVHt4AQaNvhG7jhnCsUHh+roSmbcL7OMVvOUsbPC6c0 ioqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=AyopbNvxCI6fueBifFKxKwvQ/S46wQUYAWaFb1tR1dA=; b=LMGESe3oWJE9kJDIHo8/+INDW/btPhox3nrS356q3/Qe9cqpQpRunOC+gxrPaKyftM RnY9Z4p7liA6T5MyOYBRMO63AyXPmAIqmfZomVX0FtndKfKIcJn0ig93igu+CjVVQ5SV N5PcMAI/fliH1YivLIjkpRtEh+c815bSZAJbXgjeVulOO+gY/jiMJhi3AiT7JluLjdyg ALLmvvPKF10h61ZtZYQnI+LzswYLwxnNkkyKNIfkd1HPfur/9uLaFiiLnsJI9s0O/6jI fLyU0ADoA0Et4lK9pFxyk9/44gv33Rtd7+Cm2rgtAadFRxTCqj1h5yU4rrweyGlkotaG ZlEQ== X-Gm-Message-State: ACgBeo3rknA6pmozp/qQI3DJgMyz/g501PqoHH/mhvLdyp735z3AbjB8 rZ5zvQ391yssqloIQQZYXapTVWSzHO4= X-Received: by 2002:a1f:c117:0:b0:377:855a:4e9f with SMTP id r23-20020a1fc117000000b00377855a4e9fmr5528254vkf.16.1659832515899; Sat, 06 Aug 2022 17:35:15 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id b2-20020ac5c0c2000000b003771f14d2f8sm5736994vkk.3.2022.08.06.17.35.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 17:35:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 21:34:56 -0300 Message-Id: <20220807003456.54933-2-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220807003456.54933-1-jamrial@gmail.com> References: <20220806234851.54869-1-jamrial@gmail.com> <20220807003456.54933-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/riff: map AYUV 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: c5MGwy4hfpuN There's no need to keep using a custom decoder for this pixel format. Signed-off-by: James Almer --- What's the process to remove a decoder? Deprecation period, or just git rm? libavformat/riff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/riff.c b/libavformat/riff.c index df7e9df31b..7a97cf1ccf 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -237,6 +237,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('U', 'Y', 'V', 'Y') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('V', 'Y', 'U', 'Y') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('I', 'Y', 'U', 'V') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'Y', 'U', 'V') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '8', '0', '0') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '8', ' ', ' ') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') }, @@ -302,7 +303,6 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_V210, MKTAG('C', '2', '1', '0') }, { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, - { AV_CODEC_ID_AYUV, MKTAG('A', 'Y', 'U', 'V') }, { 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') },