From patchwork Wed Aug 26 16:44:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 21936 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 06CDC44B572 for ; Wed, 26 Aug 2020 19:45:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2DCA68ACEC; Wed, 26 Aug 2020 19:45:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D754768803F for ; Wed, 26 Aug 2020 19:45:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1598460300; bh=8Qw7vZSEyvZijPiyURmNqMm8782t8J1v+aR+r7sObek=; h=From:To:Cc:Subject:Date; b=IHhd9SLaAaqxZ3QoAZZD+n4gvga0WExwJ1CNFaWDT48MShy6b1oGNn1Fk7cojQOi5 U3UkYPj3+Anh2HkpgW1N/cUaZacfj6dQVYEPItcVoSaUilAwMy86YYsfiMVqCPWBRP RB4MrIfshrYyJ8JgNh+VtQ8VbIPnlWih8Ebd6rWc= Received: from localhost.localdomain ([27.46.106.124]) by newxmesmtplogicsvrszb5.qq.com (NewEsmtp) with SMTP id B3A2B0B3; Thu, 27 Aug 2020 00:44:58 +0800 X-QQ-mid: xmsmtpt1598460298tpai056k0 Message-ID: X-QQ-XMAILINFO: MOL/g/gp2toeqDhWO/C1aZ2ZsyfWcUuBmtEhyLgb2QbVgAvHZH/6Mm3haPazaE NMSEjVzUyYTpwzHwvwAhUNNnyIL8/gDo7PUFe3o5vysycYtTVc9Xb3sC6y0KAbyVw/tzNRtxWOdB tMp+9vpjId2nCZbBWDZP0yuD8xuCYInVJ8bVju+veh8IW3OQnWFXaLKuX7t2wNDzMkRzfK5WPqMk mW4hYRsvK1+/7h1y6lbl8B4mdzQEA3j95QhfUSq4VyEK0yU89g3J/wD38Li9E2zswh70tp8I+xD9 vXBmjNuCl3AXFMUJPzAPR6XPO8y1o7eiISESEC8Nh6n0IBGIsdBnJeosP8hSV9lRVwfEZeNkSxbS WI/6Ctg5JUG1Y5P7JApjLW/XXqcTwCYokM/N4XBQy6HAyaD/1ZR9/sFGCzRO3bvWqhRHYbkutaUw G8gkOWtuPbRu6ycgZMK27oAq3hSRgGf9xilLoyPn7j+uxaMg3ogwlT6FIUsI1aFTjBHLzyQsu1Hc n2XhegbZRieE94nn8gRochIu0ZdsxwJQmwyeVj91CJd2suSvaeolr5TIKp/l2vFci8qtDNvN7tcA YXwvpiJYGBo22zx53nc2BZGvlH0RQLMG2HL3XJIcG9BRNAVcIRgOlT2ZWrPOKMvPhpDvSRUSXZot IXy3x3mualJsiiCdF83UF+V18K8sUFw2inEXEYjIE1TbSeYDKwNh5O2DF5pL5WZIws/deFfLf24X uqvOpXdAjctu4pChYh1rq7TxZjN2XOjO4v From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Aug 2020 00:44:56 +0800 X-OQ-MSGID: <20200826164456.136736-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffplay: fix autoexit doesn't work in the case of pb->error 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- Goto fail will make ffplay exit immediately. I'm not sure it is the expected behavior. How about just remove the check on pb->error so decoders can drain normally? fftools/ffplay.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 6c9c041e9a..9ff0425163 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3028,8 +3028,12 @@ static int read_thread(void *arg) packet_queue_put_nullpacket(&is->subtitleq, is->subtitle_stream); is->eof = 1; } - if (ic->pb && ic->pb->error) - break; + if (ic->pb && ic->pb->error) { + if (autoexit) + goto fail; + else + break; + } SDL_LockMutex(wait_mutex); SDL_CondWaitTimeout(is->continue_read_thread, wait_mutex, 10); SDL_UnlockMutex(wait_mutex);