From patchwork Thu Nov 21 21:27:10 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: 16368 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 B074D44723F for ; Thu, 21 Nov 2019 23:28:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8884868ACF6; Thu, 21 Nov 2019 23:28:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95832680080 for ; Thu, 21 Nov 2019 23:28:38 +0200 (EET) Received: by mail-qt1-f193.google.com with SMTP id y10so5399404qto.3 for ; Thu, 21 Nov 2019 13:28:38 -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=7ZnQNIEseWZ611CMnCUejEv9EjH7CgSJ35PFdD5tkX8=; b=nVKC3p5TJ40Z/BOoTQb3h1zRI9NQJOATT4QYSkXn+dSAid4Gy4N6DK7v+9B0/JGq0G o+Web5cSPZyW8l8/kKyENUZt6gU8TPs6GiBNZTFh0NGs5Rk+aNFxLYRZboIXcZ7I6Ryw WlYGtxv2v+cxHZljU+kAnVTSMCHjiHTZZNhNKr72emxAg9RXStkRm9Hvq0yVybUgkaRE yad/7sY/o1tDKVi2icOd8W77dSNpCz8qSKBwx0O1DdRJxyYXam2+UI15fFZkbIYyvLEa 7H9dBh6Y88rVk6VMl+OAMqry9kOqCGY2ROS90XiScb4HQoJYTNGSYchtSvQtr+qqtEri Go0w== 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=7ZnQNIEseWZ611CMnCUejEv9EjH7CgSJ35PFdD5tkX8=; b=syjk4Krs5MmIBvgQgUtpN4AqK02dZlLuqNKXtCjx7/v0vJMZ8TLP96xAE3PIjU2oh7 WAaT8Goo8WVnKeekHGhqShnJWJhOGbO5Q/v3ydBVonnv6hAYiY6ItZmhGYtbvt7uW6xf B18BCl3rnvOKOCpXNaZ/a5Omcusk3Gla6dwG3ZPCQDg/ZbB7IjOQ/DvzQ4ghX0zjmDA2 L3LDlCONSEn05PfQlMBvrmha3FOcAM8f5ur4OWG/IH2CcgpF0nAgDMOKHTliloOfnFFZ MenKcI02aNQ79A4X5vlp6zdVfyKW+vRSca3Z3WCTfn5iU5vXY7OE786I9nYT4eXmFzhm cI0g== X-Gm-Message-State: APjAAAX0uS5jn0a3ISsvUvH+1kthn+VcqrS98Ljml5ymyk/hmJQ5tb7M 4ZolLnBm0FXF35pyk6ZeUC+BhGNHN3M= X-Google-Smtp-Source: APXvYqyojbMZpgFgThr/4tzGgV0qJcxMr4mYpv9Yibzpv1adlBjHkKc4FFIpJBQbIUs6voZ+s9cILA== X-Received: by 2002:ac8:e4a:: with SMTP id j10mr2815791qti.340.1574371717134; Thu, 21 Nov 2019 13:28:37 -0800 (PST) Received: from localhost.localdomain ([181.167.72.151]) by smtp.gmail.com with ESMTPSA id t20sm2182637qtq.55.2019.11.21.13.27.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2019 13:28:36 -0800 (PST) From: ggarra13@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Nov 2019 18:27:10 -0300 Message-Id: <20191121212710.2055-1-ggarra13@gmail.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/utils.c: 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 This patch is based on a patch by bsenftner at earthlink.net. --- 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)) {