From patchwork Wed Apr 17 02:56:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12775 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 E4899447B02 for ; Wed, 17 Apr 2019 05:56:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5847689BD9; Wed, 17 Apr 2019 05:56:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57A0A68832F for ; Wed, 17 Apr 2019 05:56:51 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id w5so25736489qtb.11 for ; Tue, 16 Apr 2019 19:56:51 -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=NZfYCCRoqEmXCcrwYk0a+0R8E57lUVK1xrZFMFj97QA=; b=dJpEmsi4eBP06GCvbrmPAPGjHj/CcGJJnuoM+dqi7IrE3Jy3JsJH5VFvPhqyzo0jey B2wiMkXMiS3tpyJg3iVGnzwmuHx06WvRI8fD0PSor1PnRG69Rtsw//Ueu2/GA6fUMjmZ H+TeMufGJlTZzjRKbP4m21/shiJ9bcLM3MZX4g81Xav6TgqeXLBrmkoe98iquK9wvad2 Tdj36sK62Y3XM9RYTIZMd4eQBkNu4VlFe0BSHmeVmvRr0+V4E/DCWEmNG0tbOQdXDfZt 1lpwMxcWtErsJiYbvWcFIxeIgDM7hPFeJdru4beHDMW8bUuj5l5vaufNxLjM2i9niT+n Fkyg== 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=NZfYCCRoqEmXCcrwYk0a+0R8E57lUVK1xrZFMFj97QA=; b=LyFcGZOs1T5vPifMlQUFn9jeSPoqPC6NFAnKARcEyOoT+TZBkwrql6fQg4Ym4HBP5A Ts7hgvMDyxsfCFABDmO3IH23atKLe7Q7wBOvEVC4eiFj8wuj2M4C38Kuh4Pk90JEue3c 1octlRSzBtz9GffIs2yTLv906zPufNGNtVMik30C/A9+daA1tcFbLNH4xcO6xUpgpYro q7jhqQ038opzBamsxVbb9xt7nsqQrd9u9uzfoTAQxG18AA+/NlJZIjAq2TPjicMfds5C tWE3CkN92yE3qtwnwrXYA+4YwXCMMd0sv754+n9fngs4Y1ObK4/VatnTn2z11NaJq41A U8Iw== X-Gm-Message-State: APjAAAVICAcurT/zFLQgLHJ0n5unaEETM7n5U2A95Ia+Ys+w5EceFjH1 ELdnQ4NUVrc2agVdYVIDGWSLyMKO X-Google-Smtp-Source: APXvYqwqNsafHLcpf17eyB0AL503BylGdipwYJO+LS+9az+w59QRA10vgxBbFVxVahOcFg1cJPC1EQ== X-Received: by 2002:ac8:28e9:: with SMTP id j38mr67799649qtj.297.1555469810161; Tue, 16 Apr 2019 19:56:50 -0700 (PDT) Received: from localhost.localdomain ([181.23.87.223]) by smtp.gmail.com with ESMTPSA id c21sm28417215qkm.8.2019.04.16.19.56.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 19:56:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Apr 2019 23:56:34 -0300 Message-Id: <20190417025635.9700-2-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190417025635.9700-1-jamrial@gmail.com> References: <20190417025635.9700-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/cbs_h2645: use the fixed() macro for forbidden_zero_bit 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" This follows the spec definition, and removes a field from the relevant structs. Signed-off-by: James Almer --- libavcodec/cbs_h264.h | 1 - libavcodec/cbs_h264_syntax_template.c | 2 +- libavcodec/cbs_h265.h | 1 - libavcodec/cbs_h265_syntax_template.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index b5eee7c370..cc46eeb3b0 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -38,7 +38,6 @@ enum { typedef struct H264RawNALUnitHeader { - uint8_t forbidden_zero_bit; uint8_t nal_ref_idc; uint8_t nal_unit_type; diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index cc9bd07590..95fc6d7194 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -33,7 +33,7 @@ static int FUNC(nal_unit_header)(CodedBitstreamContext *ctx, RWContext *rw, { int err; - u(1, forbidden_zero_bit, 0, 0); + fixed(1, forbidden_zero_bit, 0); ub(2, nal_ref_idc); ub(5, nal_unit_type); diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index 0c0e4f84b0..c9bc90187b 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -35,7 +35,6 @@ enum { }; typedef struct H265RawNALUnitHeader { - uint8_t forbidden_zero_bit; uint8_t nal_unit_type; uint8_t nuh_layer_id; uint8_t nuh_temporal_id_plus1; diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 87d1332f48..9000bbc307 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -33,7 +33,7 @@ static int FUNC(nal_unit_header)(CodedBitstreamContext *ctx, RWContext *rw, { int err; - u(1, forbidden_zero_bit, 0, 0); + fixed(1, forbidden_zero_bit, 0); if (expected_nal_unit_type >= 0) u(6, nal_unit_type, expected_nal_unit_type,