From patchwork Wed Feb 27 22:00:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12164 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 C81F5448F93 for ; Thu, 28 Feb 2019 00:06:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0EFC680572; Thu, 28 Feb 2019 00:06:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0597C68082E for ; Thu, 28 Feb 2019 00:06:50 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id o17so19756665wrw.3 for ; Wed, 27 Feb 2019 14:06:49 -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=TMzMEuKWxjPQCE1dR9cgygjthPVAAchg014OPtpIDak=; b=v0EASbv5VJWKbhIcR0warDm7YxIcY8f5Rr29F7lPdPRsrtw7EoNAihHc1iLHSa8MgD m4T8W6AW2Vr2FQjr/cOGt2Z/ZOu3L1TSd5oFI7k0WGY9nXUvp9fq5znUCFx0E4cUESGY +I3YVJrs95pPhjHdeMJwigQkcHsWjnZBfeBSrvDJdF7iRVNDXHs3OjMVKDWTLb9iQwzO 6ROqBoH5D4bGiKEZx0EU/ynGeGn6CV/Gl/fSiAvFwCcePYVPc1+OXuquIab/wC+4eWr6 +x1weP7BqHZ7IM2csZuZQA5ctGwcev9UQTTws1JGoypX1XzV3Om3MXEPAjjxpm8wBlQ4 1lYg== 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=TMzMEuKWxjPQCE1dR9cgygjthPVAAchg014OPtpIDak=; b=lBkbiShIvWKFKpP3tt9fpZz2RZim9/+j1X5CiHFIBbUh5etCKypURcyUN9cGn8hodC W8uAsPf+mI7dN/rNJGTX0TpwkjG6/kbTOBG18MVh0lj6rxbJPxnX7KzhzkMaw3hu7qU2 K0Z8UPL8zNxmxZEaKuqeadrryfQ+5iSK5htsCegRAvQRKlOu8KRu00goT0at598Q3Fyy SVjsjwAj0l7wIch9rsZkr3TcimiIGhQCqbPTy46GZKM7DGrWqwv5qrYlyX8idJBthND+ q5rXSFOJy8Zbz2rM3mG6j55Fl6R9N/ptwCJh1sWdGdn27vHpSUd0YUw7dLEAAYEvBl6O ZLyg== X-Gm-Message-State: APjAAAUO0nyrUqTg+ZaUs6qlNQ8f6wa0IpNlyGwj7Ep4Bwcr9IaugUWY z5v2Q/tHl0zk/KRmHdAvkfn9W3Fl5aE7aA== X-Google-Smtp-Source: APXvYqzH/elsJxXG1jDeU/vm2RuhOKUPlzXtLH+0y4Qp5E/6QnPTTHKHaIfBrPzz+2NcWKYRSxsBKg== X-Received: by 2002:adf:d845:: with SMTP id k5mr3962710wrl.145.1551304833060; Wed, 27 Feb 2019 14:00:33 -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.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 14:00:32 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Feb 2019 22:00:20 +0000 Message-Id: <20190227220023.16040-2-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 2/5] libx264: 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" Fix the quantisation offset - use the whole range, and don't change the offset size based on bit depth. Use correct bottom/right edge locations (they are offsets from bottom/right, not from top/left). Iterate the list in reverse order. The regions are in order of decreasing importance, so the most important must be applied last. --- libavcodec/libx264.c | 50 ++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index a3493f393d..475719021e 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -285,16 +285,18 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int nnal, i, ret; x264_picture_t pic_out = {0}; int pict_type; + int bit_depth; int64_t *out_opaque; AVFrameSideData *sd; x264_picture_init( &x4->pic ); x4->pic.img.i_csp = x4->params.i_csp; #if X264_BUILD >= 153 - if (x4->params.i_bitdepth > 8) + bit_depth = x4->params.i_bitdepth; #else - if (x264_bit_depth > 8) + bit_depth = x264_bit_depth; #endif + if (bit_depth > 8) x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH; x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt); @@ -359,45 +361,47 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, if (frame->interlaced_frame == 0) { int mbx = (frame->width + MB_SIZE - 1) / MB_SIZE; int mby = (frame->height + MB_SIZE - 1) / MB_SIZE; + int qp_range = 51 + 6 * (bit_depth - 8); int nb_rois; - AVRegionOfInterest* roi; - float* qoffsets; + const AVRegionOfInterest *roi; + float *qoffsets; 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; + 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); - av_log(ctx, AV_LOG_ERROR, "AVRegionOfInterest.qoffset.den should not be zero.\n"); + av_log(ctx, AV_LOG_ERROR, "AVRegionOfInterest.qoffset.den must not be zero.\n"); return AVERROR(EINVAL); } qoffset = roi->qoffset.num * 1.0f / roi->qoffset.den; - qoffset = av_clipf(qoffset, -1.0f, 1.0f); - - // 25 is a number that I think it is a possible proper scale value. - 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; } } - - if (roi->self_size == 0) { - av_free(qoffsets); - av_log(ctx, AV_LOG_ERROR, "AVRegionOfInterest.self_size should be set to sizeof(AVRegionOfInterest).\n"); - return AVERROR(EINVAL); - } - roi = (AVRegionOfInterest*)((char*)roi + roi->self_size); } x4->pic.prop.quant_offsets = qoffsets;