From patchwork Thu Apr 23 23:33:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19201 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 6738244A07D for ; Fri, 24 Apr 2020 02:34:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 402DD68BFFA; Fri, 24 Apr 2020 02:34:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23E0568BF30 for ; Fri, 24 Apr 2020 02:34:03 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id b1so2849643qtt.1 for ; Thu, 23 Apr 2020 16:34:03 -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=E+JYHuHKjLXO1SKMTQChOVHpZZt7cnq4Wl80bt4kwpE=; b=Gylme+r0WY7a1xvELb3fPN+Uwi29AiIx6+0af9y0byE3EUAHbi5KC6/gU9/fLeKSN7 Zu2eJoSDiSg5qqhKCA4ZTEJUmgOdsba3K+A/2jFTdxp1vskU7GNvWHJgT1uWzQ0rstKC M7smVmZb9jkaw2MfgtSEESeDWFAMk8F5dvTSrnTu340fRM+XHIADY4mUvUg9+PkPKL4J MdFRFjfYxW8mxwqxXHKubBvd7t6iOBNzrLEF8fbybxp7Y6ezXlX6IcnF9lOBX8Py927o wtP8zgF5i94CPld8Gf+QuODCGkSasddOmF9qAFEYGZJ0dfbnPN6aznAsASRvHBg6iLKy 1pFA== 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=E+JYHuHKjLXO1SKMTQChOVHpZZt7cnq4Wl80bt4kwpE=; b=VF8iVsN25OyrhM5xPEEE5pJ3ZUPhjTttOhRogcNopcJdGfdV1sLesoWwX1TLr29YNX S6IBMOVySfjnrV+zSkZ+r87sPJhCDbnaAE9YB3ref4nRbHd0rUR2HPKkv7j8St56u6SH 5BlQEfzFpWstsStQPgCigizn6yzY44sIY6oq9NlMZI0WIy9egQBrKzuLXVY/ZITA80Fz uHp6c5U0o3xAanKkDbC3A5IaxghTYGzAEHcN34grkXdstIu7AbsagN/1XVD1npkaQd58 2BXnQr1aelE8cQhjaQ+8w+rmoOXCv0be9MQNDWzC9fcQh3D8D8CQwwbBTAXeXzyqsMeH DFkQ== X-Gm-Message-State: AGi0PuawISbVcwVtQ22768dubspMFjGMVOJAWCiuvLLwCoTODHPQ8eU1 2253GrXQ3e40GsZCOJNcPdkCl/XK X-Google-Smtp-Source: APiQypIlRBRYsB07MeHxN6sfEFe+PFoyM6i6JV2qypPRZPb9GpzEGcV4eR7Jq0wCYP7WH6B950eNPg== X-Received: by 2002:aed:3ac8:: with SMTP id o66mr6761347qte.110.1587684841163; Thu, 23 Apr 2020 16:34:01 -0700 (PDT) Received: from localhost.localdomain ([191.83.214.64]) by smtp.gmail.com with ESMTPSA id c68sm2056077qke.121.2020.04.23.16.34.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 16:34:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Apr 2020 20:33:12 -0300 Message-Id: <20200423233312.2910-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4 v2] avcodec/cbs_h265: move the payload_extension_present check into its own function 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" Will be reused in the following patch. Signed-off-by: James Almer --- libavcodec/cbs_h2645.c | 9 +++++++++ libavcodec/cbs_h265_syntax_template.c | 7 +++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index d42073cc5a..a60b3217a0 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -233,6 +233,15 @@ static int cbs_write_se_golomb(CodedBitstreamContext *ctx, PutBitContext *pbc, return 0; } +static int cbs_h265_payload_extension_present(GetBitContext *gbc, uint32_t payload_size, + int cur_pos) +{ + int bits_left; + bits_left = payload_size * 8 - cur_pos; + return (bits_left > 0 && + (bits_left > 7 || show_bits(gbc, bits_left) & MAX_UINT_BITS(bits_left - 1))); +} + #define HEADER(name) do { \ ff_cbs_trace_header(ctx, name); \ } while (0) diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index fe5ffac80f..96b9acc1dc 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -1568,7 +1568,7 @@ static int FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw, int err, i, length; #ifdef READ - int start_pos, end_pos, bits_left; + int start_pos, end_pos; start_pos = get_bits_count(rw); #endif @@ -1650,9 +1650,8 @@ static int FUNC(sei_buffering_period)(CodedBitstreamContext *ctx, RWContext *rw, // payload_extension_present() - true if we are before the last 1-bit // in the payload structure, which must be in the last byte. end_pos = get_bits_count(rw); - bits_left = *payload_size * 8 - (end_pos - start_pos); - if (bits_left > 0 && - (bits_left > 7 || ff_ctz(show_bits(rw, bits_left)) < bits_left - 1)) + if (cbs_h265_payload_extension_present(rw, *payload_size, + end_pos - start_pos)) flag(use_alt_cpb_params_flag); else infer(use_alt_cpb_params_flag, 0);