From patchwork Sun Jan 15 09:59:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp254721pzb; Sun, 15 Jan 2023 01:59:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXtIc//LmGGeZyZiwytVzeSKYjOvEQDsoKadJRbo161rs8V+DYSSpgR8xTi1ia+N68cSfwwY X-Received: by 2002:a17:906:c24f:b0:7c0:efb9:bc0e with SMTP id bl15-20020a170906c24f00b007c0efb9bc0emr68678195ejb.62.1673776798672; Sun, 15 Jan 2023 01:59:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673776798; cv=none; d=google.com; s=arc-20160816; b=Snhe6OE8tq2PuQjdDRVfPl4f2BGMioOcQj6yUtw8iRXkaC9TqD6XZp1zA9q5Nz+x1Y PURy0Z0Je7NXtmuKPUnJbd1iQdRLagZRL58PcbOMHu8XHCQhj0JRQCZlZqk3fUNOWyKk cVPEHtSQhPsBk917nn+pGayoPi/jzNsmgvenfTSn8JLkc/EitarIUGy5bFw4eYNMFe7J FpNsQHoHlsjyKWWZQaGlktjc9jaXFYlXkl4qLKJ6DlwFNjs/OgdkHEaPPAcbE707GcPq eW45QJTHePl2fVLtFurCO4Qxsf0AVRBpweOTmcMZvk9KV0nyQcge+xftBciKzR1yEdCw zerg== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=ZnG8dBwoRG9s/QNUBE55wp+Rsr11vsECjNhxCaxBVUI=; b=oxyLGDafRxgyGxz+Rivm5P+XOTAHf5rkh4Z1ACp88ETwwEnrYoXGeeLCSxqCs2y6N1 cgeb/srZdyMJUpKnZuJwcdlU3P8iSUtuyH1hmf9CE1+U+qLZW/R5aMxx8WgpkAMFiwTl bxTdofZFmBBSZM2nYITyayauvdOmip2vXFe06/8pvTJPRDBa3VJu9yCQLpjh0p7RcHVX WVS9LTYzEaIGoXkztHQaX5ympG3530jLd7YktinskAVOiQ9X7hswkASXXoLGBERuzvvh lXoTjfiJqdzdf3NIy9Jg/AtTHtE1fVG9F0ezPjJok2VB98LfpZsa5WHPxGxBp/EUltJ5 Uy4A== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qo14-20020a170907874e00b007c1070653adsi20749738ejc.809.2023.01.15.01.59.58; Sun, 15 Jan 2023 01:59:58 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F0B2468BC09; Sun, 15 Jan 2023 11:59:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 965CE68B579 for ; Sun, 15 Jan 2023 11:59:47 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 89A432404F7 for ; Sun, 15 Jan 2023 10:59:46 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id QUAxx6unTII6 for ; Sun, 15 Jan 2023 10:59:45 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 9E2B02400F5 for ; Sun, 15 Jan 2023 10:59:45 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 2EC663A0344 for ; Sun, 15 Jan 2023 10:59:37 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Jan 2023 10:59:34 +0100 Message-Id: <20230115095934.9065-2-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230115095934.9065-1-anton@khirnov.net> References: <20230115095934.9065-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/tests/bitstream: test bits_*_signed_nz and bits_peek_signed* 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: hC8MdxYnXGT5 --- libavcodec/tests/bitstream_template.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libavcodec/tests/bitstream_template.c b/libavcodec/tests/bitstream_template.c index 13e92a31c6..ef59845154 100644 --- a/libavcodec/tests/bitstream_template.c +++ b/libavcodec/tests/bitstream_template.c @@ -42,6 +42,7 @@ enum Op { OP_READ_63, OP_READ_64, OP_READ_SIGNED, + OP_READ_SIGNED_NZ, OP_APPLY_SIGN, OP_ALIGN, OP_NB, @@ -58,7 +59,7 @@ int main(int argc, char **argv) uint32_t random_seed; uint64_t val, val1; - int32_t sval; + int32_t sval, sval1; unsigned count; /* generate random input, using a given or random seed */ @@ -130,10 +131,26 @@ int main(int argc, char **argv) break; case OP_READ_SIGNED: count = av_lfg_get(&lfg) % FFMIN(33, bits_left(&bc) + 1); + sval1 = bits_peek_signed(&bc, count); sval = bits_read_signed(&bc, count); fprintf(stderr, "%d read_signed %u: %"PRId32"\n", bits_tell(&bc) - count, count, sval); + av_assert0(sval == sval1); + + if (count == 32) put_bits32(&pb, sval); + else put_sbits(&pb, count, sval); + break; + case OP_READ_SIGNED_NZ: + count = av_lfg_get(&lfg) % FFMIN(33, bits_left(&bc) + 1); + count = FFMAX(count, 1); + sval1 = bits_peek_signed_nz(&bc, count); + sval = bits_read_signed_nz(&bc, count); + + fprintf(stderr, "%d read_signed_nz %u: %"PRId32"\n", bits_tell(&bc) - count, count, sval); + + av_assert0(sval == sval1); + if (count == 32) put_bits32(&pb, sval); else put_sbits(&pb, count, sval); break;