From patchwork Thu Jun 20 17:45:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 13650 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 283B5449D65 for ; Thu, 20 Jun 2019 20:45:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1841F68AA99; Thu, 20 Jun 2019 20:45:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EE52689E37 for ; Thu, 20 Jun 2019 20:45:40 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id x2so4103499qtr.0 for ; Thu, 20 Jun 2019 10:45:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=zd+Gl/bim8KhPRqAPiVmzi+lvH49T855Bio4+5lcvRU=; b=DRqP/HLARWyrkVfqQWmOYI9WtOvu4ej4HA2VTrpPXbzqap5STWQC/9rO6Grjj9KTzm 8qEfCdXqOhfHcGc/OoHA0nqSorXUWAkDz0w4Ba/rHgs615VHsPDIf++LHHAltATkR46U K+PjOpMsmUrSdXj8wgE4XV0Gj9WIDhLFXSjhmaTkUDVfVePbb9wwn0iQQVih8lIamLct bU5ba0F0v4w7S9FV0i8kFGZDMa4gh5iFusCFn2rnHjJsVg86nwBjKvhuI7Ne3snUvQ99 K9/qa5y7i77K8aIiRaQnoxbAp0KR2mGarXwh5b97cQhR+besMoqZpjZuJwOKrF8QFSun kzIg== 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=zd+Gl/bim8KhPRqAPiVmzi+lvH49T855Bio4+5lcvRU=; b=NYs65hAhkbL1wYE1Y6NDVb3roKxwlVDiBw67HFLUsC2r+dYUFECSg/8a6xgzG5uFSb ku1NkACSBMAblMmWBra4W1Iogou9J5Bl+jywve7U9itDanK7Zp3GkbCgDXzsQABcf2Tb jKJUArWBrkqvYledFVdJHRTCNJeR6vmpgXHpyHffcaNspHsZIkf3S+lMcWaSDwumXPM0 weizp8hRX/DIPUT3gMQ4rT1BoKFX6YQbs614MogsMh82BZ7wF09RkLcmnVY2MDYu+wT/ kPqHJrRYGImdumR+PHWdONIf0TeqNnrTs8eu2XqtHhlkCbr+77uopkHjJ89wOlQtItUS m75w== X-Gm-Message-State: APjAAAU6GaNzIdfRVxs1iWPudqwkbZFnjCzV1eFgHlSYHr4JkIjPmiOe ZmApoA3y9XiWIWFRwf4mzlI608F/ X-Google-Smtp-Source: APXvYqzmCxshDg+NZbFlVVAgjDRfxFXuHSYjq2gzu1shxCXlQvj6S4TWSF5pGu6E/eN6gJXu8o3Dsw== X-Received: by 2002:ac8:30c4:: with SMTP id w4mr109926666qta.314.1561052739340; Thu, 20 Jun 2019 10:45:39 -0700 (PDT) Received: from localhost.localdomain ([181.23.83.211]) by smtp.gmail.com with ESMTPSA id u7sm334386qtc.25.2019.06.20.10.45.38 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 20 Jun 2019 10:45:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2019 14:45:25 -0300 Message-Id: <20190620174525.6515-2-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190620174525.6515-1-jamrial@gmail.com> References: <20190620174525.6515-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/cbs_h265: fix valid range of column_{width, height}_minus1 in H265RawPPS 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" The spec states they are in units of CTBs. Signed-off-by: James Almer --- libavcodec/cbs_h265_syntax_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index d2a20ddb35..571c9d3544 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -1059,9 +1059,9 @@ static int FUNC(pps)(CodedBitstreamContext *ctx, RWContext *rw, flag(uniform_spacing_flag); if (!current->uniform_spacing_flag) { for (i = 0; i < current->num_tile_columns_minus1; i++) - ues(column_width_minus1[i], 0, sps->pic_width_in_luma_samples, 1, i); + ues(column_width_minus1[i], 0, pic_width_in_ctbs_y - 2, 1, i); for (i = 0; i < current->num_tile_rows_minus1; i++) - ues(row_height_minus1[i], 0, sps->pic_height_in_luma_samples, 1, i); + ues(row_height_minus1[i], 0, pic_height_in_ctbs_y - 2, 1, i); } flag(loop_filter_across_tiles_enabled_flag); } else {