From patchwork Mon Jan 20 09:58:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Cook X-Patchwork-Id: 17436 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 3C5C944BCC9 for ; Mon, 20 Jan 2020 13:08:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DE3868AEEC; Mon, 20 Jan 2020 13:08:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2DC568AB4A for ; Mon, 20 Jan 2020 13:07:54 +0200 (EET) Received: by mail-ed1-f66.google.com with SMTP id j17so29088796edp.3 for ; Mon, 20 Jan 2020 03:07:54 -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:mime-version :content-transfer-encoding; bh=FzkrrnAnKAebDHgOU90iMcbX83kdKwSi+tN5AJyRysE=; b=HWM6b4ioDuwU6LrAayJKU7yb9hxc6sqdOvUkMQB/29jyBQo+wRgEWBko9TZuj0AW/f U9rqKn3pnf2RQmufOOPN+L5AxSsriyK1efQ1SsETTR1yX5lkeEAkkwDFPPFw5C0Qa4ii 35LZ3NGVBTGz18Sk8Ny6A3nMQ0J+1dPKAoHXaZiXmm0ZxjL7OwwC4cJUKtf6vxof1skO MUHJw/bhWGA9sKLpz8j9pN+4+LvCOTdndi+pqSgthXETEiwPKYUQe8gmSaBdqUXPxH4Q 7oF2WhRYLw4NvoFGA0RNhFEKeDnXMnwFKqTB/DL2jo5xcvYA1S0OOC47ha8x+Oy9bRRc QpJQ== 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:mime-version :content-transfer-encoding; bh=FzkrrnAnKAebDHgOU90iMcbX83kdKwSi+tN5AJyRysE=; b=HBC1UsycVQk4Djx6KAyhhqJtiXAKz5F94Mce/6CmTXYGHg4hnpiTirK1oOB/KpoGUY VFz5nhs6a7Ugbbz+O3U3BhxqXFOiHh/K1thcJaV8WjRmmFg8vqApCb+E43Y8ypsIIOKI FXuidpiopbx1FHFza89dkU2xhOStK67HOSV1rN+piJNtGLeYMrjQTpplzEd2nfX0OUvS SEms19JlIv0MF5pxd2SHMnG/nuP9DENrpp/LweRGP5FbEC9VS13ZOGcFn7zESIdK3ilt oayPQQtAJlmi1c3u5rfSoLYMl6tS0SKZqRWwpkPEP1yx/5LQIPFWqdBRv7hn+DAbEyq7 fndQ== X-Gm-Message-State: APjAAAWTYdLL3c6bQF89pD2bhg8bDQ30ZRt/GLbchRoeR4KuZpe4wr2X cRMO7ipzx8rVgZ4GKMh7mp/MAgdlQnCSkw== X-Google-Smtp-Source: APXvYqy3XGyOdzaZYlXJ9hWZfjY4JliTf22jWij0Q2uazEXGzMag/EDnuQ6c4dJxVNuOXjsWEntWQQ== X-Received: by 2002:adf:eb0a:: with SMTP id s10mr16555540wrn.320.1579514328888; Mon, 20 Jan 2020 01:58:48 -0800 (PST) Received: from Development-A22.cubicmotion.net ([81.92.211.68]) by smtp.gmail.com with ESMTPSA id p17sm46777809wrx.20.2020.01.20.01.58.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jan 2020 01:58:48 -0800 (PST) From: Jon Cook To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Jan 2020 09:58:38 +0000 Message-Id: <20200120095838.165480-1-jon.cook@cubicmotion.com> X-Mailer: git-send-email 2.20.1.windows.1 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 Currently width_align and height_align are zero which cases "Error submitting the frame for encoding". This change sets the alignments. Signed-off-by: Jon Cook --- libavcodec/qsvenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 9e416500e9..b18393532f 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -470,6 +470,9 @@ 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; + return 0; }