From patchwork Thu Jun 28 00:51:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9541 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1479816jad; Wed, 27 Jun 2018 17:53:14 -0700 (PDT) X-Google-Smtp-Source: AAOMgpexhIrzMYSDFdTFaO6cR0EfSnMm7v+lPUIvs9YqwTjKC3VEE5g/Wv5rud0rHKOvSx1plRIn X-Received: by 2002:a1c:c7c3:: with SMTP id x186-v6mr6840619wmf.39.1530147194345; Wed, 27 Jun 2018 17:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530147194; cv=none; d=google.com; s=arc-20160816; b=A/GGYuZ3GQ84fmZ9jtVYV7G776Ah4z7udDnev42KAoWJGYKcmqaDEACb/0R3bprY1+ czjtBE7syBNDC//3a90BcTn3w59c5NdoWlN2v8koydysfAxY/E5xFbmFCXYY2+wcnuRL oPdnJZa2uClrZR3FbEgKRgKiQ0mPwCCfCVKq0/ZcUtoTbcbvc6Y49w0CZCIi9iqfA1Pn k+HjHKd2g7KBY1m0LG+c2hcut8IG7veGQAG0BaN2Kkjc/K87gDgjSMBjYsQQPvcZgM5e zERiyZajpRq6TCvmUtB8Yl3a83ZCYJ70MdKplEMGAKZSKaYVzBGtjWHXVzc27oCBaPOr LWRw== 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=xrIJE7ke0vNwwanL+VMrmo4IlKO1C51x794PuubNn6A=; b=OCBxN8Di1a13QOixN+s1lo/kgqhNpn9KFcQpU5o5YQFJZNPFXyMb9Kh4+AS+ZHz7cb NH96+7mjpn2S5ut50YBQo1fo6CBAd0lLby1hyR/K+4ZtbrWjkLlhz3Sde6722/rjHAoQ aobuwv6QKKnbA6ziZBA1JZDUt8ZxXNwONaetf3pgxmW8UpuHdfo+iMqib6ZN77zsbKML CfgyPB8bh1xULIVZkmn52/dLL0+HvFuMhUwuiveAqf7+InRGq2e+zb+npm1atol0Jg+L VNi4vEudbcAZDTVXWG2YguNhAONbqKRNjv9+HVULKmAfpyq9M3hT/g+O2Wmj4lHyGdZ3 nfUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=YyTgtE+s; 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 u9-v6si4844732wrp.39.2018.06.27.17.53.14; Wed, 27 Jun 2018 17:53:14 -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=YyTgtE+s; 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 8C0D868A59C; Thu, 28 Jun 2018 03:51:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5095068A599 for ; Thu, 28 Jun 2018 03:51:44 +0300 (EEST) Received: by mail-wm0-f50.google.com with SMTP id z6-v6so19402148wma.0 for ; Wed, 27 Jun 2018 17:51:45 -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=fwqJ2oT/nKaEIVIiZToQ83tc2IybBNcsOXjprfeTEx0=; b=YyTgtE+sC99aDHqYmPVcYTltrRcS+zX2nTYL9yBX9L/mgulrVhCryULp3VqLQ8O2ze EiZnRicLGY/nzmygRAjWyfxlgHX+etAzrfhlY4RaHh/It0Ow43PthEHU9T3QTTpsEgy5 56WHtzepMunseG0pl6VQrqisrnadlCSoSDSVO4WFh+3S1Qf0hnIURZXIhxkPsR3ZMnE3 WEogAJu+R9K8ypoNZ/aPgpwt88Skf+KJksLcGmziOf97a7l8mOKuUp3uFBFEL3c3nmjw wWKB97eOFNddCBw6xD/KHesF4DmXLsSQjNqZXGtzQRnWiDaoyCcfVQcI6YSZDwfLbqUm YYVA== 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=fwqJ2oT/nKaEIVIiZToQ83tc2IybBNcsOXjprfeTEx0=; b=CqgR5W9WmVyw15Q39Hnw6S5KODWknyTQp6s3xD4dWZx2LZfCq6mcM9syB56nM1bNPe 94vQK3BLVm00JqmuLUiYRnLiWs470k9HIBpIB6TX3rLONSlBAhZZeHJITZIwtGwOe/st YAG37UbHE7x88eVxYlAcZeoOY5FEn0F8S2K4LPQRw/iQgTbwATNujkc5YKE3h6yqX1Mk 0kE8LDyF8s4upCxKZeBqVH2zg/9iciMFp5EC+B7L5J87bt2AGwU1FMNd4JNj91cus0jS 1F8Kf1C5zZ9b6GGPmnW6fu5005fCdBOSBGE6hIznoTqnKc7KW+bUVqMDUOtigK5tLR4+ XuUA== X-Gm-Message-State: APt69E1Grw70Eve9x+lhd+TVE6Wdkc5meEigOO3e2Et+DRL2csiuy0py eVjWRG29Pqd7hrheQom6yzrjlw== X-Received: by 2002:a1c:f009:: with SMTP id a9-v6mr6592841wmb.104.1530147104748; Wed, 27 Jun 2018 17:51:44 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id a9-v6sm1363017wrq.1.2018.06.27.17.51.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 17:51:43 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jun 2018 02:51:15 +0200 Message-Id: <20180628005117.18902-16-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628005117.18902-1-klaxa1337@googlemail.com> References: <20180628005117.18902-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 15/17] ffserver.c: Improved timestamp handling. 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 --- ffserver.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/ffserver.c b/ffserver.c index 91ad29a..38f10b7 100644 --- a/ffserver.c +++ b/ffserver.c @@ -86,7 +86,7 @@ void *read_thread(void *arg) int video_idx = -1; int audio_only = 0; int id = 0; - int64_t pts, now, start, last_cut = 0; + int64_t pts, pts_tmp, dts_tmp, now, start, last_cut = 0; int64_t *ts; char playlist_dirname[1024]; char playlist_filename[1024]; @@ -223,13 +223,8 @@ void *read_thread(void *arg) pkt.dts = 0; } - pkt.pts = av_rescale_q_rnd(pkt.pts, in_stream->time_base, tb, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - pkt.dts = av_rescale_q_rnd(pkt.dts, in_stream->time_base, tb, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - pkt.duration = av_rescale_q(pkt.duration, in_stream->time_base, tb); - pkt.pos = -1; - - // current pts - pts = pkt.pts; + // current pts in AV_TIME_BASE + pts = av_rescale_q_rnd(pkt.pts, in_stream->time_base, tb, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); // current stream "uptime" now = av_gettime_relative() - start; @@ -240,13 +235,6 @@ void *read_thread(void *arg) now = av_gettime_relative() - start; } - if (info->pub->stream_formats[FMT_HLS]) { - ret = av_write_frame(ofmt_ctx[FMT_HLS], &pkt); - if (ret < 0) { - fprintf(stderr, "Error muxing packet\n"); - break; - } - } if (info->pub->stream_formats[FMT_MATROSKA]) { // 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 || @@ -267,21 +255,27 @@ void *read_thread(void *arg) seg->id = id++; av_log(NULL, AV_LOG_DEBUG, "Starting new segment, id: %d\n", seg->id); } - + dts_tmp = av_rescale_q_rnd(pkt.dts, in_stream->time_base, tb, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); ts = av_dynarray2_add((void **)&seg->ts, &seg->ts_len, sizeof(int64_t), - (const void *)&pkt.dts); + (const void *)&dts_tmp); if (!ts) { av_log(seg->fmt_ctx, AV_LOG_ERROR, "could not write dts\n."); goto end; } ts = av_dynarray2_add((void **)&seg->ts, &seg->ts_len, sizeof(int64_t), - (const void *)&pkt.pts); + (const void *)&pts); if (!ts) { av_log(seg->fmt_ctx, AV_LOG_ERROR, "could not write pts\n."); goto end; } + pts_tmp = pkt.pts; + dts_tmp = pkt.dts; + pkt.pts = av_rescale_q_rnd(pkt.pts, in_stream->time_base, seg->fmt_ctx->streams[pkt.stream_index]->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); + pkt.dts = av_rescale_q_rnd(pkt.dts, in_stream->time_base, seg->fmt_ctx->streams[pkt.stream_index]->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); ret = av_write_frame(seg->fmt_ctx, &pkt); + pkt.pts = pts_tmp; + pkt.dts = dts_tmp; if (ret < 0) { av_log(seg->fmt_ctx, AV_LOG_ERROR, "av_write_frame() failed.\n"); goto end; @@ -312,6 +306,8 @@ void *read_thread(void *arg) AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); pkt.dts = av_rescale_q_rnd(pkt.dts, in_stream->time_base, ofmt_ctx[FMT_HLS]->streams[pkt.stream_index]->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); + pkt.duration = av_rescale_q_rnd(pkt.duration, in_stream->time_base, ofmt_ctx[FMT_HLS]->streams[pkt.stream_index]->time_base, + AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); ret = av_write_frame(ofmt_ctx[FMT_HLS], &pkt); if (ret < 0) { @@ -419,10 +415,11 @@ void write_segment(struct Client *c) pkt.pts = av_rescale_q_rnd(seg->ts[pkt_count+1], tb, c->ofmt_ctx->streams[pkt.stream_index]->time_base, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); + pkt.pos = -1; pkt_count += 2; - ret = av_write_frame(c->ofmt_ctx, &pkt); - av_packet_unref(&pkt); + ret = av_interleaved_write_frame(c->ofmt_ctx, &pkt); + //av_packet_unref(&pkt); if (ret < 0) { av_log(fmt_ctx, AV_LOG_ERROR, "write_frame failed, disconnecting client: %d\n", c->id); avformat_close_input(&fmt_ctx);