From patchwork Tue Aug 2 13:24:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sebechlebskyjan@gmail.com X-Patchwork-Id: 61 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp217267vsd; Tue, 2 Aug 2016 06:37:13 -0700 (PDT) X-Received: by 10.194.58.112 with SMTP id p16mr57477801wjq.24.1470145033437; Tue, 02 Aug 2016 06:37:13 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f13si2734773wjz.114.2016.08.02.06.37.13; Tue, 02 Aug 2016 06:37:13 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F4D7689F5E; Tue, 2 Aug 2016 16:37:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 342FD689F48 for ; Tue, 2 Aug 2016 16:36:58 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id q128so30891252wma.1 for ; Tue, 02 Aug 2016 06:37:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0kqawULb7tozYBOqXKMOuwaHcKWh5A68Oe2fnmIDXkY=; b=GtgQ4q9h0rZQL61Sp2wEefq3waMvUXpeU5162uVuHuriMxDqA8BtYqEeS6vq/sGAsZ pYvi2YJmuZ5h8rOszMqt6sYG7Y14uvUMoXfKLn6cdU5KYSxCGgMNd4OPXgnmpTynU1De FUvW2LLrWj6AduFDxFdPF79/Cnr0LkDN5q5tS4Ro5oiiSY3os8800QkmlFvBQwaWugsk aYnFMsQ3HBbvNGBAJpYQNOYs3+KjH2M/xaKUrvoq4rCqX3T7uKNhGJYNGHRrodmZu1h3 +xaYFocBCtTIBO5+SLtGO/TPM+O5O4BF61ceOFEKq/Y3VVc2CIW+h1K8DDwe8qNWbB5F JSIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0kqawULb7tozYBOqXKMOuwaHcKWh5A68Oe2fnmIDXkY=; b=lUTD2ayG0ArBVjktJaQ/PYonzJ4tO1z+jLl3l8hPuln0RE32yPLBKr7ZVqfz9Eovt9 MgbqWmYyyAhg66ElOSslhilKjlDHNtxyNWX5wnGw94QvsYg6mbGcuYkawWIO3frxudOV I7nloY85UHUGJxA1pUdioIYodwYQ+5HrCUosk/SdJqd3qSD8ARGbZVnjTtogGM5ieKJM 5pryhbweTFS66qL9DmkzT6NusBrBkf3Ks5ZzHkDsuXp0qVid6WFTumzaZZnOWFsK6HDU Ranr+CCSHh1z7GoWR5y13ltEKDaQIYSghNDpsH0qRj8Viudg8e4JwZdvfNA0TXeoQC2p oTVQ== X-Gm-Message-State: AEkooutfb92N/RWjQ6Mx3co8na6XHt89e98svuh/FmMPV6CzqX8KNcCv401o0+3QqC3vOw== X-Received: by 10.194.164.9 with SMTP id ym9mr54209792wjb.78.1470144282446; Tue, 02 Aug 2016 06:24:42 -0700 (PDT) Received: from localhost.localdomain (157.174.broadband3.iol.cz. [85.70.174.157]) by smtp.gmail.com with ESMTPSA id n131sm22060902wmd.3.2016.08.02.06.24.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Aug 2016 06:24:41 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Aug 2016 15:24:21 +0200 Message-Id: <1470144262-13167-11-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470144262-13167-1-git-send-email-sebechlebskyjan@gmail.com> References: <1470144262-13167-1-git-send-email-sebechlebskyjan@gmail.com> Subject: [FFmpeg-devel] [PATCH 10/11] avformat/fifo: Add AVFMT_FLAG_NONBLOCK support 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: Jan Sebechlebsky MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jan Sebechlebsky Add support for nonblocking calls. Signed-off-by: Jan Sebechlebsky --- libavformat/fifo.c | 70 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/libavformat/fifo.c b/libavformat/fifo.c index bc8c973..efd91e3 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -25,6 +25,7 @@ #include "avformat.h" #include "internal.h" #include "pthread.h" +#include "url.h" #define FIFO_DEFAULT_QUEUE_SIZE 60 #define FIFO_DEFAULT_MAX_RECOVERY_ATTEMPTS 16 @@ -77,6 +78,13 @@ typedef struct FifoContext { * from failure or queue overflow */ uint8_t restart_with_keyframe; + /* Whether termination was requested by invoking deinit + * before the thread was finished. Used only in non-blocking + * mode - when AVFMT_FLAG_NONBLOCK is set. */ + volatile uint8_t termination_requested; + + /* Original interrupt callback of the underlying muxer. */ + AVIOInterruptCB orig_interrupt_callback; } FifoContext; typedef struct FifoThreadContext { @@ -110,6 +118,16 @@ typedef struct FifoMessage { AVPacket pkt; } FifoMessage; +static int fifo_interrupt_callback_wrapper(void *arg) +{ + FifoContext *ctx = arg; + + if (ctx->termination_requested) + return 1; + + return ff_check_interrupt(&ctx->orig_interrupt_callback); +} + static int fifo_thread_write_header(FifoThreadContext *ctx) { AVFormatContext *avf = ctx->avf; @@ -448,6 +466,8 @@ static void *fifo_consumer_thread(void *data) static int fifo_mux_init(AVFormatContext *avf) { FifoContext *fifo = avf->priv_data; + AVIOInterruptCB interrupt_cb = {.callback = fifo_interrupt_callback_wrapper, + .opaque = fifo}; AVFormatContext *avf2; int ret = 0, i; @@ -458,7 +478,8 @@ static int fifo_mux_init(AVFormatContext *avf) fifo->avf = avf2; - avf2->interrupt_callback = avf->interrupt_callback; + fifo->orig_interrupt_callback = avf->interrupt_callback; + avf2->interrupt_callback = interrupt_cb; avf2->max_delay = avf->max_delay; ret = av_dict_copy(&avf2->metadata, avf->metadata, 0); if (ret < 0) @@ -543,7 +564,7 @@ static int fifo_write_packet(AVFormatContext *avf, AVPacket *pkt) { FifoContext *fifo = avf->priv_data; FifoMessage msg = {.type = pkt ? FIFO_WRITE_PACKET : FIFO_FLUSH_OUTPUT}; - int ret; + int ret, queue_flags = 0; if (pkt) { av_init_packet(&msg.pkt); @@ -552,15 +573,21 @@ static int fifo_write_packet(AVFormatContext *avf, AVPacket *pkt) return ret; } - ret = av_thread_message_queue_send(fifo->queue, &msg, - fifo->drop_pkts_on_overflow ? - AV_THREAD_MESSAGE_NONBLOCK : 0); + if (fifo->drop_pkts_on_overflow || (avf->flags & AVFMT_FLAG_NONBLOCK)) + queue_flags |= AVFMT_FLAG_NONBLOCK; + + ret = av_thread_message_queue_send(fifo->queue, &msg, queue_flags); + if (ret == AVERROR(EAGAIN)) { - uint8_t overflow_set = 0; + uint8_t overflow_set; + + if (avf->flags & AVFMT_FLAG_NONBLOCK) + return ret; /* Queue is full, set fifo->overflow_flag to 1 * to let consumer thread know the queue should * be flushed. */ + overflow_set = 0; pthread_mutex_lock(&fifo->overflow_flag_lock); if (!fifo->overflow_flag) fifo->overflow_flag = overflow_set = 1; @@ -588,11 +615,22 @@ static int fifo_write_trailer(AVFormatContext *avf) av_thread_message_queue_set_err_recv(fifo->queue, AVERROR_EOF); - ret = pthread_join( fifo->writer_thread, NULL); - if (ret < 0) { - av_log(avf, AV_LOG_ERROR, "pthread join error: %s\n", - av_err2str(AVERROR(ret))); - return AVERROR(ret); + if (!(avf->flags & AVFMT_FLAG_NONBLOCK)) { + ret = pthread_join( fifo->writer_thread, NULL); + if (ret < 0) { + av_log(avf, AV_LOG_ERROR, "pthread join error: %s\n", + av_err2str(AVERROR(ret))); + return AVERROR(ret); + } + } else { + ret = pthread_tryjoin_np( fifo->writer_thread, NULL); + if (ret == EBUSY) + return AVERROR(EAGAIN); + if (ret) { + av_log(avf, AV_LOG_ERROR, "pthread_tryjoin_np error: %s\n", + av_err2str(AVERROR(ret))); + return AVERROR(ret); + } } ret = fifo->write_trailer_ret; @@ -603,6 +641,16 @@ static void fifo_deinit(AVFormatContext *avf) { FifoContext *fifo = avf->priv_data; + if (avf->flags & AVFMT_FLAG_NONBLOCK) { + int ret; + fifo->termination_requested = 1; + ret = pthread_join( fifo->writer_thread, NULL); + if (ret < 0) { + av_log(avf, AV_LOG_ERROR, "pthread join error: %s\n", + av_err2str(AVERROR(ret))); + } + } + if (fifo->format_options) av_dict_free(&fifo->format_options);