From patchwork Sun Jun 18 23:43:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42217 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp349181pzb; Sun, 18 Jun 2023 16:44:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6OraUSMgbpD7ZcGe50jFEEZrzqIqpBtGyIJUgbcm0+gQrwL8te26+4pv1iY4QURZiuiN+y X-Received: by 2002:a05:6402:121a:b0:51a:4628:d3f0 with SMTP id c26-20020a056402121a00b0051a4628d3f0mr3503789edw.38.1687131864265; Sun, 18 Jun 2023 16:44:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687131864; cv=none; d=google.com; s=arc-20160816; b=lEsYBU7LDUNGGaL1hjvJ/3Hx5IYu/YD+Pn7rjKTH0vNXgQASk2Q2fdwLzThOFmqQsK 3foP7de3o1r5v8elHcKoysxDUC563q+zqwx+JO2jm/QHr2oSUBWk8tnBoDrB5ooNy9mX yn3685gD6wuPMObW48dZIJedXcqXBVujHy2nxVPpNCOCvzlZUBPtNmpW8bPuRxf0iyDV WF3ql0kDb3uoF7w9OLFQTtkHlCrdoahqufUC2sfDxhKI8tODGAyy4dL+Ug8rFBwKya+m HQdcbKrZM9R+JzVwcWPl/EpJJJHbo461C83d/lO8Q1c3noVMjb8cvnU4T7C3rf4K36OR aSBg== 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:dkim-signature:delivered-to; bh=HwWrbd19DCVilc7G+w5M3qu0lXtdpAxeRWiYm5kUt/A=; b=XsODYHL913ObJBvy/O+GsNcZHm+aoren/mjoU+YD2+NRO1tWTO/4gwVXzCaoCry5eU SDihbvlokSAqyiyklt3fLHTgVaZn0EU+XgsBLNOWJ+xuNnz418Prt2yIrzJaLQqLs5q/ HoEYAd+qAYSvUJ1TXOlc9s2Q95JFzgxzg5QXqMxCudyiJixiDe3hRmFIesha1j8k8sF6 As+LsZNvmw5AqgRylOJ8wNoXgvaHrVelM5ZgV7j2EtXez2EgqMknXCQ9s3ASIHvoCZ94 xz3g6kycnf1S7nkqQdbVleomFOI7e/zMUwceGD1HFQzcfbFhzwq1sZDwviutaEPivMsm Awuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=feVGuatK; 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 o23-20020a056402039700b0050bc4a2975bsi13726512edv.681.2023.06.18.16.44.23; Sun, 18 Jun 2023 16:44:24 -0700 (PDT) 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=20221208 header.b=feVGuatK; 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 7BEEE68BF69; Mon, 19 Jun 2023 02:43:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 833DD68B9FC for ; Mon, 19 Jun 2023 02:43:50 +0300 (EEST) Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-6b2b6910facso2019322a34.1 for ; Sun, 18 Jun 2023 16:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687131829; x=1689723829; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5cjM0WNJAmVeWJLeHFcOWjos/+9BtjRFOFtQIsL43Yo=; b=feVGuatKfOzYyue0lnQWvxJe3dzcNuOUibwVg7YeuaJXYuNU6QklVpCtgO7v9WocT2 l0Rb/L/P8sJTr0ZB4mDtd3EAXDvNezPkmPFQZx00v4gx0oxuLj2tW1VUSkw4anBeJJKM S5mOn7zqNaSj83Ss3T10xPw9piWFLSsPmA0jSTkRnrEFokyUpeeLi3nzLE5HnIvkazJN N5rHGmm14v7ddodRGBECCBqcoZA2YMfDDkU91rjqkQGqc2fVdy8+i2kWTFjgyJbQQ+Id bcXje08c/V1mrh3bJqmC84MmdvKsZ+ieFDYg5hR+jldz/5Cx/B4VqHx5EHl7RtJD2cMB plRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687131829; x=1689723829; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5cjM0WNJAmVeWJLeHFcOWjos/+9BtjRFOFtQIsL43Yo=; b=I2lN1CY8u+nZTOkXix7MfYtoRz+vEAHzQDPrObHxuMiMn7S0kO1b/caaWHooam0REb 2FdTVUHxEUY0Ey+MJWnrbxs0OmFavbcoKqppp6IUxUPR9vhMvQDX5/VyLOr27I7oifLl mMPbmOgqDMspt4y7EDI7aaFHZK/lwdoRRaWGy02v94cjWR0GKkElxgl+Ai7emlNU0pVM bztG8nfomLLl09kq6mIwLLj6r2h1tmS6kvj5iI7+nQTQnWW+kNQ583pxbMOleJ5EvCSg kKKU7M8oWndllRDacYGV5MHghQ0Zp9F4lHeyZM7Qhh+HuSZ/vXI8l5LhBx/48TK6jyHR vKRQ== X-Gm-Message-State: AC+VfDyPhc4mTM0QJKdM+9IJEnKxT81Cr82dAgYohZLT+ADwvUmliU8X JisLE/UGMwshYlgi4BBveq78Qco11Qc= X-Received: by 2002:a05:6808:4c1:b0:398:2ec7:d5ed with SMTP id a1-20020a05680804c100b003982ec7d5edmr6769089oie.19.1687131828844; Sun, 18 Jun 2023 16:43:48 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id bk36-20020a0568081a2400b0039eb5f4543csm2069664oib.34.2023.06.18.16.43.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 16:43:48 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jun 2023 20:43:29 -0300 Message-ID: <20230618234332.1370-4-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230617151848.1378-1-jamrial@gmail.com> References: <20230617151848.1378-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/17] avformat/evcdec: simplify au_end_found check 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: Vv99RNdxLvQH Signed-off-by: James Almer --- libavformat/evcdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c index 7a783e9809..a3a41cb4a5 100644 --- a/libavformat/evcdec.c +++ b/libavformat/evcdec.c @@ -144,7 +144,7 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) { int ret; int32_t nalu_size; - int au_end_found; + int au_end_found = 0; EVCDemuxContext *const c = s->priv_data; @@ -154,8 +154,6 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; } - au_end_found = 0; - while(!au_end_found) { uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE]; @@ -191,9 +189,8 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_ERROR, "evc_frame_merge filter failed to " "send output packet\n"); - au_end_found = 1; - if (ret == AVERROR(EAGAIN)) - au_end_found = 0; + if (ret != AVERROR(EAGAIN)) + au_end_found = 1; } return ret;