From patchwork Wed Mar 13 00:17:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12297 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 37637447D94 for ; Wed, 13 Mar 2019 02:18:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DFD968A7F3; Wed, 13 Mar 2019 02:18:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 505EF68A7F3 for ; Wed, 13 Mar 2019 02:17:58 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id e16so102984wme.1 for ; Tue, 12 Mar 2019 17:17:58 -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:mime-version :content-transfer-encoding; bh=r94KJRvPEGL7JBMM1vqyyx0KWv0GS4Eo++6k2hszTAo=; b=XjcfZNgTidktRzyaCWugilN43m87fCmkXRfvgpwv5YqtiwnNqzf844IlpwO4oHh9i6 gWX5QcgLWmBXNrs17t6uQHoc21xKTb1JxmAGCGkqviEtMyNDiTTUvQtXAshQEw0IiOt2 pPQTvb87VNjf8xN+VZL+vRhTrmLax1+jBisu8rcYF0uQ8cozaPSHjHCCh4qgZoK5rMib RaYQpDwsSU9jBAWZ9TFfhUVIBTkg6q9T538WHv2prswVqg0joDemkerqdR0YWqlN6G/z Q5YgQYwvWUMpr272gR+i0YwiWAzIqVHOHCs5SAr9nEc0eaVWvIi1DtjJlCwPTYX15GWd TR5g== 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=r94KJRvPEGL7JBMM1vqyyx0KWv0GS4Eo++6k2hszTAo=; b=nFw7fOgAbOVIy0B6dMDaaeh4Ka38ESA0K2Jen+vNJdNrvPmt3xzqdEoR0dCCw2Nsj0 7nkGhGW2jr3ArC5SRDN6tAgOZlYGRLTAL8naoKZ4cMeW2p2MBdHI5DDl/22MHyvtwRtK Whehf4isR6TH4Fr1o+H4JKaa1C/v37kgGbQ8ggVDPRAr2wvbH5+in8vDwqE5251yOI3t aJgxdOqKOwecRuY2bJsoWCGK3HYXfCYTSqOzrop47bGCM7JawP9emIbAmbCKQfdl1CoJ LLhQs+sUxFHU0c+YCG2A3yj+2Macj3xLTXXH/5v/AL0GELBvaRsR6aWA4GCvzdv8bhms Otdw== X-Gm-Message-State: APjAAAWwnDt0JjjkKygMGkzmA1mAteTq4b+/UQ68bkDf2riP90O6ad2N T90SKqW+BxJ89l4UKJUtbob25m+bK/c= X-Google-Smtp-Source: APXvYqw88qj2X+4HgAQ5ijxjRwD6QimvaW3I8/6tarlAfJk7/OV9cJKP7Riae4HkqK527xkn8PYfjA== X-Received: by 2002:a1c:38b:: with SMTP id 133mr244403wmd.26.1552436277428; Tue, 12 Mar 2019 17:17:57 -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 u17sm32505710wrg.71.2019.03.12.17.17.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 17:17:56 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Mar 2019 00:17:46 +0000 Message-Id: <20190313001748.11781-4-sw@jkqxz.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190313001748.11781-1-sw@jkqxz.net> References: <20190313001748.11781-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/6] 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 | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index c2c1f8b9bc..a580d113b9 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -304,27 +304,34 @@ 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. */ + + 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; + 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 = av_clip(roi->y / mb_size, 0, mby); - int endy = av_clip((roi->y + roi->height + mb_size - 1) / mb_size, 0, mby); - int startx = av_clip(roi->x / mb_size, 0, mbx); - int endx = av_clip((roi->x + roi->width + mb_size - 1) / mb_size, 0, mbx); + // This list must be iterated in reverse because the first + // region in the list applies when regions overlap. + 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->y / mb_size, 0, mby); + endy = av_clip((roi->y + roi->height + mb_size - 1) / mb_size, 0, mby); + startx = av_clip(roi->x / mb_size, 0, mbx); + endx = av_clip((roi->x + roi->width + mb_size - 1) / mb_size, 0, mbx); if (roi->qoffset.den == 0) { av_free(qoffsets); @@ -332,18 +339,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;