This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 7289b00894a9d5f0b57deac6d86a228fc8f5607f Author: Andreas Rheinhardt <[email protected]> AuthorDate: Fri Aug 7 17:31:07 2026 +0200 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Sun Aug 9 17:29:55 2026 +0200 avcodec/dirac_dwt: Use ptrdiff_t for stride Reviewed-by: Lynne <[email protected]> Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/dirac_dwt.c | 2 +- libavcodec/dirac_dwt.h | 7 ++++--- libavcodec/dirac_dwt_template.c | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c index 0d92ad06da..859e2234e7 100644 --- a/libavcodec/dirac_dwt.c +++ b/libavcodec/dirac_dwt.c @@ -73,7 +73,7 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y) for (level = d->decomposition_count-1; level >= 0; level--) { int wl = d->width >> level; int hl = d->height >> level; - int stride_l = d->stride << level; + ptrdiff_t stride_l = d->stride << level; while (d->cs[level].y <= FFMIN((y>>level)+support, hl)) d->spatial_compose(d, level, wl, hl, stride_l); diff --git a/libavcodec/dirac_dwt.h b/libavcodec/dirac_dwt.h index 84f71d9120..909b18327a 100644 --- a/libavcodec/dirac_dwt.h +++ b/libavcodec/dirac_dwt.h @@ -21,6 +21,7 @@ #ifndef AVCODEC_DIRAC_DWT_H #define AVCODEC_DIRAC_DWT_H +#include <stddef.h> #include <stdint.h> typedef int DWTELEM; @@ -37,7 +38,7 @@ typedef struct DWTCompose { typedef struct DWTPlane { int width; int height; - int stride; + ptrdiff_t stride; uint8_t *buf; uint8_t *buf_base; uint8_t *tmp; @@ -56,11 +57,11 @@ typedef struct DWTContext { uint8_t *temp; int width; int height; - int stride; + ptrdiff_t stride; int decomposition_count; int support; - void (*spatial_compose)(struct DWTContext *cs, int level, int width, int height, int stride); + void (*spatial_compose)(struct DWTContext *cs, int level, int width, int height, ptrdiff_t stride); union { vertical_compose_3tap tap3; vertical_compose_5tap tap5; diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c index 0d39754ed8..886d806f06 100644 --- a/libavcodec/dirac_dwt_template.c +++ b/libavcodec/dirac_dwt_template.c @@ -336,7 +336,7 @@ static void RENAME(vertical_compose_daub97iL1)(uint8_t *_b0, uint8_t *_b1, uint8 } } -static void RENAME(spatial_compose_dd97i_dy)(DWTContext *d, int level, int width, int height, int stride) +static void RENAME(spatial_compose_dd97i_dy)(DWTContext *d, int level, int width, int height, ptrdiff_t stride) { vertical_compose_3tap vertical_compose_l0 = d->vertical_compose_l0.tap3; vertical_compose_5tap vertical_compose_h0 = d->vertical_compose_h0.tap5; @@ -360,7 +360,7 @@ static void RENAME(spatial_compose_dd97i_dy)(DWTContext *d, int level, int width cs->y += 2; } -static void RENAME(spatial_compose_dirac53i_dy)(DWTContext *d, int level, int width, int height, int stride) +static void RENAME(spatial_compose_dirac53i_dy)(DWTContext *d, int level, int width, int height, ptrdiff_t stride) { vertical_compose_3tap vertical_compose_l0 = d->vertical_compose_l0.tap3; vertical_compose_3tap vertical_compose_h0 = d->vertical_compose_h0.tap3; @@ -382,7 +382,7 @@ static void RENAME(spatial_compose_dirac53i_dy)(DWTContext *d, int level, int wi cs->y += 2; } -static void RENAME(spatial_compose_dd137i_dy)(DWTContext *d, int level, int width, int height, int stride) +static void RENAME(spatial_compose_dd137i_dy)(DWTContext *d, int level, int width, int height, ptrdiff_t stride) { vertical_compose_5tap vertical_compose_l0 = d->vertical_compose_l0.tap5; vertical_compose_5tap vertical_compose_h0 = d->vertical_compose_h0.tap5; @@ -407,7 +407,7 @@ static void RENAME(spatial_compose_dd137i_dy)(DWTContext *d, int level, int widt } // haar makes the assumption that height is even (always true for dirac) -static void RENAME(spatial_compose_haari_dy)(DWTContext *d, int level, int width, int height, int stride) +static void RENAME(spatial_compose_haari_dy)(DWTContext *d, int level, int width, int height, ptrdiff_t stride) { vertical_compose_2tap vertical_compose = d->vertical_compose; int y = d->cs[level].y; @@ -423,7 +423,7 @@ static void RENAME(spatial_compose_haari_dy)(DWTContext *d, int level, int width // Don't do sliced idwt for fidelity; the 9 tap filter makes it a bit annoying // Fortunately, this filter isn't used in practice. -static void RENAME(spatial_compose_fidelity)(DWTContext *d, int level, int width, int height, int stride) +static void RENAME(spatial_compose_fidelity)(DWTContext *d, int level, int width, int height, ptrdiff_t stride) { vertical_compose_9tap vertical_compose_l0 = d->vertical_compose_l0.tap9; vertical_compose_9tap vertical_compose_h0 = d->vertical_compose_h0.tap9; @@ -448,7 +448,7 @@ static void RENAME(spatial_compose_fidelity)(DWTContext *d, int level, int width d->cs[level].y = height+1; } -static void RENAME(spatial_compose_daub97i_dy)(DWTContext *d, int level, int width, int height, int stride) +static void RENAME(spatial_compose_daub97i_dy)(DWTContext *d, int level, int width, int height, ptrdiff_t stride) { vertical_compose_3tap vertical_compose_l0 = d->vertical_compose_l0.tap3; vertical_compose_3tap vertical_compose_h0 = d->vertical_compose_h0.tap3; @@ -476,7 +476,7 @@ static void RENAME(spatial_compose_daub97i_dy)(DWTContext *d, int level, int wid cs->y += 2; } -static void RENAME(spatial_compose97i_init)(DWTCompose *cs, uint8_t *buffer, int height, int stride) +static void RENAME(spatial_compose97i_init)(DWTCompose *cs, uint8_t *buffer, int height, ptrdiff_t stride) { cs->b[0] = buffer + avpriv_mirror(-3-1, height-1)*stride; cs->b[1] = buffer + avpriv_mirror(-3 , height-1)*stride; @@ -485,14 +485,14 @@ static void RENAME(spatial_compose97i_init)(DWTCompose *cs, uint8_t *buffer, int cs->y = -3; } -static void RENAME(spatial_compose53i_init)(DWTCompose *cs, uint8_t *buffer, int height, int stride) +static void RENAME(spatial_compose53i_init)(DWTCompose *cs, uint8_t *buffer, int height, ptrdiff_t stride) { cs->b[0] = buffer + avpriv_mirror(-1-1, height-1)*stride; cs->b[1] = buffer + avpriv_mirror(-1 , height-1)*stride; cs->y = -1; } -static void RENAME(spatial_compose_dd97i_init)(DWTCompose *cs, uint8_t *buffer, int height, int stride) +static void RENAME(spatial_compose_dd97i_init)(DWTCompose *cs, uint8_t *buffer, int height, ptrdiff_t stride) { cs->b[0] = buffer + av_clip(-5-1, 0, height-2)*stride; cs->b[1] = buffer + av_clip(-5 , 1, height-1)*stride; @@ -503,7 +503,7 @@ static void RENAME(spatial_compose_dd97i_init)(DWTCompose *cs, uint8_t *buffer, cs->y = -5; } -static void RENAME(spatial_compose_dd137i_init)(DWTCompose *cs, uint8_t *buffer, int height, int stride) +static void RENAME(spatial_compose_dd137i_init)(DWTCompose *cs, uint8_t *buffer, int height, ptrdiff_t stride) { cs->b[0] = buffer + av_clip(-5-1, 0, height-2)*stride; cs->b[1] = buffer + av_clip(-5 , 1, height-1)*stride; @@ -524,7 +524,7 @@ static int RENAME(spatial_idwt_init)(DWTContext *d, enum dwt_type type) for (level = d->decomposition_count - 1; level >= 0; level--){ int hl = d->height >> level; - int stride_l = d->stride << level; + ptrdiff_t stride_l = d->stride << level; switch(type){ case DWT_DIRAC_DD9_7: _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
