| Message ID | 20210129052302.3124447-1-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Commit | 124e2a79e2b75c8f4d215dd00ab51534caa04b6b |
| Headers | show |
| Series | [FFmpeg-devel,01/13] avfilter/drawutils: Remove remnants of old API | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
LGTM
Are there replacements or substitutes for these? On 29-01-2021 10:52 am, Andreas Rheinhardt wrote: > ff_fill_line_with_color and ff_draw_rectangle are unused since > 19c8f2271423281c9b876b984076a6467c455904; ff_copy_rectangle > is unused since 53b7a3fe081ec56c5706228eb6431bb943ad471a. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavfilter/drawutils.c | 98 ----------------------------------------- > libavfilter/drawutils.h | 13 ------ > 2 files changed, 111 deletions(-) > > diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c > index 5f4cb548f0..71fe25692c 100644 > --- a/libavfilter/drawutils.c > +++ b/libavfilter/drawutils.c > @@ -77,104 +77,6 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt) > return 0; > } > > -int ff_fill_line_with_color(uint8_t *line[4], int pixel_step[4], int w, uint8_t dst_color[4], > - enum AVPixelFormat pix_fmt, uint8_t rgba_color[4], > - int *is_packed_rgba, uint8_t rgba_map_ptr[4]) > -{ > - uint8_t rgba_map[4] = {0}; > - int i; > - const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(pix_fmt); > - int hsub; > - > - av_assert0(pix_desc); > - > - hsub = pix_desc->log2_chroma_w; > - > - *is_packed_rgba = ff_fill_rgba_map(rgba_map, pix_fmt) >= 0; > - > - if (*is_packed_rgba) { > - pixel_step[0] = (av_get_bits_per_pixel(pix_desc))>>3; > - for (i = 0; i < 4; i++) > - dst_color[rgba_map[i]] = rgba_color[i]; > - > - line[0] = av_malloc_array(w, pixel_step[0]); > - if (!line[0]) > - return AVERROR(ENOMEM); > - for (i = 0; i < w; i++) > - memcpy(line[0] + i * pixel_step[0], dst_color, pixel_step[0]); > - if (rgba_map_ptr) > - memcpy(rgba_map_ptr, rgba_map, sizeof(rgba_map[0]) * 4); > - } else { > - int plane; > - > - dst_color[0] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]); > - dst_color[1] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0); > - dst_color[2] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0); > - dst_color[3] = rgba_color[3]; > - > - for (plane = 0; plane < 4; plane++) { > - int line_size; > - int hsub1 = (plane == 1 || plane == 2) ? hsub : 0; > - > - pixel_step[plane] = 1; > - line_size = AV_CEIL_RSHIFT(w, hsub1) * pixel_step[plane]; > - line[plane] = av_malloc(line_size); > - if (!line[plane]) { > - while(plane && line[plane-1]) > - av_freep(&line[--plane]); > - return AVERROR(ENOMEM); > - } > - memset(line[plane], dst_color[plane], line_size); > - } > - } > - > - return 0; > -} > - > -void ff_draw_rectangle(uint8_t *dst[4], int dst_linesize[4], > - uint8_t *src[4], int pixelstep[4], > - int hsub, int vsub, int x, int y, int w, int h) > -{ > - int i, plane; > - uint8_t *p; > - > - for (plane = 0; plane < 4 && dst[plane]; plane++) { > - int hsub1 = plane == 1 || plane == 2 ? hsub : 0; > - int vsub1 = plane == 1 || plane == 2 ? vsub : 0; > - int width = AV_CEIL_RSHIFT(w, hsub1); > - int height = AV_CEIL_RSHIFT(h, vsub1); > - > - p = dst[plane] + (y >> vsub1) * dst_linesize[plane]; > - for (i = 0; i < height; i++) { > - memcpy(p + (x >> hsub1) * pixelstep[plane], > - src[plane], width * pixelstep[plane]); > - p += dst_linesize[plane]; > - } > - } > -} > - > -void ff_copy_rectangle(uint8_t *dst[4], int dst_linesize[4], > - uint8_t *src[4], int src_linesize[4], int pixelstep[4], > - int hsub, int vsub, int x, int y, int y2, int w, int h) > -{ > - int i, plane; > - uint8_t *p; > - > - for (plane = 0; plane < 4 && dst[plane]; plane++) { > - int hsub1 = plane == 1 || plane == 2 ? hsub : 0; > - int vsub1 = plane == 1 || plane == 2 ? vsub : 0; > - int width = AV_CEIL_RSHIFT(w, hsub1); > - int height = AV_CEIL_RSHIFT(h, vsub1); > - > - p = dst[plane] + (y >> vsub1) * dst_linesize[plane]; > - for (i = 0; i < height; i++) { > - memcpy(p + (x >> hsub1) * pixelstep[plane], > - src[plane] + src_linesize[plane]*(i+(y2>>vsub1)), width * pixelstep[plane]); > - p += dst_linesize[plane]; > - } > - } > -} > - > int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) > { > const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); > diff --git a/libavfilter/drawutils.h b/libavfilter/drawutils.h > index b999d70e55..2ca2475585 100644 > --- a/libavfilter/drawutils.h > +++ b/libavfilter/drawutils.h > @@ -30,19 +30,6 @@ > > int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt); > > -int ff_fill_line_with_color(uint8_t *line[4], int pixel_step[4], int w, > - uint8_t dst_color[4], > - enum AVPixelFormat pix_fmt, uint8_t rgba_color[4], > - int *is_packed_rgba, uint8_t rgba_map[4]); > - > -void ff_draw_rectangle(uint8_t *dst[4], int dst_linesize[4], > - uint8_t *src[4], int pixelstep[4], > - int hsub, int vsub, int x, int y, int w, int h); > - > -void ff_copy_rectangle(uint8_t *dst[4], int dst_linesize[4], > - uint8_t *src[4], int src_linesize[4], int pixelstep[4], > - int hsub, int vsub, int x, int y, int y2, int w, int h); > - > #define MAX_PLANES 4 > > typedef struct FFDrawContext {
Gyan Doshi: > Are there replacements or substitutes for these? > The new API was introduced in 8ec0832743d73c5de4c4978ea5f65b54cfa07625; ff_copy_rectangle is replaced by ff_copy_rectangle2, ff_draw_rectangle by ff_fill_rectangle; there is no direct replacement for ff_fill_line_with_color, as said functions allocated the lines which none of the new functions does. - Andreas > On 29-01-2021 10:52 am, Andreas Rheinhardt wrote: >> ff_fill_line_with_color and ff_draw_rectangle are unused since >> 19c8f2271423281c9b876b984076a6467c455904; ff_copy_rectangle >> is unused since 53b7a3fe081ec56c5706228eb6431bb943ad471a. >> >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> >> --- >> libavfilter/drawutils.c | 98 ----------------------------------------- >> libavfilter/drawutils.h | 13 ------ >> 2 files changed, 111 deletions(-) >>
On 30-01-2021 12:47 am, Andreas Rheinhardt wrote: > Gyan Doshi: >> Are there replacements or substitutes for these? >> > The new API was introduced in 8ec0832743d73c5de4c4978ea5f65b54cfa07625; > ff_copy_rectangle is replaced by ff_copy_rectangle2, ff_draw_rectangle > by ff_fill_rectangle; there is no direct replacement for > ff_fill_line_with_color, as said functions allocated the lines which > none of the new functions does. Thanks, Gyan
diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 5f4cb548f0..71fe25692c 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -77,104 +77,6 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt) return 0; } -int ff_fill_line_with_color(uint8_t *line[4], int pixel_step[4], int w, uint8_t dst_color[4], - enum AVPixelFormat pix_fmt, uint8_t rgba_color[4], - int *is_packed_rgba, uint8_t rgba_map_ptr[4]) -{ - uint8_t rgba_map[4] = {0}; - int i; - const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(pix_fmt); - int hsub; - - av_assert0(pix_desc); - - hsub = pix_desc->log2_chroma_w; - - *is_packed_rgba = ff_fill_rgba_map(rgba_map, pix_fmt) >= 0; - - if (*is_packed_rgba) { - pixel_step[0] = (av_get_bits_per_pixel(pix_desc))>>3; - for (i = 0; i < 4; i++) - dst_color[rgba_map[i]] = rgba_color[i]; - - line[0] = av_malloc_array(w, pixel_step[0]); - if (!line[0]) - return AVERROR(ENOMEM); - for (i = 0; i < w; i++) - memcpy(line[0] + i * pixel_step[0], dst_color, pixel_step[0]); - if (rgba_map_ptr) - memcpy(rgba_map_ptr, rgba_map, sizeof(rgba_map[0]) * 4); - } else { - int plane; - - dst_color[0] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]); - dst_color[1] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0); - dst_color[2] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0); - dst_color[3] = rgba_color[3]; - - for (plane = 0; plane < 4; plane++) { - int line_size; - int hsub1 = (plane == 1 || plane == 2) ? hsub : 0; - - pixel_step[plane] = 1; - line_size = AV_CEIL_RSHIFT(w, hsub1) * pixel_step[plane]; - line[plane] = av_malloc(line_size); - if (!line[plane]) { - while(plane && line[plane-1]) - av_freep(&line[--plane]); - return AVERROR(ENOMEM); - } - memset(line[plane], dst_color[plane], line_size); - } - } - - return 0; -} - -void ff_draw_rectangle(uint8_t *dst[4], int dst_linesize[4], - uint8_t *src[4], int pixelstep[4], - int hsub, int vsub, int x, int y, int w, int h) -{ - int i, plane; - uint8_t *p; - - for (plane = 0; plane < 4 && dst[plane]; plane++) { - int hsub1 = plane == 1 || plane == 2 ? hsub : 0; - int vsub1 = plane == 1 || plane == 2 ? vsub : 0; - int width = AV_CEIL_RSHIFT(w, hsub1); - int height = AV_CEIL_RSHIFT(h, vsub1); - - p = dst[plane] + (y >> vsub1) * dst_linesize[plane]; - for (i = 0; i < height; i++) { - memcpy(p + (x >> hsub1) * pixelstep[plane], - src[plane], width * pixelstep[plane]); - p += dst_linesize[plane]; - } - } -} - -void ff_copy_rectangle(uint8_t *dst[4], int dst_linesize[4], - uint8_t *src[4], int src_linesize[4], int pixelstep[4], - int hsub, int vsub, int x, int y, int y2, int w, int h) -{ - int i, plane; - uint8_t *p; - - for (plane = 0; plane < 4 && dst[plane]; plane++) { - int hsub1 = plane == 1 || plane == 2 ? hsub : 0; - int vsub1 = plane == 1 || plane == 2 ? vsub : 0; - int width = AV_CEIL_RSHIFT(w, hsub1); - int height = AV_CEIL_RSHIFT(h, vsub1); - - p = dst[plane] + (y >> vsub1) * dst_linesize[plane]; - for (i = 0; i < height; i++) { - memcpy(p + (x >> hsub1) * pixelstep[plane], - src[plane] + src_linesize[plane]*(i+(y2>>vsub1)), width * pixelstep[plane]); - p += dst_linesize[plane]; - } - } -} - int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); diff --git a/libavfilter/drawutils.h b/libavfilter/drawutils.h index b999d70e55..2ca2475585 100644 --- a/libavfilter/drawutils.h +++ b/libavfilter/drawutils.h @@ -30,19 +30,6 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt); -int ff_fill_line_with_color(uint8_t *line[4], int pixel_step[4], int w, - uint8_t dst_color[4], - enum AVPixelFormat pix_fmt, uint8_t rgba_color[4], - int *is_packed_rgba, uint8_t rgba_map[4]); - -void ff_draw_rectangle(uint8_t *dst[4], int dst_linesize[4], - uint8_t *src[4], int pixelstep[4], - int hsub, int vsub, int x, int y, int w, int h); - -void ff_copy_rectangle(uint8_t *dst[4], int dst_linesize[4], - uint8_t *src[4], int src_linesize[4], int pixelstep[4], - int hsub, int vsub, int x, int y, int y2, int w, int h); - #define MAX_PLANES 4 typedef struct FFDrawContext {
ff_fill_line_with_color and ff_draw_rectangle are unused since 19c8f2271423281c9b876b984076a6467c455904; ff_copy_rectangle is unused since 53b7a3fe081ec56c5706228eb6431bb943ad471a. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavfilter/drawutils.c | 98 ----------------------------------------- libavfilter/drawutils.h | 13 ------ 2 files changed, 111 deletions(-)