History

swscale/rgb2xyz: follow convention on image pointers and strides

Instead of taking an int16_t pointer and a stride in halfwords, follow the usual convention of treating all planes and strides as byte-addressed. This does not have any immediate effect but makes these functions more reusable without unintended "gotchas".

Niklas Haas committed 2 years ago

Commit 775de8c1 parent 9d8f5141 file · +45 −38Browse files

Unified · Split

libswscale/swscale.c+45−38
@@ -637,23 +637,26 @@ static int check_image_pointers(const uint8_t * const data[4], enum AVPixelForma · 636 unmodified lines
637637 return 1;
638638 }
639639
640−static void xyz12Torgb48(struct SwsContext *c, uint16_t *dst,
641− const uint16_t *src, int stride, int w, int h)
640+static void xyz12Torgb48(struct SwsContext *c, uint8_t *dst, int dst_stride,
641+ const uint8_t *src, int src_stride, int w, int h)
642642 {
643643 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);
644644
645645 for (int yp = 0; yp < h; yp++) {
646+ const uint16_t *src16 = (const uint16_t *) src;
647+ uint16_t *dst16 = (uint16_t *) dst;
648+
646649 for (int xp = 0; xp < 3 * w; xp += 3) {
647650 int x, y, z, r, g, b;
648651
649652 if (desc->flags & AV_PIX_FMT_FLAG_BE) {
650− x = AV_RB16(src + xp + 0);
651− y = AV_RB16(src + xp + 1);
652− z = AV_RB16(src + xp + 2);
653+ x = AV_RB16(src16 + xp + 0);
654+ y = AV_RB16(src16 + xp + 1);
655+ z = AV_RB16(src16 + xp + 2);
653656 } else {
654− x = AV_RL16(src + xp + 0);
655− y = AV_RL16(src + xp + 1);
656− z = AV_RL16(src + xp + 2);
657+ x = AV_RL16(src16 + xp + 0);
658+ y = AV_RL16(src16 + xp + 1);
659+ z = AV_RL16(src16 + xp + 2);
657660 }
658661
659662 x = c->xyzgamma[x >> 4];
@@ -678,37 +681,41 @@ static void xyz12Torgb48(struct SwsContext *c, uint16_t *dst, · 18 unmodified lines
678681
679682 // convert from sRGBlinear to RGB and scale from 12bit to 16bit
680683 if (desc->flags & AV_PIX_FMT_FLAG_BE) {
681− AV_WB16(dst + xp + 0, c->rgbgamma[r] << 4);
682− AV_WB16(dst + xp + 1, c->rgbgamma[g] << 4);
683− AV_WB16(dst + xp + 2, c->rgbgamma[b] << 4);
684+ AV_WB16(dst16 + xp + 0, c->rgbgamma[r] << 4);
685+ AV_WB16(dst16 + xp + 1, c->rgbgamma[g] << 4);
686+ AV_WB16(dst16 + xp + 2, c->rgbgamma[b] << 4);
684687 } else {
685− AV_WL16(dst + xp + 0, c->rgbgamma[r] << 4);
686− AV_WL16(dst + xp + 1, c->rgbgamma[g] << 4);
687− AV_WL16(dst + xp + 2, c->rgbgamma[b] << 4);
688+ AV_WL16(dst16 + xp + 0, c->rgbgamma[r] << 4);
689+ AV_WL16(dst16 + xp + 1, c->rgbgamma[g] << 4);
690+ AV_WL16(dst16 + xp + 2, c->rgbgamma[b] << 4);
688691 }
689692 }
690− src += stride;
691− dst += stride;
693+
694+ src += src_stride;
695+ dst += dst_stride;
692696 }
693697 }
694698
695−static void rgb48Toxyz12(struct SwsContext *c, uint16_t *dst,
696− const uint16_t *src, int stride, int w, int h)
699+static void rgb48Toxyz12(struct SwsContext *c, uint8_t *dst, int dst_stride,
700+ const uint8_t *src, int src_stride, int w, int h)
697701 {
698702 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->dstFormat);
699703
700704 for (int yp = 0; yp < h; yp++) {
705+ uint16_t *src16 = (uint16_t *) src;
706+ uint16_t *dst16 = (uint16_t *) dst;
707+
701708 for (int xp = 0; xp < 3 * w; xp += 3) {
702709 int x, y, z, r, g, b;
703710
704711 if (desc->flags & AV_PIX_FMT_FLAG_BE) {
705− r = AV_RB16(src + xp + 0);
706− g = AV_RB16(src + xp + 1);
707− b = AV_RB16(src + xp + 2);
712+ r = AV_RB16(src16 + xp + 0);
713+ g = AV_RB16(src16 + xp + 1);
714+ b = AV_RB16(src16 + xp + 2);
708715 } else {
709− r = AV_RL16(src + xp + 0);
710− g = AV_RL16(src + xp + 1);
711− b = AV_RL16(src + xp + 2);
716+ r = AV_RL16(src16 + xp + 0);
717+ g = AV_RL16(src16 + xp + 1);
718+ b = AV_RL16(src16 + xp + 2);
712719 }
713720
714721 r = c->rgbgammainv[r>>4];
@@ -733,17 +740,18 @@ static void rgb48Toxyz12(struct SwsContext *c, uint16_t *dst, · 18 unmodified lines
733740
734741 // convert from XYZlinear to X'Y'Z' and scale from 12bit to 16bit
735742 if (desc->flags & AV_PIX_FMT_FLAG_BE) {
736− AV_WB16(dst + xp + 0, c->xyzgammainv[x] << 4);
737− AV_WB16(dst + xp + 1, c->xyzgammainv[y] << 4);
738− AV_WB16(dst + xp + 2, c->xyzgammainv[z] << 4);
743+ AV_WB16(dst16 + xp + 0, c->xyzgammainv[x] << 4);
744+ AV_WB16(dst16 + xp + 1, c->xyzgammainv[y] << 4);
745+ AV_WB16(dst16 + xp + 2, c->xyzgammainv[z] << 4);
739746 } else {
740− AV_WL16(dst + xp + 0, c->xyzgammainv[x] << 4);
741− AV_WL16(dst + xp + 1, c->xyzgammainv[y] << 4);
742− AV_WL16(dst + xp + 2, c->xyzgammainv[z] << 4);
747+ AV_WL16(dst16 + xp + 0, c->xyzgammainv[x] << 4);
748+ AV_WL16(dst16 + xp + 1, c->xyzgammainv[y] << 4);
749+ AV_WL16(dst16 + xp + 2, c->xyzgammainv[z] << 4);
743750 }
744751 }
745− src += stride;
746− dst += stride;
752+
753+ src += src_stride;
754+ dst += dst_stride;
747755 }
748756 }
749757
@@ -993,8 +1001,7 @@ static int scale_internal(SwsContext *c, · 243 unmodified lines
9931001 base = srcStride[0] < 0 ? c->xyz_scratch - srcStride[0] * (srcSliceH-1) :
9941002 c->xyz_scratch;
9951003
996− xyz12Torgb48(c, (uint16_t*)base, (const uint16_t*)src2[0], srcStride[0]/2,
997− c->srcW, srcSliceH);
1004+ xyz12Torgb48(c, base, srcStride[0], src2[0], srcStride[0], c->srcW, srcSliceH);
9981005 src2[0] = base;
9991006 }
10001007
@@ -1052,21 +1059,21 @@ static int scale_internal(SwsContext *c, · 51 unmodified lines
10521059 }
10531060
10541061 if (c->dstXYZ && !(c->srcXYZ && c->srcW==c->dstW && c->srcH==c->dstH)) {
1055− uint16_t *dst16;
1062+ uint8_t *dst;
10561063
10571064 if (scale_dst) {
1058− dst16 = (uint16_t *)dst2[0];
1065+ dst = dst2[0];
10591066 } else {
10601067 int dstY = c->dstY ? c->dstY : srcSliceY + srcSliceH;
10611068
10621069 av_assert0(dstY >= ret);
10631070 av_assert0(ret >= 0);
10641071 av_assert0(c->dstH >= dstY);
1065− dst16 = (uint16_t*)(dst2[0] + (dstY - ret) * dstStride2[0]);
1072+ dst = dst2[0] + (dstY - ret) * dstStride2[0];
10661073 }
10671074
10681075 /* replace on the same data */
1069− rgb48Toxyz12(c, dst16, dst16, dstStride2[0]/2, c->dstW, ret);
1076+ rgb48Toxyz12(c, dst, dstStride2[0], dst, dstStride2[0], c->dstW, ret);
10701077 }
10711078
10721079 /* reset slice direction at end of frame */

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