X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fdrawutils.c;h=f95e12091b3bec8ec185501b8d6c72b7da2674fb;hb=985c0dac674846721ec8ff23344c16ac7d1c9a1e;hp=5f4cb548f026f30de0b485b353545c8b0bf12bb3;hpb=f4cf6ba8c9646814af842a99335c6ee312ded299;p=ffmpeg

diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index 5f4cb548f02..f95e12091b3 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -70,6 +70,10 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt)
     case AV_PIX_FMT_GBRAP12BE:
     case AV_PIX_FMT_GBRAP16LE:
     case AV_PIX_FMT_GBRAP16BE:
+    case AV_PIX_FMT_GBRPF32LE:
+    case AV_PIX_FMT_GBRPF32BE:
+    case AV_PIX_FMT_GBRAPF32LE:
+    case AV_PIX_FMT_GBRAPF32BE:
     case AV_PIX_FMT_GBRP:  rgba_map[GREEN] = 0; rgba_map[BLUE ] = 1; rgba_map[RED  ] = 2; rgba_map[ALPHA] = 3; break;
     default:                    /* unsupported */
         return AVERROR(EINVAL);
@@ -77,104 +81,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);
@@ -185,7 +91,7 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags)
 
     if (!desc || !desc->name)
         return AVERROR(EINVAL);
-    if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL | AV_PIX_FMT_FLAG_ALPHA))
+    if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA))
         return AVERROR(ENOSYS);
     if (format == AV_PIX_FMT_P010LE || format == AV_PIX_FMT_P010BE || format == AV_PIX_FMT_P016LE || format == AV_PIX_FMT_P016BE)
         return AVERROR(ENOSYS);