History

swscale/yuv2rgb: fix conversion to X2RGB10

This resolves a problem where conversions from YUV to X2RGB10LE would produce color values a factor 4 too small, because an 8-bit value was placed in a 10-bit channel.

Manuel Stoeckl committed 5 years ago

Commit ca594df1 parent 78ec2f313 files · +13 −13Browse files

Unified · Split

13 files
  1. libswscale/yuv2rgb.c +1 −1
  2. tests/ref/fate/filter-pixdesc-x2rgb10le +1 −1
  3. tests/ref/fate/filter-pixfmts-copy +1 −1
  4. tests/ref/fate/filter-pixfmts-crop +1 −1
  5. tests/ref/fate/filter-pixfmts-field +1 −1
  6. tests/ref/fate/filter-pixfmts-fieldorder +1 −1
  7. tests/ref/fate/filter-pixfmts-hflip +1 −1
  8. tests/ref/fate/filter-pixfmts-il +1 −1
  9. tests/ref/fate/filter-pixfmts-null +1 −1
  10. tests/ref/fate/filter-pixfmts-pad +1 −1
  11. tests/ref/fate/filter-pixfmts-scale +1 −1
  12. tests/ref/fate/filter-pixfmts-transpose +1 −1
  13. tests/ref/fate/filter-pixfmts-vflip +1 −1
libswscale/yuv2rgb.c+1−1
@@ -976,7 +976,7 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], · 975 unmodified lines
976976 y_table32 = c->yuvTable;
977977 yb = -(384 << 16) - YUVRGB_TABLE_LUMA_HEADROOM*cy - oy;
978978 for (i = 0; i < table_plane_size; i++) {
979− unsigned yval = av_clip_uint8((yb + 0x8000) >> 16);
979+ unsigned yval = av_clip_uintp2((yb + 0x8000) >> 14, 10);
980980 y_table32[i]= (yval << rbase) + (needAlpha ? 0 : (255u << abase));
981981 y_table32[i + table_plane_size] = yval << gbase;
982982 y_table32[i + 2 * table_plane_size] = yval << bbase;
tests/ref/fate/filter-pixdesc-x2rgb10le+1−1
@@ -1 +1 @@
1−pixdesc-x2rgb10le 98d697ed4668daf535163d5e08c903bb
1+pixdesc-x2rgb10le b50c6ddaf37214a06251c29798f94d6d
tests/ref/fate/filter-pixfmts-copy+1−1
@@ -80,7 +80,7 @@ rgba b6e1b441c365e03b5ffdf9b7b68d9a0c · 79 unmodified lines
8080 rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea
8181 rgba64le b91e1d77f799eb92241a2d2d28437b15
8282 uyvy422 3bcf3c80047592f2211fae3260b1b65d
83−x2rgb10le b0a0c8056521beeaa3fea4985ca87176
83+x2rgb10le c1e3ac21be04a16bb157b22784524520
8484 xyz12be a1ef56bf746d71f59669c28e48fc8450
8585 xyz12le 831ff03c1ba4ef19374686f16a064d8c
8686 ya16be 37c07787e544f900c87b853253bfc8dd
tests/ref/fate/filter-pixfmts-crop+1−1
@@ -77,7 +77,7 @@ rgb8 9b364a8f112ad9459fec47a51cc03b30 · 76 unmodified lines
7777 rgba 9488ac85abceaf99a9309eac5a87697e
7878 rgba64be 89910046972ab3c68e2a348302cc8ca9
7979 rgba64le fea8ebfc869b52adf353778f29eac7a7
80−x2rgb10le 5c0789f76a713f343c2ed42a371d441d
80+x2rgb10le f4265aca7a67dbfa9354370098ca6f33
8181 xyz12be cb4571f9aaa7b59f999ef327276104b7
8282 xyz12le cd6aae8d26b18bdb4b9d068586276d91
8383 ya16be a3d18014454942a96f15a49947c0c55d
tests/ref/fate/filter-pixfmts-field+1−1
@@ -80,7 +80,7 @@ rgba ee616262ca6d67b7ecfba4b36c602ce3 · 79 unmodified lines
8080 rgba64be 23c8c0edaabe3eaec89ce69633fb0048
8181 rgba64le dfdba4de4a7cac9abf08852666c341d3
8282 uyvy422 1c49e44ab3f060e85fc4a3a9464f045e
83−x2rgb10le a7a5dcdfe1d4b6bd71e40b01c735f144
83+x2rgb10le a18bc4ae5274e0a8cca9137ecd50c677
8484 xyz12be d2fa69ec91d3ed862f2dac3f8e7a3437
8585 xyz12le 02bccd5e0b6824779a1f848b0ea3e3b5
8686 ya16be 40403b5277364777e0671da4d38e01ac
tests/ref/fate/filter-pixfmts-fieldorder+1−1
@@ -71,7 +71,7 @@ rgba 1fdf872a087a32cd35b80cc7be399578 · 70 unmodified lines
7171 rgba64be 5598f44514d122b9a57c5c92c20bbc61
7272 rgba64le b34e6e30621ae579519a2d91a96a0acf
7373 uyvy422 75de70e31c435dde878002d3f22b238a
74−x2rgb10le 636c90498c64abba1cc0624c5209a61f
74+x2rgb10le cdf6a9e8a8d081aa768c6ae2e6221676
7575 xyz12be 15f5cda71de5fef9cec5e75e3833b6bc
7676 xyz12le 7be6c8781f38c21a6b8f602f62ca31e6
7777 ya16be 0f13e0f52586d172aaa07710fa3e8f31
tests/ref/fate/filter-pixfmts-hflip+1−1
@@ -77,7 +77,7 @@ rgb8 68a3a575badadd9e4f90226209f11699 · 76 unmodified lines
7777 rgba 51961c723ea6707e0a410cd3f21f15d3
7878 rgba64be c910444019f4cfbf4d995227af55da8d
7979 rgba64le 0c810d8b3a6bca10321788e1cb145340
80−x2rgb10le 9f99dce306383daf25cd1542b2517fef
80+x2rgb10le d4a8189b65395a88d0a38a7053f3359f
8181 xyz12be 25f90259ff8a226befdaec3dfe82996e
8282 xyz12le 926c0791d59aaff61b2778e8ada3316d
8383 ya16be d5b342355bdd9e3197e01b13b7c6301e
tests/ref/fate/filter-pixfmts-il+1−1
@@ -79,7 +79,7 @@ rgba 625d8f4bd39c4bdbf61eb5e4713aecc9 · 78 unmodified lines
7979 rgba64be db70d33aa6c06f3e0a1c77bd11284261
8080 rgba64le a8a2daae04374a27219bc1c890204007
8181 uyvy422 d6ee3ca43356d08c392382b24b22cda5
82−x2rgb10le a01ea7dd339e028780e04971012d826d
82+x2rgb10le 517fb186f523dc7cdc5c5c6967cfbe94
8383 xyz12be 7c7d54c55f136cbbc50b18029f3be0b3
8484 xyz12le 090ba6b1170baf2b1358b43b971d33b0
8585 ya16be 7bc720918bc0132e9717acbde89874e0
tests/ref/fate/filter-pixfmts-null+1−1
@@ -80,7 +80,7 @@ rgba b6e1b441c365e03b5ffdf9b7b68d9a0c · 79 unmodified lines
8080 rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea
8181 rgba64le b91e1d77f799eb92241a2d2d28437b15
8282 uyvy422 3bcf3c80047592f2211fae3260b1b65d
83−x2rgb10le b0a0c8056521beeaa3fea4985ca87176
83+x2rgb10le c1e3ac21be04a16bb157b22784524520
8484 xyz12be a1ef56bf746d71f59669c28e48fc8450
8585 xyz12le 831ff03c1ba4ef19374686f16a064d8c
8686 ya16be 37c07787e544f900c87b853253bfc8dd
tests/ref/fate/filter-pixfmts-pad+1−1
@@ -28,7 +28,7 @@ nv42 1738ad3c31c6c16e17679f5b09ce4677 · 27 unmodified lines
2828 rgb0 78d500c8361ab6423a4826a00268c908
2929 rgb24 17f9e2e0c609009acaf2175c42d4a2a5
3030 rgba b157c90191463d34fb3ce77b36c96386
31−x2rgb10le c240f8a8dfa647c57c0974d061c9652a
31+x2rgb10le a0c5925bd56b6f85f918c4e9fb93e90e
3232 xyz12le 85abf80b77a9236a76ba0b00fcbdea2d
3333 ya16le 940fafa240b9916de5f73cb20a552f24
3434 ya8 5fc0f471207ddf7aa01b07027d56b672
tests/ref/fate/filter-pixfmts-scale+1−1
@@ -80,7 +80,7 @@ rgba 85bb5d03cea1c6e8002ced3373904336 · 79 unmodified lines
8080 rgba64be ee73e57923af984b31cc7795d13929da
8181 rgba64le 783d2779adfafe3548bdb671ec0de69e
8282 uyvy422 aeb4ba4f9f003ae21f6d18089198244f
83−x2rgb10le 591fe7942544c8fc40e5d30e0e589f49
83+x2rgb10le d56bdb23fa6a8e12a0b4394987f89935
8484 xyz12be c7ba8345998c0141ddc079cdd29b1a40
8585 xyz12le 95f5d3a0de834cc495c9032a14987cde
8686 ya16be 20d4842899d61068f5fb6af478bf26a6
tests/ref/fate/filter-pixfmts-transpose+1−1
@@ -76,7 +76,7 @@ rgb8 c90feb30c3c9391ef5f470209d7b7a15 · 75 unmodified lines
7676 rgba 4d76a9542143752a4ac30f82f88f68f1
7777 rgba64be a60041217f4c0cd796d19d3940a12a41
7878 rgba64le ad47197774858858ae7b0c177dffa459
79−x2rgb10le a64d4d901b09bea9d59eda58be5e88ff
79+x2rgb10le 09cb1d98fe17ad8a6d9d3bec97ddc845
8080 xyz12be 68e5cba640f6e4ef72dff950e88b5342
8181 xyz12le 8b6b6a6db4d7561e80db88ccaecce7a9
8282 ya16be 3e161cb5f225922a80fefdc9cc02a4f9
tests/ref/fate/filter-pixfmts-vflip+1−1
@@ -80,7 +80,7 @@ rgba c1a5908572737f2ae1e5d8218af65f4b · 79 unmodified lines
8080 rgba64be 17e6273323b5779b5f3f775f150c1011
8181 rgba64le 48f45b10503b7dd140329c3dd0d54c98
8282 uyvy422 3a237e8376264e0cfa78f8a3fdadec8a
83−x2rgb10le 332a6f5f5012008a562cb031836da028
83+x2rgb10le 262c502230cf3724f8e2cf4737f18a42
8484 xyz12be 810644e008deb231850d779aaa27cc7e
8585 xyz12le 829701db461b43533cf9241e0743bc61
8686 ya16be 55b1dbbe4d56ed0d22461685ce85520d

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t