From patchwork Thu Aug 13 21:46:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21638 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 828B444AD4A for ; Fri, 14 Aug 2020 00:50:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5BCA9688091; Fri, 14 Aug 2020 00:50:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B284688091 for ; Fri, 14 Aug 2020 00:50:30 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id t14so6296459wmi.3 for ; Thu, 13 Aug 2020 14:50:30 -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:mime-version :content-transfer-encoding; bh=RGmkzz2owvhr4UdwOyaIFW1jx6cewWH+NsSENOua5v8=; b=ziyFvW4N+6iKzrITiZzOVrYF3Rc1E9ouQzH/yttnekmzxmmK41qJR5b4JmMNJOnI92 UwarohW7TXZt32Esxp82XE5XCs8mPxVut7mcxSG/mFkJ97quqKI1lmkKTpyiHce7/rTn miLCkQo7sIA9bmYeOujY6oF8gtIEviQrr9AOOSA9PPOTXzhu5FZGR1rUff9YaLN9IRFN DaT/5f/r780pbk4ShywFQu4gcQ1w2p7u3tgAHhX+2+TmTxXGQ7CKjNHXeqLC7PkFNFP8 BH1pB0VspYH0T1LjqvtVUAsJRacYeDUPOKrynI/hIvZH+naOSr8wFc1S9XRjFu1/YZIb 1gvg== 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:mime-version :content-transfer-encoding; bh=RGmkzz2owvhr4UdwOyaIFW1jx6cewWH+NsSENOua5v8=; b=dCXVca911jaHduW9mmy+1c0e1QoBMv7yYQf4usVop+wz3jyRVnPG0I91C17K1e3N1v XdcViCo2lY75LJwnGXKj9DgfdWsZ3uOyLGWy4aMXn6KEULAJDjIOMGjA2Wx59UX2Epun m1c0fSngkA3eQEh0pSHcYUZ7u9FNqKqLNwzaMfUhr+MaDWpwQ+A4WD7OnX/ZTQckHZT8 Vo7hAXTvstScWg71BnJ3jIk1RR/ffGmgcQxbgu3lPHeuj8zl+WQVXQ+LFHonBLuCX0i3 bY8QZqKWCCmcodbeqJjsPqLu12JFASera3Hk8meqO5OVznnjxooGUN7QJobX1X4BYny6 mOvg== X-Gm-Message-State: AOAM532AxJUQUym72wyxZBdWGOZ0O93JIrvITVQzb2uHqBOlY9Qv9K1I vjbJNbQYO7moUzF7czCGu1EmWA8OkGI= X-Google-Smtp-Source: ABdhPJwsUHdEeVYFzvFONac2/RgkoN/juUmADm4xaf6Apo0yQnM3X7bX0KLbhOlYRttya/JBtrrnmg== X-Received: by 2002:a7b:c194:: with SMTP id y20mr6323477wmi.183.1597355429260; Thu, 13 Aug 2020 14:50:29 -0700 (PDT) Received: from localhost.localdomain (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id a23sm12016226wme.0.2020.08.13.14.50.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 14:50:28 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Aug 2020 22:46:11 +0100 Message-Id: <20200813214613.489791-1-sw@jkqxz.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] vaapi_encode_h265: Ensure that tile sizes conform to profile constraints 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" While libavcodec doesn't care about these constraints, the HM reference decoder does enforce them and other decoders may run into problems. --- libavcodec/vaapi_encode_h265.c | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 316030914c..279d0ff1f7 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1105,7 +1105,7 @@ static av_cold int vaapi_encode_h265_configure(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeH265Context *priv = avctx->priv_data; - int err; + int err, i; err = ff_cbs_init(&priv->cbc, AV_CODEC_ID_HEVC, avctx); if (err < 0) @@ -1143,6 +1143,39 @@ static av_cold int vaapi_encode_h265_configure(AVCodecContext *avctx) ctx->roi_quant_range = 51 + 6 * (ctx->profile->depth - 8); + // Ensure that tile sizes conform to profile constraints. + if (ctx->tile_cols > 1 || ctx->tile_rows > 1) { + if (ctx->surface_width < 256 || + ctx->surface_height < 64) { + // Special case to give a more helpful error message when + // tiles are not usable at all. + av_log(avctx, AV_LOG_ERROR, "The codec does not support " + "tiles at this resolution (%dx%d).\n", + avctx->width, avctx->height); + return AVERROR(EINVAL); + } + for (i = 0; i < ctx->tile_cols; i++) { + int width = ctx->tile_col_width[i] * ctx->slice_block_width; + if (width < 256) { + av_log(avctx, AV_LOG_ERROR, + "Tile column %d with width %d CTUs (%d pixels) " + "is too thin - consider using fewer tile columns.\n", + i, ctx->tile_col_width[i], width); + return AVERROR(EINVAL); + } + } + for (i = 0; i < ctx->tile_rows; i++) { + int height = ctx->tile_row_height[i] * ctx->slice_block_height; + if (height < 64) { + av_log(avctx, AV_LOG_ERROR, + "Tile row %d with height %d CTUs (%d pixels) " + "is too short - consider using fewer tile rows.\n", + i, ctx->tile_row_height[i], height); + return AVERROR(EINVAL); + } + } + } + return 0; }