From patchwork Sun Mar 11 22:41:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 7921 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp974362jad; Sun, 11 Mar 2018 15:42:58 -0700 (PDT) X-Google-Smtp-Source: AG47ELvDIUSViOILATFyfeir7WvhJlNDZYKSL/iOlQ+BWy5BK75J60Ay+KEfPl/R5YLVF0l+eVg5 X-Received: by 10.28.107.10 with SMTP id g10mr3918137wmc.20.1520808178323; Sun, 11 Mar 2018 15:42:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520808178; cv=none; d=google.com; s=arc-20160816; b=i5SuX7o1qumeKZMq5lXG8d/8eVxKdJaLMMMeWDr91UeTsZqmRXslrIho/pdP2+kX// THyokV7/YOte/thSyeT5UfpQbihppizAnPtAmQG5TFHAr9bwY+d3siO2MXfMXHMfXOSj kj85gZ3EV3E2USKlQbtp2oyUfsaT5wNrfoARNqUA6M0Yq7WpoEviyoxvNQmjOuVGZ7AP nUR119Rj10xLketj6HZQ5Lf/aQ4LPKojyzNyrSWjUTTF9keMnkKMXobiP83LYHMwh8zP RwQ5JOPKrDApvJF/5fyr3vV6Y8Ys/lB/1UDGtD9x7m0xbKQKDdOCTPUq4nGwfZDiEy2/ Uk7g== 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=fPyE7yY+DytJchp5HRVcrklYM8l/TX593HOrg7TjvH458CQSuncWjyD21dFlE2QMsW IWx/doGyOh5ATDYYo4xIViyRisdctbSd9bQP+HNo+6vzNqt6m1XAaY75T489MxQ8cBqJ 9gmjI0ECZUd/eEHFY+E5VNJ7Ls4tlP9RfkPr/A3AZ0IPmOgTCSrGg5IDUzISo1BvfH1q Ezt5CWHF8J06/ssVpmB+DjHnHLCvTVt29pjwv582xROPsfsVM31YhTprnCRuFxyQ6af8 9nFdixDebsjMpLKbwiTwBUzIxFvUwI2Z4hEgPpgRpSDtevqIp4chjjU1bJ8nPYjiJjDo u6uw== 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=h5+vq3GO; 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 q23si2297878wmf.268.2018.03.11.15.42.57; Sun, 11 Mar 2018 15:42:58 -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=h5+vq3GO; 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 2A0D368A2EE; Mon, 12 Mar 2018 00:42:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCD5C68A0BC for ; Mon, 12 Mar 2018 00:41:58 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id t3so12983392wmc.2 for ; Sun, 11 Mar 2018 15:42:09 -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=h5+vq3GOOE3ec33iIRG1ttGGM/cCjS2e/g9T9UlZ4QXuCStM8DN6JGYZnUL8LOylhP P1sKDiYYB+H0VDKIdo1SPKnixhnIbGua6U60eY6I3OMcf2ILeuMS/MmhLwfXs3DP/+qi mrJLnidgxcemadzNeoqiRynWbKtXs87stErv72NgsMPeCyD0qhabPUKtg6soPuzyw7n2 Ef5mTrRd3I5qvL68bk68aEF3Axy9QeWGQJFh2R8OLeTQe9obe9XnvTLJHPxsgCr5MFPi kDHJnWe0zs6auA+V8GNJlbzeKPBIQZqkpeP5UnPXM/tb47MiBjWdDSzktZahDLbmcSos ssIw== 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=oul8YV3ZCWSEaBmj1pVgDfrxqON1DqXbwAcM4daIiuuv35pbGEdXFYVCriIFP3SdkM 1RvDucBzeX+t7034X8QtM5vG0gXqbO4KvbOkC9OQ1ImkNyJfu5PQ2IzglI6fISafFn94 uVgoinqr7fzftlmwpFLoMVkDWlVocpdkeVqOa8VIB6lVactZKceHoVm2fr24AfzTy7/B gTpNGLz4WeSK1iK8Xi/2iZ7SOW09BrVjyhhG+LJYqedDTIYPaxiaMMnJZFRXr/Bc+Yx7 z0e/8NXLIzyMWQPHwKty16VWysN8e2p3e+Vd5wUsuOcQSkdOK/V59kL+2NUVIqfQY9Jo yTag== X-Gm-Message-State: AElRT7E+5xR2voMcKMv0FC+wHXz+xctMTx/Yhiv1OtOYBDkdRA8sNo5G 2RmN7kWiYVp/bm5KYBSfTUHAKU8z X-Received: by 10.28.228.131 with SMTP id b125mr3700092wmh.153.1520808128583; Sun, 11 Mar 2018 15:42:08 -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 d5sm5317163wma.18.2018.03.11.15.42.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 15:42:07 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Mar 2018 22:41:55 +0000 Message-Id: <20180311224156.23986-6-sw@jkqxz.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180311224156.23986-1-sw@jkqxz.net> References: <20180311224156.23986-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 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;