From patchwork Sun Sep 10 15:25:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: llyyr X-Patchwork-Id: 43680 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1640614pzb; Sun, 10 Sep 2023 08:26:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCRWkMMTjsVDrh1joE28YBvuk0vdxwB6M4o3S7XUinGfwyRkxWrsoKpr1jsJiSEYXnbQ86 X-Received: by 2002:a17:906:6411:b0:9a2:295a:9bc5 with SMTP id d17-20020a170906641100b009a2295a9bc5mr5977518ejm.21.1694359565879; Sun, 10 Sep 2023 08:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694359565; cv=none; d=google.com; s=arc-20160816; b=N0yL2cfG3qVbkB+SNOo9HU6ad/6TBaVR54nFMtdzfRTtw1k8pta7xAfJ7DWeYkVPFv m17IBxBEu/Ioe9XURqUmulW0ysHKKaW3oQEZ5oHoxAMXXZAq6SdsAI7OEbuw1a16vD8o 6ua6KK1ciNs7yc/Ff4X2V7/PP3ihMS6K31WFkgHnlvoncUeN8ji4ckGts5iJL2XzY+Iw MwvnSg2ZWZiVKvviH2DsuXUuDtNvmoB6K+k6imV61c70IFUNeYwzeTtwLFikoL39LCZO VRl4uYpcCiYTUa/L5rmrcWT90SKpcTIMOb4m9dewkV51pQWUbznNx2tWt4wKnSa4SHlV u+lg== 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=S5bSzTHa8AHYJ114O23VAf5v33eNX0Np8cZPTeudSes=; fh=9+5V1imiycJiT5azxiNRH94nOdHnEBV1p/NpmNUA0dg=; b=fICO5g1/3mCsK7+VmRvW80yl9jTNLfmu4F4Nz8CijAZBGIQqpjb73XwKm+UKmsfdJl xyTEIIiMkoZH2dd2DzgYtxtZ3BpwOYuqL+tOllOKcPWzkmuUIoco2LwUD94kVLoapG9v ZFsjVL3ePQsVs14U2xqjoIwURsqZ9w1U7Tpnlj07OBLsJcd0b7XQ3OIjIRZCncI6/4dI eCnKkx6gVazoLoshd+RYzoqO3oVUG65GBsGSjHDyEpy7A4KuqRVO/cBfQ5mqXwKdDOTg sgnq2itlkTkeYKIdfbi4WVIMmL1JfabqOqKhITkGnd3J6kAB4oYkjDHQOun8pQec33m4 xKXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=l+Y+u15G; 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 l22-20020a1709065a9600b009a18a87b008si4656476ejq.146.2023.09.10.08.26.05; Sun, 10 Sep 2023 08:26:05 -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=l+Y+u15G; 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 9D3F168C90F; Sun, 10 Sep 2023 18:26:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF8A868C56B for ; Sun, 10 Sep 2023 18:25:56 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1c39bc0439bso5539155ad.0 for ; Sun, 10 Sep 2023 08:25:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694359554; x=1694964354; 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=ZSOFZPlN4MQ87lKybdjINHnaPF7d+18HI8oK6FdQ2T8=; b=l+Y+u15GnVoN9OjRyYhOD6frUoDaySiF0tlEPFzNAs/utBzdbdZceApH5z6z6yZseW Mk2JNt4X+4mIvuUXhVXTAE6Pb9U5jMA0MbjoWMqaJM6zsjfyEyadvQko7Uytca4G0Z5v 5aap5hhnkZ2CInOGf70daeXQyMr8dFxqk9ICWyaZ1tAKGrO8W/tiUbWqfocSvQjYxkzL 0nKmHDLTlYc8o18YuMs8XhY+pp/19H16JRoTIGWUzYIr4YPSBVaV+lmNAePcTVXK8KMp d0SN1oOb4RhIv0NDBIlMTl5/2xhicdQxKQ9Fis9D9B3cv/vwFNcVeZ503DsgvwLmO58o BXBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694359554; x=1694964354; 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=ZSOFZPlN4MQ87lKybdjINHnaPF7d+18HI8oK6FdQ2T8=; b=OtywKSwO0cVVmLF0m3eD3vSk143NNDCDmEJz+7O5bOQhY1KTQ2LrFW8GLcR5OvYXoE K1hp09i0ySajMNTMZeOhSpVQc/ft2ewgBdaMyA0ZcPaesCqsLcuE5I4crjBvjbCQgnmN im1GzSbdcP8Y2buKixKiDu+yppGP3G/JE3NkIf+t0klGoaznf+rCN/La+7rMCFsi3umh HvLBdASz/gCe1nxGCeJbxNorNXgtEQwYu0qpsHb5653CF6OTTbztClAS0yOlsrllVtae QA0BXVGEIEyVCXpWwaskjcrm0OPXf3+3EXeqfX6BDdgOwGFir4J+XMIlXUYEeKO4XtxQ Ca0A== X-Gm-Message-State: AOJu0YzGjrjqNUtIFWjA7DfsaokBNOB4PbvO0vgqgmD7ekLaQtrNaUkj TE4813qmJQVt1qgUYvGSAsOtzPNJgw4= X-Received: by 2002:a17:902:e80f:b0:1c1:e818:1e76 with SMTP id u15-20020a170902e80f00b001c1e8181e76mr10016764plg.6.1694359553778; Sun, 10 Sep 2023 08:25:53 -0700 (PDT) Received: from localhost.localdomain ([103.194.71.93]) by smtp.gmail.com with ESMTPSA id w6-20020a170902e88600b001bbdf32f011sm4717922plg.269.2023.09.10.08.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Sep 2023 08:25:53 -0700 (PDT) From: llyyr To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 20:55:22 +0530 Message-ID: <20230910152522.27429-2-llyyr.public@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] hevc_ps: fix cpb_cnt_minus1 initialization 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: bXPRLEo3jgsG Fixes: fc429d785e9e24c5520ce716d4bc3b5547e581eb cpb_cnt used to be initialized to 1 before fc429d785e9e24c5520ce716d4bc3b5547e581eb so cpb_cnt_minus1 should be initialized to 0. Also add +1 to the decode_sublayer_hrd call to account for the change to the offset --- libavcodec/hevc_ps.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index bdd623507d..ac3fe55b07 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -406,8 +406,6 @@ 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); @@ -426,11 +424,11 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present, } if (hdr->flags.nal_hrd_parameters_present_flag) - decode_sublayer_hrd(gb, hdr->cpb_cnt_minus1[i], &hdr->nal_params[i], + decode_sublayer_hrd(gb, hdr->cpb_cnt_minus1[i]+1, &hdr->nal_params[i], hdr->flags.sub_pic_hrd_params_present_flag); if (hdr->flags.vcl_hrd_parameters_present_flag) - decode_sublayer_hrd(gb, hdr->cpb_cnt_minus1[i], &hdr->vcl_params[i], + decode_sublayer_hrd(gb, hdr->cpb_cnt_minus1[i]+1, &hdr->vcl_params[i], hdr->flags.sub_pic_hrd_params_present_flag); } From patchwork Sun Sep 10 15:25:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: llyyr X-Patchwork-Id: 43681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1640681pzb; Sun, 10 Sep 2023 08:26:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGOb2BVwNG7rV8ckfj5LVLYkOw0Tqx8s1Agz6FgHlsQJzl8lFII+EOfhZsbuYXZKDQktDnU X-Received: by 2002:a17:906:2189:b0:99b:de31:6666 with SMTP id 9-20020a170906218900b0099bde316666mr6115164eju.22.1694359576347; Sun, 10 Sep 2023 08:26:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694359576; cv=none; d=google.com; s=arc-20160816; b=w0VBfJL1Nd0eYwBToNEh7sCIHRpeC4lO1R8Lv1ZeuwWeWYM/ub+gctKhQ1dr3KpZZv yKamnR5w/u2gfuzKhlIH/3sunsJ9eINzgBtNY7KAeOB4c5N5x0JhklxkFytXPdKJR3vz 1x66aYg/+1fbeo3+heeQSgSow+ttA4Ycg2x5V+G31AgHzgQ0QFqEh82YjcrKNHKQCW/G wxKbNaDl4JtRoikuR8rLPUlx6RXYtkP+zmYkSdxMw9mdv3NbRmv+Ydy021kaqKoWHl97 cYc3J67DNMCXUPqptsn4+wIPGlYVzRi4xXadL+y5YyNjirlNnn6QTx15nBNQdCvywFAC f6Sg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=O+N3SZBfkgw04TUAuDhIQUxUmKIgkfzJDoF4lM/uKMs=; fh=9+5V1imiycJiT5azxiNRH94nOdHnEBV1p/NpmNUA0dg=; b=H5paQ91Xh8xCDv+A6t61P47yBbPI9+VbQN/34R2+euXCmQHkWl0t0IiU4EpBFuJXU7 OBa5TGsenj5HWlvXpTe4ZKef7vFHcdwG3NYqffz3G6NC4KwzbwN3du0aUs8XPMU0WnU0 s3FBMBSeHbU0HPbTGOPCkE5FAcZYh/PDUMqrcXOYmsJcBKhHNU9XS5Cq3bQOll34HSIJ DBCBMyROpJuAfu1XqpknSHQ/hpHVXEFwEoFMn4N1V+y/MBmpNEec8KCCG7B99HhTeA+p YPY6YZ55TQ06n0BYAnV4McSSvhMZEGolhv5sJGpQ7ZmZn2AWfv1BzKh8jx/wKPqe2pkD CDCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=qvMIOiB4; 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 k14-20020a1709063e0e00b00991f1e4b044si4505511eji.336.2023.09.10.08.26.15; Sun, 10 Sep 2023 08:26:16 -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=qvMIOiB4; 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 AC1C568C8C9; Sun, 10 Sep 2023 18:26:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 704DB68C8EA for ; Sun, 10 Sep 2023 18:26:07 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1bc0d39b52cso24949625ad.2 for ; Sun, 10 Sep 2023 08:26:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694359565; x=1694964365; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/3QdJuLTbKb6EwAsFShzzUtCg6RM8guwEpx5fCtrRZg=; b=qvMIOiB4CyGtSNpmRsxIf7w5718Ujjk0HAI3iojU+DABAbmcjPFwwobskEs/s2F6it SxCf1HIQt/te1k8LvyYFPU8couWWpyTg7wUoU49wi7PWPzyfeR91asi06DobEp6l7top cFkw/zAcaI+/GsrCaW+kt4mdnESBIz7qlbFjIE/QsT3cu007FrGJiy3+cFdddJkcKKrG iqO/mmi6IjIMKOcLUCeLit2sIxoi70w3U64xUQPxRlumtRBHE4X66w57ByIP55Ghs2pl d/jlT1/5lmtT9e8Mmko7NZhvBmI+BW2xHTSSyMHx/w7jP3FDo0F5uCcEBJwVIFZMxGDs UpYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694359565; x=1694964365; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/3QdJuLTbKb6EwAsFShzzUtCg6RM8guwEpx5fCtrRZg=; b=nEroLAFOk9S1/AfYiDUtdwiaDbYNvk06hoafp9Z9AmSDIzrNIHd4oEA2bA1wSn0bBE x0rwLcMGh6DntFSxlzqLnvwL+27diAmDQXs26sBzbmztaSMzuX7urYOg8vcOAwlMvfcu +WM7vwxKenI9QZrcnVSxVFIZ7vxeH2bDttu6Y70YzdLZkv/9ZEyq+l0KEg8Z2O8+dfNG SDMV4yQjnJb6LxqRFyJ1Dx5pm+xYt5Uq9TgIRI2mZhwgLQuYoG+rfB89dLc5iweEvM7a 3zm4YI2iggg1Qez6LAtWGz7Zy3FZ1+SqPhK/eipb26Lf0+RAwdNJ1/5mPF/2CQgwYpSo /ADg== X-Gm-Message-State: AOJu0Yw31fWiFwAdlBcpTQUY30GKJn33KJluzcOU+U4Ne+k+eElkSYdh YujyAv3K/YshszamVoIHGlzseHTfMb4= X-Received: by 2002:a17:902:8c85:b0:1bb:3979:d467 with SMTP id t5-20020a1709028c8500b001bb3979d467mr5624264plo.63.1694359565420; Sun, 10 Sep 2023 08:26:05 -0700 (PDT) Received: from localhost.localdomain ([103.194.71.93]) by smtp.gmail.com with ESMTPSA id w6-20020a170902e88600b001bbdf32f011sm4717922plg.269.2023.09.10.08.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Sep 2023 08:26:05 -0700 (PDT) From: llyyr To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 20:55:24 +0530 Message-ID: <20230910152522.27429-4-llyyr.public@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230910152522.27429-2-llyyr.public@gmail.com> References: <20230910152522.27429-2-llyyr.public@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] hevc_ps: fix 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: GfM6aLXSbCWQ Fixes: fc429d785e9e24c5520ce716d4bc3b5547e581eb Since fc429d785e9e24c5520ce716d4bc3b5547e581eb splits the fixed_rate flag into general and within_cvs, check for both. --- libavcodec/hevc_ps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index ac3fe55b07..7507d2bf9c 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -409,7 +409,8 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present, 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);