From patchwork Thu Feb 1 18:28:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Walton X-Patchwork-Id: 7474 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp3414233jak; Thu, 1 Feb 2018 10:34:17 -0800 (PST) X-Google-Smtp-Source: AH8x225QaYdpSXzi3pJjFmocPjyLORDxfK5M7xkznze4d6QN2IzMla8EM7QPSF/aviobNIFUyR4T X-Received: by 10.223.150.208 with SMTP id u74mr20188923wrb.193.1517510057006; Thu, 01 Feb 2018 10:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517510056; cv=none; d=google.com; s=arc-20160816; b=ygUFWmkwWRfAPOdfkBYKNldqTm4pOnWPBJV00E8sa4E30YvwEe9SMTivAK1xdnBsxd RtX1BPR1TgXEItoejihgDNd6AoXku0jaEmyP4cdyNkxnNAYDiHwZj6Liqjl3yW0tg+oQ aTVwpkC8Nf+4d27sB7lO1o74gFuTvZ4xlsJOrJUd3ehsbpo3dYs3pax7awL8HY0F7A74 /m0NKlc2j4XDI3h3/0mzIF7lP6aGdxndZguLhP+aNziqPln4+nVl70sl3kKG1o21TNYI rKZxIzQCL4wwOFRXL2i/SfHJM4tawCo5nlv9mBBKjP6ZDKPwWQ7Vwk4PSF8GE23CS+5x kztA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to:arc-authentication-results; bh=/sn19N4kMamjbpGVOqNecUO7zuJdwFQPaQjLB4qWmPA=; b=RYP9R7jAQcE01CqShaO8k5qYK93N125dveYPF7KyV9Lm0a5i5eVsQvl8MriZm07X/z DOP9nbzTREonu6FNwjF++NOmN+tK1wB9f/Z4MGaiNphoDo/NgJueOfJfcauIc3q77TY4 NRBxTkh52kMrK9Tx3P8RFiSHNyfVJktN/Ds5IYkMLIXeVh0xC0K3eCkKdUju98ujrPxG 3b3kTI/LAxJJJy3UKLVriNtZHY4h0EBF/dtrPuUIrDSjLxo5kF3iEZ85DWK+Cf723IIX YR4ZYMu9TFpeM9JNxHcF6RcaHoc7JV5pIoo3PPQnF+XowdknjjYjkrAXFp13N0Ft64+B ZIng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@kepstin.ca header.s=google header.b=iLabOSEQ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=REJECT dis=NONE) header.from=kepstin.ca Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g130si410931wme.57.2018.02.01.10.34.16; Thu, 01 Feb 2018 10:34:16 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@kepstin.ca header.s=google header.b=iLabOSEQ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=REJECT dis=NONE) header.from=kepstin.ca Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 816E2689BD0; Thu, 1 Feb 2018 20:34:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81C57689AB0 for ; Thu, 1 Feb 2018 20:34:02 +0200 (EET) Received: by mail-it0-f68.google.com with SMTP id m11-v6so798301iti.1 for ; Thu, 01 Feb 2018 10:34:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kepstin.ca; s=google; h=message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=9CQ0TMZdQ24uE/x/FqdNoA70MCOKhqXHB1dAiWJx+zM=; b=iLabOSEQG3tYvgJQHTYe0FjAxpyqylSvuu33SBg9PWA+Bwh7ZDJJJ00RWU90JmLmyW gaOUSPm8/PinXzHKjKSAjVyi2ffl1FhzZtOHZ7Tzzd28TQTJ4IjJjxm0P1CGmzSJ4B+w W2vEeQsU9LtV7/IViDpCb+IIu6OQkR2IEo17w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=9CQ0TMZdQ24uE/x/FqdNoA70MCOKhqXHB1dAiWJx+zM=; b=UM1q4xkpoEi7ySqxrjUWsi3qyomZqLjyYR57zAVgnCXC8EdZow6crtyuof0Da89S4o hz6ujVUbXFrP83+1M2uL2eWL/1kOCJcGE5LXyUch8mIjswBfTpuvb0FJK8yGUW0xakZ0 y1Cz72Iydviqg9m7FJKLcm2ukR7MaucllRl9lCH8wxPI2FbQPOiFkbKx1JLEQhkjzGwr N3g2GNXgp4Uzg/DknQOnXBBjyfLQmzIUlV6PfE29y7RxlFwqYdm3H3gRmWtnV16tKmxH 0ifVPzPDTIfwgK6rmgL+j5fzVLdOL94qy6+UVcTU1KniXidYFSxlXGevXKIwGLATDr5C QtKg== X-Gm-Message-State: AKwxyteH+Yo+sPqXyEKcSKyDel2pwLVxf7wYNPNJTrd9Gnum/wfX6m16 jVmGOw0BjasZCSLD3E2FbEiLWX1hLHg= X-Received: by 10.36.2.69 with SMTP id 66mr43758444itu.117.1517509707631; Thu, 01 Feb 2018 10:28:27 -0800 (PST) Received: from rocky ([2001:470:8924:82da::f82b]) by smtp.gmail.com with ESMTPSA id z62sm88969ioe.49.2018.02.01.10.28.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Feb 2018 10:28:27 -0800 (PST) Message-ID: <1517509705.31803.2.camel@kepstin.ca> From: Calvin Walton To: FFmpeg development discussions and patches Date: Thu, 01 Feb 2018 13:28:25 -0500 X-Mailer: Evolution 3.26.4 (3.26.4-1.fc27) Mime-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] librsvgdec: Fix frame clearing code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Charles Lawrence , Rostislav Pehlivanov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The existing code attempts to clear the frame by painting in OVER mode with transparent black - which is a no-op. As a result if you have many input frames (e.g. you're using a sequence of svg files), you'll start to see new frames drawn over old frames as memory gets re-used. Switch the code to paint using the CLEAR compositing operator, which fills every channel with 0 values (setting a source colour is not required). --- libavcodec/librsvgdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Updated based on feedback - instead of setting a transparent paint colour, I'm just using the CLEAR operator which is hard-coded to transparent black, and might have an optimized fast path. diff --git a/libavcodec/librsvgdec.c b/libavcodec/librsvgdec.c index e57070f8e4..6697785026 100644 --- a/libavcodec/librsvgdec.c +++ b/libavcodec/librsvgdec.c @@ -82,8 +82,10 @@ static int librsvg_decode_frame(AVCodecContext *avctx, void *data, int *got_fram crender = cairo_create(image); - cairo_set_source_rgba(crender, 0.0, 0.0, 0.0, 1.0f); - cairo_paint_with_alpha(crender, 0.0f); + cairo_save(crender); + cairo_set_operator(crender, CAIRO_OPERATOR_CLEAR); + cairo_paint(crender); + cairo_restore(crender); cairo_scale(crender, dimensions.width / (double)unscaled_dimensions.width, dimensions.height / (double)unscaled_dimensions.height);