From patchwork Sat Jul 13 08:03:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13924 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D3307447A6B for ; Sat, 13 Jul 2019 11:10:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A764168A9A4; Sat, 13 Jul 2019 11:10:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5B0D68A110 for ; Sat, 13 Jul 2019 11:10:24 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id f25so5552010pgv.10 for ; Sat, 13 Jul 2019 01:10: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; bh=bneNfa/qROGA/eMH4fCkXVEQ4AGUlfA+GYGLbRPLJ2E=; b=r1FD8I/NX1Bq93ZsfeRt6SpL05uds0wacqMmk3ZBT0WA5y81v6ddP2H+wSrtTtb2HI NhQl54j3eZjPVCXflGSSFTMGYsnAV36LFMh2CMDr1+W2LPCYJPWu5UKOdtd5m1yBLCP9 LGxlBwrxT+XgEjT2xkW8t2KOaThZ9pdKzPvoZOicX+omRLgfUuIWuz5UwJ9NOiA7VE54 Jq59UStxjtTguHIueaWia8N+vbzz83XV281Hw1pKaGh1zoXM5FGb+WXQmvkN+MFMwD9A 2JQpIjkWQtp4lSM4yHb72g5rt8ecTGVhGdhmpduVcVlP5E+jmEBB/5FAAcW/B0OY1Wia sU6g== 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; bh=bneNfa/qROGA/eMH4fCkXVEQ4AGUlfA+GYGLbRPLJ2E=; b=JNL7P9RnYc/IqrGKbqzrmo9M/OudMTFDwU5BuvHKYfTTftVRFXm20BB9+w9K2LLRzl WsgYSEjmGfL3x8tzmwaehVeBgUy2/22b2pQt2wXuosvUsAUo0kW1Ufmk9hArsngAoH6H F5AjFsz5vhui6LEKqfeajcBK0t6xxFgtejRXk1qCKeCJb/oa1M9c3CjQE1Lw3ifKvipb +MyXs+5d0uAPfvxM3K0dYFa5ZOjXcnXIQ+DkPZo2dndr+5JQDFbhWouWwhSKHf2iXICl wO8fC3Omq3BwqQJrnEAa4JSCzRy6Aq5KMG+KIUWutQjLAHKl/2m3JHvKIaRWzlQl6sF3 QGjA== X-Gm-Message-State: APjAAAVruNTrlua58qH6J+jevJJMvH0e6FMJgSErHmh3jKuWlGi2OIhy YdiXOOH/nf3Gqmemk6L1qTq9Lcl1 X-Google-Smtp-Source: APXvYqzIB/pjuiipYYOBRu0HtPUYB1HqNONuvIEFGiJQZbh+9MVZPVi0haAcb+MOY1VcmW3UZyYdBA== X-Received: by 2002:a17:90a:e397:: with SMTP id b23mr16801664pjz.140.1563004999410; Sat, 13 Jul 2019 01:03:19 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id p67sm13867089pfg.124.2019.07.13.01.03.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jul 2019 01:03:19 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jul 2019 16:03:15 +0800 Message-Id: <1563004995-10494-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1] lavf/hlsenc: fix hls muxer time drifts from the actual clock time 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: Jun Zhao , Pavel Pilar MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix hls muxer time drifts from the actual clock time, based on Pavel Pilar's fix. fix: Ticket7986 Signed-off-by: Pavel Pilar Signed-off-by: Jun Zhao --- libavformat/hlsenc.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 4abc728..110d114 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -42,6 +42,7 @@ #include "libavutil/opt.h" #include "libavutil/log.h" #include "libavutil/time_internal.h" +#include "libavutil/time.h" #include "avformat.h" #include "avio_internal.h" @@ -2741,11 +2742,9 @@ static int hls_init(AVFormatContext *s) "Disabling 'independent_segments' flag\n"); } - if (hls->flags & HLS_PROGRAM_DATE_TIME) { - time_t now0; - time(&now0); - vs->initial_prog_date_time = now0; - } + if (hls->flags & HLS_PROGRAM_DATE_TIME) + vs->initial_prog_date_time = av_gettime() * 0.000001; // microseconds to seconds + if (hls->format_options_str) { ret = av_dict_parse_string(&hls->format_options, hls->format_options_str, "=", ":", 0); if (ret < 0) {