From patchwork Wed Feb 9 03:28:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 34198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1371712iov; Tue, 8 Feb 2022 19:29:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwFmeF0qyyurSqGNCzE2AHqEn1w8+d9fYcsUokBrUnAUOKVQj+VvTq0MD6uDEECzCmraVJi X-Received: by 2002:aa7:d286:: with SMTP id w6mr432339edq.452.1644377396587; Tue, 08 Feb 2022 19:29:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644377396; cv=none; d=google.com; s=arc-20160816; b=iOtrriv0bHaZ64vwaqo3IK6qvYMQb5Oq0+2mKlqI1Kq/7DYuIFKT4Hu48lFM1a6nXf hVyKglFRD9UTDUeeBz6a7vcFnC2T6Vzozdoy2bPfQRBj3hWM/yvsta95/M0AUZrxgDEJ vQVcpJEFvbm1OPjv8FtDwx0ewF97meUw87sq+hypuN7BBGYMMZv4PaD/gcjizEZwDMYX titgxEXgZdhLTPVwLt01VO5e4c/W7SZMonDBiHLVItPfo/CeRnSi3qbgA88XG0b2yMJz 1tawhEWmovZ4PBkHsYcpsyu4mAtvwh9voUex9n3rysT/oxqkmKg//WxzCOKEI8X91sBq /xoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:dkim-signature:delivered-to; bh=idqUcsFBjZaQOJ/Yz36GgaCiwScFCFRGZxJZa/EIEBw=; b=MZG/qe1601Pb5YgKz5pasv9KJKfIx5jOVpEDJzFLzOZJSLsLQnT5lxEeW6luI9PTol 6VxnimVKZpLTTFQBw2fL4Fa0rXORUrYIMU/q3SaeTQAlrnIVHDxCLAGkMq+0AAroxpUj NHsD27fO4tj47v7g8ktcsGh1F5R+vNyVTctFIzEm14uLnB9Jr5mW2gy28KfswbeewFoO jTRY0VH9gpxk/GF/2nN8FfMTqzuhiGLYrl25sswwOsG/emP8IWRViwyYHCjZP4jSydMK UgYHrQL9PYlpTWl4BK3zxrMzAjJsqP0We1k0xZkyw82pliSN7JgmI2dgqiCNNgP9LWnr Or1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZuU8ZHT+; 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 y9si11827770edd.54.2022.02.08.19.29.56; Tue, 08 Feb 2022 19:29:56 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZuU8ZHT+; 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 6289B68B164; Wed, 9 Feb 2022 05:29:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C75C68019D for ; Wed, 9 Feb 2022 05:29:25 +0200 (EET) Received: by mail-qk1-f179.google.com with SMTP id c189so645250qkg.11 for ; Tue, 08 Feb 2022 19:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=saxN9HVlGEV0mlwhCAg8mmes1L9bOuJJdA/TucvEGPk=; b=ZuU8ZHT+fpZOb6E2WVxXs/9PbfeGx/FwVyBXr6SvcSA9aCJ0ShYVXMB9lJIQz0u6XG SEdWwLilyt2BPppVdpwF2jKBSOoVYp4p7xp1uti5w/pZMePNLPA+Q7GH1X2CSX6tl04n lRGwoE8sXfuBc7zz5wj6Mqi8DAEf9CNzvJ3Ft+C/LGbYS7obBgBCMJsQsScpnf4CND21 5101Xl7lQa0w6/o7Xyws4KeSKJU+BIzSIEcsCJI74ZtEh2Hv5dIZ9Az8/x/gEhaBZVyL nKZ0mFyfdbH1m+EZL3u6+TFNT/TTJBw4daN8NHLHN1os5Sez54WhNbLtmMgfYKiBEbxW wjLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=saxN9HVlGEV0mlwhCAg8mmes1L9bOuJJdA/TucvEGPk=; b=ybKq2pUIoM4cOJWlP2RaURjYNlALWPxR+KbkGPx76y3EBqMXNnbyO0Ve9r6ZnIdQCr lF/0RwLoMqToStqzlYW1ENFjK6LXUErWSTRgRxC7HiM6mu7WA0pm4SAGGP/iOBNROp/C EwofNQdYadcotQgU9kpq1kjmt79ziYb5t/rE4cN5rUDUIO/T8J324Ux4lH1dD+/jBn8g 9QnsQUFszBH9mJBikAqwlOP5BPQibxzWLrmJpAX0OyLsC6/mWaAqMi0FByAkjGIc88jw 1DcHUvxhd+5TN6XR6cDvO6YF01ytWfMg8yckiyCvd/QaMBPDmyU+cEhkkTKKU4vVI+K0 mCJQ== X-Gm-Message-State: AOAM531G1wjMdcsYeN90JOODnbltnTvRsKP6FzQzEdcmfsIvakiR6Fzr mcdCTu4ssBc0suRCD6Y/dzkRy+62C3E5Hg== X-Received: by 2002:a05:620a:c4d:: with SMTP id u13mr147027qki.29.1644377363885; Tue, 08 Feb 2022 19:29:23 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id o19sm8452524qta.19.2022.02.08.19.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 19:29:23 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 22:28:48 -0500 Message-Id: <20220209032854.565698-3-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220209032854.565698-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> <20220209032854.565698-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/8] avpriv_find_start_code(): readability enhancement part 1 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 Cc: Scott Theisen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6z8m+5X3W5Ng No functional change. --- libavcodec/utils.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c7c7323351..42a1885d61 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -963,10 +963,11 @@ const uint8_t *avpriv_find_start_code(const uint8_t *av_restrict p, } } - p = FFMIN(p, end) - 4; - *state = AV_RB32(p); - - return p + 4; + if (p > end) + p = end; + // read the previous 4 bytes, i.e. bytes {p - 4, p - 3, p - 2, p - 1} + *state = AV_RB32(p - 4); + return p; } AVCPBProperties *av_cpb_properties_alloc(size_t *size)