From patchwork Thu Oct 11 08:56:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Liu X-Patchwork-Id: 10638 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp1876586uaq; Thu, 11 Oct 2018 02:21:34 -0700 (PDT) X-Google-Smtp-Source: ACcGV63C4usCbJFXf/9G6/FrQtP5R5aJhEcM2kThi1GVmVQvVDQQpSSxciCJ68QW0MeHG0q7LWEW X-Received: by 2002:adf:eb48:: with SMTP id u8-v6mr732297wrn.22.1539249694125; Thu, 11 Oct 2018 02:21:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539249694; cv=none; d=google.com; s=arc-20160816; b=reNKsKTenZ82k4mtzolFUTFnBSZcbEb3c9N2egK+INL9kpIhbXVtOaIQ1u0hH1tKXG uLM1pizj7SxnSE1s3ide9fZ2P1gL//mEfbcxqV4YDRulWi6Hwsd4YtyowgAV9vPHbUrf wPIHhI2/SXVLXW375pcrSRVayO+r3xBTW58tbKHjR3z5KioT0Esbj0s7mBMbLN3g3C9z 9BNaq8bqu6AqD8x9Q7wWmsqy0Dnl0PkXPv0y+hC2e2poQ8vhFHTySSpbCjdOVKgp477Z LdS4V4ZHAGtsofaCVpZpfxD80gGt2a14HiCl9y8ISMRK7s5upThgclrvBmdtjvCZDgSt TYYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=8lNUENcylD4vF3Z1FOKsGGvAfxmsZp7Y1wVL7RXc+bc=; b=o0beJfwt6dTofvXA7O1F8fPZEqJRT2VMf4yJYIdFFo0oDwKrboa7pNhnRM2J+f5B8j mWZ8ZZP1hZYaM8Sm+F4OKlTC9JFR5qVht9zDnW64nTpRltxd76UtdSbe3hMrZ3wvf3B/ Zizj9opGydhJjPc4wMPsJnUb33AkNgttn03bRNc28Kb1BW+kegm+RSYGcgefErlqIeok vEK0qD9csHnLWZg1gvaV2WBEBEGYrO6V2WW3Ti+X3+J5asBlCSjhtOzWcO2GEflxgZa9 YdRUaU5FU5CmKbZAFFd98wr3BCnNPhcLU3pTrGjWu8xa/0nywbqZpsx2ol7keI0wONua Uzvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=edCjA7hK; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s10-v6si14620909wms.112.2018.10.11.02.21.33; Thu, 11 Oct 2018 02:21:34 -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 header.s=20161025 header.b=edCjA7hK; 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 sp=QUARANTINE 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 E847668A1B4; Thu, 11 Oct 2018 12:21:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16C9E680A49 for ; Thu, 11 Oct 2018 12:21:02 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id r9-v6so4091159pff.11 for ; Thu, 11 Oct 2018 02:21:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rq7pGsKsf1JIT5B8cT5VS+A0M2zE2o+Om858ydzFw5s=; b=edCjA7hKHN+dX8dBVZNsrKejrO91nkP8t5kN1PuMhwZYaiRLwtXA4Ssj1w5gXjbkHd 73PHo7d6zQ8Ngng5361gFDnRAWY+gk//Nqji+UY6LIVTzlpwWs4siavJuwtc8bBfWX7d CZk3UnfgnQkdw9sF9nbSZX9qYzCf2KWdGmwtvHYssn0X4PAOL19Wsn4jOX22/tk4JPoz BmNZlR6xEPgi5Mo8wYHgQeAJubIFY+9H/M0RcWo/nUPJiNj7RjYOPVsx36iVg4P2yN/P Kab5G+1JTmtoDar/HEwMppIq7xzxifGvdQ31Bd7iY1TNrKAg12uohS9/yOuu7WerrRiR pHvw== 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:mime-version:content-transfer-encoding; bh=Rq7pGsKsf1JIT5B8cT5VS+A0M2zE2o+Om858ydzFw5s=; b=jygL0UxBCB0nolQCzFRWzyMB8V/HLF2qpNzbyEYCLT4rzctgA5fqrlFFjfTA+AIO1u WJMlHMfNJg/hmt9A2Hgxr+mKY6iwmuA80kfrtBEtKPD8nYRb02Vsh7v7PwFxRJuuSLX7 JSVFa/eUhALM1drCHGv0uB7xc0d4yAgB73nmFB6klSCCkJIroThdHf5PiPAEvYPjts4s z3ONmUat2yKfoKPLwfkhk+8M58ag5xGZtZMAlKgj8t0tQKAzV1GIQj4EGyXVdwSHlGPk 4KxHzh9BYne717gKhdsm3DLfkCDCKlcNpP/GkrqPa+2tkkjioA5tt9ODpZH7XoO+/0nM +e9w== X-Gm-Message-State: ABuFfoiN+ZMJdBHpag0f+BC7mi9oDCCZaQ32eCaKNcGW15+YROIMbEM/ nXwYarfumeY+fWDoGjBrfVU5PGOZPb4= X-Received: by 2002:a65:5188:: with SMTP id h8-v6mr634845pgq.288.1539248240806; Thu, 11 Oct 2018 01:57:20 -0700 (PDT) Received: from localhost.localdomain ([103.20.32.163]) by smtp.gmail.com with ESMTPSA id u184-v6sm44088527pgd.27.2018.10.11.01.57.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Oct 2018 01:57:19 -0700 (PDT) From: Charles Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Oct 2018 16:56:47 +0800 Message-Id: <20181011085647.81329-5-liuchh83@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181011085647.81329-1-liuchh83@gmail.com> References: <20181011085647.81329-1-liuchh83@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avformat:hlsenc.c: fix the output's duration smaller than input's in sub-range mode. 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: Charles Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" In fmp4 & sub-range mode, the output's duration always smaller than expected, because the size of the last #EXT-X-BYTERANGE is too small. Signed-off-by: Charles Liu --- libavformat/hlsenc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 8b3a9b78f4..f8f060d065 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2380,6 +2380,7 @@ static int hls_write_trailer(struct AVFormatContext *s) if (ret < 0) { goto failed; } + vs->size = range_length; ff_format_io_close(s, &vs->out); } @@ -2388,8 +2389,6 @@ failed: if (oc->pb) { if (hls->segment_type != SEGMENT_TYPE_FMP4) { vs->size = avio_tell(vs->avf->pb) - vs->start_pos; - } else { - vs->size = avio_tell(vs->avf->pb); } if (hls->segment_type != SEGMENT_TYPE_FMP4) ff_format_io_close(s, &oc->pb);