From patchwork Tue Jun 20 14:40:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42249 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1441864pzb; Tue, 20 Jun 2023 07:41:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6T++P36NnBHDMFWUH/Mg8UYSu0pP2KZTYWbG4PkKP9+Ks/BRrbp+3vcBKT6vX5IoGtFZIB X-Received: by 2002:a17:906:eecd:b0:973:da59:7c91 with SMTP id wu13-20020a170906eecd00b00973da597c91mr11799653ejb.51.1687272072624; Tue, 20 Jun 2023 07:41:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687272072; cv=none; d=google.com; s=arc-20160816; b=vjc2FTTABCFPnIJk8XSxndpHLVsWX/xyYFxeZOteVQJlpYU03VDcz03ru7AO5Ephcx y5sPoIwOYa+Mfu86iFY31xXOf1qzqMtrVjSFhahPUSweglyO2lkI0hIzSDZEhu6eq2+F cssJPmz8zYs5LCXtqwDHjBHbDsgccwnVvVz/RyOOwCH0xJ24bBEzKa/a4SM740UMFF3Y dAPW5HJne0gj0VUaiyu0i7g1cuWgc87AO1gt/mPE0voveKGUKWmIQnpPvp/tSjxWwkQM bC5bk8bkc38K+jc/SfaolduOi9otIV1GuFyQ4A83xal0kkp4I00HnWntRZi7zzKjYz3Q m+oQ== 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=SiAAZ1ObMjryxLG5lc9X4N2RTfZqXczcxYzpiRNZGwE=; b=FjUZcTDxu6ZJAIKzdCn1NRDdWk0J5bjlukrAsfJlD0ugAQR2OVWxDyecVkzzAc5+iE yiznImVF2K0qMAkTrqC7b9hGIU+Spk+Y/YYlpAg7pTn5RdSGAPfGjB9kymCT70dIgtLC LoaOkSuZQyGZy5/OzhyhqYtf2As01YzNo7Z3XTfYLatuv7ijdRSSziN/ilbkzhDRLk3d wtqjPxUhx//hB5rYas1Zbf7U86nCGEEE0IYXItOMdQVv+F13PYlPFDI2JBAln1Wcuk6d yQ4NLEXA/MHeOGGaMgBlVMflSVj9WPs7YRXUm+6MZHCyboN4T0lfmkp8u10SJ8eQjyAC OaZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Jj0MCBUn; 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 i17-20020a17090685d100b009877f058f0bsi1185126ejy.99.2023.06.20.07.41.12; Tue, 20 Jun 2023 07:41:12 -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=Jj0MCBUn; 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 7FBF568C176; Tue, 20 Jun 2023 17:40:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79C5F68C159 for ; Tue, 20 Jun 2023 17:40:47 +0300 (EEST) Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-1a98a7fdf3bso3202726fac.1 for ; Tue, 20 Jun 2023 07:40:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687272046; x=1689864046; 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=pbj7hZ4HT+lScQdn0SInjSfIlJwOLMDZCX/8+CgpJq0=; b=Jj0MCBUnjQQDEDmzoKKA6qhy5y0eBrE94oVfs+Dydqv+icRWkebZfGoSBnDqkGMaXK jBM/RiuzEttLAMw4aKO+vL/VeiuJA2/SMsPyoZ2F9QsSaY52qObqrUVEnvnsnw9I5qHF qr3xkrXgO1dPMgUxLDlsi4ARuIJ8CIQy5x+P3+l/QMHKD5h4Ba1M1KVtKUqRn+8eus2Q hRlaPrNMLOpkm6yfb1Wgpz7bWNsFWvyB1H9CH5FDLan53ipeJQeVS/VJosN9L5OMpNjx PnUgXz5WJkmyUi/sFVvKf9WS9eKM6sEU0pVvXELjZ594LaHQeR7VgTDnixb8SvKhva8P 8wTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687272046; x=1689864046; 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=pbj7hZ4HT+lScQdn0SInjSfIlJwOLMDZCX/8+CgpJq0=; b=CDUa8UftDUbcKufJ95jfP51/vrztVguSi2DPoRBANyY0x6YUdhl0qQwTNnx1bL/JvX dr4OalRC7EudLUTqVUKaFSP2w3urRmETXLAY5k0b+7TfA0JU2y0L8uWHYR7YWsXkVSXN jVsEpz6kP09js0iFpYNkblaga1g4rMzyVs89zShylMXK5NWPH24Of7FCEEsEPJk+2aNG p3vPts1WER5+lDa23mvl1xUxXerZo7mjhKw7z9P0OPoSeoWctwwPrcJ89EnnZFfznUo4 1bdUFJUaq4143mbfaY80xQe8K9r+HlWPCKeDEAADHyLqIGXwZNELGduDtg0aVNn20+PS 0snA== X-Gm-Message-State: AC+VfDxer2ef4FHmy2Z8hdmbdBFdFaGQ7AOb3rt19IWaaIh3I5qzLmlg BmQ1ZFI8gYH4bssuzkIEGht0cUqi++s= X-Received: by 2002:a05:6870:a2c4:b0:1a6:b022:252c with SMTP id w4-20020a056870a2c400b001a6b022252cmr5561595oak.3.1687272045865; Tue, 20 Jun 2023 07:40:45 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id nl13-20020a056871458d00b001a69e7efd13sm1417838oab.5.2023.06.20.07.40.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 07:40:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 11:40:36 -0300 Message-ID: <20230620144042.9629-3-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230620144042.9629-1-jamrial@gmail.com> References: <20230620144042.9629-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/9] avformat/evcdec: flush the bsf on EOF 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: vc8LmFE+Vfl/ Signed-off-by: James Almer --- libavformat/evcdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c index 68f3a91e53..842258d229 100644 --- a/libavformat/evcdec.c +++ b/libavformat/evcdec.c @@ -183,15 +183,14 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) int ret; int32_t nalu_size; int au_end_found = 0; - EVCDemuxContext *const c = s->priv_data; - if (avio_feof(s->pb)) - return AVERROR_EOF; - while(!au_end_found) { uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE]; + if (avio_feof(s->pb)) + goto end; + ret = ffio_ensure_seekback(s->pb, EVC_NALU_LENGTH_PREFIX_SIZE); if (ret < 0) return ret; @@ -212,6 +211,7 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret != (nalu_size + EVC_NALU_LENGTH_PREFIX_SIZE)) return AVERROR_INVALIDDATA; +end: ret = av_bsf_send_packet(c->bsf, pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Failed to send packet to "