From patchwork Sun Nov 17 21:37:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Gonzalo_Garramu=C3=B1o?= X-Patchwork-Id: 16306 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 6A37D449E21 for ; Sun, 17 Nov 2019 23:46:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 452B068A675; Sun, 17 Nov 2019 23:46:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63BA16881D7 for ; Sun, 17 Nov 2019 23:46:05 +0200 (EET) Received: by mail-qt1-f177.google.com with SMTP id p20so17952167qtq.5 for ; Sun, 17 Nov 2019 13:46:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=7j9P6NPLl4mIA2hk8/l8LNfwICF12cRuZ62j/d4eWaw=; b=CBH45G+Piy7oIAIyl0vgTL46nXYW4fshVPkw4MwjAmKyxEScRyNBMN0q6Ad8w78dXP SD+kj//R4MPx73HJha3CFkxF4Sk8bmNQYdFn0n+8vcXNkXMZ86DWhJO0DybslT91O+9/ YIseAEDDBYy6fJHAKj/TCJK1d317GpvSDY+QJ+Ux4HeuWdpLESa8SBMKLaFQfKBsLIRu JAAlniqQFhVIXdvdSfzX5ZPUedlNsyR7tgymWG/kQR02bFuRiaedjd3LJ2SUb5o3GLkk S89zESCNJgumYuV1WVo1nbmdjh1hxlKFnBlqGA4vdwj3RyuCzBFqjm6zuzimwrTcJqHU 43SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=7j9P6NPLl4mIA2hk8/l8LNfwICF12cRuZ62j/d4eWaw=; b=c1zhDSHilUCCPFPE/j9XMB76CIBk8t64IMcFiB/zIBnFMKl1xt9g7V8hgtY+S+XkTs RS/RNR+W4zj2gA1IK/XUC5hBRvvTu1Cs8FObPOubWtnWfHwkyGAK+35NQ7aVtiQIF672 OQpeVLHxyRTBr3SYSPn8vF2z/ndxwVNIp26ktQ/n/BUMOTYVwIE89en5aRpwXZyunTjs x4Sr9f+mVWFoI2kT6OxHG6BRmsM+Euaray4PM4FMLeg8CIjKXOrO6VEZDKCgu2VMRa1h TxI/7PcRdX5K17xHvHAHE4JMhT1EgsET63GvxHk7P3UaHm+wI19ZTFlgy1fclecOAtTN ZBpA== X-Gm-Message-State: APjAAAUCBh96uFt6K3M1khp3MM59+G4gbtPK+BzYsRSTGDdbg6BwxCZp CoRw9s4wqucu7vgyNRT67vhYq0CK64o= X-Google-Smtp-Source: APXvYqx9dtEF/XAtLhsmQH6P5NRphw4L1TmK2Y65RgJ1H6kiW/VRx+fCWSqIYz3scHK2WWiH8wB44w== X-Received: by 2002:ac8:2ae9:: with SMTP id c38mr22686672qta.330.1574026681314; Sun, 17 Nov 2019 13:38:01 -0800 (PST) Received: from [192.168.0.5] ([181.167.72.151]) by smtp.gmail.com with ESMTPSA id r80sm7548454qke.121.2019.11.17.13.37.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Nov 2019 13:38:00 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: gga Message-ID: Date: Sun, 17 Nov 2019 18:37:58 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] av_read_frame timeout 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The following patch adds a timeout interrupt to av_read_frame to prevent it from hanging up the application.  This patch was proposed some years ago but was not applied back then.  I believe it is useful and should be considered for approval. diff --git a/libavformat/utils.c b/libavformat/utils.c index 8196442dd1..d98ebe46a4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1792,6 +1792,12 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) } for (;;) { + if (ff_check_interrupt(&s->interrupt_callback)) { + ret = AVERROR_EXIT; + av_log(s, AV_LOG_DEBUG, "interrupted\n"); + return ret; + } + AVPacketList *pktl = s->internal->packet_buffer; if (pktl) {