From patchwork Sat May 30 16:05:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20004 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 E911744A6AD for ; Sat, 30 May 2020 19:06:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D88F568B0B2; Sat, 30 May 2020 19:06:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31BFB68B038 for ; Sat, 30 May 2020 19:06:34 +0300 (EEST) Received: by mail-wm1-f44.google.com with SMTP id n5so7154914wmd.0 for ; Sat, 30 May 2020 09:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0u2Z84unXVwKDMIDhq2499bDLBmY+YmRA0AjMKPf+L8=; b=sgIa8VuA7x+cSktJ6RB0CRHQ6J2Uvzie2yf/jsCfCBeVxWdqFEUGilEiWCSEvuxMiq FPwivxMMdyXDJ8cKXS3K/241DS/xSvZwiiaZAZ/bz8rEnGaSfAUNxlhMEqfhxD2QSgxp aLxT4RH6MGNRkYyfj15yY0stWL6CLWOE8JhgXaXoRTGGjTz2B9t+HQOBgoXqXDGGHJ5f bQ6CPRRMz1yCO5k7jKuaA8il/9igQjW0EsEO7SCvz1AnwNGxML4elshyNeCeZOt8dY+W fLaiTxOFksler00hkhCIj9LQg1nXyTGlkgu5DjLCQW2ow2eBr1boJzG7jcgY21fKnhAI Gnxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0u2Z84unXVwKDMIDhq2499bDLBmY+YmRA0AjMKPf+L8=; b=ixGgc231MaYaGnRmo1dO5kGAXdQMRmkKtI4MU14Ganh8Si591CHKJTiWebELvi8+uI Yz2fTkB6RbM976fLy7gUTpGVeznPe15LzDhLw44/VC8kfM0L7c7jmnUATkWYhlYj7KFG K4N0VOGPoqCjd+9VzIRcRT7WE78eZHeh++y8gSgvxdXaJyLM9sYNEgV+JWnFhYUOJjTH a7CNJPnRAeg1tjGIX+V9hMMl3pyzlnoO9T1aIwqgHn1oEDshcMZk0UDqOFx3xpHp5SmN w7+oDF7YBduc7p5zww29MJ9xgh4rwp0T22pE3D9wGeXGzWdRmlii4peFHN5ksIZQRpQf FszQ== X-Gm-Message-State: AOAM53197Uo+Yd7OulwkfEN0WwudtPkJOir9mXA5v4sF/WZxmSc5KAZ/ HF3aVNNfrpA13JPmryiVXHc/HxvK X-Google-Smtp-Source: ABdhPJyD0e2LuN8isQ/Jf3px6tIWePspo5Kv/kHkfh5/G/Yzs7u8Qr/JBgyskKHptOdPT91AjiW94A== X-Received: by 2002:a1c:4c16:: with SMTP id z22mr14415700wmf.17.1590854793071; Sat, 30 May 2020 09:06:33 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:23 +0200 Message-Id: <20200530160541.29517-18-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/36] avcodec/bytestream: Add unchecked bytestream2 peek functions 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/bytestream.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h index 0516a6e3dc..d0033f14f3 100644 --- a/libavcodec/bytestream.h +++ b/libavcodec/bytestream.h @@ -77,11 +77,15 @@ static av_always_inline type bytestream2_get_ ## name(GetByteContext *g) \ } \ return bytestream2_get_ ## name ## u(g); \ } \ +static av_always_inline type bytestream2_peek_ ## name ## u(GetByteContext *g) \ +{ \ + return read(g->buffer); \ +} \ static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \ { \ if (g->buffer_end - g->buffer < bytes) \ return 0; \ - return read(g->buffer); \ + return bytestream2_peek_ ## name ## u(g); \ } DEF(uint64_t, le64, 8, AV_RL64, AV_WL64)