From patchwork Fri Apr 20 04:17:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Somsak Sriprayoonsakul X-Patchwork-Id: 8519 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp221070jad; Thu, 19 Apr 2018 21:20:02 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrEZbD+1bBY27vMACDktcMf1OGb/qE38rSCT0rTCN8FetYziyKyuI746m7sWeMjkFEfMgRx X-Received: by 10.28.58.147 with SMTP id h141mr756082wma.67.1524198002121; Thu, 19 Apr 2018 21:20:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524198002; cv=none; d=google.com; s=arc-20160816; b=Z50z6g5aqD/huFmsA7h2AuS+f30Moh8TaH83R38vgblAZjjX6694E8RwEJBC0lsOC7 m1SJzUqRJXUOSn2cHhs9bPopFme8GUwRw/Ort8ejHXWfLM1JbFqC0Yx8c2HYETzGeOql eg0t7OwKtJ3LLL04Bw/O44fQQS4QzlOJQdhEh2zo+qRYbr1L11UtDwSvU9HMZ3D5Ssar jrW8FbLLA0M2Z79Vdk3cGTBwzhc6H0tI5G5Ns2o1m7O+yiCnPbAQQzJFPuVjz9KhtNRI aRnliyDE0EV1R6KXocZPcTB2RY2wOj35M6W3D/3BvJ+PPpIGul3QCFbSssOz2JoDvbsf j2Yg== 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=NX/7rwIQ4QYlrn2fQ1LPFpIM551XApCDOE8RXyfGu0U=; b=QcORFel1WVg/4oPBEbby3o4If5uEpk2NxJWCfUe7uRCvJdMrSR4aaNqo4zS3bjGTq/ 28rw4EMy8nsMXV39lFfBewZobQNuSKB5aPZvPdXnox66jeV8rPD/5bNSoet20lCWkTcx KLlPq1tftg0sb9DSjhbQa8xrH/H2SO7qJ3jZdRsjsPSJzZVrvT/69YmffBk9n27qnynN 36QaNbDSwqwhx9dF6lgUofIcUUAo9RR3fwsuhy/Ux85rSbxXhdvr4yQfx9MArrDtphkE H8D7pyQ/c4+VICbfdEYWuqjiefontG6w1TQk1Hy5lExsnsvWn8dudFeFM10tGVvJZ2Wy BkVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=s+dhYjtZ; 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 x123si462819wme.21.2018.04.19.21.20.01; Thu, 19 Apr 2018 21:20:02 -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=s+dhYjtZ; 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 E988768A121; Fri, 20 Apr 2018 07:19:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f46.google.com (mail-pl0-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9470680489 for ; Fri, 20 Apr 2018 07:19:25 +0300 (EEST) Received: by mail-pl0-f46.google.com with SMTP id 59-v6so4507408plc.13 for ; Thu, 19 Apr 2018 21:19:53 -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; bh=F8+LJFpYmRIErayNAmEuBD8xC3wfTYr2X6WlTikKpaw=; b=s+dhYjtZFyMMZlOyzaIlcXvRteWr4zFNGgpmIrBHXoNyQ3glTOIA5MKorAqdmL9vBl 5NVUHnFPD2XyW/W/NMQi5DSBdAehiQwOxWLeZYVJuNd4GVzUqZRbT8JB+kEOh9M3J2HX 8HD4Exgx9XsKXN/mVCrDlqVg1sHC8jFLxtBTZqB5WvvDOKvFwS1XUBl9SA1vbdqZRspy JQwUPwi6ricAo8Jm+hVYe5+Pjd7KwDj2lm5Or8+E424SMwCO/FBdx8gt1y5mHDKWcIuE Twd0NZI2VtlKPALQHw+AYVmUYHKdCl6AW84cDrw4bh3VbWBUj9s+i/jxCzUZ1Ofxa7fG qNuw== 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=F8+LJFpYmRIErayNAmEuBD8xC3wfTYr2X6WlTikKpaw=; b=lF6b9D35dfQ1zRjGqWgm9HxuCPFEyBaIJIFmVhlMDG8pKNyhUWFhzf4tB40jl7AmiR BL5Cxrj1EHayPsTg+7dTeNJIlS23cy1M/Q+CMuJe7JDRJNKLKtIjBpdcUpmKnlxkEZsH +T+poWX489F5X7VEr3A2ggiO8yuBo4Dr9MnpOvvEFfHff+UJk3P3rY1aDvmzgOyKMGWO aKE8sN101RWMU7Kwxq8UwUuki89OX5i40dBuvBJxotbdJbL59osh3XykHKtCJNWHaP2q NGCG/jl3CegKYRqn+XSu31/i2HNxv9Vrmr5/3fv7ZHakfJundsPPuXP6UgS+//RKBrxn 39kQ== X-Gm-Message-State: ALQs6tCUgbHh2oyTOXu4HDZU8/dsDBUyfOVw4Lx2fc5QQqS0x1ljjwdq HkCdhJnkufraXJo3GplTuRwTdWps X-Received: by 2002:a17:902:b604:: with SMTP id b4-v6mr8788169pls.109.1524197991767; Thu, 19 Apr 2018 21:19:51 -0700 (PDT) Received: from localhost.localdomain (ppp-115-87-78-245.revip4.asianet.co.th. [115.87.78.245]) by smtp.gmail.com with ESMTPSA id k83sm13000163pfg.153.2018.04.19.21.19.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Apr 2018 21:19:50 -0700 (PDT) From: Somsak Sriprayoonsakul To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Apr 2018 11:17:50 +0700 Message-Id: <20180420041750.9245-2-somsaks@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180420041750.9245-1-somsaks@gmail.com> References: <20180420041750.9245-1-somsaks@gmail.com> Subject: [FFmpeg-devel] [PATCH] Added support for unequal duration for VOD playlist 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: Somsak Sriprayoonsakul MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/hlsenc.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index c27a66ea79..b6260b262d 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1026,26 +1026,28 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, vs->last_segment = en; - // EVENT or VOD playlists imply sliding window cannot be used - if (hls->pl_type != PLAYLIST_TYPE_NONE) + // EVENT playlists imply sliding window cannot be used + if ( (hls->pl_type == PLAYLIST_TYPE_EVENT) || (hls->pl_type == PLAYLIST_TYPE_NB) ) hls->max_nb_segments = 0; if (hls->max_nb_segments && vs->nb_entries >= hls->max_nb_segments) { - en = vs->segments; - vs->initial_prog_date_time += en->duration; - vs->segments = en->next; - if (en && hls->flags & HLS_DELETE_SEGMENTS && + if( hls->pl_type != PLAYLIST_TYPE_VOD ) { + en = vs->segments; + vs->initial_prog_date_time += en->duration; + vs->segments = en->next; + if (en && hls->flags & HLS_DELETE_SEGMENTS && #if FF_API_HLS_WRAP - !(hls->flags & HLS_SINGLE_FILE || hls->wrap)) { + !(hls->flags & HLS_SINGLE_FILE || hls->wrap)) { #else - !(hls->flags & HLS_SINGLE_FILE)) { + !(hls->flags & HLS_SINGLE_FILE)) { #endif - en->next = vs->old_segments; - vs->old_segments = en; - if ((ret = hls_delete_old_segments(s, hls, vs)) < 0) - return ret; - } else - av_free(en); + en->next = vs->old_segments; + vs->old_segments = en; + if ((ret = hls_delete_old_segments(s, hls, vs)) < 0) + return ret; + } else + av_free(en); + } } else vs->nb_entries++;