From patchwork Thu May 31 22:27:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9205 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp163589jad; Thu, 31 May 2018 15:28:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI1d2kNPNW+Kn/BgQpKZlVHQYDT3UcvuonGsuGFySOOiFOBVLfhrD8w+ChnhK+EiEXkw7d6 X-Received: by 2002:adf:b710:: with SMTP id l16-v6mr6953573wre.115.1527805680290; Thu, 31 May 2018 15:28:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805680; cv=none; d=google.com; s=arc-20160816; b=QSt4qYytDgy0CKxX71YGsorbasNPPgMNnoINuFR3lUyBM3WWE+qX+xnPU6BPkQqSI7 /LHlm/lxLoykHuKmUcQp565OcQNXS/0THSSnkbz8XkYITDcQQFpBnFRd1C0Ie8y0XzW7 qfDJrhdxzVKq0SnglMF3ribEQmcNRdbavOAoE5aKv2RCLINbP6gW7KXhF73N3TKLDdwY hNLEdUpJkqaKqnEQtHeG7aldu9/206G4hTJyeyFY9Ja0Zp+acVotFAgNeaofXt25l363 JHrk5LYs35BcodKqzWuLNalVnNXy0eQBwYbaowjo3cIu3z7kgOG0DR1lfH9pqC2gPnR/ iz9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=FEqN5WXLZ376YKK7g/JXL17BcBG7xwOM0GN3jik9ci8=; b=l3Y0Mlt9kurO/WAkAfNqUMk5cFI0uO1iPmKRtGKCdELpaKNlCcegm7J8gV1Ego/AQe V59sDAhIbh5k7b7eBOpvR2R5myvDgpOru0EDmiPXJi4Is13oN4wmkdp9H9M5OrHQVxiK bv6JBpTBtVbTBRNN8z0+NLWXiR11sE6I4Bmr2TWUG4oySIiX+uyW4n1EgTAXXsrFvhU+ XQoR8/ihWVIVsJ6e1XFPY6TQIjKlCRC8JB6+8Z8hEDMoFy8IsiCCV1G31PVvZ8532dfL wpFbZdRwO1Jemsi2zi4L630TcKCKkYjPvkkoJXL+v4yY1HamJzhZ91hNI1U4R2l/zCHq LL9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=NU025U2W; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t5-v6si16803417wrp.371.2018.05.31.15.27.59; Thu, 31 May 2018 15:28:00 -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=@googlemail.com header.s=20161025 header.b=NU025U2W; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62B3968A559; Fri, 1 Jun 2018 01:26:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D7E268A567 for ; Fri, 1 Jun 2018 01:26:27 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id v13-v6so22764046wrp.13 for ; Thu, 31 May 2018 15:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lQ9FV3S87DW7kpBTMtLA9aejuhndC+dsaAK98P21cDg=; b=NU025U2WMiEoyKZ2G0gFHzCMN6EmAieTYf7u5LyJObGnHsWBbQhL4Bb0QSaRGnzxk0 1GrZB0Xtbsmup+YiLYndqZtGGvV9zlHFAWeRZ355LxH8mcs3QuxnacqI7q+3UGDPgBym jSQjiHYT4ALjoOkOtbFyeY0QYyoUbNjLtblc1bLvpFExr48sDF7BPhYgkKZgeiHMjeQy /avoBBjY0teT0mTLgXdmvpc916ZbXxz6ugc9v4NdwzlNC2Wmu/Tm+eD3/ABcaVp4GlRd /Bh1DIjb9jYeDMoXrBVyE85TtjUi8x1TG08kC8jgYUC5FpQOzZH2fOZ3sGYh/Q/YMBGn Jkzw== 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:in-reply-to :references; bh=lQ9FV3S87DW7kpBTMtLA9aejuhndC+dsaAK98P21cDg=; b=ck9YVHYAZiX+Iudm/fk/Zne1L92ya1MTTIzh2bGqknvp+3p1+kXXKgRNsdRNOh94U/ ly4OeOBZaoIptexG52oTIEB26gXHxSnP4NsEBVcamnvUY/rpF9/Hc8ukTY71vWUUuIGb z+qrLV39m2ONSETGKB39Dd5HlfYPYyDZI00zRq2QC/q+u5KQmEkKX48r5xHzKhgSsfbX 0JDeASoIw16CE7ZFNeME5cyzDvYlJ1OrCpHKWSTo3axCWiLZ+9Bb42HsPjei9Cn0eW5z Oc78LVsKlJprEwo9F6IzwpxWxRcW7311tRqTBwqV1RK/DWxmLpBp37wKMufwEGiWIw1S DTeA== X-Gm-Message-State: ALKqPwf+Ji67QYVSOt+BholpE5gzrSXv0sxOxoUzUxVWDRLmQ2npIS89 50MlJQgCyzNLsLSt/kwmibZuzg== X-Received: by 2002:adf:bbcd:: with SMTP id z13-v6mr6932023wrg.183.1527805631950; Thu, 31 May 2018 15:27:11 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id z14-v6sm414688wma.11.2018.05.31.15.27.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:27:10 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:27:02 +0200 Message-Id: <20180531222702.10236-1-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180528182836.23125-1-klaxa1337@googlemail.com> References: <20180528182836.23125-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH] ffserver.c: Add ability to stream audio-only files. 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- Change from previous patch: More natural way to check if AUDIO_ONLY_SEGMENT_SECONDS has elapsed since last cut. ffserver.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ffserver.c b/ffserver.c index 288f8a1..0278bc8 100644 --- a/ffserver.c +++ b/ffserver.c @@ -42,6 +42,7 @@ #define BUFFER_SECS 30 #define LISTEN_TIMEOUT_MSEC 1000 +#define AUDIO_ONLY_SEGMENT_SECONDS 2 struct ReadInfo { struct PublisherContext *pub; @@ -76,8 +77,9 @@ void *read_thread(void *arg) AVFormatContext *ifmt_ctx = info->ifmt_ctx; int ret, i; int video_idx = -1; + int audio_only = 0; int id = 0; - int64_t pts, now, start; + int64_t pts, now, start, last_cut = 0; int64_t *ts; struct Segment *seg = NULL; AVPacket pkt; @@ -99,10 +101,8 @@ void *read_thread(void *arg) break; } } - if (video_idx == -1) { - av_log(ifmt_ctx, AV_LOG_ERROR, "No video stream found.\n"); - goto end; - } + if (video_idx == -1) + audio_only = 1; // All information needed to start segmenting the file is gathered now. @@ -141,8 +141,9 @@ void *read_thread(void *arg) now = av_gettime_relative() - start; } - // keyframe or first Segment - if ((pkt.flags & AV_PKT_FLAG_KEY && pkt.stream_index == video_idx) || !seg) { + // keyframe or first Segment or audio_only and more than AUDIO_ONLY_SEGMENT_SECONDS passed since last cut + if ((pkt.flags & AV_PKT_FLAG_KEY && pkt.stream_index == video_idx) || !seg || + (audio_only && pts - last_cut >= AUDIO_ONLY_SEGMENT_SECONDS * AV_TIME_BASE)) { if (seg) { segment_close(seg); publisher_push_segment(info->pub, seg); @@ -150,6 +151,7 @@ void *read_thread(void *arg) publish(info->pub); av_log(NULL, AV_LOG_DEBUG, "Published new segment.\n"); } + last_cut = pts; segment_init(&seg, ifmt_ctx); if (!seg) { av_log(NULL, AV_LOG_ERROR, "Segment initialization failed, shutting down.\n");