diff options
| -rw-r--r-- | libavcodec/raw.c | 12 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixdesc | 18 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-copy | 18 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-crop | 18 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-field | 18 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-hflip | 18 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-il | 18 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-null | 18 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-pad | 2 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-rotate | 2 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-scale | 18 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixfmts-vflip | 18 |
12 files changed, 95 insertions, 83 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index e23dbeadf9..c3f3de1694 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -166,6 +166,18 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUVA444P16LE, MKTAG('Y', '4', 0 , 16 ) }, { AV_PIX_FMT_YUVA444P16BE, MKTAG(16 , 0 , '4', 'Y') }, + { AV_PIX_FMT_GBRP, MKTAG('G', '3', 00 , 8 ) }, + { AV_PIX_FMT_GBRP9LE, MKTAG('G', '3', 00 , 9 ) }, + { AV_PIX_FMT_GBRP9BE, MKTAG( 9 , 00 , '3', 'G') }, + { AV_PIX_FMT_GBRP10LE, MKTAG('G', '3', 00 , 10 ) }, + { AV_PIX_FMT_GBRP10BE, MKTAG(10 , 00 , '3', 'G') }, + { AV_PIX_FMT_GBRP12LE, MKTAG('G', '3', 00 , 12 ) }, + { AV_PIX_FMT_GBRP12BE, MKTAG(12 , 00 , '3', 'G') }, + { AV_PIX_FMT_GBRP14LE, MKTAG('G', '3', 00 , 14 ) }, + { AV_PIX_FMT_GBRP14BE, MKTAG(14 , 00 , '3', 'G') }, + { AV_PIX_FMT_GBRP16LE, MKTAG('G', '3', 00 , 16 ) }, + { AV_PIX_FMT_GBRP16BE, MKTAG(16 , 00 , '3', 'G') }, + /* quicktime */ { AV_PIX_FMT_YUV420P, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */ { AV_PIX_FMT_YUV411P, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */ diff --git a/tests/ref/fate/filter-pixdesc b/tests/ref/fate/filter-pixdesc index 94e4bfbc2d..56373fb5bb 100644 --- a/tests/ref/fate/filter-pixdesc +++ b/tests/ref/fate/filter-pixdesc @@ -16,15 +16,15 @@ bgr565le ed027571692aecd522aa65a90cc7e09b bgr8 71ef789609c746c2e7e4be9dec29062c bgra 0364b074268682ea46168742a8239f7d gbrap 412a2449fdfaeb5ebdf5e4196cc7391a -gbrp 89d6e4b116e3bd542fa09a19a977ad16 -gbrp10be 5dc62e2d01fa7c19a57abe48246f2232 -gbrp10le 0cac205a304b59811ce30fcad49b3527 -gbrp12be de1d2a6b1d189bce9b9a2cf322c31c24 -gbrp12le e3267ef00bb48778df21a386416d2e14 -gbrp14be 7979d158b30c0b45db97aba2228d15fc -gbrp14le d32b6c73a820f9d03a779a996924893d -gbrp9be 2478d1c27ae4ec94ec4b5e439128af0c -gbrp9le 640240ca2663e48f0bacd8edb5242c7d +gbrp 4778f8cc2bdbcd65e272ea1761cdca6d +gbrp10be 0be11fe4b2324054be6f949e81966691 +gbrp10le 173f89ae58fd4d01d6a365318e4da3b1 +gbrp12be 1f5231ed7e4589a3ec98fa79134bdc6a +gbrp12le cc4830a263fecadeea535c4938b5cee1 +gbrp14be 6f5143374536e1cf1595260e91c86b7b +gbrp14le 937ff1dd9f498b39f9e882316e371fbf +gbrp9be c76ab5850c9bc72bbbf36caa6d1c5ac7 +gbrp9le 5ad363dc9570187ad3e3f2344fbb30cf gray 2ee2ea2340d0ecf2dfa6f90f87384799 gray16be 389f4e5a8ab413b3af32767b59ed7f9e gray16le a1f912941247e45b394b9cf4f0e81130 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 0c3ce68415..edb246b6d8 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -16,15 +16,15 @@ bgr565le ed027571692aecd522aa65a90cc7e09b bgr8 71ef789609c746c2e7e4be9dec29062c bgra 0364b074268682ea46168742a8239f7d gbrap 412a2449fdfaeb5ebdf5e4196cc7391a -gbrp 89d6e4b116e3bd542fa09a19a977ad16 -gbrp10be 5dc62e2d01fa7c19a57abe48246f2232 -gbrp10le 0cac205a304b59811ce30fcad49b3527 -gbrp12be de1d2a6b1d189bce9b9a2cf322c31c24 -gbrp12le e3267ef00bb48778df21a386416d2e14 -gbrp14be 7979d158b30c0b45db97aba2228d15fc -gbrp14le d32b6c73a820f9d03a779a996924893d -gbrp9be 2478d1c27ae4ec94ec4b5e439128af0c -gbrp9le 640240ca2663e48f0bacd8edb5242c7d +gbrp 4778f8cc2bdbcd65e272ea1761cdca6d +gbrp10be 0be11fe4b2324054be6f949e81966691 +gbrp10le 173f89ae58fd4d01d6a365318e4da3b1 +gbrp12be 1f5231ed7e4589a3ec98fa79134bdc6a +gbrp12le cc4830a263fecadeea535c4938b5cee1 +gbrp14be 6f5143374536e1cf1595260e91c86b7b +gbrp14le 937ff1dd9f498b39f9e882316e371fbf +gbrp9be c76ab5850c9bc72bbbf36caa6d1c5ac7 +gbrp9le 5ad363dc9570187ad3e3f2344fbb30cf gray 2ee2ea2340d0ecf2dfa6f90f87384799 gray16be 389f4e5a8ab413b3af32767b59ed7f9e gray16le a1f912941247e45b394b9cf4f0e81130 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 4c2e4e844d..9651fb9fc4 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -16,15 +16,15 @@ bgr565le ab7b6055bc3b6b7edc9a5e4de43ec90d bgr8 f85ff16e21d922ad6d32648ef3acfbfb bgra 9f2e37d73ad3b759fc9d6b12ee668c38 gbrap 32c0326859b41ae1fee015648162c6a0 -gbrp b59909dd28f16bbe0e3c474523471b3c -gbrp10be c7ebd8966a6dda5858366094f7f1c08c -gbrp10le 6624c0deb9f3a966b15485aa54e8e927 -gbrp12be ca6978c75aa0e68fe9bfe51525103c91 -gbrp12le 2cada0b4a7b4edcb823b7eddd7c82420 -gbrp14be 160084920ca0c108ae6fd3bbd1882c54 -gbrp14le 7549f7f56affecf6bd412e97719a6fb5 -gbrp9be c9a0aa01e46a55a70943b5b94be1a190 -gbrp9le da35c8294af5806bbc44b9d83cad903d +gbrp 0f59d3a61d391c3dea6f6e5861e9c2f7 +gbrp10be bc12b34950af11e3f1016acbe2d5dec5 +gbrp10le 0ff56c84154050f992fefc357449da9a +gbrp12be b2154eaa6344a37ace82e42b757585e2 +gbrp12le 77956c63e99444fc61c306643acba403 +gbrp14be 3ab29f18610ce10ce2e5c99b1af78415 +gbrp14le d1465f7280f35aa0a70709e5a7bee1a4 +gbrp9be f17b7ba66ba35ed0fcbbb5c32c7e0f56 +gbrp9le fc11219debfbe8dd8c3d6f0ef92c4d50 gray 6d34024704f862c75db3ba6989a4a039 gray16be 02ac848ad4e28c06938599563ba81ff7 gray16le 672aebfeb8a0f4067b3c6064340056e4 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index db3720100a..d4822b18a8 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -16,15 +16,15 @@ bgr565le 6dd85cd5e19266c53a54cbcf06d396a7 bgr8 9669f6974f0fc1c0afa1c7d4df093c0b bgra f7cabae31dd7465dab2203f45db646f8 gbrap fdb15f25cd6db3d19a7df727e0f4de3a -gbrp 55eab469e3e02ccc5a358565d9b1eaa7 -gbrp10be 38753e9ac21e13d76d1a83bd7272c026 -gbrp10le a65ff11ee79ae698550218549288e6cc -gbrp12be 5f49bf3190b98221dab95056ab46bd96 -gbrp12le 3d1cd386205bc690407c81a007a79170 -gbrp14be 60e2efec11a36e7cb0db95e01603d9eb -gbrp14le fdcdecdd2c8dc13561a3788ce0487c85 -gbrp9be 86380bf8eaeee32ec40d776f699394e5 -gbrp9le 1286d4558d9bc7c3d68261f4b43e3ba9 +gbrp 0867ccbcdf50a02871ad7788e3e0931e +gbrp10be c452475d38b13a4707634eff74001215 +gbrp10le 009a9f7ba2ac9a8c67269bf3a76581c5 +gbrp12be e1e01fbefb6ab400a7eb460aa9ad6acd +gbrp12le cf2fd4db9e69d82acb0aedfc094ebc9a +gbrp14be 52ce4bffdd04a2f51ab2d3ae4e78dfa5 +gbrp14le 775b50257b848007c4ef3441ba772db1 +gbrp9be c293422f1395bfddc788282eef139ed6 +gbrp9le 0d2bb77c25d84611ec6222f3dffe11c0 gray 42a0ad7625a0481183e375e38679d8d3 gray16be a447af6482b922c9997ac02e5d3535f1 gray16le c1dd0db327295898ff282d07f48c105d diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 12d75481e7..d672346b9a 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -16,15 +16,15 @@ bgr565le 4b4c708d4ad222f41734dce68e9d48b6 bgr8 ad1db7a17cdfab2ede6f22c2415a3fbf bgra 85fa06ad9fd156c3179a647a2e741b60 gbrap 5fbf0a36ee9486161a862a4b2d6f8242 -gbrp 95fde5b6a767cf8d2679a4a6d18fdbe7 -gbrp10be 5ddc834dbf2198f6b1af36c66b185e2c -gbrp10le 04814cbb805b66e8e085c7db4a548deb -gbrp12be 8184b00342421c366764c091e9174260 -gbrp12le 1519cba0b6ddd7ee3df7c97670f1cbd5 -gbrp14be 10872df155aab67a13b98ad162908896 -gbrp14le 5fd363517fca5ef0ac725d1c047f2e75 -gbrp9be 187c83736d4fe1d7c8491609debc8f86 -gbrp9le 5476b0787da2d928d98d4cda60537fb5 +gbrp 8b00ca96932c9bce5bca01ee621e0957 +gbrp10be df96591083deab8382c1907ea1e99e9e +gbrp10le 98769f5176bd3872f494aea8039d8475 +gbrp12be 9a0ee0322bbd7a25ffd85b0070c5a563 +gbrp12le 2f3899d712ee3e1510b0f442ceaeb505 +gbrp14be 966af80018ebf6b0576004362c1ba395 +gbrp14le 297e71281660b905711330a86eca8a71 +gbrp9be 8268b9a1e9f4d6a42e57db9c81d82fa5 +gbrp9le b3a09bba825e16e6d160328706a9f62f gray aaa9c2fe3c2a2a43a4b35226ea689b3c gray16be d206a080739d89cb7dc0009ad4082ed4 gray16le 7ebcfd9401ba85e584230de8fc02986d diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 64d04751bc..d9a7a861b5 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -16,15 +16,15 @@ bgr565le 485b2b6f589a936d6fb12d0033809dca bgr8 d7fae34b87a67556c273585d9140ff96 bgra 7b4abc57f0ee99a0226e9bfd5d25cf9e gbrap 583131faa19f062f6523321da52066de -gbrp b85cfeb0e34559ffb4b2e4f1209a3712 -gbrp10be 5487219fee31607d6b19aa0d302fb42f -gbrp10le 7975e53a9e03a8acfa877334ae5e9d1d -gbrp12be 34bd529e3b085e813e7471e5a5951423 -gbrp12le 14716b36ee4043158f24b49b6a723213 -gbrp14be 426ac36ea666041afd39f842dbdd683c -gbrp14le e0823115de7b2e44c25e1c59dd204ac1 -gbrp9be 0db6ce2fe6a7fc2d5c7d6d4f0decd112 -gbrp9le 00a1a9fe310753a28c0512568a317c67 +gbrp a2db88b8efce6681a3c858be2c229a33 +gbrp10be 714a32d10c27395406f4e4afb20a2216 +gbrp10le e44229ebb1cf96d3ce1960d092e0dfc2 +gbrp12be 09fc9ba31c8c0c8c9cd89767fda92800 +gbrp12le 2c778bcef911d43795e3f6c3b97be09f +gbrp14be 35d6dc9135fe910dc26b64f03de2d42b +gbrp14le 778c97b5ed06b9f1a230840a15771bac +gbrp9be b9fc10ab1ddad0e7945d6b047725d078 +gbrp9le ef3d6bc8069b95cae31100908a7fa967 gray 2cadbaed81ee12181bda9f4aa87ddbc0 gray16be cd9c1367dabd2f1858ae4f31693e622f gray16le 4ef774c282280d7ed4780690df6e5cb4 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 0c3ce68415..edb246b6d8 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -16,15 +16,15 @@ bgr565le ed027571692aecd522aa65a90cc7e09b bgr8 71ef789609c746c2e7e4be9dec29062c bgra 0364b074268682ea46168742a8239f7d gbrap 412a2449fdfaeb5ebdf5e4196cc7391a -gbrp 89d6e4b116e3bd542fa09a19a977ad16 -gbrp10be 5dc62e2d01fa7c19a57abe48246f2232 -gbrp10le 0cac205a304b59811ce30fcad49b3527 -gbrp12be de1d2a6b1d189bce9b9a2cf322c31c24 -gbrp12le e3267ef00bb48778df21a386416d2e14 -gbrp14be 7979d158b30c0b45db97aba2228d15fc -gbrp14le d32b6c73a820f9d03a779a996924893d -gbrp9be 2478d1c27ae4ec94ec4b5e439128af0c -gbrp9le 640240ca2663e48f0bacd8edb5242c7d +gbrp 4778f8cc2bdbcd65e272ea1761cdca6d +gbrp10be 0be11fe4b2324054be6f949e81966691 +gbrp10le 173f89ae58fd4d01d6a365318e4da3b1 +gbrp12be 1f5231ed7e4589a3ec98fa79134bdc6a +gbrp12le cc4830a263fecadeea535c4938b5cee1 +gbrp14be 6f5143374536e1cf1595260e91c86b7b +gbrp14le 937ff1dd9f498b39f9e882316e371fbf +gbrp9be c76ab5850c9bc72bbbf36caa6d1c5ac7 +gbrp9le 5ad363dc9570187ad3e3f2344fbb30cf gray 2ee2ea2340d0ecf2dfa6f90f87384799 gray16be 389f4e5a8ab413b3af32767b59ed7f9e gray16le a1f912941247e45b394b9cf4f0e81130 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index 616e2c05ac..82f30b60bd 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -6,7 +6,7 @@ bgr0 c55368036cccbb0af471d6bd82abe02a bgr24 67f9fd70dc6d9896b7122976b33932b4 bgra c8dd017b5a3b55e8b9d0ac1cdcf327bd gbrap 8551b62534034c8aaebaa7d9fdefdfe9 -gbrp 4f3b389ed3f8a3945560a36f862b452a +gbrp 9257834cbecf3842c2a6a820601a7504 gray ca280f6888a9b66688b5f8ea68fe454a rgb0 b1977b45634c4db58a183a07feb2acff rgb24 e73de9dc0fdd78f4853c168603cc7aba diff --git a/tests/ref/fate/filter-pixfmts-rotate b/tests/ref/fate/filter-pixfmts-rotate index 594ffc0797..0438aefca2 100644 --- a/tests/ref/fate/filter-pixfmts-rotate +++ b/tests/ref/fate/filter-pixfmts-rotate @@ -6,7 +6,7 @@ bgr0 efe11efe2840fa84ee95cdb913463bc1 bgr24 d0f449e8b38e07c947bd808f441a8ace bgra 54cebf01881cb63ec3727f7cc23b0a6b gbrap 6d69c0cd0cba6300065f8d990e35b081 -gbrp b73c4db6a96fa79106232ba0e2da1c10 +gbrp db3b6345d2a5c0fb524f93486d97193e gray 5a896c38449a0fb08129a7394952eb31 rgb0 c29f92ff5224044c7272c763fa5321e6 rgb24 739f0eb47e76ce5c87354d5631ac2d5b diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 116158a0dc..a2eb72340d 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -16,15 +16,15 @@ bgr565le f524e9f16bdd68b247dbcb621e543fc0 bgr8 68a3a395043dc57335ad1f8e891229c5 bgra 3eaf5489b8aa13a3388aad3751b597bf gbrap 76ddf2bedea40c8743f4117b786d4773 -gbrp 7b83ae32c1f76bd634e50f4797a74e92 -gbrp10be 77dae432c42fad019c286753b0e4b0a8 -gbrp10le 7d3e7341423b1206e8a6a3a02b48b5d7 -gbrp12be 2c237c413e765024eb3f73d8c5e03df8 -gbrp12le 9a0c9eda1f16d640663c729d4bb88024 -gbrp14be 2b4f1928a5ef53d0a216b3b10fa11ca0 -gbrp14le 47100ec39fad45579de1dff56fe17117 -gbrp9be c345137de0aa4b0536a00009e8e11267 -gbrp9le b798662b2ba4cdf21ad6a6d4c1fe1b72 +gbrp e2704defddf1cb8d75f0c80fec6491d3 +gbrp10be 7dce0805f7ead7d480bd83323d76bf9c +gbrp10le 24b220d50ffcb3fdffe11ef63f0ea758 +gbrp12be 49ae16b634cd12b108c0ac153f053549 +gbrp12le 889da16199f9cf1449d93cc0ca8c5a15 +gbrp14be e63375705d6915035c7bce0faa4934e5 +gbrp14le eb6cb4555edb175d807fe1b5382d2fc7 +gbrp9be 2c9adb80abc16546cac69b4872aaf557 +gbrp9le fcfa1684553e3e185179462bca347649 gray c45dcee08887f43dc463f79d7ecd7d68 gray16be 70064f9acdc5e3935ccda67e765bf2fb gray16le 578241fb43029e5ae841a3c94d940dce diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index a70d2a5bfd..83347b5059 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -16,15 +16,15 @@ bgr565le 9fab295d966386d4ef99d5b43066da47 bgr8 275ce12eeb05de67a6915f67cbb43ce5 bgra d29c35871248c476c366e678db580982 gbrap 29844a8e4334493fdd2d499bcb532535 -gbrp 7852e9bbe52cfad9bab8081a5c7a5a31 -gbrp10be f591c6c98396baf3242837827081f2f7 -gbrp10le c5edb9bb566edbc8c478595ac6ab070f -gbrp12be c61c19ad1bcca18719dd071e2cb77287 -gbrp12le 334a6c802ae0e15d9e0950c27ce4a457 -gbrp14be e24459d3b4a1e9c56ec3658c525b7a32 -gbrp14le 99207ef7c7dcb1d1369dc3fe3b5dc261 -gbrp9be 1daea1677f8a62c5a1ef8959c5e0e4b0 -gbrp9le e3cca50b844e7dd326eadf6e38fab84b +gbrp d3f2823513bfdac8f714385513cc396b +gbrp10be 49b93ac01777e4bafcb9afd4d9d74533 +gbrp10le 61c0cbb0978d26494d3a233042e1e256 +gbrp12be 36f58621c2a10141cdae56c82cd99946 +gbrp12le 33dd0c50bc6c9cec92e8afcce076dff3 +gbrp14be 488b314f58b3e41d67c1b093ce19a7fb +gbrp14le 48b4273ff29b6b68a05a6027254ff75e +gbrp9be b4361a1ad66cdff0d32d4af769a8a960 +gbrp9le 5bc148ca18ff1bf7095e78a4e65ed8ab gray 800813149a825964025e75cf14ec528b gray16be 9b23f3e79c54a6ccb62e0135a32e3045 gray16le 93cfa8fbb2a86ead275ce1817444e6d5 |