From patchwork Wed Nov 20 22:33:29 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: 16357 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 6B992442FBF for ; Thu, 21 Nov 2019 00:42:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4980268A8A0; Thu, 21 Nov 2019 00:42:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F039868A6D0 for ; Thu, 21 Nov 2019 00:42:16 +0200 (EET) Received: by mail-qt1-f196.google.com with SMTP id t8so1416486qtc.6 for ; Wed, 20 Nov 2019 14:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QXeOyPe+LfjVwWqYS6ulTn2mcBXWVkeCnMhf0+d5Fww=; b=vgrv8J2ibDy1U4zaWiBqukRMn8JHWgx7UkJZr01YK7umB+oLFrJy3LVuXlAcrM3vev orX232ElUf6t2xNjZuc3gpSIKvFG1Rdko85DwyD+WN9Vebh0FhoVnyyclvW3HuUKAhOX JTlxL37fUsXk+10zgKM43fQquUK81+V7qtR6qsW9RQfkFp66QFaGmbjJNjjTcJzOvfW0 Sxo+AG1vr2ioPT/u8d8RhJ2ov6dt7PW0RDwT/g9WuIccbd5O81JvsM1AReq5OcfKTTHN UU9K3orXktHkK35kWV+uIdccxopnmg50dxO330acMnyycZvTo6xEy9lEkzSTVHQ2VSRx E2TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QXeOyPe+LfjVwWqYS6ulTn2mcBXWVkeCnMhf0+d5Fww=; b=HjEVn/azXozQOGFSu+vKCu7FgWhXYmtU4xASJs+TGAf34LUQdxdXfeCvMPytKC5XQd Y9y35stH3j0+Mw4VS4jsq337BlVrTmekdt91456nEk5+K6N5X2DiqLOQSCEFRI+77lxp qCuzX+jMyAN15jsOyskUKWW60IyZMr0PG37/EPz1zPTCByhy0D/F3uJzfo9+/g2e7Rfr ZfIZ90p7gwgSFcg+Ct8GRyn+RDkiR81Pe4kypFaMQUTxbNEEMF4xsC8X1qAtcam20tPa JENqRpTqPVeLIPlw5xUmBQ2MRPTV0tIGKnIejLlw46hzhva6DYiJYxRbc5DgWQdfy/cy dYqg== X-Gm-Message-State: APjAAAWkQ6poOjOlDUGIw5hweBmKnas9ObrkHVpLiBr2dh+1zSECbRgV +oKjROZNWJfkHEsWkLAWxVp863GrWQc= X-Google-Smtp-Source: APXvYqxZFsWWshy5N3wTEShY02ms1yAUvBxOZT8BekqqPxNCtlEOa4ZrCXe2prssAB4Z/Jx5rDxcVA== X-Received: by 2002:aed:255c:: with SMTP id w28mr5260585qtc.185.1574289229777; Wed, 20 Nov 2019 14:33:49 -0800 (PST) Received: from localhost.localdomain ([181.167.72.151]) by smtp.gmail.com with ESMTPSA id g16sm357298qkm.59.2019.11.20.14.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2019 14:33:49 -0800 (PST) From: ggarra13@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Nov 2019 19:33:29 -0300 Message-Id: <20191120223329.4923-1-ggarra13@gmail.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Added interrupt to av_read_frame() in utils.c. This allows av_read_frame to return after a timeout period. 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: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gonzalo Garramuño --- libavformat/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 8196442dd1..c3c2c77c0c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1838,6 +1838,11 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) } } + if (ff_check_interrupt(&s->interrupt_callback)) { + av_log(s, AV_LOG_DEBUG, "interrupted\n"); + return AVERROR_EXIT; + } + ret = read_frame_internal(s, pkt); if (ret < 0) { if (pktl && ret != AVERROR(EAGAIN)) {