From patchwork Sat Dec 17 07:57:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Nagy X-Patchwork-Id: 1842 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp219021vsa; Sat, 17 Dec 2016 00:04:11 -0800 (PST) X-Received: by 10.28.215.6 with SMTP id o6mr5979342wmg.5.1481961851660; Sat, 17 Dec 2016 00:04:11 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h132si7162076wmd.145.2016.12.17.00.04.10; Sat, 17 Dec 2016 00:04:11 -0800 (PST) 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; 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 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 962B5689BDC; Sat, 17 Dec 2016 10:04:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f175.google.com (mail-io0-f175.google.com [209.85.223.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8120689BAF for ; Sat, 17 Dec 2016 10:03:54 +0200 (EET) Received: by mail-io0-f175.google.com with SMTP id 136so116226813iou.3 for ; Sat, 17 Dec 2016 00:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=qpxfl+Jxy++kUX5E9gPGHNtZ77yMiVBu9z7R4ggIJng=; b=u/Sduo3rSPhxnTauXZBREZYgfMBxGiZfmLyxAcZKcsplowMNcZM2sjzFjaaIj4MbjI +DVZxVoWxzNx0mmtZ5pC2c6xhg0CcsLHuaPefr/ZTS3kc5QL99H+mqnUWYsWjwA0wAEQ MyO2nO6aO1gHaVO85LbP2BneQPllmNA7lHlAwljOQWfNGSYqvS+FM1lu/ae38jPfsFjV H04nz+BGG7ISx4r1FWx4pL+iYGa7MXeZ/7O4uKavwP1pKppZTU048cpm6uEb9vBQUZvc 9ZFPvu90K1szM9mZJgkVDO4ydEJpSTpwLqXn7Jq7pInKC+HnrXSmbg5ShW8dl2eY5Nn5 qdzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=qpxfl+Jxy++kUX5E9gPGHNtZ77yMiVBu9z7R4ggIJng=; b=flP7tfPO9XyY4VTNPbUamGGVXQqQlDDKbfYhT6PDUo55ubNY35OI4OpGwLOrVg/VNX OwRkGZdk5wurebLaM8yaGS4AvrepMYHjvp35qOxAC6EBjjXEIkqYN8vacDf270MxlZCH aNu8DaCEREX+pb/mb9+rDXXi5Xs2gnYwRMOhHyEsirRwyT9zO/FXiuDaU5lyIFdSVFN7 bI7EaIDcLm73RAf1ZFS+Xf8cnkN56/ZYJBPOMXLyOVYG/DdXRj0YoBFQKi8TslUfGOYm hZda8c3EYBY3dPrk7bZvyRJ9e2Kpj9enwO1cyMZylcjPR4vzGoSLMJQjCtiYgLsIVm5U NmtA== X-Gm-Message-State: AIkVDXIkoucCmNgNDIOqWkPgfTC9MMd1K+Vie11gsr49dv1QSxO7vNFqodELcWYQfTmNCs54taRoz75qOQ48vA== X-Received: by 10.107.11.161 with SMTP id 33mr6866679iol.210.1481961473548; Fri, 16 Dec 2016 23:57:53 -0800 (PST) MIME-Version: 1.0 Received: by 10.64.68.37 with HTTP; Fri, 16 Dec 2016 23:57:53 -0800 (PST) From: Robert Nagy Date: Sat, 17 Dec 2016 08:57:53 +0100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] Fig bug when incrementing initial_prog_date_time when 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 8b7499f6ddb32bd1f9ee5f2413bf30664af58799 Mon Sep 17 00:00:00 2001 From: Jesper Ek Date: Wed, 7 Dec 2016 15:56:33 +0100 Subject: [PATCH] Fig bug when incrementing initial_prog_date_time when removing segments initial_prog_date_time shouldn't be adjusted when deleting segments from disk, but rather when segments are removed from the playlist. --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) !(hls->flags & HLS_SINGLE_FILE || hls->wrap)) { diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index acf3a30..d03cf02 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -185,7 +185,6 @@ static int hls_delete_old_segments(HLSContext *hls) { segment = hls->old_segments; while (segment) { playlist_duration -= segment->duration; - hls->initial_prog_date_time += segment->duration; previous_segment = segment; segment = previous_segment->next; if (playlist_duration <= -previous_segment->duration) { @@ -414,6 +413,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double if (hls->max_nb_segments && hls->nb_entries >= hls->max_nb_segments) { en = hls->segments; + hls->initial_prog_date_time += en->duration; hls->segments = en->next; if (en && hls->flags & HLS_DELETE_SEGMENTS &&