From patchwork Sat Nov 18 00:36:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6154 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1273533jah; Fri, 17 Nov 2017 16:37:09 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ56akTdarMCxM0OmRonj5aI7BBu5PS/QHxcKI8Bz13lSdXemVF0Ax1ihM4GeITI+tXOWH5 X-Received: by 10.28.113.84 with SMTP id m81mr5692662wmc.134.1510965429413; Fri, 17 Nov 2017 16:37:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510965429; cv=none; d=google.com; s=arc-20160816; b=FfEXaJZgRJ0g0WF7TcnAThoB6Fm6M4ZXrvRtVdiVcyEMFQ3VhyNuGQhlGwfFXGbXhj 9gBKNRb2QT5YzjLrtsvSnutwmFoIlPSXui0KlaBv+VJsWg0+M+SQVDotb1uZhUZtADVf YreMOMfNjAf41nFlyMYqUviA9OcnxFIzV7X2Bqrqiu80y7S87Wu4XzRzbDYzI4CHRerR NRajg5Rf6gyx+BN4gbf1IK7Xo3TGdJ1oluNqobWiWb2NBOKbZIFaEWcyaMuUp0I0mbcU vhADF5wy6YDOYMPBcwz0H/1Ma1zDHf8OMYssfyStBoaP8GDbojmW75akfI9mTt4SUqJY qROw== 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:cc: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=9wegBDvT5V4Zg/tvfTiKA5rOVXO0bD57JgRTjfYnkoM=; b=NAX5euVyByKtiL7cDXfqpegyk+ZIoaKP7I8hieZTytvZT+fIvDULBpXIcDvD2j3wkD DEiDFKtfGjK7o4PMc3JC70bIqSN57NJPBLu/QQ4Rd6wdkTLmfwLIKDTsBZXvSo7jAJsk ZzyC2Cyu5MwiJcmzSoFY+Is9IJYUL3lHYnVhYyYV5Gp+w6tYMUYSQgsdemFkG12kOeWQ PsmOYjpNdGMeRxZK9BAPXkV+TH48LFfvBmv7gfsIjhMlBkc15vlqrtTs2AIHb4XwWHE6 aiGb0rpeE0Ig6SnavsbKPtbylYb5gE1wa8flVwRQDc0i+8Ks72UUKSF7UuQdhZpkLcH0 0OtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=IchenAkx; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w142si3360592wmw.195.2017.11.17.16.37.09; Fri, 17 Nov 2017 16:37:09 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=IchenAkx; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B78FA689A91; Sat, 18 Nov 2017 02:36:51 +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 C2259689953 for ; Sat, 18 Nov 2017 02:36:45 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id r39so8894244qtr.13 for ; Fri, 17 Nov 2017 16:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=vNYYSPKEEPr5JKPyuvTkz3sjZmwzKk6OwqoWV/CxihQ=; b=IchenAkxD9S9Xp+HiMQhrdwu6w5wYtnNRTYK2ds+Ky0WGvOw1rYjSkhekwtfxOnI2J cHYstwGJQLPwyWylSCCXC+OD3o7fdf5S+TwLjako0ZgKGn51n47R4eRDoWA/7CBZ7aUX +4NlW+3nOdLhOV3PcBfTTmlCfOkibrbZ3nRyTmiC/gzMFCdQ4I2PUYB+EdcUdGOligII boK9MK3F0Lb/U0jYag5F+KBEY0XKjGY1KWUcz8cHolVZle9XQyLr0Fq0dH4/qJxXzWqh +n7zd5Lv/IBYgO2Qlh5buszBDX5eWsGPRoYNRqzDSM0hOM9a+tS5KXleSWaKz1+mmyRN aQ2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=vNYYSPKEEPr5JKPyuvTkz3sjZmwzKk6OwqoWV/CxihQ=; b=ZqU2cTmYG6ZsHvumDhGmQoAIxnfi6AZud0BIVTR2Is1Uu/KMwZnFEkdvQCDd3itaPL B9sJ1nnViUpqB95EJQ4TC70AygxTMzm3poqxlhn/c9eu1UAJWE7RzsI0hcdQ2hP+7XoZ wNgokvhQJIKsLvV7WopLEpjntZrHYc03NljA9P6KEj6jsO6DbxvxO4Y3UIvHj1ul5Cvo F23DJo3/y0zHvO7Ouycq0OrMeqdFAsWR8XA5C9+jZp1pp2cf+RsIGj1bcYNTFuA8qnEi Nwkojmju/i9StYXwSZH2CSDpzh51GN02DKWPv2aQB0IqTHEHDPLWS7USb2dL28PL/ZdS aSMg== X-Gm-Message-State: AJaThX5NjWdgM693G8fHDE7p9rene1/mTvavuXPHvSTVFiG0WZzFQDMc vyW3mQBTj50FJn/OvpwwFkncjFww X-Received: by 10.200.56.75 with SMTP id r11mr11150242qtb.65.1510965421005; Fri, 17 Nov 2017 16:37:01 -0800 (PST) Received: from localhost.localdomain (c-67-160-208-228.hsd1.ca.comcast.net. [67.160.208.228]) by smtp.gmail.com with ESMTPSA id 13sm3413114qtv.67.2017.11.17.16.36.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Nov 2017 16:37:00 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Nov 2017 16:36:47 -0800 Message-Id: <20171118003648.33514-3-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171118003648.33514-1-ffmpeg@tmm1.net> References: <20171118003648.33514-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_cropdetect: don't ignore frames, export crop parameters 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: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- libavfilter/vf_cropdetect.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index 7c7d0b953a..87ecb2a6ec 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -167,8 +167,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) int outliers, last_y; int limit = lrint(s->limit); - // ignore first 2 frames - they may be empty - if (++s->frame_nb > 0) { + if (1) { + s->frame_nb++; metadata = &frame->metadata; // Reset the crop area every reset_count frames, if reset_count is > 0 @@ -230,6 +230,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) SET_META("lavfi.cropdetect.x", x); SET_META("lavfi.cropdetect.y", y); + frame->crop_top = y; + frame->crop_left = x; + frame->crop_right = frame->width - w - x; + frame->crop_bottom = frame->height - h - y; + av_log(ctx, AV_LOG_INFO, "x1:%d x2:%d y1:%d y2:%d w:%d h:%d x:%d y:%d pts:%"PRId64" t:%f crop=%d:%d:%d:%d\n", s->x1, s->x2, s->y1, s->y2, w, h, x, y, frame->pts,