RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

zimg: minor name consistency improvement 

Now these are like x2ccc10_pack: MSB to LSB, with bit width following
each component (except for components with the same bit width).
This commit is contained in:
wm4 2019-10-20 23:17:37 +02:00
parent 1c96152db3
commit 43e903980b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/zimg.c
View File

@ -236,7 +236,7 @@ static int align_unpack(void *user, unsigned i, unsigned x0, unsigned x1)
} }
// 3 8 bit color components sourced from 3 planes, plus 8 MSB padding bits. // 3 8 bit color components sourced from 3 planes, plus 8 MSB padding bits.
static void cccx8_pack(void *dst, void *src[], int x0, int x1) static void x8ccc8_pack(void *dst, void *src[], int x0, int x1)
{ {
for (int x = x0; x < x1; x++) { for (int x = x0; x < x1; x++) {
((uint32_t *)dst)[x] = ((uint32_t *)dst)[x] =
@ -247,7 +247,7 @@ static void cccx8_pack(void *dst, void *src[], int x0, int x1)
} }
// 3 8 bit color components sourced from 3 planes, plus 8 LSB padding bits. // 3 8 bit color components sourced from 3 planes, plus 8 LSB padding bits.
static void xccc8_pack(void *dst, void *src[], int x0, int x1) static void ccc8x8_pack(void *dst, void *src[], int x0, int x1)
{ {
for (int x = x0; x < x1; x++) { for (int x = x0; x < x1; x++) {
((uint32_t *)dst)[x] = ((uint32_t *)dst)[x] =
@ -390,7 +390,7 @@ static void setup_regular_rgb_packer(struct mp_zimg_repack *r)
// word access, while the metadata here uses byte access). // word access, while the metadata here uses byte access).
int first = p->components[0] ? 0 : 1; int first = p->components[0] ? 0 : 1;
r->repack = packed_repack; r->repack = packed_repack;
r->packed_repack_scanline = p->components[0] ? cccx8_pack : xccc8_pack; r->packed_repack_scanline = p->components[0] ? x8ccc8_pack : ccc8x8_pack;
r->zimgfmt = planar_fmt; r->zimgfmt = planar_fmt;
for (int n = 0; n < 3; n++) for (int n = 0; n < 3; n++)
r->components[n] = corder[p->components[first + n]]; r->components[n] = corder[p->components[first + n]];