From patchwork Sun Dec 24 05:06:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 6949 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp4331044jad; Sat, 23 Dec 2017 21:06:50 -0800 (PST) X-Google-Smtp-Source: ACJfBovRKc6Tm74WUnBIQ7n2YztFwObxD73ZJwnOR9F/aPZuXumh67L+5ZmyVgtZO+DQTMxi0EBy X-Received: by 10.28.175.66 with SMTP id y63mr17160483wme.125.1514092010053; Sat, 23 Dec 2017 21:06:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514092010; cv=none; d=google.com; s=arc-20160816; b=n4HU0N9J+/hm/L/ygZ5EyAPm7VlXo+4Q6TXZ2s7zoh1vymkpJ8lXucdS+RcRSmTJsu yomWA3SfjkwqW4/8AuDBiAeD/40hlFhnVwh9yTuqIapRfxhv60iAp1e32zHoIwRjFlcC y51WL7u1VFx3w4lYcJ0902WAdieOot2P9AzjtVS+EST6ncmrzJI3O/rrtwaMXFjvQqr2 YEHiYY+9yH/EYSA5dotZfR+gtDzAOra5iBvBYvpAAKzTN5m3eLewVEQNdLsosOK2crvx 8WKZC5yaiJAnC578pDjghQ+dKXUBkMR7FiC/JGnvJcnKDzrjjso0fmQ+1+xS3O+vKAd9 i+5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:references:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=Kgmaeg9AN8ADRZFQV53b0SQ+CDs1XAQCB2sR84k8u9Q=; b=FjpOdpofuqS2452QmU6cr0scpYsrHPj0nj/1lC0IpZm8zALY4MxR1KIroHeYHs2kRQ bLgMgmIN2wn0JnMIsNIh1O4NdC2FQxkXSzwi/8JsioKyFeW1OteCP3OTEyfLxxnP9mA5 E51Ufq6bDDIvw07YRa9lqDlCiyZIbo5hzI4UPfSrOYQecDl+oPz5TGqLAcZcJGWYpegL BO0Iw0dLj+d6am1tFLUGtGp7f1dFKERDN9g8OYlLSWAe4dODTTJlDgezVFY5nY5OTnui IydJYSz/aRpXVB2PHXHNM0z0KAt0SmbuUnXmslmsaTti8hEv90avbTqaSfqeeP/zfM/I LR7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tZI14sdA; 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 p16si8872061wmf.1.2017.12.23.21.06.49; Sat, 23 Dec 2017 21:06:50 -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=tZI14sdA; 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 2E786680CFF; Sun, 24 Dec 2017 07:06:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f182.google.com (mail-pf0-f182.google.com [209.85.192.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3EE6680399 for ; Sun, 24 Dec 2017 07:06:29 +0200 (EET) Received: by mail-pf0-f182.google.com with SMTP id j124so16868971pfc.2 for ; Sat, 23 Dec 2017 21:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=nEw02924jIebpSNhhbtt+RokdCa7Zi0nuCUYY22TcV0=; b=tZI14sdA8RTytp5XdUoAqALvXpiWzj4ygh3nQvW0/KPTRCe4Ft7UtXDST6vXM4t6BD npHvDdq6D7HOaMJ7jFAnJYhK+M+pq3nBhl3vcE7lOkOrj84MzPL844FOWU5Ayk7VZGTh dSglZjW+3fl3GCdyqwlIR0qo5+6vB4Dz26zfq024pOqMS4y9WqmBn0Sv+ERF6Py0U9cx Q8F/mmyg9YpgvAjjx+UnrT6XSjBZr1M4d0K8398hganJbGCgoAYIsTJFZ7+UPaQh65hb zmzXvzooKMIJDvyB2tqWUXw1E10hOLZYEB34xAmlHSCvnWXg4355gYUclp6MVeWmS+LY r2IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=nEw02924jIebpSNhhbtt+RokdCa7Zi0nuCUYY22TcV0=; b=REZA/x1wlnv3sdPpdQBTksht8+Vmkm8AqNOiAPnKwFyt8OyR/7VkP2p7rcNmarcwWp WTNnGL+23Z8IoFzakwj6ELWMCsAsOXWZ4GfZPwHhIK7sjtyNQDAaxHlkxo1+froYK1pV 4ZFdW1CTdW4iUs9D9RU9/hdqslRjaxXBlPdD5lhsKJOAI0GEUiQny56QlxgR5XRqROpb ELvuId1muVYFtR3IcF8jFrS4oikANhco2NZgevzgiYoQ4JVOI9/1x2SCN7GZGL6dWBrN YmhcxeTB8bGrfYHtkC5Ry8QVW2ExjphV6D63QcoVNDtglJ0SwcoeklQ6oBrN6j4KAi7Q FH4w== X-Gm-Message-State: AKGB3mLo13a1bQkqFPBsP0BjeamtunU+XcxRZ9nflym7Uee4ZIDdwdeR /SMxU+Qjk1U02A5GWLsBT2QdOkrM X-Received: by 10.101.87.201 with SMTP id q9mr7369844pgr.349.1514091999721; Sat, 23 Dec 2017 21:06:39 -0800 (PST) Received: from [192.168.1.105] ([103.206.133.143]) by smtp.gmail.com with ESMTPSA id y5sm52842796pfd.63.2017.12.23.21.06.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 21:06:38 -0800 (PST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org References: <3d03ff4b-a66c-9011-1a6a-a2c09417c151@gmail.com> Message-ID: <61da5873-3bd9-9618-a8c8-6dd715b296e0@gmail.com> Date: Sun, 24 Dec 2017 10:36:34 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <3d03ff4b-a66c-9011-1a6a-a2c09417c151@gmail.com> Content-Language: en-US Subject: Re: [FFmpeg-devel] [PATCH] avfilter/vidstab: set bytesPerPixel only for packed 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 12/23/2017 4:39 PM, Gyan Doshi wrote: > Patch for ticket #6736. This patch alters the test, not any assignment, so corrected verbiage. Regards, Gyan From dbc21f9fe4061ac30339b8086226ea2c47f8bd29 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Sat, 23 Dec 2017 16:14:25 +0530 Subject: [PATCH] avfilter/vidstab: check bytesPerPixel only for packed formats. libvidstab introduced this variable only for packed formats but in vf_vidstab*.c, it's checked for all inputs. So the filter errors out for YUV422/444P streams. Fixes #6736. --- libavfilter/vf_vidstabdetect.c | 3 ++- libavfilter/vf_vidstabtransform.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index 63a178a0c2..fd7ff3be24 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -107,10 +107,11 @@ static int config_input(AVFilterLink *inlink) VSMotionDetect* md = &(s->md); VSFrameInfo fi; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int is_planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; vsFrameInfoInit(&fi, inlink->w, inlink->h, ff_av2vs_pixfmt(ctx, inlink->format)); - if (fi.bytesPerPixel != av_get_bits_per_pixel(desc)/8) { + if (!is_planar && fi.bytesPerPixel != av_get_bits_per_pixel(desc)/8) { av_log(ctx, AV_LOG_ERROR, "pixel-format error: wrong bits/per/pixel, please report a BUG"); return AVERROR(EINVAL); } diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 11a0e3d512..d1ec1391cb 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -146,6 +146,7 @@ static int config_input(AVFilterLink *inlink) FILE *f; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int is_planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; VSTransformData *td = &(tc->td); @@ -161,7 +162,7 @@ static int config_input(AVFilterLink *inlink) return AVERROR(EINVAL); } - if (fi_src.bytesPerPixel != av_get_bits_per_pixel(desc)/8 || + if ((!is_planar && fi_src.bytesPerPixel != av_get_bits_per_pixel(desc)/8) || fi_src.log2ChromaW != desc->log2_chroma_w || fi_src.log2ChromaH != desc->log2_chroma_h) { av_log(ctx, AV_LOG_ERROR, "pixel-format error: bpp %i<>%i ",