Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lsws: add in/out support for the new 12-bit 2-plane 422 and 444 pixfmts

Browse Source
pull/389/head
Lynne 2 years ago
parent 0bda3340a3
commit 934525eae0
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
18 changed files with 82 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libswscale/input.c
  2. 4
      libswscale/utils.c
  3. 1
      tests/ref/fate/filter-pixdesc-p212be
  4. 1
      tests/ref/fate/filter-pixdesc-p212le
  5. 1
      tests/ref/fate/filter-pixdesc-p412be
  6. 1
      tests/ref/fate/filter-pixdesc-p412le
  7. 4
      tests/ref/fate/filter-pixfmts-copy
  8. 4
      tests/ref/fate/filter-pixfmts-crop
  9. 4
      tests/ref/fate/filter-pixfmts-field
  10. 4
      tests/ref/fate/filter-pixfmts-fieldorder
  11. 4
      tests/ref/fate/filter-pixfmts-hflip
  12. 4
      tests/ref/fate/filter-pixfmts-il
  13. 4
      tests/ref/fate/filter-pixfmts-null
  14. 2
      tests/ref/fate/filter-pixfmts-pad
  15. 4
      tests/ref/fate/filter-pixfmts-scale
  16. 2
      tests/ref/fate/filter-pixfmts-transpose
  17. 4
      tests/ref/fate/filter-pixfmts-vflip
  18. 26
      tests/ref/fate/sws-pixdesc-query

8
libswscale/input.c
Unescape View File

@ -1452,9 +1452,13 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
c->chrToYV12 = p010BEToUV_c;
break;
case AV_PIX_FMT_P012LE:
case AV_PIX_FMT_P212LE:
case AV_PIX_FMT_P412LE:
c->chrToYV12 = p012LEToUV_c;
break;
case AV_PIX_FMT_P012BE:
case AV_PIX_FMT_P212BE:
case AV_PIX_FMT_P412BE:
c->chrToYV12 = p012BEToUV_c;
break;
case AV_PIX_FMT_P016LE:
@ -1944,9 +1948,13 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
c->lumToYV12 = p010BEToY_c;
break;
case AV_PIX_FMT_P012LE:
case AV_PIX_FMT_P212LE:
case AV_PIX_FMT_P412LE:
c->lumToYV12 = p012LEToY_c;
break;
case AV_PIX_FMT_P012BE:
case AV_PIX_FMT_P212BE:
case AV_PIX_FMT_P412BE:
c->lumToYV12 = p012BEToY_c;
break;
case AV_PIX_FMT_GRAYF32LE:

4
libswscale/utils.c
Unescape View File

@ -248,8 +248,12 @@ static const FormatEntry format_entries[] = {
[AV_PIX_FMT_X2BGR10LE] = { 1, 1 },
[AV_PIX_FMT_P210BE] = { 1, 1 },
[AV_PIX_FMT_P210LE] = { 1, 1 },
[AV_PIX_FMT_P212BE] = { 1, 1 },
[AV_PIX_FMT_P212LE] = { 1, 1 },
[AV_PIX_FMT_P410BE] = { 1, 1 },
[AV_PIX_FMT_P410LE] = { 1, 1 },
[AV_PIX_FMT_P412BE] = { 1, 1 },
[AV_PIX_FMT_P412LE] = { 1, 1 },
[AV_PIX_FMT_P216BE] = { 1, 1 },
[AV_PIX_FMT_P216LE] = { 1, 1 },
[AV_PIX_FMT_P416BE] = { 1, 1 },

1
tests/ref/fate/filter-pixdesc-p212be
Unescape View File

@ -0,0 +1 @@
pixdesc-p212be 3a6540d860f6befcc76f367f1c493548

1
tests/ref/fate/filter-pixdesc-p212le
Unescape View File

@ -0,0 +1 @@
pixdesc-p212le 008b0b732e8f719cf2859ad106717a67

1
tests/ref/fate/filter-pixdesc-p412be
Unescape View File

@ -0,0 +1 @@
pixdesc-p412be b6e7d1f6049563cc3e3d3a20c437ee88

1
tests/ref/fate/filter-pixdesc-p412le
Unescape View File

@ -0,0 +1 @@
pixdesc-p412le 4505a632dee08204171ff96908bd2149

4
tests/ref/fate/filter-pixfmts-copy
Unescape View File

@ -68,10 +68,14 @@ p016be 7f9842d6015026136bad60d03c035cc3
p016le c453421b9f726bdaf2bacf59a492c43b
p210be 847e9c6e292b17349e69570829252b3e
p210le c06e4b76cf504e908128081f92b60ce2
p212be 4df641ed058718ad27a01889f923b04f
p212le 414d3c187722afa8da718358924a9f6b
p216be f5009974fc1cd5d552705eeb52de35d9
p216le 2f634e1a3cd5c9c122e0f2ebadb3503d
p410be 7c2509d2df4bbb199ab653ebb6dce61e
p410le 527761e1f4381007044679710a352ecc
p412be d3055624d596c30deb633f24761d6888
p412le 1f19a675b00d8c9df499200fd80bcc10
p416be fd828e966d45ae908f5d2d4b3349b816
p416le 983064bfd506be1e26cd57bafc14ae50
pal8 ff5929f5b42075793b2c34cb441bede5

4
tests/ref/fate/filter-pixfmts-crop
Unescape View File

@ -66,10 +66,14 @@ p016be 8b2de2eb6b099bbf355bfc55a0694ddc
p016le 373b50c766dfd0a8e79c9a73246d803a
p210be 2947f43774352ef61f9e83777548c7c5
p210le 74fcd5a32eee687eebe002c884103963
p212be c983aa869bae2c70e7b01810902ffc05
p212le b7ace445c6c403a2f6ff9686f38a7045
p216be 41351128eaf636041c8987698730391a
p216le e56f5e5b0d4460d56f27a5df8a4a1462
p410be e17c78ff059363177548412e6ab4e65f
p410le 75f910c7282d8065d97f502ba974c481
p412be 69b358196dffed9cbbb1342214a6d689
p412le 87899c57e7eccbe3d08fcebd2d83f6b2
p416be 52f08b8a56a09d6e954c2eab6cf24d99
p416le ecb78b327ea5cfe1fff82945c1fca310
pal8 1f2cdc8e718f95c875dbc1034a688bfb

4
tests/ref/fate/filter-pixfmts-field
Unescape View File

@ -68,10 +68,14 @@ p016be a0311a09bba7383553267d2b3b9c075e
p016le ee09a18aefa3ebe97715b3a7312cb8ff
p210be 58d46f566ab28e3bcfb715c7aa53cf58
p210le 8d68f7655a3d76f2f8436bd25beb3973
p212be a8901966c5bc111e9e62d3989b0b666b
p212le 9b3df82ffdafda3163e124e38de10347
p216be dd1f3e0bb5c49775a598ab29802fc268
p216le b573c0473a1368813d077487cc9bce0e
p410be 658fd0d92eb327cbd562abafc8694db7
p410le c981188c7fd9f32988a9f4732303f82b
p412be a2afab602628b8da3f0af5c235f2a30e
p412le 38cb842fef010b73d71654dc9ae4afca
p416be 66616bf2320464b5e9b6372d48b6b9a9
p416le 1039b97bbe42ef0af1bc46d2c0fc819e
pal8 0658c18dcd8d052d59dfbe23f5b368d9

4
tests/ref/fate/filter-pixfmts-fieldorder
Unescape View File

@ -58,10 +58,14 @@ nv24 4fdbef26042c77f012df114e666efdb2
nv42 59608290fece913e6b7d61edf581a529
p210be ca2ce2c25db43dcd14729b2a72a7c604
p210le 755363012d8801b96ead2e8b1b4d2ab8
p212be b28ae205def3434349347f8c0d94b707
p212le 90fe12fa6ac4d8d2631c082d2b9a5d74
p216be 17741c0cdb65914ad13c5114121a175f
p216le c0c888ab7bde56638732344076b3b2ba
p410be b6d65b820198ca6ff0103d9794727792
p410le 2771dd3ae54a439921f51c29e79b6799
p412be 2d0c876b68f25ac0e8326faa81d911d8
p412le ab400cb3fa1aa16c3af8c58efa679979
p416be a0f8b5acad8fafc45fc7b2275fac1d84
p416le 2e73af44eb933580da59981176848dcc
rgb0 2e3d8c91c7a83d451593dfd06607ff39

4
tests/ref/fate/filter-pixfmts-hflip
Unescape View File

@ -66,10 +66,14 @@ p016be 744b13e44d39e1ff7588983fa03e0101
p016le a50b160346ab94f55a425065b57006f0
p210be 6f5a76d6467b86d55fe5589d3af8a7ea
p210le b6982912b2376371edea4fccf99fe40c
p212be 9ffa4664543233ec7c9b99a627cb7003
p212le cb4960bd87232af96bb3d6faea650cf7
p216be c1b58f61cd6df9cf01c3086786fb8a69
p216le 1f5213bebf4c99634f57290f5ad99c0d
p410be 2e06214ea84595aa1294239b0f1e900f
p410le 1143c811c383e4461b1192dca0c74246
p412be a106a2e9bb534f31173dc93ac2888800
p412le 77c33ea4dc8f94a8054f19b8b9bac491
p416be da6807d924b63a54b804d32e427524bf
p416le a42b88cabc4395aa0bf1bcbbc876f48f
pal8 5b7c77d99817b4f52339742a47de7797

4
tests/ref/fate/filter-pixfmts-il
Unescape View File

@ -68,10 +68,14 @@ p016be 3df51286ef66b53e3e283dbbab582263
p016le eadcd8241e97e35b2b47d5eb2eaea6cd
p210be 29ec4e8912d456cd15203a96487c42e8
p210le c695064fb9f2cc4e35957d4d649cc281
p212be ee6f88801823da3d617fb9e073e88068
p212le 8fb9e5664b18c94f37d29e5b1cb834ab
p216be ad85bdc59755608602608a9438bb82ea
p216le 77757390da383a90981e461d128d8789
p410be 2128861337e660232e6fb664cc4de3e6
p410le 6cf3a3e199b327f4f013e0346410d7a8
p412be 481cb1d4c7b125d0148f5aa132ddcdd5
p412le 6a7cf1156ee98f00ec31c863b9fb5ded
p416be 47dec75cefeb6220be7731bc25b7be9c
p416le 4990b51ff889d9ee23e68997f81c09f1
rgb0 cfaf68671e43248267d8cd50cae8c13f

4
tests/ref/fate/filter-pixfmts-null
Unescape View File

@ -68,10 +68,14 @@ p016be 7f9842d6015026136bad60d03c035cc3
p016le c453421b9f726bdaf2bacf59a492c43b
p210be 847e9c6e292b17349e69570829252b3e
p210le c06e4b76cf504e908128081f92b60ce2
p212be 4df641ed058718ad27a01889f923b04f
p212le 414d3c187722afa8da718358924a9f6b
p216be f5009974fc1cd5d552705eeb52de35d9
p216le 2f634e1a3cd5c9c122e0f2ebadb3503d
p410be 7c2509d2df4bbb199ab653ebb6dce61e
p410le 527761e1f4381007044679710a352ecc
p412be d3055624d596c30deb633f24761d6888
p412le 1f19a675b00d8c9df499200fd80bcc10
p416be fd828e966d45ae908f5d2d4b3349b816
p416le 983064bfd506be1e26cd57bafc14ae50
pal8 ff5929f5b42075793b2c34cb441bede5

2
tests/ref/fate/filter-pixfmts-pad
Unescape View File

@ -31,8 +31,10 @@ p010le fbbc23cc1d764a5e6fb71883d985f3ed
p012le 3a92c1bd3e9de050bf6abcc3fd911ab7
p016le fbbc23cc1d764a5e6fb71883d985f3ed
p210le 680912c059de39c3401cac856bd1b0c1
p212le a2f88017bcce2383ba60bc4872e639ba
p216le 8718662e226a4581561e7bb532af2d83
p410le 5ca28f2bcc849987810e1f3437b12feb
p412le 2a619fca8166dcd09251a577ed36ab53
p416le fa4e023d0bf4b03b0ffef3d4d35abf7e
rgb0 0984eb985dabbe757ed6beb53db84eff
rgb24 17f9e2e0c609009acaf2175c42d4a2a5

4
tests/ref/fate/filter-pixfmts-scale
Unescape View File

@ -68,10 +68,14 @@ p016be 31e204018cbb53f8988c4e1174ea8ce9
p016le d5afe557f492a09317e525d7cb782f5b
p210be 2cc6dfcf5e006c8ed5238988a06fd45e
p210le 04efb8f14a9d98417af40954a06aa187
p212be 611c6e267e7a694ce89467779e44060b
p212le 3d060f9f294b484ebe1ee120c808af03
p216be 2f649a226812c8e5a553c4e22d301684
p216le c8f65811f717a12706a598561c6df46d
p410be 354cd1324ad382df1a3d573833323cce
p410le 90fdd95ec4482c127d98307550a885c6
p412be dc04d91115bcd4100bfb61c103e0877c
p412le b01358e9c0fa99a98dadd28769f949e8
p416be aa54294859a8e6cb2c9cf64d343fdb60
p416le d91a0858ea8d2cf1ed29f179c9ad9666
pal8 29e10892009b2cfe431815ec3052ed3b

2
tests/ref/fate/filter-pixfmts-transpose
Unescape View File

@ -65,6 +65,8 @@ p016be ad0de2cc9bff81688b182a870fcf7000
p016le e7ff5143595021246733ce6bd0a769e8
p410be 8b3e0ccb31b6a20ff00a29253fb2dec3
p410le 4e5f78dfccda9a6387e81354a56a033a
p412be 88e4578d2c6d99399a6cf1db9e4c0553
p412le 7905a6e5a0c29b68e025824c7e29adb8
p416be 350a90bda53349435d89ec13533726b7
p416le 7bb46e2aec65669a27502ec452941237
rgb0 31ea5da7fe779c6ea0a33f1d28aad918

4
tests/ref/fate/filter-pixfmts-vflip
Unescape View File

@ -68,10 +68,14 @@ p016be 06e9354b6e0e38ba41736352cedc0bd5
p016le fd18d322bffbf5816902c13102872e22
p210be ca886ab2b3ea5c153f1954b3709f7249
p210le d71c2d4e483030ffd87fa6a68c83fce0
p212be 1734e5840d4e75defe7a28683c3f8856
p212le dec72e3481e123f127a6179b3dcd3a1d
p216be 7f268f755ed02592b3a49fd5f7bd48bb
p216le 2c0a660762527706799c4705ca50a9c5
p410be 4c603e4464ed3f34cc432b4d1f912082
p410le 849308a1cdf41e055019cf311d1b2201
p412be 8e641f154aa2151c9e87b377b4f8b213
p412le 1b22d5b9893b25a8b8836c5fb5aeb43d
p416be 7e7657ab40cf953351a14ea76e296519
p416le 0991d7fff4e2caf36be219ecdd9619d4
pal8 450b0155d0f2d5628bf95a442db5f817

26
tests/ref/fate/sws-pixdesc-query
Unescape View File

@ -67,8 +67,12 @@ isNBPS:
p012le
p210be
p210le
p212be
p212le
p410be
p410le
p412be
p412le
x2bgr10be
x2bgr10le
x2rgb10be
@ -160,8 +164,10 @@ isBE:
p012be
p016be
p210be
p212be
p216be
p410be
p412be
p416be
rgb444be
rgb48be
@ -226,10 +232,14 @@ isYUV:
p016le
p210be
p210le
p212be
p212le
p216be
p216le
p410be
p410le
p412be
p412le
p416be
p416le
uyvy422
@ -338,10 +348,14 @@ isPlanarYUV:
p016le
p210be
p210le
p212be
p212le
p216be
p216le
p410be
p410le
p412be
p412le
p416be
p416le
yuv410p
@ -431,10 +445,14 @@ isSemiPlanarYUV:
p016le
p210be
p210le
p212be
p212le
p216be
p216le
p410be
p410le
p412be
p412le
p416be
p416le
@ -853,10 +871,14 @@ Planar:
p016le
p210be
p210le
p212be
p212le
p216be
p216le
p410be
p410le
p412be
p412le
p416be
p416le
yuv410p
@ -1029,8 +1051,12 @@ DataInHighBits:
p012le
p210be
p210le
p212be
p212le
p410be
p410le
p412be
p412le
xv36be
xv36le
xyz12be

Write Preview
Loading…
Cancel
Save