From patchwork Wed Mar 21 23:12:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8085 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp154730jad; Wed, 21 Mar 2018 16:18:46 -0700 (PDT) X-Google-Smtp-Source: AG47ELth81yLul0HSoGHWzn06KbZC1rS1ejszp5B4U6vo/SyrBGtBtDRARXljrT/23mu/crnbReY X-Received: by 10.223.225.142 with SMTP id k14mr17410187wri.38.1521674326114; Wed, 21 Mar 2018 16:18:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521674326; cv=none; d=google.com; s=arc-20160816; b=BvdZs4CYPvP1NJQR4IxjgsLvUb3GvlUkEfrq05NsJ9GZPn9r/t9GFHJ8H0GIuDppZX LASvZHoXBLZ5PtGyy8bIVpRVKx9EZjygw+0stlhtHrvqla5f5WE6HXaWfwEMBgpMCEW9 VOMnB33gJGhthi7teaPAA9hxkEhioQ5K3r2kXuedO0YZSgbdbhescuX0WWNgOQGbfjld 1JKa7EP4m5KYk/c0URxQVGPx8dxhsXeYPlNDGA3FiMqoSyDr96qDv3IYo3sqRljv1+O2 FWqNBt7yCu8d8vkqHlb3SS1a2IUrCGakwTcni9gWVVs2LX7Oa1C6s9T9gdBtHrezi6pt oc0w== 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=uXwI2RGeaqO04fAjKHen9kGIG+T18VLluWnOPWIDsX0=; b=CxIxVudKe7bRYdDXqLwj0MLuRTpL18z4vBR2wdfw0D7B+rWdFydVqiie5FbWYP6HSi jsMkZXIOt3M0ls9Tt8Vns6twzrJZQX1RxSOaIiFgc2omrQfqOurFJePfZQZ7mI/EHq2i AtAr5FYAEifgmoWLqZ9Zhn4n10EKqjWwovm8JasgeJby5CCQV18ROIv+T0wFAxFe42sQ lLOjMN/PmXIniDT0MN+SW4tDJe4uboXI0s02SV0nNEGdpRkVlxjjAGxkSeJBC9AGsKzv 7q5sv1mDJX4LzFbXXoGFYdZRd4EzMjPPiX6h/4Iwl324eQjPyH2gANk1tJZ64l4VrsST c7HQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=ibE48QVX; 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 g21si4056628wra.434.2018.03.21.16.18.45; Wed, 21 Mar 2018 16:18:46 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=ibE48QVX; 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 9F37D689C47; Thu, 22 Mar 2018 01:18:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EB12689B63 for ; Thu, 22 Mar 2018 01:18:18 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id z73so6860442wrb.0 for ; Wed, 21 Mar 2018 16:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=fHjCxIr4uBec1cwszjr7oHn8irHglPgHdJMUhZR5KeE=; b=ibE48QVXEWSL/uhOIKbHyPvwMAPUTGgW84vnMquPhs+o4LThAJSJY5VB4usRLmIL6M WstHHtpnGZUfxdgZ2x4RlOD0v7JVXt/hMNm9Uo5VlsC+yD+L181w+aw1dprQStIcPdc1 TSpvO1kbfI9JCZKQVYYUnEty02K8UA9XZsAJsLIvaG1W/ASJWadkcx/DIbVKun+8hogI hXOhuJ1fn8/AypGTqrWH9o+M2D+ciu/pf72sM1TphsPjX5H0xfYqs+ziFUoryhCY29G6 uhT6S5EHFubwPu+w6oydD3mwWk3A/8c9ZWVaqjmWnaBa3B0aNBXewSpRGPQlITt4ghEi fU9g== 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=fHjCxIr4uBec1cwszjr7oHn8irHglPgHdJMUhZR5KeE=; b=sKDwT2gXjoimCjJVDqgJdRJ1Kd/41gWmlT/nLO1MT256Wmg/ryReXlrQluPNTnxRVn wdJshNVazNAsrlXBvtbPvqOZa0n8MUQFiODadtGy0IG+S3LYkiuO5eocdzlrAk9nHQ68 2n474bmAUBRUzhVwuE9Sbbr7ub/iT4gr2zCjWnlS4uHzD3nJmEnD5q2QXpZOjZuR8ERS G4551rDSylPqS4Qiz62dgPAEbI6Rd3vuStCwVnGHDzpErqSdh+FsB/sh0ZuzsG4HqSGq zLGtx1dvuj52l35F0uieJ8vd2TRqO5Fk+2AhMgnetCUe8IpF2K3SXP0dg/eVUV6rdhqx MwAA== X-Gm-Message-State: AElRT7FVWfwZSZC/Qyu9ppZwzgJ7J2JoagssIBnd+uGRER9AJ8m4cAP0 /I7O1bMUCKMdVFe/AyYLPIX7dTJu X-Received: by 10.223.133.197 with SMTP id 5mr17362478wru.130.1521673966147; Wed, 21 Mar 2018 16:12:46 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 11sm5218741wmd.1.2018.03.21.16.12.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 16:12:45 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Mar 2018 23:12:35 +0000 Message-Id: <20180321231236.3024-6-sw@jkqxz.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180321231236.3024-1-sw@jkqxz.net> References: <20180321231236.3024-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 6/7] vf_scale_vaapi: Apply cropping rectangle to input 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_scale_vaapi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index c19e23ccd0..d6529d5235 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -100,13 +100,13 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) memset(¶ms, 0, sizeof(params)); - // If there were top/left cropping, it could be taken into - // account here. input_region = (VARectangle) { - .x = 0, - .y = 0, - .width = input_frame->width, - .height = input_frame->height, + .x = input_frame->crop_left, + .y = input_frame->crop_top, + .width = input_frame->width - + (input_frame->crop_left + input_frame->crop_right), + .height = input_frame->height - + (input_frame->crop_top + input_frame->crop_bottom), }; params.surface = input_surface;