From patchwork Thu Nov 21 11:08:54 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: 16363 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 98EC544A361 for ; Thu, 21 Nov 2019 13:17:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7895D68ABB5; Thu, 21 Nov 2019 13:17:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9374D68A106 for ; Thu, 21 Nov 2019 13:17:21 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id e187so2676206qkf.4 for ; Thu, 21 Nov 2019 03:17:21 -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=I1FJIcfoCLWlV7KQrqeqF4RpW7TX2dKR1YpNmutWMYXwvDQPfEEC3ZGeCP5suLCWVy o9ClvrtRq2SLJ7r09NLCaXLmtrZGFzuYu6wHFa3284RSl9Rg4WMwExsKerkZXlOa5mn2 JxJ95zQ2fswCaRV+PzawbaHHQyj0o1AJBSl4t4wMR+ZeB8Se6wy5fJKZ1Z5/GTuy7eFW ZoJeSF3wDPZxoRq0zCAN9eeL1jwlIFzk1Hntq3uziFBixYHOYGXPE6Ei809rnVeh664q TB5CaoTz5GPkRUN5ydqe8frAfBRURAf5Oqt6p8hTml9Cp2ovcR+/QFJUtTMttNXPCwmg isNg== 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=YZUaQT+K5VZmSRBjOoxQRDjRCAyTog/tFBce4II2cjluYEQDWjD8qqp04cSvBklYTS LzdxOd8LymwmLfwkrhDIodjNC5BgdbvD+HH5QoV0k/LeYtjdJqMDIcRTee8dY3K3NO7l AQ4/ICSjQuZ9e2pXRtEDD0DldNcEHxOQ2j3CwbC+7BDszKB2m2bgO9jXa1JbiA/jbXLy rp6epZl2MVFekP/2T8k8I6acgcgyECvpzWf+rwINFyLXPhLEbQZ5EYKYg+2dxm1P/DVf d+Vz+NqrgqQ17v8kynwMvWK6lDhhb6UzROiMLuEpYQZdWJXSXr5UQ/anEgt5jfoNfFXK wFqQ== X-Gm-Message-State: APjAAAVS3u/dpWKmaXH9aale/Wfgmz1Wmy+sW+IkG6RKn9jIZnlY5PXi pIIpdSJ8JRD2+AaN8uuBLa7bIU7FSZU= X-Google-Smtp-Source: APXvYqxGlJn1+L689psB+pWslFZITIB+hAN258d9nYlmhFmgdAICCyaNUt5qN/sqX8AY9E1tgHEAzA== X-Received: by 2002:a37:491:: with SMTP id 139mr6826382qke.200.1574334599640; Thu, 21 Nov 2019 03:09:59 -0800 (PST) Received: from localhost.localdomain ([181.167.72.151]) by smtp.gmail.com with ESMTPSA id i189sm1174818qkc.65.2019.11.21.03.09.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2019 03:09:59 -0800 (PST) From: ggarra13@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Nov 2019 08:08:54 -0300 Message-Id: <20191121110854.4615-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, based on a patch by bsenftner at earthlink.net. 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)) {