From patchwork Wed Aug 3 13:58:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37103 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp457875pzb; Wed, 3 Aug 2022 06:59:59 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uYebjzzwWsSmNi7Uv3j9l5iQvJBiIJh0rwfrCJwXitUnCLvZpRS9ei7KPfQMWbRZYTotS9 X-Received: by 2002:a17:907:d8b:b0:72f:4645:1730 with SMTP id go11-20020a1709070d8b00b0072f46451730mr21011676ejc.724.1659535199391; Wed, 03 Aug 2022 06:59:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659535199; cv=none; d=google.com; s=arc-20160816; b=OcDZ15QOrgzTeh8l1AGTcSNUtd/5KF7MjLIYqf0RlVgli5N9qWxNu4hNA7fccv4XxH VMyn1Fs87sDZHJbIsQJfYFuz6u+PvQOxJ30d3Teifq5IjDd037sOfjV9FoS127EbKug4 TWf/51Y/mmoj64zT+BDErsL40LW81JzZPPOqKyTxJWxJTxNkPGU/C45z+UX6BxvfDKhA o+n3a63o+vCnrUnGqP8bUPrObkJazGjVTpAwJCBX+Rod+zl7sLlTsl/yXR2WLuEgjEHp E9+YeyB9kkdrZzSa9bU5XeUJ7hVOjxWBlRj//kminX97wHHrTeCLSefPlz0rup9uKWc0 DS+g== 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=0XRM6/+kizNBUT3xzGWu7pHqC/43EhOdGJEVmpIKgCY=; b=VT/20sxLnss1GhPF3h0K7HqMfr9qC+sJkucwSX0YKsIfDIWdybRCz9foeqrAp/4WBI YSxkzETwFkIE2UkpVj14T+wEyoCuxo0P6QS+cJGXNTkZztvKAfA+5OGBojTA/TqDkxSt 88qNTdsVlDDCIjKCl92RQvfct0V9aVjkLjd+vf3CTa2+kpLwkRoq1OdFoD1e8uze002i Ex88rhaRwKqE0ImA82BcVwP3njf4O7mdflxp+nKpxekQRrzcFJW1Nfa2FI9Z17bO3m9r tD06xZAGvwbfj9kjg16KPKgTk+tQq8UHXV7oEAL1rLfd3iCMp6cyCxUMF7lP86q639Ov IFLA== 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 cy12-20020a0564021c8c00b0043565c5a2fbsi13625467edb.89.2022.08.03.06.59.58; Wed, 03 Aug 2022 06:59:59 -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; 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 8E44268B8C3; Wed, 3 Aug 2022 16:59:08 +0300 (EEST) 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 E053068B7C2 for ; Wed, 3 Aug 2022 16:59:02 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 7EB792400F5 for ; Wed, 3 Aug 2022 15:59:01 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Y6MSlJO_DO1k for ; Wed, 3 Aug 2022 15:59:00 +0200 (CEST) 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 04D9D240592 for ; Wed, 3 Aug 2022 15:58:55 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 4CD173A075F; Wed, 3 Aug 2022 15:58:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 15:58:42 +0200 Message-Id: <20220803135844.16662-23-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220803135844.16662-1-anton@khirnov.net> References: <20220803135844.16662-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 23/25] fftools/ffmpeg_demux: factorize signalling end of demuxing 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: kIICAHbtSxxt --- fftools/ffmpeg_demux.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index e02d2d9656..be734be581 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -18,6 +18,7 @@ #include "ffmpeg.h" +#include "libavutil/avassert.h" #include "libavutil/error.h" #include "libavutil/time.h" #include "libavutil/timestamp.h" @@ -142,7 +143,6 @@ static void *input_thread(void *arg) /* fallthrough to the error path */ } - av_thread_message_queue_set_err_recv(f->in_thread_queue, ret); break; } @@ -162,7 +162,7 @@ static void *input_thread(void *arg) msg.pkt = av_packet_alloc(); if (!msg.pkt) { av_packet_unref(pkt); - av_thread_message_queue_set_err_recv(f->in_thread_queue, AVERROR(ENOMEM)); + ret = AVERROR(ENOMEM); break; } av_packet_move_ref(msg.pkt, pkt); @@ -181,11 +181,13 @@ static void *input_thread(void *arg) "Unable to send packet to main thread: %s\n", av_err2str(ret)); av_packet_free(&msg.pkt); - av_thread_message_queue_set_err_recv(f->in_thread_queue, ret); break; } } + av_assert0(ret < 0); + av_thread_message_queue_set_err_recv(f->in_thread_queue, ret); + return NULL; }