From patchwork Tue Jul 18 13:50:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 4351 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1602562vsb; Tue, 18 Jul 2017 06:56:21 -0700 (PDT) X-Received: by 10.28.107.76 with SMTP id g73mr2287432wmc.57.1500386180776; Tue, 18 Jul 2017 06:56:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500386180; cv=none; d=google.com; s=arc-20160816; b=GtGx/ERrAK9wqJwMeSYl7qRKTEkxnNfBodvWUAdMSdjTPDK8n0fuexMWdPuMzn1R7u 4EQmGCFCSd2ooX4uOgSxIk0y39KiCGyockT+cnXu8INx20zDSfy2q9Ib+kobNtn7SZc+ DLVCC2WqwLtHm9liJFWd31ASnYZ1PwoSO7FO3o3tPY9gw4ghG02rcwxYZLPUaxmLHZ58 Ho8Ws1LhWZRQ94PPeKoUGz/rBYS/sONaD7V9O7eC1Go1FdUPoKHx58KenQIlFVk57yYP 6OS/Y8AGdJhyJkcZu+xvlXpTsy6X8IlPNXVd17IdcPN6ZXmwxijpWFS1kGJ/hoTL9YI5 ZHbg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=nMkBwJFCJ49FDUfDdeFiCg6/lC8vkkF+KK4gO8XlaOY=; b=tow6GLrU5AGL4TpnFX0GclCLu6DRiyQBttgAVP1VA/XofMY/LB7psjNvA4FNTTyCRJ 0HbapCsCdLUN7F0qkS59HX419+Ww5/X1y+nJrUpcAxqHFpQ62R3m9KTvZhGDCcQ7Uq7u mPb7t6uW+Wzdabd+Zts35l/Pi/ucl8fG9UY54H+I179zCpax8/1fR6TjQSWNgy2HK7zo ZiIR0jqMcS8PfZjPcAKt7aGVyPaxaEEuYBVNLNUTvw7hhLvO6CiQU9zTjonlXE7hSeul fJUQqi8xfD+FDPRGinf/MrNixL23ahMwYrmifcCeeJIZles+DzU3+TBlGbCCc8Uxu63b Sz8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Fz5RI+D8; 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 m127si9128129wmf.119.2017.07.18.06.56.20; Tue, 18 Jul 2017 06:56:20 -0700 (PDT) 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.b=Fz5RI+D8; 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 438006891DD; Tue, 18 Jul 2017 16:55:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6206680AA3 for ; Tue, 18 Jul 2017 16:55:51 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id u126so1534086qka.0 for ; Tue, 18 Jul 2017 06:55:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=61HpJ2GzjKvUhAHtaZMI4gTUT0acuUlPD7ybF22xq00=; b=Fz5RI+D8KEzIHvkFEQuo4m2gs65pgs53+LaqDHcd62q1MVp+U/IOslHZIvSQRB3qiJ 3/AJZtIXRxg4exMiNxlAtpHjZHK2yP18QEYXzdzVwjBBrFyY7e/K8F3j56F+GUTyxqEb iJueof66FzOfoE4UpA/Jgk3hnIm8Z4DBU4XDDCjHbrJicONHG+lge5ButEY7mcMBu3PM 0S8iT93uj6es/fYgbOi5T3qg2DBcMFVnO/EyIuRnaCH7RoPoOgd+MjpYlUDOuY6G4dOO wniXAH1vodhvKpf5u0/G/IFK8mnzIoeroyaHGiSMhjZbGlsUnTYbK2u2GX2t9iVMnWAR PWrg== 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:in-reply-to :references; bh=61HpJ2GzjKvUhAHtaZMI4gTUT0acuUlPD7ybF22xq00=; b=GA4Fxg/eNQH2Gbg11VWpf9CoBvSr8dJrL31D/W5/ap9XFeCjrIERxiF976TzuEXnuZ KlY1wBhirtPI3Qb1Ok3eLtTGZbk9h3E2+Ur9TI0LWBd5IDYnJ+w7lFXdVarwl9IGLmPw o1EBiiLWIVNNSuhiAIpdmgh+Ip0iEK/RXGjlqoxNwZH+RwGqgcfQUPxtXgExuI7kFwXC ZSWkiPSnMVMkqWBYjqJJR91/ELZM0by3mS1OCRKHj8Ene5MDJBLh/V4FICD4HY+kxj1z X2OgsfNopEkSyifFj953LJxXr+jeIJj1YiJtDa79+K1DYjTTSSlWRGM2optUQ/t2Z8Wg 8SPQ== X-Gm-Message-State: AIVw1114/93xyqLF9hjQD+gcKTJCP7CCmT1gZ2xfj0phJ53ipTkKJ61V QpzvbLcfwDhIcEj/ X-Received: by 10.233.223.68 with SMTP id t65mr2005082qkf.122.1500385826985; Tue, 18 Jul 2017 06:50:26 -0700 (PDT) Received: from vimacbookpro.vimeo.iac.corp (93-40-167-184.ip39.fastwebnet.it. [93.40.167.184]) by smtp.gmail.com with ESMTPSA id j39sm1767590qtj.19.2017.07.18.06.50.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 18 Jul 2017 06:50:26 -0700 (PDT) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jul 2017 15:50:14 +0200 Message-Id: <20170718135015.52683-4-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170718135015.52683-1-vittorio.giovara@gmail.com> References: <20170718135015.52683-1-vittorio.giovara@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] zscale: Enable single precision input/ouput filtering 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" --- libavfilter/vf_zscale.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 466689dbc5..d96edb3ade 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -179,6 +179,7 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP16, + AV_PIX_FMT_YUV444F32, AV_PIX_FMT_YUVA444F32, AV_PIX_FMT_NONE }; int ret; @@ -429,7 +430,7 @@ static void format_init(zimg_image_format *format, AVFrame *frame, const AVPixFm format->subsample_w = desc->log2_chroma_w; format->subsample_h = desc->log2_chroma_h; format->depth = desc->comp[0].depth; - format->pixel_type = desc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE; + format->pixel_type = (desc->flags & AV_PIX_FMT_FLAG_FLOAT) ? ZIMG_PIXEL_FLOAT : desc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE; format->color_family = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? ZIMG_COLOR_RGB : ZIMG_COLOR_YUV; format->matrix_coefficients = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? ZIMG_MATRIX_RGB : colorspace == -1 ? convert_matrix(frame->colorspace) : colorspace; format->color_primaries = primaries == -1 ? convert_primaries(frame->color_primaries) : primaries; @@ -573,13 +574,13 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) s->alpha_src_format.width = in->width; s->alpha_src_format.height = in->height; s->alpha_src_format.depth = desc->comp[0].depth; - s->alpha_src_format.pixel_type = desc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE; + s->alpha_src_format.pixel_type = (desc->flags & AV_PIX_FMT_FLAG_FLOAT) ? ZIMG_PIXEL_FLOAT : desc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE; s->alpha_src_format.color_family = ZIMG_COLOR_GREY; 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 = odesc->comp[0].depth > 8 ? ZIMG_PIXEL_WORD : ZIMG_PIXEL_BYTE; + 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.color_family = ZIMG_COLOR_GREY; zimg_filter_graph_free(s->alpha_graph);