From patchwork Tue Oct 8 22:50:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8b47:0:b0:48e:c0f8:d0de with SMTP id x7csp734624vql; Tue, 8 Oct 2024 23:36:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXIKAfY+b3G+WNBdlljw99ylLKfmq/QKC69fnzKzlYRHskFblcETO0iDu6V58fSXdmim+jX35sHiPFHKdVo6/Pn@gmail.com X-Google-Smtp-Source: AGHT+IHdZfRsXd01O4V+lYfpA1DQKBWiaQDS3FEixTXh8jsk79UEGPhJZpJybF2uE15LJaT7kZM6 X-Received: by 2002:a17:907:6d12:b0:a8d:2faf:d343 with SMTP id a640c23a62f3a-a998d1f503emr81715366b.27.1728455793329; Tue, 08 Oct 2024 23:36:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728455793; cv=none; d=google.com; s=arc-20240605; b=OVDq2hkGAib0tPFEz2aFG6ohxuqUxuBImHjWi9m5O2TJtNRT8ngs4mYZtJi21KjONr rbZ70oCIoYj+hzoHWWiutKsvJxQZDygn4hNlrfIbVkNgixzgZjYvULu+ALMlA25KbJ1n ghhp50/ZM53hTBs5phg5HxRpyZ8tcepr2v+TolWccvgzkdEOdQOAZ4z5TNMrIbgMEABK 9COkERZ+7zNJuFX6I93+fSbF9e409S4Q1xeb0MJd4AiMhQ1Et5AgycXRHO2x2L992b2L LX9gtiilbo6SN1yJ14IghYltRI8DNp3znuY0+TEDUQzXDAu0toMDKfm45wkDmc0D9jCB LUBA== 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=PfVy7LVsbyjbJpTRi2WneaGVHdtAEmbW3rRYzPK9TrE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=B541gHXtOp1IJ1cmjhubVa/oy1YXoT/wpC2OXbYSyQeT4Z/31B942FxOcJUT6CvVfw Xhqf5IVwe4+jMyU3aLo03lF1n0s2gsTVke+gOXeCBa76B6/iBmaJaoEO7aGHlMERNA0S Mx6iEfaDeKZO0lFiZd0eKZ36F6Qh/TLWx5F9XJmgsr+K/cjfULjToUR9WW2T4C9eCRdh 6EVhoHseAru52bOWvzrMG6ZJypZEs0hoD6y+fCJc5jSurP1kUISQkppa83P9Ahp9G+5K 1/EGvD4Sa/G1IzqdGxBICbMBSifUDMhz8dBzyFAOGly8c/v3Wfzukk2QuBD0j14EPnfW dpTw==; 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=Idh5qN0v; 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-a99585e1010si406116766b.341.2024.10.08.23.36.08; Tue, 08 Oct 2024 23:36:33 -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=Idh5qN0v; 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 EA5F168DDE1; Wed, 9 Oct 2024 01:50:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E68A468DDB8 for ; Wed, 9 Oct 2024 01:50:52 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-20b84bfbdfcso2121635ad.0 for ; Tue, 08 Oct 2024 15:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728427851; x=1729032651; 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=RxOKZoT3W1vLcsLWqPKZBVJcLcGGRuX9KnQGA1pjIMs=; b=Idh5qN0vVXpRAcK6KQZHqul8dnOfR1CfY1CzA/uLhpVBtoeNxeVnpH92jk9wzcKibF arr7xz/EkRbAjLRaCEKwMd+2lFevIRqO/QQt9RXUwAZk1r8pUvJ6PQ4gAGfYx0bKCHAe 69TyV0oBLFJO/WGLk5AY0OautmIN7qJcixECe8iUY2PFrKaUcaG+a2J4xxmZMX1tjNaj KxSsjbmI57me/7U8XfvddcmKZzPibCydX3/tMNJeROonZtu03nSJMouNxLZZj/E7ndTz 205gsdMviqrQPKn4TZjSH+s2lujFMga5aXfzgmOqtHjLDOvv4bO6161ec8+K6qtR94cD nxYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728427851; x=1729032651; 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=RxOKZoT3W1vLcsLWqPKZBVJcLcGGRuX9KnQGA1pjIMs=; b=Q2aiHZypyT3gQfY8bVaSajFR4xMcLPfgLPsWTqg+ljr1c0arbug7w8hkXL78hi2lK+ toldkI2OHyZpA8U6m5jFSLI6IG1TNuAnQYlWcYBVvfbq6Qo57mMbSWibJ5jI2ZO+InRL Nmc5/e2RCLsaHhx7Hup5vhq7aaoScRMOmSusxBqgD3HO8dYZTyX+taihUbVPmbsrXGfT sffb53pTz4O1c3BxWo9mo80ETI0qiTCa/1Jkmmn6wKxciOBlzZl3J1b/0bm0gl0o4w5x cAwTSq1cMYrKBtFyZ/6VSxsJGwl2X0EzNi4uIesBikwAz17CGEhPXxBHA0dmWpdjKkSf QYig== X-Gm-Message-State: AOJu0Yyc4fk5UTuqIGgaMMXykf9L7CwZcPzQs5xGrIGooLNuXkkJuvMh V6jg3UE/HSfcxwHH4wk0XJMsjmAQ4cmTX8qUr+fUYZCZPyrN3jQpVms4AA== X-Received: by 2002:a17:902:f545:b0:206:955c:67be with SMTP id d9443c01a7336-20c4e288024mr58703885ad.9.1728427850544; Tue, 08 Oct 2024 15:50:50 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c138afaa0sm60373855ad.4.2024.10.08.15.50.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 15:50:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2024 19:50:16 -0300 Message-ID: <20241008225027.12209-11-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008225027.12209-1-jamrial@gmail.com> References: <20241008225027.12209-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/21] avformat/riff: map v408 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: bOL8KFkgBpZ0 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-uyva | 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 acdd79ded8..4b77be4157 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_UYVA, MKTAG('v', '4', '0', '8') }, { 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 b079b00f6c..02f6b5ebc6 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', '4', '0', '8') }, { 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-uyva b/tests/ref/fate/filter-pixdesc-uyva index 49fd1bc6b1..684562877e 100644 --- a/tests/ref/fate/filter-pixdesc-uyva +++ b/tests/ref/fate/filter-pixdesc-uyva @@ -1 +1 @@ -pixdesc-uyva 7cec5f820722500f491c3495113e726e +pixdesc-uyva 646d7fbb9600f80590d9a7cff4919cd5 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 4910c1b9ed..419d0e9bd9 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -97,7 +97,7 @@ rgb8 7ac6008c84d622c2fc50581706e17576 rgba b6e1b441c365e03b5ffdf9b7b68d9a0c rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea rgba64le b91e1d77f799eb92241a2d2d28437b15 -uyva affad7282152bcce415bdf228df00ae4 +uyva 8896d7525f12de08818a01a5d5cf84f1 uyvy422 3bcf3c80047592f2211fae3260b1b65d v30xle b5ec677137b6f1d9f14a2386a1a7a526 vuya 3d5e934651cae1ce334001cb1829ad22 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 7fe2876e40..0ee93f570a 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -95,7 +95,7 @@ rgb8 9b364a8f112ad9459fec47a51cc03b30 rgba 9488ac85abceaf99a9309eac5a87697e rgba64be 89910046972ab3c68e2a348302cc8ca9 rgba64le fea8ebfc869b52adf353778f29eac7a7 -uyva caa03b07812dbb6c48b5fb34edf73962 +uyva 03f362ac6a39f25286bc6616111b0752 v30xle f92c959d672e17a3a27351e671757212 vuya 76578a705ff3a37559653c1289bd03dd vuyx 615241c5406eb556fca0ad8606c23a02 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 51107d7b91..364fae0882 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -97,7 +97,7 @@ rgb8 62c3b9e2a171de3d894a8eeb271c85e8 rgba ee616262ca6d67b7ecfba4b36c602ce3 rgba64be 23c8c0edaabe3eaec89ce69633fb0048 rgba64le dfdba4de4a7cac9abf08852666c341d3 -uyva c1c2953840061e3778842051b078a41e +uyva 147398d2e8d310f915c95863ad192c5e uyvy422 1c49e44ab3f060e85fc4a3a9464f045e v30xle 265a463ad722cfaede2fa6cb5e9bf34e vuya f72bcf29d75cd143d0c565f7cc49119a diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 72af3664b8..aa9bea3d52 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -86,7 +86,7 @@ rgb8 6deae05ccac5c50bd0d9c9fe8e124557 rgba 1fdf872a087a32cd35b80cc7be399578 rgba64be 5598f44514d122b9a57c5c92c20bbc61 rgba64le b34e6e30621ae579519a2d91a96a0acf -uyva fa5df2c0474b2a41dbe2210372b15fcc +uyva ccf5dfd33765dda88c4b4afa2ea31305 uyvy422 75de70e31c435dde878002d3f22b238a v30xle 1f04ac91824200d94d7841736c41f728 vuya a3891d4168ff208948fd0b3ba0910495 diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 0592290ebc..7d17f057d1 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -95,7 +95,7 @@ rgb8 68a3a575badadd9e4f90226209f11699 rgba 51961c723ea6707e0a410cd3f21f15d3 rgba64be c910444019f4cfbf4d995227af55da8d rgba64le 0c810d8b3a6bca10321788e1cb145340 -uyva 9266fd7374abf86f7035e356574586f0 +uyva a8391c24037e2a670196b47bf6a2ca57 v30xle 1c62803a7a7c0c89e5fda3d41cc0a376 vuya 7e530261e7ac4eae4fd616fd7572d0b8 vuyx f1d087284fb1556d76e6def5f94bf273 diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 04a12e53a6..6e5f11ca46 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -96,7 +96,7 @@ rgb8 93f9fa5ecf522abe13ed34f21831fdfe rgba 625d8f4bd39c4bdbf61eb5e4713aecc9 rgba64be db70d33aa6c06f3e0a1c77bd11284261 rgba64le a8a2daae04374a27219bc1c890204007 -uyva f16f848f8283bcd59da6a4d85bc5b0a0 +uyva d2655e1a1c56bcb48f7c7a6a6270dd93 uyvy422 d6ee3ca43356d08c392382b24b22cda5 v30xle 267a4c668b14157d35399302bb978ac1 vuya b9deab5ba249dd608b709c09255a4932 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 4910c1b9ed..419d0e9bd9 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -97,7 +97,7 @@ rgb8 7ac6008c84d622c2fc50581706e17576 rgba b6e1b441c365e03b5ffdf9b7b68d9a0c rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea rgba64le b91e1d77f799eb92241a2d2d28437b15 -uyva affad7282152bcce415bdf228df00ae4 +uyva 8896d7525f12de08818a01a5d5cf84f1 uyvy422 3bcf3c80047592f2211fae3260b1b65d v30xle b5ec677137b6f1d9f14a2386a1a7a526 vuya 3d5e934651cae1ce334001cb1829ad22 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index f995db4237..3ed65ebced 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -42,7 +42,7 @@ rgb0 0984eb985dabbe757ed6beb53db84eff rgb24 17f9e2e0c609009acaf2175c42d4a2a5 rgb48le ed08db9b1aa50d69b8c3d73db93e390e rgba b157c90191463d34fb3ce77b36c96386 -uyva be076f4efae6b51032c5fc676a31f2cc +uyva 06271af718417c21d5bc6a992b04c32a vuya 44368c0a758ee68e24ce976e3b1b8535 vuyx ff637b205b78ee581e393124d0f44f5d vyu444 88fde4581eb7369d7ff28bb27268b169 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index b6516d2970..57c530b487 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -97,7 +97,7 @@ rgb8 bcdc033b4ef0979d060dbc8893d4db58 rgba 85bb5d03cea1c6e8002ced3373904336 rgba64be ee73e57923af984b31cc7795d13929da rgba64le 783d2779adfafe3548bdb671ec0de69e -uyva ee83c7ba25cfc997de70a4e5b3eb398f +uyva 2358038be6dac002a6c736e798a3d91c uyvy422 aeb4ba4f9f003ae21f6d18089198244f v30xle 42be9fac7725274bf54012b073ee0e91 vuya ffa817e283bf6a0b6fba21b07523ccaa diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index e7fa2ca852..5902d90910 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -87,7 +87,7 @@ rgb8 c90feb30c3c9391ef5f470209d7b7a15 rgba 4d76a9542143752a4ac30f82f88f68f1 rgba64be a60041217f4c0cd796d19d3940a12a41 rgba64le ad47197774858858ae7b0c177dffa459 -uyva 1500c3f52e32b2080be180d2e8196a7b +uyva cb773ee5a9f8964b9c826d55f9f425a3 v30xle 8a31095e6eb8e85ab6f030773fa20d03 vuya 9ece18a345beb17cd19e09e443eca4bf vuyx 46b5b821d7ee6ddedb3ddafd1e5b007c diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index edcd3ed3d3..73d9d3297e 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -97,7 +97,7 @@ rgb8 7df049b6094f8a5e084d74462f6d6cde rgba c1a5908572737f2ae1e5d8218af65f4b rgba64be 17e6273323b5779b5f3f775f150c1011 rgba64le 48f45b10503b7dd140329c3dd0d54c98 -uyva 0d2d0d286d841ea5b35cc06626dcafe4 +uyva d43e89ba3d5c9274e1948eac8630fcc6 uyvy422 3a237e8376264e0cfa78f8a3fdadec8a v30xle 1b2e25e974fdcd53b396b577725d33cb vuya fb849f76e56181e005c31fce75d7038c