From patchwork Mon Apr 17 14:16:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41223 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2394101pzb; Mon, 17 Apr 2023 07:17:17 -0700 (PDT) X-Google-Smtp-Source: AKy350aMu7Gp+hH1lc3mCsEldKra8ytnxdZ3VcPqHAtVafJwbuXrPcdg3v+EJ1tZIY44YfIn5P8Z X-Received: by 2002:aa7:dcd0:0:b0:4fa:b05e:ced5 with SMTP id w16-20020aa7dcd0000000b004fab05eced5mr13776391edu.36.1681741037214; Mon, 17 Apr 2023 07:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681741037; cv=none; d=google.com; s=arc-20160816; b=KCe4OI9n6rR6hXoa/3Js1ctktai5JhCb3XUYXk2Waku4DtuPIDyWjkft3irPO7OnnO Koh5jBjenVJycjJhtkutb8ssrSkub0qn3bcVmaDQ26DVdTATTIAGX7UxcIj++LiSsd2+ OgwuubK3uN9+bpK9axFNpoBhqZxiZZwWWb8Z5YCXkXWHEPn2UMns4SlWa9cLyFCD89zd 6m6AHbBuBggdmKMcmI8lXexD8AfmbOcXyqADIAbJlQ1nr6eLI6NkkGKqyzRDIoklarPB CnnxNUsoQMUt2405od7to+c6Xsiy3iwhEP4XNy8AUuaUVpJlNB6LDL+6EPfrsk3Gcd7G RmSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=/uOS27K5EfmOQDHJ5bkIgoeCn/1q46PjnzIb2aX8SVg=; b=hUIGMI9vMj0aFiLCc9NChbX6xpfnnump0mocjA4R8YmUDUl4eGHMZyEcCMsjSwKvl8 lp2mMBXT+PonPBxQdsKy6hX8SVY/xXzbxMzDGFKXku89ER2v6rQhamRV+/zaUF9aqk4k oZsqBufbiCILCPpCDTTi8cDxOWCRBhKXFX1e5QyzNSNMRMSdsdCaAY8Wjygjc8+79p2P MBv/NmGVvdgwsP58EqKK14x6K5wwzqyNgVsW9/ZhE5OZs1K4zdRWVTZwDxnw9nAjnLJ6 2BvrbQMC4l+LtNzZSrkhHpgGDHd0MsaDAvi5xj3G9ZkPLYOXlZV90mNz2zOap21X7oqQ mcHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="OU/bQ7Bx"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u23-20020a056402065700b004cebb5c1590si10098560edx.446.2023.04.17.07.17.16; Mon, 17 Apr 2023 07:17:17 -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=@gmail.com header.s=20221208 header.b="OU/bQ7Bx"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A97068B1C4; Mon, 17 Apr 2023 17:17:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C569768B1C4 for ; Mon, 17 Apr 2023 17:17:05 +0300 (EEST) Received: by mail-ot1-f41.google.com with SMTP id bu14-20020a0568300d0e00b0069fab3f4cafso12223724otb.9 for ; Mon, 17 Apr 2023 07:17:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681741023; x=1684333023; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=H9ycPNamyrBDgq3dhyujnn3TWAn7TpVvl1CjSGZJaug=; b=OU/bQ7Bx4eahie4iRBdER/eUSG840IjGDKV/0P8pImawX+poj5lvSVVjCqKBFRsA50 GLI7DmQAPqDejuOh0kFyH+/HCHevwtWT+ZPJ+KMBsVUuWLpdlk3pLy3u2Y6Qg05Zu0Ud 4Rs5E13nrox1xdcpPFOe6PbKysDciatO8hrpP4Hec4W3I8r5Q5rYplO8ykahQqoz5v0U sgkKhMgcQmGYFAn94nfcdWDuNaiqmzT/WTs5HFgQ4+ls/eb7XFM6weLME9H38iXHOTcu HCBDOOc0p4JyitrZ5Cbe9DWeZ+EXOGURQj6zORAcJ+EE8N2lmwA8sCGsaqbQEAqxUYVX /gxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681741023; x=1684333023; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=H9ycPNamyrBDgq3dhyujnn3TWAn7TpVvl1CjSGZJaug=; b=R2s8p3dZIAjqDkyKRJai0KeQoPxdWIwfe4R5QuLel7+Xx0kr1oUzYlwoo+cR8fwgzK n1VtHXqyef8unHWptmWluIXwEKL9uVhPd7V4TNKqDOfiQFHPZmIWBd2yx2WZiWZfZDDJ G0AeToemVnwfEWAyraoOmKUTCim8zePGB5MfRwEeWCw8vPb9JQW7WTVUTBI7EhRl+R2Y QEhLRta3wPtlr4THKTns6j0TtkMBL+qwKvbI49NKNPf2GWrGdmDTc9Sh8uI4nHpciP/Y x72pbqZwvw5RK5XFqwJh4iTJY1Xjcavl1FdHngSTPEG39D6B4ttbiT6m4f6oppF5puQz LtBA== X-Gm-Message-State: AAQBX9ejtH5oGmI/c+Zxjia1eioWUr5Y2x7SFPxnNljyg4P9lZmAwewm 6PLyNdwcCGymXhMHgpo7ofu/586dSxo= X-Received: by 2002:a9d:7749:0:b0:6a5:f5ca:f36b with SMTP id t9-20020a9d7749000000b006a5f5caf36bmr18999otl.18.1681741023485; Mon, 17 Apr 2023 07:17:03 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q15-20020a9d4b0f000000b006a5edce01f4sm572123otf.26.2023.04.17.07.17.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:17:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 11:16:45 -0300 Message-Id: <20230417141647.1129-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/hevc_ps: further constrain allowed num_ref_loc_offsets values X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 5Mo4xeTwZryr The spec says: "The value of num_ref_loc_offsets shall be in the range of 0 to vps_max_layers_minus1, inclusive". Signed-off-by: James Almer --- libavcodec/hevc_ps.c | 13 +++++++------ libavcodec/hevc_ps.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index be1d668c26..69d5504ce1 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1384,18 +1384,17 @@ static void colour_mapping_table(GetBitContext *gb, HEVCPPS *pps) } static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, HEVCSPS *sps, HEVCVPS *vps) { pps->poc_reset_info_present_flag = get_bits1(gb); pps->pps_infer_scaling_list_flag = get_bits1(gb); if (pps->pps_infer_scaling_list_flag) pps->pps_scaling_list_ref_layer_id = get_bits(gb, 6); - pps->num_ref_loc_offsets = get_ue_golomb_long(gb); - if (pps->num_ref_loc_offsets > FF_ARRAY_ELEMS(pps->ref_loc_offset_layer_id)) { - pps->num_ref_loc_offsets = 0; + pps->num_ref_loc_offsets = get_ue_golomb(gb); + if (pps->num_ref_loc_offsets > vps->vps_max_layers - 1) return AVERROR_INVALIDDATA; - } + for (int i = 0; i < pps->num_ref_loc_offsets; i++) { pps->ref_loc_offset_layer_id[i] = get_bits(gb, 6); pps->scaled_ref_layer_offset_present_flag[i] = get_bits1(gb); @@ -1693,6 +1692,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps) { HEVCSPS *sps = NULL; + HEVCVPS *vps = NULL; int i, ret = 0; unsigned int pps_id = 0; ptrdiff_t nal_size; @@ -1753,6 +1753,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, goto err; } sps = (HEVCSPS *)ps->sps_list[pps->sps_id]->data; + vps = (HEVCVPS *)ps->vps_list[sps->vps_id]->data; pps->dependent_slice_segments_enabled_flag = get_bits1(gb); pps->output_flag_present_flag = get_bits1(gb); @@ -1921,7 +1922,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, } if (pps->pps_multilayer_extension_flag) { - if ((ret = pps_multilayer_extension(gb, avctx, pps, sps)) < 0) + if ((ret = pps_multilayer_extension(gb, avctx, pps, sps, vps)) < 0) goto err; } diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index 1f704108e3..184f87a001 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -314,7 +314,7 @@ typedef struct HEVCPPS { uint8_t poc_reset_info_present_flag; uint8_t pps_infer_scaling_list_flag; uint8_t pps_scaling_list_ref_layer_id; - uint16_t num_ref_loc_offsets; + uint8_t num_ref_loc_offsets; uint8_t ref_loc_offset_layer_id[64]; uint8_t scaled_ref_layer_offset_present_flag[64]; int8_t scaled_ref_layer_left_offset[64]; From patchwork Mon Apr 17 14:16:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41224 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2394265pzb; Mon, 17 Apr 2023 07:17:28 -0700 (PDT) X-Google-Smtp-Source: AKy350Y1yaVjMbuv5qIpPi0TU7TWC4aE0cy4NgGs0JDfWp9kptZ72jIpKlvBiAiZDMPkv1FXjUDE X-Received: by 2002:a05:6402:51a:b0:4fa:315a:cb55 with SMTP id m26-20020a056402051a00b004fa315acb55mr14947573edv.21.1681741047796; Mon, 17 Apr 2023 07:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681741047; cv=none; d=google.com; s=arc-20160816; b=GIkEsjtSK+uU6VraGl1P5/d6qrBYcl2lo5Gv0+/XvoNzyDGD+5MjvTUEW6UcdoKKkO gVV7erdOovdSDZhHXKpviOX77mFzT7NAoFaJzT8ysAwCzlU/w/+E0eHBf1+JugL+Ov1g 68hCt/2xtJdqdUxmtUcPexs00I5HMBVUvzyKqGAEmdPJiHRnHsBYGHgzYlf/XydJoozq w6tzLbPo5TNYKdyDa3t428Hj6Kk6FXjmpD83i/wuSxoDRCc6eRlvDmqZ00jkK5bXKi/8 gTJC859bMncBM3Ek5eKz7bA9bR0CLWiiR3NA6ve2H65X7fJeYN3FCgVjWfun5i4YpZNF g+YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Hw0M1DDIq1FOn3mPInAeOIZdczPywlHBWLL7ukiJ84E=; b=OwB0eBm2TPCLyof2NWKOjb+MFfdYv9ynTfCpUXsc7UUCqo+y57OX+EZjftC+zKahuu l/xYs5gRbFInFb51YXVKl+1M+9c9FNe98Gn6VAuWs9FK+ak6KY6pvRlzf+1f5PUQld3b qk+FLQ6V2tJGdQxPDcWCu8/Wgp5TPxFQcqE2hRBqOd9jbAokmqtkWE6tWs+pZed/hnoB kA0mRYYrZi0ydlQagavM8N8kvoU7ym8lv0PyYxC+xv8L56old5HfP1UGnZhuTSCOjGst IfIdPykaRvMfTKLC46W9NZCSpQNGxAPSZdr/XQoNknZZsGjmasq74hbX6QDxkF36qnyJ 3OQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="cvD/+zK8"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c2-20020aa7df02000000b005049a47a9cdsi9947555edy.658.2023.04.17.07.17.27; Mon, 17 Apr 2023 07:17:27 -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=@gmail.com header.s=20221208 header.b="cvD/+zK8"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C93E68BE36; Mon, 17 Apr 2023 17:17:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DC396806EF for ; Mon, 17 Apr 2023 17:17:06 +0300 (EEST) Received: by mail-oi1-f169.google.com with SMTP id t14so758077oiw.5 for ; Mon, 17 Apr 2023 07:17:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681741025; x=1684333025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4D5xxcB7Q8Z5u3nzrKnnDcS6QNFaBXOLcwMhXEA6BVM=; b=cvD/+zK8up/3efIhiEc1CBx29UsRX9Y7hO/GGdr3j3z58WlRFG+uso6wL5ueZpLLai nie/o+x1IYbcPSNfydhXo7hLrEVYJsKp0jqKbEmIH+3t0TRC/ac+o9TgkpzUnXulGcA6 ul1s2RBD8CXv+yq8wtwauxjg2kOo6iT9iT+9zUKcUCsDXoh25TkoakjuZZf/uAVvAYao 6Y8xUUjeATCMkbZWEynN9cXDOD1DPsvGXUElVPBVWVafFmUBlbPNlmh7VkInVHFWSbov VMPpGr3KER0vhxFuwUcE0AybFbOL+5zTD9BC56L+FvI94uBMomcKB7ZR257rzgQFvchs qzqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681741025; x=1684333025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4D5xxcB7Q8Z5u3nzrKnnDcS6QNFaBXOLcwMhXEA6BVM=; b=Phi7ACuPY5q56ghFgvA6vz319C3ER+KTlul9mvakUnLPoeRbE7OMYKN8h3mbBJB8wK zwftAvVHR1UYI6Y3Chbke9awAs2lt2D4qjl1rjTbYs8fJa3Jh5wySekj+Tgx31yWxlJT cWFN10Smrlq7p9uEUBHKoSROp+KUaha/Tq4AyL6MpebDN0nW3ZF1OPrC0NM+rWjMjp+4 zUrtegyC5fUEzwoWMHw9OvbJA7e3vIUvVmGfI5h9Mz0LvTLzucm5sIMP/MTKFhz4KQ0b 320RlhKZYJovTLJYMd3KPaM1bV04fDGzgS9wAVeEHnPEAsj2ynqgqk4PZ8ZkNS7yWnA+ wrXA== X-Gm-Message-State: AAQBX9f+anNJuzm6pF3tLZdxdKmMTU5xVRmV1ROVyyB9CvhVFuA8f6w6 3v7B06Byfoy2CgR0tgIdpHDV2P3Drw4= X-Received: by 2002:a05:6808:191c:b0:38d:15c7:367e with SMTP id bf28-20020a056808191c00b0038d15c7367emr2121712oib.49.1681741024809; Mon, 17 Apr 2023 07:17:04 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q15-20020a9d4b0f000000b006a5edce01f4sm572123otf.26.2023.04.17.07.17.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:17:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 11:16:46 -0300 Message-Id: <20230417141647.1129-2-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230417141647.1129-1-jamrial@gmail.com> References: <20230417141647.1129-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/hevc_ps: fix storage type for some PPS multilayer extension fields X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 4BvP8IYq65L9 The spec states that the range of values for them is −2^14 to 2^14 − 1, inclusive. Signed-off-by: James Almer --- libavcodec/hevc_ps.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index 184f87a001..5a80cf5d80 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -317,15 +317,15 @@ typedef struct HEVCPPS { uint8_t num_ref_loc_offsets; uint8_t ref_loc_offset_layer_id[64]; uint8_t scaled_ref_layer_offset_present_flag[64]; - int8_t scaled_ref_layer_left_offset[64]; - int8_t scaled_ref_layer_top_offset[64]; - int8_t scaled_ref_layer_right_offset[64]; - int8_t scaled_ref_layer_bottom_offset[64]; + int16_t scaled_ref_layer_left_offset[64]; + int16_t scaled_ref_layer_top_offset[64]; + int16_t scaled_ref_layer_right_offset[64]; + int16_t scaled_ref_layer_bottom_offset[64]; uint8_t ref_region_offset_present_flag[64]; - int8_t ref_region_left_offset[64]; - int8_t ref_region_top_offset[64]; - int8_t ref_region_right_offset[64]; - int8_t ref_region_bottom_offset[64]; + int16_t ref_region_left_offset[64]; + int16_t ref_region_top_offset[64]; + int16_t ref_region_right_offset[64]; + int16_t ref_region_bottom_offset[64]; uint8_t resample_phase_set_present_flag[64]; uint16_t phase_hor_luma[64]; uint16_t phase_ver_luma[64]; From patchwork Mon Apr 17 14:16:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2394410pzb; Mon, 17 Apr 2023 07:17:38 -0700 (PDT) X-Google-Smtp-Source: AKy350Y4Ms93YPYILUuDiXGZL6NbJIj2BXHj2wls7D6x7IB19kVGEiKaj6b1Ek7IaeMaIb8BKp+u X-Received: by 2002:a17:906:395:b0:94a:96c4:135c with SMTP id b21-20020a170906039500b0094a96c4135cmr6488211eja.73.1681741057878; Mon, 17 Apr 2023 07:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681741057; cv=none; d=google.com; s=arc-20160816; b=VbjhuOO0uvL6nUAQ8Wgn7I8oUY171LPLqIDiqlj+LBWP1u5ezQlw0yCG/yscJ8UIOo MkxxwXv6adcrwLRgRLWVT6FOIkJ4mbpA1qmGFJHFEiIkS0svimSB/+0Ad4Hjq+2q7V/o bnvhVzuK3aO9NP7iKhwQk1gBUX4JlfrQKLybleEu8/kwEaHfD9zB7l8N6EYTRKl/QdD4 YSTvlGykF98RCyJR1v2prmLycdp9sNCiljn0Z+sBZEBdcJfGyVrSiDvUMi6SBv7Hk3ys O6hmUsfYDyHmc4LSNks1pIny04Xrl6D7+FqCDmJy4j3vyR+rKtfjgmFITdyHHEFqZsmo pjwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=sC6us6ZksI7VVmYcypw87tejb/lFM9NXdCQh5x7yjQM=; b=0iwc2lNTFo3ZTmo8evDf3lO//pIT8xJzDiehbGJCkcF+DrfE2I5zugl7+VNUHOIT8h bYUR+ySD9e4gsYYDsSmgRyW7drKZyNE7FfS5hNzE9Yp4eTfhzeRDwdEiCgMS20JYi8BD MLK5jRibWOz2AXf6tEncZ2dqAI5aAU509CKpNoIqvj9bxoYx0IIET3wycaQexA6OayX/ Oi7abb5IQMUfC0yy6dLa/7B/b6/R7LgbtUD2kqqp2jPyX/507maiGdBSTf7lAE557Qqv YUUUNLkvzdhJGemlBQ/qQR9YWk68nBdU2rgvl/tjTaRrIBr5L7B+2+PZjbM52E5TgGII aBCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=PBjO0pYo; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id we23-20020a170907235700b0094f6c4b556esi2254186ejb.518.2023.04.17.07.17.37; Mon, 17 Apr 2023 07:17:37 -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=@gmail.com header.s=20221208 header.b=PBjO0pYo; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C6BF68BE41; Mon, 17 Apr 2023 17:17:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E837068B630 for ; Mon, 17 Apr 2023 17:17:07 +0300 (EEST) Received: by mail-oi1-f180.google.com with SMTP id bh10so16814309oib.1 for ; Mon, 17 Apr 2023 07:17:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681741026; x=1684333026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yHvWGagDbTyJ0IBXLOz+GImih3PwNmT5lhwx6WSGTlA=; b=PBjO0pYonnpBsiJMRhDzVxZYb5UZsS+hDnJVXPZHXXy2H0A1c7gwjKT6Jc5iP6GslH T+yAPlphB4m5agLYvjyNundOK6iYN6mc8pV2Nc18e+ogrRXQtt4x5UxmrOuRepy6i2Ke spfm4OUtBRIwoUPTbWn5bqDXZiWze2dHm9NmYd8R0/5d0qZzKbSRE6HrNpLEUJQnQd8/ l/A3F4pLTceXY1fvQZgqd9BtPgXQK3mNE0CWbcBuO23MJDOyTrvkn3z8EFG9LOgD1xMa bAyab4pcVLXebjXolimLbav0zFQM52S/APFzsq3Ia2NPvIHaEnxiuEzK50tMs5dBV91/ N49w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681741026; x=1684333026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yHvWGagDbTyJ0IBXLOz+GImih3PwNmT5lhwx6WSGTlA=; b=k1uvIShrX2F/YzNLS3cVnoSenQn24ELJqxqxrLLFpH9J2hcOMGIlS5ffQBJFCqFJ/4 lOGcNF9PBkIpG6sTSchvhsird4bwRYZ4sK/sijW6iDGPkcCFmO5TOL41ahHVdj5x++fG sO4CK6bSg4hPm5AGmd81ZyAtjyC0JkIqp62Cn58jywarn0f0Jl/SyK7N8k6J+anaIGUT 2AyVJVgng/HfHKwxMnWr+1ZKXL3sRDm+KxE8jlVW9n7CvimIuAKfEkrLxuknin6jH61f 07CCOlNKTXYWSD8/SbpNeq9iHlaaDxpqeVPr5j+GnTROALvZA0nnYZ4EmLCjeQVqCs34 A5ew== X-Gm-Message-State: AAQBX9d1b8AJ+xe7fJQtwZs7Xx730k3i682iKrH5nGZtWX1aznHVXESL 2yDSr1ME2gOHgYDCR+NKry2QJCjrptA= X-Received: by 2002:a05:6808:1283:b0:38c:570f:8c83 with SMTP id a3-20020a056808128300b0038c570f8c83mr4566254oiw.15.1681741026002; Mon, 17 Apr 2023 07:17:06 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q15-20020a9d4b0f000000b006a5edce01f4sm572123otf.26.2023.04.17.07.17.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:17:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 11:16:47 -0300 Message-Id: <20230417141647.1129-3-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230417141647.1129-1-jamrial@gmail.com> References: <20230417141647.1129-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/hevc_ps: use get_ue_golomb() for some PPS multilayer extension fields X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 5RJtv4DALrFT Also remove the _plus* and _minus* parts of some of these to be in line with other similar fields in the decoder. Signed-off-by: James Almer --- libavcodec/hevc_ps.c | 27 +++++++++++++-------------- libavcodec/hevc_ps.h | 18 +++++++++--------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 69d5504ce1..7401ea23f5 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1324,7 +1324,7 @@ static void colour_mapping_octants(GetBitContext *gb, HEVCPPS *pps, int inp_dept int idx_y, int idx_cb, int idx_cr, int inp_length) { unsigned int split_octant_flag, part_num_y, coded_res_flag, res_coeff_q, res_coeff_r; - int bit_depth_cm_input_y, bit_depth_cm_output_y, cm_res_bits; + int cm_res_bits; part_num_y = 1 << pps->cm_y_part_num_log2; @@ -1346,10 +1346,9 @@ static void colour_mapping_octants(GetBitContext *gb, HEVCPPS *pps, int inp_dept if (coded_res_flag) for (int c = 0; c < 3; c++) { res_coeff_q = get_ue_golomb_long(gb); - bit_depth_cm_input_y = 8 + pps->luma_bit_depth_cm_input_minus8; - bit_depth_cm_output_y = 8 + pps->luma_bit_depth_cm_output_minus8; - cm_res_bits = FFMAX(0, 10 + bit_depth_cm_input_y - bit_depth_cm_output_y - - pps->cm_res_quant_bits - (pps->cm_delta_flc_bits_minus1 + 1)); + cm_res_bits = FFMAX(0, 10 + pps->luma_bit_depth_cm_input - + pps->luma_bit_depth_cm_output - + pps->cm_res_quant_bits - pps->cm_delta_flc_bits); res_coeff_r = cm_res_bits ? get_bits(gb, cm_res_bits) : 0; if (res_coeff_q || res_coeff_r) skip_bits1(gb); @@ -1367,13 +1366,13 @@ static void colour_mapping_table(GetBitContext *gb, HEVCPPS *pps) pps->cm_octant_depth = get_bits(gb, 2); pps->cm_y_part_num_log2 = get_bits(gb, 2); - pps->luma_bit_depth_cm_input_minus8 = get_ue_golomb_long(gb); - pps->chroma_bit_depth_cm_input_minus8 = get_ue_golomb_long(gb); - pps->luma_bit_depth_cm_output_minus8 = get_ue_golomb_long(gb); - pps->chroma_bit_depth_cm_output_minus8 = get_ue_golomb_long(gb); + pps->luma_bit_depth_cm_input = get_ue_golomb(gb) + 8; + pps->chroma_bit_depth_cm_input = get_ue_golomb(gb) + 8; + pps->luma_bit_depth_cm_output = get_ue_golomb(gb) + 8; + pps->chroma_bit_depth_cm_output = get_ue_golomb(gb) + 8; pps->cm_res_quant_bits = get_bits(gb, 2); - pps->cm_delta_flc_bits_minus1 = get_bits(gb, 2); + pps->cm_delta_flc_bits = get_bits(gb, 2) + 1; if (pps->cm_octant_depth == 1) { pps->cm_adapt_threshold_u_delta = get_se_golomb_long(gb); @@ -1415,10 +1414,10 @@ static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, pps->resample_phase_set_present_flag[i] = get_bits1(gb); if (pps->resample_phase_set_present_flag[i]) { - pps->phase_hor_luma[pps->ref_loc_offset_layer_id[i]] = get_ue_golomb_long(gb); - pps->phase_ver_luma[pps->ref_loc_offset_layer_id[i]] = get_ue_golomb_long(gb); - pps->phase_hor_chroma_plus8[pps->ref_loc_offset_layer_id[i]] = get_ue_golomb_long(gb); - pps->phase_ver_chroma_plus8[pps->ref_loc_offset_layer_id[i]] = get_ue_golomb_long(gb); + pps->phase_hor_luma[pps->ref_loc_offset_layer_id[i]] = get_ue_golomb_31(gb); + pps->phase_ver_luma[pps->ref_loc_offset_layer_id[i]] = get_ue_golomb_31(gb); + pps->phase_hor_chroma[pps->ref_loc_offset_layer_id[i]] = get_ue_golomb(gb) - 8; + pps->phase_ver_chroma[pps->ref_loc_offset_layer_id[i]] = get_ue_golomb(gb) - 8; } } diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index 5a80cf5d80..0c9c278662 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -327,21 +327,21 @@ typedef struct HEVCPPS { int16_t ref_region_right_offset[64]; int16_t ref_region_bottom_offset[64]; uint8_t resample_phase_set_present_flag[64]; - uint16_t phase_hor_luma[64]; - uint16_t phase_ver_luma[64]; - uint16_t phase_hor_chroma_plus8[64]; - uint16_t phase_ver_chroma_plus8[64]; + uint8_t phase_hor_luma[64]; + uint8_t phase_ver_luma[64]; + int8_t phase_hor_chroma[64]; + int8_t phase_ver_chroma[64]; uint8_t colour_mapping_enabled_flag; uint16_t num_cm_ref_layers_minus1; uint8_t cm_ref_layer_id[63]; uint8_t cm_octant_depth; uint8_t cm_y_part_num_log2; - uint16_t luma_bit_depth_cm_input_minus8; - uint16_t chroma_bit_depth_cm_input_minus8; - uint16_t luma_bit_depth_cm_output_minus8; - uint16_t chroma_bit_depth_cm_output_minus8; + uint8_t luma_bit_depth_cm_input; + uint8_t chroma_bit_depth_cm_input; + uint8_t luma_bit_depth_cm_output; + uint8_t chroma_bit_depth_cm_output; uint8_t cm_res_quant_bits; - uint8_t cm_delta_flc_bits_minus1; + uint8_t cm_delta_flc_bits; int8_t cm_adapt_threshold_u_delta; int8_t cm_adapt_threshold_v_delta;