From patchwork Thu Jun 7 23:43:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9314 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp195115jad; Thu, 7 Jun 2018 16:47:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIJSEBym+Qed5XVlaP5KOpCGQteuPhiaM3xXyM8DQNxgqRJ0/krgf7+VWLjAjqOMCNJewzL X-Received: by 2002:a1c:8012:: with SMTP id b18-v6mr2730171wmd.13.1528415268094; Thu, 07 Jun 2018 16:47:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415268; cv=none; d=google.com; s=arc-20160816; b=Ao+4SFGV6pByZh713gfRz/hN4QSw67oUQ3B0n5dZLNdM8WSgI1KEQYhFy3n6KS/p4a sEg1mMf7UDkt4bn6529RdJBBFCum5HLUXjXUcfmsyvSchw7q6pFEO7WsnD1IX4OfioKs mjPq6bKKCUJNG6RTTxZB23+MmHQBMXoV6bnv/g87j45i3tjdRsyQlamQsewfOn48G8UB s4XgCwns2wAv1qbrPrz2AevpY6SpsHFwCv6gEAleQKMqrfRx9CSSQTwdej0mx4dNOmj4 7VDTy1frxpmQdZQ4GHgN0BxW0uDMPt5hJ4ZZZQMAPE+jgDichrs7mAnNwyupRRSc6Cmi G6cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=L2ZMsjqLiRIeCr3ik9wLxgrGIPtA5oVMPzr/z7oJ6kk=; b=Ci8bvhWk2uSm1/JMmIGS7ArRqVKj8kBLav4krSerhHAJalZDGjwW+W8DjTWlQRh4g5 5eCUPZ5P0zfnP8kxXHDm+p2S1sRB7nf5gpoKrrpgqlFUvGtEx+HzKF7cotHtjidOS2cw v3YxMea5XtezDYqFi9/0R0ChXatO6jEf1oEqwyF5E3dWnQWFw3dlCOccA0uM95vHb7Hk 90qvDVnxtCJ9/2U6J1ptw2zM8dXodI4Qp4FpH8B6nv0aAORQIH+U7sqIGyvtw0X7JcKr KTVntO0z3VfBOs+N44o8rKezwV//YwVnvNMAPOJPgAidnDqOcBe09csYy/Bi1gANhR0U FEBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=mzZRzk2R; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x11-v6si80378wmd.72.2018.06.07.16.47.47; Thu, 07 Jun 2018 16:47:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=mzZRzk2R; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C206168A86A; Fri, 8 Jun 2018 02:43:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD36268A85D for ; Fri, 8 Jun 2018 02:43:22 +0300 (EEST) Received: by mail-wm0-f44.google.com with SMTP id p126-v6so240373wmb.2 for ; Thu, 07 Jun 2018 16:44:10 -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; bh=/OWx/Ht1sX485hAQYGsHAMDNGTc1M/lKgTC6UWAMYLc=; b=mzZRzk2RQpNCZ/2m4mzHYuqjkuqJjRWaX5NJ7VbX/q6RH3QOT/8bTjVJqia2ncUqWn SRcXDaX0R0AUJ4yZFIYVTblhY1p0EPDkVBsNjdlzJkjs5YzvMZS1RLHQvv7Tbwy34uHG V1VZz5qrBbqXeR58p5D9gr5h0UleT+djGhiwH9pDi+rGnra+Z6GZMfQmjHVUGaArpaDl wWjFWeqkmSCY19h5VB86GgzjAqRw9Jd4XzY1OqE9MtlYjIu4F2xojs3j0S3uk36Dbylq zTxDwyU/E/Oj/Io78xfwSMNZmuzuVDxgdgi1zgpbPDDpC6lPCR60sT/eJYOGDE4z8PV1 7HXA== 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; bh=/OWx/Ht1sX485hAQYGsHAMDNGTc1M/lKgTC6UWAMYLc=; b=PocYLspOWHcSEPmv02EqINyLWLXegw5T8+OyIjvX0e8Yd88saUThLQQEtYjYTzyMWd R5qke2i5pyiS/toKQOyHJp7LQYVNPd0LgCI90g2ny2lFO/THh0vhfJDJTpcWShcs4YdL C2xwgHmyXeVZ8+Y97qKZFn+sVU8CnaGykfZY336gTuHhY99TkfcCUain0ln6MTcK9shE xdndLEVJkIxmtQp1vezyCqhYXDohzI+gThR4vqI6yfScMVxfNE1B/rjAifNf9iJJRJtl rfPcnKwZFu0iMPRKaTGqHJSGOiOojVY2i13ghksAYFRE/W6t5O+Rx4qabsqRtGyims5o XkIA== X-Gm-Message-State: APt69E1hJo+vEaOCA/7W/oNacNL9TdKUAy7d8CNAv1z0hFwjWi2u2v+3 a4a8BQlfyRmO9Kf/axNlNnIQP8Om X-Received: by 2002:a1c:2856:: with SMTP id o83-v6mr3213937wmo.3.1528415049851; Thu, 07 Jun 2018 16:44:09 -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 r2-v6sm18640545wrq.55.2018.06.07.16.44.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:44:09 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:25 +0100 Message-Id: <20180607234331.32139-31-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 30/36] cbs_h264: Fix range and default value of max mv lengths 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The max and default values are 15, not 16. --- libavcodec/cbs_h264_syntax_template.c | 8 ++++---- libavcodec/vaapi_encode_h264.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 027b555db6..21edcb799e 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -185,16 +185,16 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, flag(motion_vectors_over_pic_boundaries_flag); ue(max_bytes_per_pic_denom, 0, 16); ue(max_bits_per_mb_denom, 0, 16); - ue(log2_max_mv_length_horizontal, 0, 16); - ue(log2_max_mv_length_vertical, 0, 16); + ue(log2_max_mv_length_horizontal, 0, 15); + ue(log2_max_mv_length_vertical, 0, 15); ue(max_num_reorder_frames, 0, H264_MAX_DPB_FRAMES); ue(max_dec_frame_buffering, 0, H264_MAX_DPB_FRAMES); } else { infer(motion_vectors_over_pic_boundaries_flag, 1); infer(max_bytes_per_pic_denom, 2); infer(max_bits_per_mb_denom, 1); - infer(log2_max_mv_length_horizontal, 16); - infer(log2_max_mv_length_vertical, 16); + infer(log2_max_mv_length_horizontal, 15); + infer(log2_max_mv_length_vertical, 15); if ((sps->profile_idc == 44 || sps->profile_idc == 86 || sps->profile_idc == 110 || sps->profile_idc == 110 || diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 4034053dc0..0d7780110c 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -491,8 +491,8 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->vui.bitstream_restriction_flag = 1; sps->vui.motion_vectors_over_pic_boundaries_flag = 1; - sps->vui.log2_max_mv_length_horizontal = 16; - sps->vui.log2_max_mv_length_vertical = 16; + sps->vui.log2_max_mv_length_horizontal = 15; + sps->vui.log2_max_mv_length_vertical = 15; sps->vui.max_num_reorder_frames = (ctx->b_per_p > 0); sps->vui.max_dec_frame_buffering = sps->max_num_ref_frames;