From patchwork Sun Sep 10 15:00:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: llyyr X-Patchwork-Id: 43679 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1627770pzb; Sun, 10 Sep 2023 08:01:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3O/v1x/Os4a0sYllJdb2GZpbPMzlKCSOeG7sxNIPqGp7ZjB5jXIfdRbNeW5cp2nT5P5he X-Received: by 2002:adf:a19a:0:b0:31f:9501:fc0c with SMTP id u26-20020adfa19a000000b0031f9501fc0cmr2635074wru.45.1694358111119; Sun, 10 Sep 2023 08:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694358111; cv=none; d=google.com; s=arc-20160816; b=ubU0QglxgZzTF1IhAQqYHIft3WqM9bBEG/pHDPQ2RRp9ZRE0RXmInX9rcHcZSgZZ2m bPlkcM1IkT6eZc2/HbGKVg1Kp2hprHlAkn7MVmBLrjp79TDs3D459ePcgCmf70SCGtuG d6rN3g6DNFwD7kV6VqoQWxj8m+GMgPbgslI7BZ0nG5ZRxZXoEfF96E9niL9zrHnOJC7p aCzh+UpzgqJ7mq3nY86JMpD1LNuRAbaACON9/UWOTLzHgUC0Oa2v/LnHE//Rzk/v5Fu7 PEgv9HKoAE9TT9ePqrGedgaGKoYa7hq4uP6ZHw+C5iM1DF9DO+SkxW2fNYkmvgitZxbv YplA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=XzpUhlRZ4wmdGKU++YzMkHW3HIVzEbqBksc3MOZCbW8=; fh=9+5V1imiycJiT5azxiNRH94nOdHnEBV1p/NpmNUA0dg=; b=M3v10fkXIFJg21dDg0NXTIbccMO8o+Ukg2hykOiMAstJFagw2v6GfAcfKmZpJlJu9m PddAXf/e3IL1MGqcyd8TJc+tyzt412b/05A+9VsukR95AoeL5wtIx8sgi+BjZl2A9YzC Towq62Rad6OnfY3iCUwUEPXt5QZK+KQ2POPvxMniofiWzYKngUqt/JmHSk4xmYAGytbg /FIj/8nMId3ws0HttR430feoR66iVHNpqnGrOFJZmGPVct8d/SjMqnOp1vKpjgFsiNer KZMpA6rlckn0QFkpZnnhRkeLicZaI/ENxdP9uJy1VbdNWUUGxx2yPsMsIj+fiWgW5tau fyNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="MW/uxiFf"; 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 t18-20020aa7d4d2000000b0052a47104f9bsi4907938edr.184.2023.09.10.08.01.50; Sun, 10 Sep 2023 08:01:51 -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="MW/uxiFf"; 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 4A42768C8F8; Sun, 10 Sep 2023 18:01:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC028680072 for ; Sun, 10 Sep 2023 18:01:39 +0300 (EEST) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-273fa877befso330649a91.2 for ; Sun, 10 Sep 2023 08:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694358098; x=1694962898; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OQ5a0ypKe12Sl3rkcjqbmojiwX4w5eLV8WrS9BPX+l0=; b=MW/uxiFfm27ENHqUgXkpxb0YFLDnqZWEfwwBDlWDzMUll2h9hu+1Sw4poE9nA2RlgA Z+IHE24bO8QtpYEiJjZl7vg3N+pXe6h25qbjCZCuTERCREmXlAZj3JzhybWzGLGRsKmd /B1WOU+pky3YCgwmrmgwXqZ2HZSqmo0mCmPY+GAj6GUb4HPyz5GIk9Ir6i3PIWJQkDKg NMIJfs29Hfg5N7R9rUyVdo2QlKslOkBpwXQKuvTfS/SFvrvsqb7fXlFkvJcpoJ77+vse h5BPzA4o54ReUtKwt1N8dF2TThU5cqYOVhI3/loKH8yAjxmt0C+vEdCwvUJUygjR6gxT t9Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694358098; x=1694962898; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OQ5a0ypKe12Sl3rkcjqbmojiwX4w5eLV8WrS9BPX+l0=; b=VgqCg5Bvm8DhSWFxpLPsneATw9U3sd82D4BizPwm3mYEwqstC1l7ofJp7z1xsZYYMK 73AQuw0oalC/cy4Ds8kKCSyi7o9bwCByeqjZx5l16XA3AFcP7sh+dBt2TkowsN9FrY3a S78Hp++jGSFQs1PVI3Nd3vWvI1mYjZOhSH93vlckSAQ9I4ZYZANIuLhQRfHI+wk8iW3g hfqhGmxbnJEN+X1MNFkGdd0IGVRsF82zZ0DkS93iMU7EfCZg4A9fqYUe+pnKDsGV6I0O M+WW5GAggSShtwJhVgJvP/3O46wV0qhZ3lYhSWtuUrogdO+6pUFVqm/MGvBLboz/cARN c5FQ== X-Gm-Message-State: AOJu0YzWGQVKdI3FRrZTsVRwjvFwxAcnEMikjk1A2IkHntwmbi6y080B CqCGhXbsSDJi84XRwm0HktlHsBYt9n0= X-Received: by 2002:a17:90a:f003:b0:26d:269d:c758 with SMTP id bt3-20020a17090af00300b0026d269dc758mr5334847pjb.4.1694358097523; Sun, 10 Sep 2023 08:01:37 -0700 (PDT) Received: from localhost.localdomain ([103.194.71.93]) by smtp.gmail.com with ESMTPSA id mp15-20020a17090b190f00b0025bfda134ccsm4202176pjb.16.2023.09.10.08.01.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Sep 2023 08:01:37 -0700 (PDT) From: llyyr To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 20:30:40 +0530 Message-ID: <20230910150100.11249-2-llyyr.public@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hevc_ps: fix cpb_cnt_minus1 initialization and fixed_rate check 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 Cc: llyyr Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eVLsE0R40OvT Fixes: fc429d785e9e24c5520ce716d4bc3b5547e581eb cpb_cnt was initialized to 1 before fc429d785e9e24c5520ce716d4bc3b5547e581eb, so cpb_cnt_minus1 should be initialized to 0 instead of 1. Since we split fixed_rate into a general flag and a within_cvs_flag now, check for both in conditional. --- libavcodec/hevc_ps.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index bdd623507d..da5ba5a3bf 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -406,12 +406,11 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present, for (int i = 0; i < max_sublayers; i++) { hdr->flags.fixed_pic_rate_general_flag = get_bits1(gb); - hdr->cpb_cnt_minus1[i] = 1; - if (!hdr->flags.fixed_pic_rate_general_flag) hdr->flags.fixed_pic_rate_within_cvs_flag = get_bits1(gb); - if (hdr->flags.fixed_pic_rate_within_cvs_flag) + if (hdr->flags.fixed_pic_rate_within_cvs_flag || + hdr->flags.fixed_pic_rate_general_flag) hdr->elemental_duration_in_tc_minus1[i] = get_ue_golomb_long(gb); else hdr->flags.low_delay_hrd_flag = get_bits1(gb);