From patchwork Thu Dec 7 21:33:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 6591 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp8818287jah; Thu, 7 Dec 2017 13:40:41 -0800 (PST) X-Google-Smtp-Source: AGs4zMbZ43tMcn4mQ5Sjc8q9GWPD+9KAd3wyu66lA2X8XOSl3db4UBLYqIZ9G1ScW2JqH3kAIZyU X-Received: by 10.28.227.136 with SMTP id a130mr2420065wmh.104.1512682841647; Thu, 07 Dec 2017 13:40:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512682841; cv=none; d=google.com; s=arc-20160816; b=xZ9guR7d0bErGtxExLONu/5hyNtfss0EnBaTyZcTrfxnKu6/nMJFtgc4dxspCrxtk0 79eDvHCOnYyRFF1cX+1d1ZX6FumnHFhlLl7hJQPAg9OTM5taG84YFfr8U4Ad2HE3XKaA Kc7eW6o2zmYNu9f1MvnWqzgehhLZDWSL5wDRORG7PY7XnDlky3QC9Hv5RceMijtLBkkW VszVHhtODXK3YEM2CY3Miww76WkOYQ+1iW4OPBhyoMQ3uMiUkImbuZydAFXt6+PnS9Yu FTxPgUcEGGKICYyaTT2Y6KQqWzW6c7MiSnFhgs8droK7JWExCsDksytpi0xM4pgCQS9+ ko4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=HxVd0kQ3K6eX+VqnJeDhrQzpk1LgOlTVoqQsKXvSbf8=; b=rl/EC4VkGlgq5HAxBm29sc4skbVeKaxcncQCopkx2DG6r34eLIL5zbRT73PA/sgjTZ eOihmQH9WTVxyUwrXllvPZRrGK6PkjgxBaC17AXZL15bihJJm5zbz2pDy8Jufc+7rK1m tQVwAhctZXzfMI797R96+pFwl49eP916DIoSoMPQbQWbgcfFE4spbCKtiWW4sFXzVg0y JAsYghpflBQ2bBmIPCupY/fGXeDPBCJV63LVgsAUwW1F0HwV7WqZEudECU5Y0eV8QslR tdM6JtswbAeJKzitbHL66lTnnCZaZQE5Pz9qSu3NmRMhFXNnHNCtGw1S/ffwnMWAwtiJ tL0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ASnKVO5Q; 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=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h5si87640wmh.17.2017.12.07.13.40.41; Thu, 07 Dec 2017 13:40:41 -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=@gmail.com header.s=20161025 header.b=ASnKVO5Q; 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=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05C3768A3BD; Thu, 7 Dec 2017 23:40:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE66368A395 for ; Thu, 7 Dec 2017 23:40:26 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id f2so21427291qtj.4 for ; Thu, 07 Dec 2017 13:40:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=RyWdWVW7MLyQGVum9K691nEY6RnbHtoy9tonyK26p74=; b=ASnKVO5QW/4UxTka0wUoU0mb9BCLRZe1iYoMfhr+opl0Cl/g4OLSpbVhnyWrA24MyM 9MlJGkpiFYl3XBvNvpPlOKl+2safq5ssaOFJqyoBiLECVpLdYymtJR6X4uglbBd7R2bC k2w65nQzyjhagYFg7Z6IE9zviFs9UsXyH20KWuyKZsOs+CqgCjrs8vcyVI8RogcStK1O 5+BXt+bhmgtVX+Fni7m5sjNoGRICyI4yKKz6OCxZPh8PtCi47g8Z24feOrGVqiFFPizx rrPIlNsz9LrxGgVrri4EKYfWrfcuVxtXOUkFqsOL86ogWEFtIQlRonOTLS7dkNa+rrrz vO7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=RyWdWVW7MLyQGVum9K691nEY6RnbHtoy9tonyK26p74=; b=ijeSFV0A41WTt0BNjyCrrX/zejnh1761adddxkd8C8oOmHufwGAKkiT5wDQ+yABBZo twYMFNaXHHvWILW14SuNKDwazYfQW/kNg2s8ehKAUQquNBKpqj9+e+RiPgQYrwSD/9Jr tBjoRdspaF4IOsi6/pHzLOfbdmyd2vPOhoc8kXqGmDBfzRRObgxsYwYixVD3UyE6/Yp1 Mswbnz/5Wnj03bUsUx8phaQfNQ/jBfjxi1glWKuk7r5LP3N0CxuBpWw1fNLBG384F2Ff ZwxApVrU9JoI8joO3cylSXtN+iSv/brmFIaKz2zKyrBCDt/eM5YtP2geah2y3FD5Z0mV kJmg== X-Gm-Message-State: AKGB3mJnbejTtzbGTl2rMDEqEjiJc2yMVcScNlDTokHKUF+a8922C6Y0 di+JPFsWkH+lKR4Kd24P3033aA== X-Received: by 10.55.155.198 with SMTP id d189mr31045281qke.347.1512682383078; Thu, 07 Dec 2017 13:33:03 -0800 (PST) Received: from vimacbookpro.vimeows.com ([8.40.92.161]) by smtp.gmail.com with ESMTPSA id i35sm4085783qte.96.2017.12.07.13.33.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Dec 2017 13:33:02 -0800 (PST) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Dec 2017 16:33:00 -0500 Message-Id: <20171207213300.15256-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] vf_zscale: Fix alpha destination graph for floating point pixel formats 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This was setting the input pixel type instead of the output one, leading to incorrect data being fed to the library. Signed-off-by: Vittorio Giovara --- libavfilter/vf_zscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 865910bd87..6e1d36cb4c 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -615,7 +615,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) s->alpha_dst_format.width = out->width; s->alpha_dst_format.height = out->height; s->alpha_dst_format.depth = odesc->comp[0].depth; - s->alpha_dst_format.pixel_type = (desc->flags & AV_PIX_FMT_FLAG_FLOAT) ? ZIMG_PIXEL_FLOAT : odesc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE; + s->alpha_dst_format.pixel_type = (odesc->flags & AV_PIX_FMT_FLAG_FLOAT) ? ZIMG_PIXEL_FLOAT : odesc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE; s->alpha_dst_format.color_family = ZIMG_COLOR_GREY; zimg_filter_graph_free(s->alpha_graph);