From patchwork Wed Aug 11 14:03:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29422 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp1428912iod; Wed, 11 Aug 2021 07:04:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7XIuaIetc3JSCQbFpoVykWsrQuGGPWBfN3bzOxmRgULg92t7LzvMy4tIITT4GJ0HRer3f X-Received: by 2002:a05:600c:19cd:: with SMTP id u13mr6209241wmq.143.1628690663736; Wed, 11 Aug 2021 07:04:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628690663; cv=none; d=google.com; s=arc-20160816; b=c95a4T0sAUfn4jjVLTG+KpuELTjwsh52nRlOCvHOgKd7ElMmp6Yt0o/+M2BgKSaGK7 8jOoE3o4TQMZ9+HLPRBCp+nqrhMDG7rYNBcKKEBsXwsiGEtibns8XCh1M0a0rN4RFnPe InVTuulj0Eoo13teWUPLqDJPX8eRvyutkX49kVSkfjR1numm132T/RlAf6nztAsbria2 RC6eW/64cHCgkI0shk1qs4U2tjzAAaJnms1VWV9zeWZMzDLClhfnyBZx2jIzD4xnts5s xtZojGQUxFLv2cVGlyi7rlqxL+SRJhnACXnk7Bo7Nb3R6gWtkitDT7UUXvpql8ZYjktB 6rZQ== 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=6yl09JV9gTEfRreBCzBvRMWXPfkRjlntzMFWN+Hg5ac=; b=K8oomgR8MnqqYuwYube0IOzWFDVu1SiSPdfo3kSUAxMnFgNlStLRxzbnEGMVxDme2a 8wotDHtJLLHXjVXNTmCsFZd9JIjS2M7dT6PduYThoogSfk5O/WNYDAy0eB0s6RpGRKjD ddtKkGjq7BK2kz4PLvExcnYRWbMLYF7LvjA2R6hfU8oUctt7Psg9e0ehWBzkhBwVAoZ0 qWXJDNkJyk7Vtybtj3aAZBASbieCfu+7t8Jh57YvM9efrKMHJAWaJlwNDAnRWiop0RhA eNZW6J7P8BB4ixsjMbBf7Alv5G8MICCtR7t+PNj2YJ1NUyU1tcgPz/d+Jy87lUIi1Ql7 nugw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tb1RTV1x; 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 b3si10927679edr.477.2021.08.11.07.04.21; Wed, 11 Aug 2021 07:04:23 -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=20161025 header.b=tb1RTV1x; 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 EC9C868A278; Wed, 11 Aug 2021 17:04:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D59D68021B for ; Wed, 11 Aug 2021 17:04:11 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id q2so2812733plr.11 for ; Wed, 11 Aug 2021 07:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=FhcYsjAoUh8DtmGG9NGOUoMu/Te3ClSIy7VwNJ4B3nE=; b=tb1RTV1xb/yOPeNkhUbNA/x/JsC+DmjktN7iiF1hgUb/YheD3x41RWOvdyTPcP80b7 9Ez5Bl6I+SH/T2RXBlO3MagmXO35qSHLdKZ5C4z/y4ltkRG2ltVMOb44hmMJHdMoogxo LwM11H6+FWwfCNaASWXwNzsohZo6GRNOYorTzIesVQ2Vz7SP1l9rPt7A1CjeUR8jRiyf 1BUcNXC+d4i0+YrdLjvAdpXWX9Z7tXFdYx9CIii1VCFTHWeA/tLpjJMRiXTzQ1T9+Itt YjWE4f6lSNVL0wy57ATmPyKGyldoVJcwU/5TfXjSQBcxehdnQocvs9HllMq2mQPvli1S 7LNw== 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:mime-version :content-transfer-encoding; bh=FhcYsjAoUh8DtmGG9NGOUoMu/Te3ClSIy7VwNJ4B3nE=; b=B/X4hRr4PgDz/ULQ2kFqqvWTsFk2Aw0CzW4EAX5zMEJ07yDS/Vw3XD8mZW5P9DKIKL Y2Lx6HrB/4jD9KkOensGAXq4kackt2NZsecRK2MxqyOeLA6kVmbeen4s1vlJ2dQc2Nl/ lTRiSGCI5lse3BWPvSUx8QhX5sQUvOVtEkuD3gbgl+rkt6ss0bggiv3xRhnamQ3BGi5K MZIrWlIFbQSl9kzuTlzaDHyF4hJ259KUApalvmrKfb5eVDejjcBMCLRSFOVK6NIVD0xZ zJzfsGnQzqtURcovzYLjjza3UzMV0TRdqCoDUeSwp+pWh2iv38zBsIJ3nU1B1pG70qyL fMGQ== X-Gm-Message-State: AOAM531gCQTMp9XpXfbp2a0Df1pjIbJ/4bYMwT4FSU6Ntcj0ps4eipzk HC901yfAprdtCUjy5AqDOYD7qkycqls= X-Received: by 2002:a63:556:: with SMTP id 83mr96713pgf.1.1628690649105; Wed, 11 Aug 2021 07:04:09 -0700 (PDT) Received: from localhost.localdomain ([191.84.236.172]) by smtp.gmail.com with ESMTPSA id g19sm16715506pfc.168.2021.08.11.07.04.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 07:04:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Aug 2021 11:03:40 -0300 Message-Id: <20210811140340.4624-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_h264: infer all pic_order_cnt slice fields when not coded 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: lC7IZsiHA8DC Also change the syntax for some checks, to more closely follow the spec. Signed-off-by: James Almer --- libavcodec/cbs_h264_syntax_template.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 0f8bba4a0d..5de7b5b76b 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -1106,19 +1106,21 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw, if (pps->bottom_field_pic_order_in_frame_present_flag && !current->field_pic_flag) se(delta_pic_order_cnt_bottom, INT32_MIN + 1, INT32_MAX); + else + infer(delta_pic_order_cnt_bottom, 0); + } else + infer(delta_pic_order_cnt_bottom, 0); - } else if (sps->pic_order_cnt_type == 1) { - if (!sps->delta_pic_order_always_zero_flag) { - se(delta_pic_order_cnt[0], INT32_MIN + 1, INT32_MAX); - if (pps->bottom_field_pic_order_in_frame_present_flag && - !current->field_pic_flag) - se(delta_pic_order_cnt[1], INT32_MIN + 1, INT32_MAX); - else - infer(delta_pic_order_cnt[1], 0); - } else { - infer(delta_pic_order_cnt[0], 0); + if (sps->pic_order_cnt_type == 1 && !sps->delta_pic_order_always_zero_flag) { + se(delta_pic_order_cnt[0], INT32_MIN + 1, INT32_MAX); + if (pps->bottom_field_pic_order_in_frame_present_flag && + !current->field_pic_flag) + se(delta_pic_order_cnt[1], INT32_MIN + 1, INT32_MAX); + else infer(delta_pic_order_cnt[1], 0); - } + } else { + infer(delta_pic_order_cnt[0], 0); + infer(delta_pic_order_cnt[1], 0); } if (pps->redundant_pic_cnt_present_flag)