From patchwork Fri Mar 23 22:42:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 8130 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp948003jad; Fri, 23 Mar 2018 15:43:12 -0700 (PDT) X-Google-Smtp-Source: AG47ELsqZUarMtjbmUuCUSf4g48EoC/I/Lcrw3SQzAs0ffEr9u8paTolG+2d+ExKJdF5VefWNW7o X-Received: by 10.28.69.133 with SMTP id l5mr9032825wmi.152.1521844992857; Fri, 23 Mar 2018 15:43:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521844992; cv=none; d=google.com; s=arc-20160816; b=FoZwBp8J4YtaC4X8V6L2e41myGEDu4yWJy3ulKoqxoQ/4Dnwv76dt1zOVq3IL7k58C HJ+WqUxm9M3Gyrxzn1FLoLjz2xcHN7eKfcMJ35BUI/wniJCNP6H/XKPvgKeu+KNLcmm3 EFLfZj7GkW02GtGkM7ETZ/k/mMXY78Yih6hgEnQHpsJMXJ0gmuA1G7V3Li29BM0st23v +LqjCYg38/8HB+zftR21gYwA09yvH0qpyy7j6+M7pH9NPEc/00ruPK3nMhcYTKSD0JzV Qao8c3SAmbSuM9won7Ap7R5psF5qFTOPT4fJQIVJBzhO03uRgtE1ukxUCTcd7nn+M6sG Tgpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:arc-authentication-results; bh=MESkI501kCVSXNznAYKhEC2KMyKCbZ2Adbq5PqYmzI4=; b=KAcNF+aTdxR3Op/zyR1mzdC5vK0BKbpZYcAn+yz+GtunbaQLYBEWIC/1hFssJncjsg tTwQ4asmUyKrYAdE3rfs4RDgppOBogpo0rDz4RiY/RfPeQFrcxbfNjTvePoaEXRkC+c9 J/jBD856acxQxc4T6BLG1PMeGwKpU59cE5FUT3y8RwFVv+Q/RXwAmfyjFYSiSLuTFtgw OvZyiVrFkgYPFihtaV9GA0OtZwf/pB2EcO82s6RA3++5dkMO0rPAWr5MYoophPQEIqej QFNwYryrb7Emh8qFF4EEurbd2j+q/5JWIlgoezz7IyKaFyHkYnSv4rCvzaIrU6J4hHO+ euZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UKbOJqbI; 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 w5si6548193wmw.170.2018.03.23.15.43.12; Fri, 23 Mar 2018 15:43:12 -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=UKbOJqbI; 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 13FBB6898A7; Sat, 24 Mar 2018 00:42:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F3A46883E8 for ; Sat, 24 Mar 2018 00:42:40 +0200 (EET) Received: by mail-lf0-f66.google.com with SMTP id o102-v6so20437633lfg.8 for ; Fri, 23 Mar 2018 15:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PYoooGi9y1nf/jVTi0tWGtJeJi5bbZdytck+6Yo4K9U=; b=UKbOJqbI70bZBxA8FsF9CckASlhOwo7QP5Y9g1qaX9Rbjbt3voiqErJa/aQla5oso2 BTYW5XZ46VU1E9LLmcDry1AWIEglb8C3s4RAHuIi27KBLvMgAdt89UKFuQ7f+MsSwEDd SxcMDJn5IyL2PA1eXT2rjwBz9v25YtN+8lwWTbitlwr6Qo9eQxfAWZFGbhYGraiqX96k VhGgr0D0tYcKN2oH96M+ZfGyzQrl88m5c7wy5DPpYGaIRwqQ3yjsfmxgby2U2TL9FTt1 blDznTle3w/T+pBqDc0F2NWO3cpfRHHdI/usyw3uvPxdkeYSsq5lzbVL97a9j2yKNLjz lTRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PYoooGi9y1nf/jVTi0tWGtJeJi5bbZdytck+6Yo4K9U=; b=FwarMHqNoZvoHjRURRhQ3JHlvkxCz9XOm7gEFSx/97KAOTmuTVaN0fILFmeGOn+XX4 plVSOm1xbDAt1j3WV7lPVn2kP/YrgqCDokINRqxryj8wmEa2t37unzFNebUSDJ74W6o7 MzaBL+pID1+zR1fKLH2N0qFIvIFQF+5N7emkSTbxjL7nPgrtNgzvGlvS0SpbezVWZdox 4SrSNz5eYWszqo1OSFvh22XfPG8RA134PfAjMiq8SmIJ74ZwdP2q2wQ7NXbpu6cnZYX6 c/Vz6t7phOwVH/Pyf4/9HS6YzAJDC3tQyBkWUFHp721EH4kYEpxoRJpRbxMebMSDSbUQ 4MbQ== X-Gm-Message-State: AElRT7EM4HMeN6RN4FNfFOpfZ/GmErPwFI0ES4GtYC5CnkYZhy6fRDTR lwQ5lRPbgPw8bEuh4uh8XAIcv9nL X-Received: by 2002:a19:4f0a:: with SMTP id d10-v6mr21360939lfb.134.1521844975903; Fri, 23 Mar 2018 15:42:55 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id s1sm394264lji.92.2018.03.23.15.42.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Mar 2018 15:42:54 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Mar 2018 00:42:51 +0200 Message-Id: <20180323224251.29626-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180323224251.29626-1-jeebjp@gmail.com> References: <20180323224251.29626-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] hlsenc: set target duration always exact or longer than max segment duration 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jan Ekström Follows the RFC with floating point durations. F.ex., 5.005 => 6 Signed-off-by: Jan Ekström --- libavformat/hlsenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 07569dbff1..ecb581acb9 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1386,7 +1386,8 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) for (en = vs->segments; en; en = en->next) { if (target_duration <= en->duration) - target_duration = lrint(en->duration); + /* Target duration has to always be exactly or longer than any segment */ + target_duration = ceil(en->duration); } vs->discontinuity_set = 0;