From 74a20707e5f0f86aeedcadf43bc81ece5575aaab Mon Sep 17 00:00:00 2001 From: hanishkvc Date: Fri, 26 Jun 2020 15:15:09 +0530 Subject: [PATCH 02/15] Fix oversights, i32 back to i64 bcas its a union --- libavfilter/vf_fbdetile.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_fbdetile.c b/libavfilter/vf_fbdetile.c index 4e9613b079..313963643d 100644 --- a/libavfilter/vf_fbdetile.c +++ b/libavfilter/vf_fbdetile.c @@ -47,9 +47,9 @@ typedef struct FBDetileContext { #define OFFSET(x) offsetof(FBDetileContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM static const AVOption fbdetile_options[] = { - { "type", "set framebuffer format_modifier type", OFFSET(type), AV_OPT_TYPE_INT, {.i32=TYPE_INTELX}, 0, NB_TYPE-1, FLAGS, "type" }, - { "intelx", "Intel XTiled layout", 0, AV_OPT_TYPE_CONST, {.i32=TYPE_INTELX}, INT_MIN, INT_MAX, FLAGS, "type" }, - { "intely", "Intel YTiled layout", 0, AV_OPT_TYPE_CONST, {.i32=TYPE_INTELY}, INT_MIN, INT_MAX, FLAGS, "type" }, + { "type", "set framebuffer format_modifier type", OFFSET(type), AV_OPT_TYPE_INT, {.i64=TYPE_INTELX}, 0, NB_TYPE-1, FLAGS, "type" }, + { "intelx", "Intel XTiled layout", 0, AV_OPT_TYPE_CONST, {.i64=TYPE_INTELX}, INT_MIN, INT_MAX, FLAGS, "type" }, + { "intely", "Intel YTiled layout", 0, AV_OPT_TYPE_CONST, {.i64=TYPE_INTELY}, INT_MIN, INT_MAX, FLAGS, "type" }, { NULL } }; @@ -88,23 +88,22 @@ static int config_props(AVFilterLink *inlink) } static void detile_intelx(AVFilterContext *ctx, int w, int h, - uint8_t *dst, int dstLinesize, - const uint8_t *src, int srcLinesize) + uint8_t *dst, int dstLineSize, + const uint8_t *src, int srcLineSize) { - int i, j; // For a 32Bit / Pixel framebuffer int tileW = 128; int tileH = 8; int numHTiles = w/tileW; - sO = 0; - dX = 0; - dY = 0; - nTRows = (w*h)/tileW; - cTR = 0; - k = 0; + int sO = 0; + int dX = 0; + int dY = 0; + int nTRows = (w*h)/tileW; + int cTR = 0; + int k = 0; while (cTR < nTRows) { - dO = dY*dstLinesize + dX; + int dO = dY*dstLineSize + dX; memcpy(dst+dO+0*dstLineSize, src+sO+0*512, 512); memcpy(dst+dO+1*dstLineSize, src+sO+1*512, 512); memcpy(dst+dO+2*dstLineSize, src+sO+2*512, 512); -- 2.20.1