From patchwork Wed Feb 27 22:00:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12163 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 A1511448F93 for ; Thu, 28 Feb 2019 00:06:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AEDF689FED; Thu, 28 Feb 2019 00:06:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96EAA6803CB for ; Thu, 28 Feb 2019 00:06:51 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id l5so19739846wrw.6 for ; Wed, 27 Feb 2019 14:06:51 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=Vjp4c6OBUeK1SX/UMuDpiQx+R1xOPi1TI8wiW3snWkg=; b=NSUoEsntNxVKBpXo8isJT1NiV2m4hTtrl75w0kckQ/IODruPv5RkVhyYt8DycE8wNM tB/K6UXUKxqk7XeUOf1kU3BQs41Jj7rlogyUYmQWsX6VQNM0bD7HSuAKnGZGIiKfMq31 eOoKJI8qCVNpIuD3estnTtduWUvOHqRXDrk38aWSAxIRA+KYX2irh05oYcqLYYikqdc+ S26+F+81ZbK/0kjQ6HDXU0yUa+1c35qa07eGc/s4Gu4tDMrqGpPRPH8GYGPFf8BqNzCd ddiQ2nPccBqlVrOKNVAtNFDRRU5BXGon0/19gCeGhVpTx0Zl3LUUc+h+quhbXc5r2CGq c2HQ== 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:mime-version:content-transfer-encoding; bh=Vjp4c6OBUeK1SX/UMuDpiQx+R1xOPi1TI8wiW3snWkg=; b=XM2UYlHTEc4SPqfqUS02+3K6OFqX9Kd77xTfbt0fiLBaoFlVBRhBXMH0h9lIXk1dIt qxkgbOSOyY1+qjgVyDQxYu1YnlvpzyALKTO5y7Xr1SbUGMNDj9VYX0kM35J7nqBKqvg1 AdqD+7CgywSZZIv6B01SuMKKtX14ADu+pBcWfqpy5zhsS2M27ufsgKNDPpJQdiREK3NF DQFtp38dHAwueZ+76tQIcmXu3QhCAaBuoFQsuzGMKYSiEltVj3etFb4lR1KQgq7VY0dr E0hBm+KuHB0zLkIYXK1wxQJ4b6/JnosIr4Y1LcE3kZs4NeAmqIHAKQGZi6X0OQ+HEsL4 p5jQ== X-Gm-Message-State: APjAAAWc4PoZo//D/g0yLEGfPLBs4yahF0CGApSVTngutyhr152y9Q4d 4A2GdFxdf8MBQg85YM70VTnM1LUfbfQlcw== X-Google-Smtp-Source: APXvYqxDlYJcorox4qLfTA1nEjqQZH8tYtztcfbIqSDF8L5DGaXWw+FzYRCHBPKDQwmi2LrvUaeIdg== X-Received: by 2002:adf:a49c:: with SMTP id g28mr3750572wrb.147.1551304834408; Wed, 27 Feb 2019 14:00:34 -0800 (PST) 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 n14sm20586073wrx.24.2019.02.27.14.00.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 14:00:33 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Feb 2019 22:00:21 +0000 Message-Id: <20190227220023.16040-3-sw@jkqxz.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190227220023.16040-1-sw@jkqxz.net> References: <20190227220023.16040-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] libx265: Update ROI behaviour to match documentation 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" Equivalent to the previous patch for libx264. --- libavcodec/libx265.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 98415366da..af1a2b2287 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -296,27 +296,33 @@ static av_cold int libx265_encode_set_roi(libx265Context *ctx, const AVFrame *fr int mb_size = (ctx->params->rc.qgSize == 8) ? 8 : 16; int mbx = (frame->width + mb_size - 1) / mb_size; int mby = (frame->height + mb_size - 1) / mb_size; + int qp_range = 51 + 6 * (pic->bitDepth - 8); int nb_rois; - AVRegionOfInterest *roi; + const AVRegionOfInterest *roi; float *qoffsets; /* will be freed after encode is called. */ qoffsets = av_mallocz_array(mbx * mby, sizeof(*qoffsets)); if (!qoffsets) return AVERROR(ENOMEM); - nb_rois = sd->size / sizeof(AVRegionOfInterest); - roi = (AVRegionOfInterest*)sd->data; - for (int count = 0; count < nb_rois; count++) { - int starty = FFMIN(mby, roi->top / mb_size); - int endy = FFMIN(mby, (roi->bottom + mb_size - 1)/ mb_size); - int startx = FFMIN(mbx, roi->left / mb_size); - int endx = FFMIN(mbx, (roi->right + mb_size - 1)/ mb_size); + roi = (const AVRegionOfInterest*)sd->data; + if (!roi->self_size || sd->size % roi->self_size != 0) { + av_log(ctx, AV_LOG_ERROR, "Invalid AVRegionOfInterest.self_size.\n"); + return AVERROR(EINVAL); + } + nb_rois = sd->size / roi->self_size; + + // This list must be iterated in reverse because regions are + // defined in order of decreasing importance. + for (int i = nb_rois - 1; i >= 0; i--) { + int startx, endx, starty, endy; float qoffset; - if (roi->self_size == 0) { - av_free(qoffsets); - av_log(ctx, AV_LOG_ERROR, "AVRegionOfInterest.self_size must be set to sizeof(AVRegionOfInterest).\n"); - return AVERROR(EINVAL); - } + roi = (const AVRegionOfInterest*)(sd->data + roi->self_size * i); + + starty = av_clip(roi->top / mb_size, 0, mby); + endy = av_clip((frame->height - roi->bottom + mb_size - 1) / mb_size, 0, mby); + startx = av_clip(roi->left / mb_size, 0, mbx); + endx = av_clip((frame->width - roi->right + mb_size - 1) / mb_size, 0, mbx); if (roi->qoffset.den == 0) { av_free(qoffsets); @@ -324,18 +330,11 @@ static av_cold int libx265_encode_set_roi(libx265Context *ctx, const AVFrame *fr return AVERROR(EINVAL); } qoffset = roi->qoffset.num * 1.0f / roi->qoffset.den; - qoffset = av_clipf(qoffset, -1.0f, 1.0f); - - /* qp range of x265 is from 0 to 51, just choose 25 as the scale value, - * so the range of final qoffset is [-25.0, 25.0]. - */ - qoffset = qoffset * 25; + qoffset = av_clipf(qoffset * qp_range, -qp_range, +qp_range); for (int y = starty; y < endy; y++) for (int x = startx; x < endx; x++) qoffsets[x + y*mbx] = qoffset; - - roi = (AVRegionOfInterest*)((char*)roi + roi->self_size); } pic->quantOffsets = qoffsets;