From patchwork Mon Jul 9 09:12:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 9653 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp2283266jad; Mon, 9 Jul 2018 02:12:55 -0700 (PDT) X-Google-Smtp-Source: AAOMgpel9MLQD08b5FY8FtTP8bE1T99yDefgEV0HLiRvsn/7SbIwOyTe1sJoE8HA/fDb3AyJvYG5 X-Received: by 2002:adf:8162:: with SMTP id 89-v6mr13483452wrm.192.1531127575056; Mon, 09 Jul 2018 02:12:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531127575; cv=none; d=google.com; s=arc-20160816; b=nHubFNoGzCrda1y3yT0pGKRnQOajsDI+kcCjV/kd6tYTyTLvn3xgHu7LfWFu65JlBk 1bY6vFt7/lEOoP35vQszNmB+69yFZfKgjkB3kCgNtijUgdcjhOB68S97C5vwH4I4uHJx wp/frCSDYrfYMFiPvO5jjYYiBT3dQP/qhu1D5k+fHJiUfCzvjgI9+48YMODDRoIwDJuq cn6GDuxw+79gdiE3+rhnNI0yy3ewQz/7Aad73lLNQOMmfBYZfUZCm4WW6JIIvMycC2Eb Ilj5k0wVVhLspTMvSu/CEf7/sjgyE38gt/mS1rKd2QUJCi4BVINLZ9rielNbas3DlAJl 4O7w== 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:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=RtRYW5FrkTaaekrBjjst9AY66MJ1bVx2tyCYalekZ90=; b=CZBAIeCgGk45DjY9rTUFl0x31VrRxUDSUfjXOpdzhu6eaohgWfiRNUIALoGa1ex3Pq OHVnpM5J+yeyqaBBzwV87wI52CFSfNecTsUhjoEoj2Qyfu7N1SSVqfrE8YuRQs4Mpf56 T01GpLME5crzZ/T38KSojuoY8rvHkcrJkforyERb6Z0bLIYGnHjgypZgBVZxJwNYH0K4 wG5B4ozSYo03JjbhU6PlZ429wDEMVoaipeq09bax2/g3KayMei7WMJ/HZPSPkVhHtNmP sRmf1FYUuFWUuj0PXH8aWLd1WqPiOuHWeujI0ntAD3LVum3XFQYCb0MYNl1eHdck6HYD a0sw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q18-v6si11567130wrj.213.2018.07.09.02.12.54; Mon, 09 Jul 2018 02:12:55 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1620E68A358; Mon, 9 Jul 2018 12:12:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 606BC689724 for ; Mon, 9 Jul 2018 12:12:40 +0300 (EEST) X-QQ-mid: bizesmtp4t1531127559tjrnpgae3 Received: from localhost (unknown [121.69.97.6]) by esmtp4.qq.com (ESMTP) with id ; Mon, 09 Jul 2018 17:12:37 +0800 (CST) X-QQ-SSF: 01100000002000F0FLF0B00A0000000 X-QQ-FEAT: AB8/+U/WO6FZmhzVgkxb1TlY/W2ftwIleQZte0fgtw2FDIFoxOWy+FL+mAy7z ojRZ24zISTSS46b14Z2qY3zUDWUJAQ06/O69auEVlWgHb6VG9eYO3rI7NddF6rYQXwh8Vc1 rvYIaWWiHFLojnatY3YIZplcWTtKr+tHYq0gufOfvyVrpgZE40YF6IJW1qx2AlkaUhVcR3u vJt2JLKEP4p3ujiDCKj+15dYzihUaia/36KxQXSmXxFbP/PiNkqFo0neGe30H5parW5raH4 wqoUP23GPnclJIewwGySLvJBzKc+O4Bi7hVg== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Jul 2018 17:12:31 +0800 Message-Id: <20180709091231.92133-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: improve compute after_init_list_dur 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix ticket: 7305 vs->sequence - hls->start_sequence - vs->nb_entries is the after_init_list_dur fragment numbers fix the wrong compute way vs->sequence - vs->nb_entries Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 2268f898b0..35a26e8875 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2178,7 +2178,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (vs->sequence - vs->nb_entries > hls->start_sequence && hls->init_time > 0) { /* reset end_pts, hls->recording_time at end of the init hls list */ int init_list_dur = hls->init_time * vs->nb_entries * AV_TIME_BASE; - int after_init_list_dur = (vs->sequence - vs->nb_entries ) * hls->time * AV_TIME_BASE; + int after_init_list_dur = (vs->sequence - hls->start_sequence - vs->nb_entries ) * (hls->time * AV_TIME_BASE); hls->recording_time = hls->time * AV_TIME_BASE; end_pts = init_list_dur + after_init_list_dur ; }