Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'

Browse Source 
* commit '0ca0924c10d9617a5793964bf79655424ef32b68':
  swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64

Conflicts:
	libswscale/swscale_unscaled.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/64/head
Michael Niedermayer 11 years ago
parent cecb6d6f83 0ca0924c10
commit 3428a9b8d5
11 changed files with 24 additions and 4 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. 2
      libswscale/swscale_unscaled.c
  2. 8
      libswscale/utils.c
  3. 2
      tests/ref/fate/filter-pixfmts-copy
  4. 2
      tests/ref/fate/filter-pixfmts-crop
  5. 2
      tests/ref/fate/filter-pixfmts-field
  6. 2
      tests/ref/fate/filter-pixfmts-fieldorder
  7. 2
      tests/ref/fate/filter-pixfmts-hflip
  8. 2
      tests/ref/fate/filter-pixfmts-il
  9. 2
      tests/ref/fate/filter-pixfmts-null
  10. 2
      tests/ref/fate/filter-pixfmts-scale
  11. 2
      tests/ref/fate/filter-pixfmts-vflip

2
libswscale/swscale_unscaled.c
Unescape View File

@ -1666,6 +1666,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGRA64) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR555) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR565) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGRA64) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY16) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRP9) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRP10) ||
@ -1678,6 +1679,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGBA64) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB555) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB565) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGBA64) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_XYZ12) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV420P9) ||
IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YUV420P10) ||

8
libswscale/utils.c
Unescape View File

@ -142,8 +142,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_YUVA444P16LE]= { 1, 1 },
[AV_PIX_FMT_RGB48BE] = { 1, 1 },
[AV_PIX_FMT_RGB48LE] = { 1, 1 },
[AV_PIX_FMT_RGBA64BE] = { 1, 1 },
[AV_PIX_FMT_RGBA64LE] = { 1, 1 },
[AV_PIX_FMT_RGBA64BE] = { 1, 1, 1 },
[AV_PIX_FMT_RGBA64LE] = { 1, 1, 1 },
[AV_PIX_FMT_RGB565BE] = { 1, 1 },
[AV_PIX_FMT_RGB565LE] = { 1, 1 },
[AV_PIX_FMT_RGB555BE] = { 1, 1 },
@ -165,8 +165,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_Y400A] = { 1, 0 },
[AV_PIX_FMT_BGR48BE] = { 1, 1 },
[AV_PIX_FMT_BGR48LE] = { 1, 1 },
[AV_PIX_FMT_BGRA64BE] = { 0, 0 },
[AV_PIX_FMT_BGRA64LE] = { 0, 0 },
[AV_PIX_FMT_BGRA64BE] = { 0, 0, 1 },
[AV_PIX_FMT_BGRA64LE] = { 0, 0, 1 },
[AV_PIX_FMT_YUV420P9BE] = { 1, 1 },
[AV_PIX_FMT_YUV420P9LE] = { 1, 1 },
[AV_PIX_FMT_YUV420P10BE] = { 1, 1 },

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

@ -15,6 +15,8 @@ bgr565be 13a36d6502be88fc0c2aec05b8d2d501
bgr565le ed027571692aecd522aa65a90cc7e09b
bgr8 71ef789609c746c2e7e4be9dec29062c
bgra 0364b074268682ea46168742a8239f7d
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap 412a2449fdfaeb5ebdf5e4196cc7391a
gbrp 4778f8cc2bdbcd65e272ea1761cdca6d
gbrp10be 0be11fe4b2324054be6f949e81966691

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

@ -15,6 +15,8 @@ bgr565be ee9a1debb896d41c53a026f9e6ce006b
bgr565le ab7b6055bc3b6b7edc9a5e4de43ec90d
bgr8 f85ff16e21d922ad6d32648ef3acfbfb
bgra 9f2e37d73ad3b759fc9d6b12ee668c38
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap 32c0326859b41ae1fee015648162c6a0
gbrp 0f59d3a61d391c3dea6f6e5861e9c2f7
gbrp10be bc12b34950af11e3f1016acbe2d5dec5

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

@ -15,6 +15,8 @@ bgr565be bf955b9a035af0e613cf1de249f55f9d
bgr565le 6dd85cd5e19266c53a54cbcf06d396a7
bgr8 9669f6974f0fc1c0afa1c7d4df093c0b
bgra f7cabae31dd7465dab2203f45db646f8
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap fdb15f25cd6db3d19a7df727e0f4de3a
gbrp 0867ccbcdf50a02871ad7788e3e0931e
gbrp10be c452475d38b13a4707634eff74001215

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

@ -15,6 +15,8 @@ bgr565be c37ced8fa4951da20831edf9bd46b35c
bgr565le da0ee7f773efa07fdacc62b7deac452b
bgr8 94a043f6d5e01de077a92a9be6f77582
bgra 02db5e046ced11d3f09d901cae205e2f
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap 5317a66b677c943203b2a5e93607dc68
gbrp b1ffeba90a60e9a23c9f35466c135069
gbrp10be 07b2842fdf9b92f6cd8e8cf3a8abdfac

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

@ -15,6 +15,8 @@ bgr565be 3b464a00c619410eac7bdea9c96faf60
bgr565le 4b4c708d4ad222f41734dce68e9d48b6
bgr8 ad1db7a17cdfab2ede6f22c2415a3fbf
bgra 85fa06ad9fd156c3179a647a2e741b60
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap 5fbf0a36ee9486161a862a4b2d6f8242
gbrp 8b00ca96932c9bce5bca01ee621e0957
gbrp10be df96591083deab8382c1907ea1e99e9e

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

@ -15,6 +15,8 @@ bgr565be 5ff7a76d9f58800e38f21a84d88c7129
bgr565le 485b2b6f589a936d6fb12d0033809dca
bgr8 d7fae34b87a67556c273585d9140ff96
bgra 7b4abc57f0ee99a0226e9bfd5d25cf9e
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap 583131faa19f062f6523321da52066de
gbrp a2db88b8efce6681a3c858be2c229a33
gbrp10be 714a32d10c27395406f4e4afb20a2216

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

@ -15,6 +15,8 @@ bgr565be 13a36d6502be88fc0c2aec05b8d2d501
bgr565le ed027571692aecd522aa65a90cc7e09b
bgr8 71ef789609c746c2e7e4be9dec29062c
bgra 0364b074268682ea46168742a8239f7d
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap 412a2449fdfaeb5ebdf5e4196cc7391a
gbrp 4778f8cc2bdbcd65e272ea1761cdca6d
gbrp10be 0be11fe4b2324054be6f949e81966691

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

@ -15,6 +15,8 @@ bgr565be fca6f07daf23d9dd84381dd4c9afd959
bgr565le f524e9f16bdd68b247dbcb621e543fc0
bgr8 2a6509639c181fb7829721bdbf78187c
bgra fec5335edde2f1ee1f40d2fe4305855c
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap 76ddf2bedea40c8743f4117b786d4773
gbrp e2704defddf1cb8d75f0c80fec6491d3
gbrp10be 7dce0805f7ead7d480bd83323d76bf9c

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

@ -15,6 +15,8 @@ bgr565be 7100c2ddfee42e7efafec1ccefecf7c6
bgr565le 9fab295d966386d4ef99d5b43066da47
bgr8 275ce12eeb05de67a6915f67cbb43ce5
bgra d29c35871248c476c366e678db580982
bgra64be d41d8cd98f00b204e9800998ecf8427e
bgra64le d41d8cd98f00b204e9800998ecf8427e
gbrap 29844a8e4334493fdd2d499bcb532535
gbrp d3f2823513bfdac8f714385513cc396b
gbrp10be 49b93ac01777e4bafcb9afd4d9d74533

Write Preview
Loading…
Cancel
Save