From patchwork Tue Jan 21 12:13:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Cook X-Patchwork-Id: 17454 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 771A7448C44 for ; Tue, 21 Jan 2020 14:14:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5233568AB42; Tue, 21 Jan 2020 14:14:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35FB9689C71 for ; Tue, 21 Jan 2020 14:13:56 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id b6so2966233wrq.0 for ; Tue, 21 Jan 2020 04:13:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cubicmotion.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sdmqBynmRNAGwjRpBvbJUOAbCiPxZHop4ojpLJf1Zyo=; b=YasHNHZUX5BBxj8FWLlVxwGPryddGB40l9LsKtdWQDU+Q/okcYmo3L/6UhpSh4iXae lD/rs9BQYTv3vKW4ZjcvK7DYJw5tfOMttzw8UEaoHKpO0MhnbFHy3z4VazlDv02qLt01 T9m4vJW8T2gyNvvjI685PMrECfhv+8R1Tl0jkFWb9xUZf8Sb1fL2R7TOIAcMm7K4aXBP 3T9E1ZKoDb2pQZQD9PP2YQQwC8EUnqsX8lSoJx1ZQQtnF1g7CC8GYKY2HKzJurAjwOta tw7FHw1+37/l15iDYKiz7q9m2zBprQHUM8nI2XTlNZQX8GakQ5MKvKFcIxhL62RHoDlv BchA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sdmqBynmRNAGwjRpBvbJUOAbCiPxZHop4ojpLJf1Zyo=; b=FLStZ/hxrComyn5Lq7eo5XeE2WyDEWshWe9vR/1Tq3rTabHMdnwgGamr2Poy2fYghf XixRopBqcNvYORRC1p0pyDbz/YT8B/8EMzi9iDrVtgDrADSjt9SR02FiaKKc/+Zlao9x MdrcxHV4Gwe0TzKza4Bfk3WD8Qqj/GbUzvhQs8yh+yQQi0vd/bJq0cjHgWCV423Cx8Tn 9NGhJClJEkvMHQO72tXrx0JZY30zClRSX9gqOnv8rK52zDIIyH2gEJXQa6OvMNMbCMHB 2wfx/XxoUO8qw/WWWJ/R2xo+dy6zPnyFGOZR+uNTsUyzgkXnGR7hBS8k+G7MDQqK/65J bfdw== X-Gm-Message-State: APjAAAWnARaUyujWKAHM8XU9Kp0+Xt3LOf6IZiQQjB+2repJcV8IfJzO PDGYIuXAPzaCozRN3KqmCrAlWXcCIKuCdA== X-Google-Smtp-Source: APXvYqwJiD8z8cDgWQMdJgyxheFGO7C3c0JYJRVurgOPPKn7f8w5lyie05TBzNqFq8Z0qmb0jBTVrw== X-Received: by 2002:adf:a48e:: with SMTP id g14mr4976322wrb.409.1579608835438; Tue, 21 Jan 2020 04:13:55 -0800 (PST) Received: from Development-A22.cubicmotion.net ([81.92.211.68]) by smtp.gmail.com with ESMTPSA id i10sm53063322wru.16.2020.01.21.04.13.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jan 2020 04:13:55 -0800 (PST) From: Jon Cook To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jan 2020 12:13:51 +0000 Message-Id: <20200121121351.4369680-1-jon.cook@cubicmotion.com> X-Mailer: git-send-email 2.20.1.windows.1 In-Reply-To: <20200120094956.154224-1-jon.cook@cubicmotion.com> References: <20200120094956.154224-1-jon.cook@cubicmotion.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/qsvenc.c: Set height and width alignment when using mjpeg_qsv 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: JonCookCubic Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: JonCookCubic Setting FrameInfo.Width and Height as per review comments Signed-off-by: JonCookCubic --- libavcodec/qsvenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 9e416500e9..40904af388 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -470,6 +470,12 @@ static int init_video_param_jpeg(AVCodecContext *avctx, QSVEncContext *q) q->param.mfx.Quality = av_clip(avctx->global_quality, 1, 100); q->param.mfx.RestartInterval = 0; + q->width_align = 16; + q->height_align = 16; + + q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, q->width_align); + q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, q->height_align); + return 0; }