From patchwork Sat Nov 18 00:36:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6155 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1277308jah; Fri, 17 Nov 2017 16:42:33 -0800 (PST) X-Google-Smtp-Source: AGs4zMYCKIuUGS8KFdCpjQRG0JBWrIooh88mxoj3NJoKxTvT/Y0qtX85J5BEZnY/9IL6CALXyvBc X-Received: by 10.223.189.5 with SMTP id j5mr552963wrh.172.1510965753757; Fri, 17 Nov 2017 16:42:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510965753; cv=none; d=google.com; s=arc-20160816; b=pN0xWg4vvJ/tRzA+agrjZnKCe7FZh+CrXBjERRk8y6n0iHrCUG7cIoYI/11cwcsN/C v/xGRxGlopoRe8idbDGqBk/nn5cnsfeiOmk3MLRsWipm94mqqTVZSCI29IpdG+9W/wFH ap2+zIKHSEBujl1Skb3HFIMZk9WduswBKjSQaW2x083V9GGqy/WYExhuonr8qvfbIv4B 7A1KL6mfLBUm/BHbT5mSarlz8ogVqF9Ai8mTbiFeErcABQMry4VfBAO6tnokCZE8d2S5 dKomMPkbaM2Korm4GGiKHuTKoRd/2tbsmYd6E3b1n1gQPyVycgGCGrTtsQRh0b0wmnH1 +V7w== 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=M3ZL63rikhQyPL60aROzeAX6ipu/N508+deEptIHgtk=; b=GwFDAMCndSM8tfv+0VsYkaAiDTv9G4KwW2/fMUQGcq4P73s/ZQFbrCO8GnSBZlfV0b PpQ0L81S2hqtCZmdT2kHzZb8LYndsn1Ef7Z1QYbZk5k4Qve6hQ0xTX9uGChGOjJBje8p vQfBDe6s2ljGfliKfOsYZ9UZI2rzP67Bs79ewBow5W9Yd5CAta7/tT5/JXo/CxLWYzUf jawNiwHQh9um5O+MEj0I5Q01M04A+4+YzSUk9X/PBNkv9ymWFPwZhFa5VKaza0hhK2PK 0kKQyQWSKIDcILvlFqtFyA+No+e6CvY2Rk7cUVT0WavYBFm00I3t9VdiaKy/Nssjk8PF /WrQ== 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=HPYWKxto; 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 h14si3729461wre.269.2017.11.17.16.42.33; Fri, 17 Nov 2017 16:42:33 -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=HPYWKxto; 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 EC2E2689B0E; Sat, 18 Nov 2017 02:42:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f171.google.com (mail-qt0-f171.google.com [209.85.216.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67864689A40 for ; Sat, 18 Nov 2017 02:42:09 +0200 (EET) Received: by mail-qt0-f171.google.com with SMTP id 31so8939349qtz.9 for ; Fri, 17 Nov 2017 16:42:25 -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=wXdPjPAYdYC6KlbpDPxRbcEDA7kxVYqAkN1ZQ7ycTBA=; b=HPYWKxtoM+WFnGe7Y9wrzN+SolVnCM0gWhflRDFTQ0uuu6XVwVxYae9d2e1mY6AsYy 6XILvrHBpwGW5SzgWjvBi1o18cBBqyaikQdS9zKBDwWarIKWGU3UWzeuNRocI4PIcOdO DEkt1Ft1pbKFOyXeNzGDh0pLodhKKb7QUor2PyJPM/YwyDBPVh7jsQeKA+nQZ4ZUF88J TG+VmBt0FPY5WmA4n+ah1r0IsARWntp5rUyoTeM7BDQmUTkxFGJCOI/tYegG0ko2VMmT y9wBt1DS/+rzJkjhCkNqsnBF+SlrFPw9t3mC7v3c/YpR9DUFOYJpg9gmchMizn2jYzm+ 68ZQ== 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=wXdPjPAYdYC6KlbpDPxRbcEDA7kxVYqAkN1ZQ7ycTBA=; b=F/18qxCluAh9IL/qBw1v0rio86dN/sJrFyiE2Zbq9zNkKA5rECZbqCS/5QP5Mn0dAD /2yubP85DF1QDDg7VZDlPsil1xnScV2IL7SrweMn2Ap50twB4N6DlPo7+4aMUGWBSrmc fta9cbwjl1ixbi6+jjVThj+ybWQYkDgVWvyiDJY46EKy1hFSijmOqYG3hIQuOmV0MHVS ZQn43SOhpoUXKC5iXVH8cSegPF+bTlI9+jhCaS3twOODxPRPoESyT0U/KvtQE1dy7rfE ju7LSBlbfE3pc4R9JjpGawCxSjjw7sZuo1pOFNi4b2tm8VmsEtf/IMYNHIA5UzMEDUjN dJGA== X-Gm-Message-State: AJaThX5Ef7hFEjJexpyROwrCbbpkcK58sGk0cqpbyKJha05FfWCv75xz HiA6vF0mcHbs1Ihxci7GkY1lVeC9 X-Received: by 10.200.43.78 with SMTP id 14mr11407591qtv.72.1510965421983; 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.37.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Nov 2017 16:37:01 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Nov 2017 16:36:48 -0800 Message-Id: <20171118003648.33514-4-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 3/3] ffmpeg: apply frame cropping between filter graph and encoder 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 --- fftools/ffmpeg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index babd85f7bc..159b8e0016 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1265,6 +1265,10 @@ static void do_video_out(OutputFile *of, enc->time_base.num, enc->time_base.den); } + // apply any frame cropping added by filters + av_frame_apply_cropping(in_picture, ist->dec_ctx->flags & AV_CODEC_FLAG_UNALIGNED ? + AV_FRAME_CROP_UNALIGNED : 0); + ost->frames_encoded++; ret = avcodec_send_frame(enc, in_picture);