From patchwork Sun May 8 01:17:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 35685 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2363973pzb; Sat, 7 May 2022 18:18:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIoC+uAnedyPVskWp8B/iC3pgYsPWei2L0l9HlDiJ6LxxvQEEmHoWHKeYH2L/1lkcjI9c7 X-Received: by 2002:a05:6402:5c9:b0:420:aac6:257b with SMTP id n9-20020a05640205c900b00420aac6257bmr10650450edx.128.1651972715804; Sat, 07 May 2022 18:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651972715; cv=none; d=google.com; s=arc-20160816; b=nTXOoLvFPrglsXroEEc2AhMQwTKNFJ4ladAC/sCsRxnPk4E6x9wlVXhcZvTNMuhe9E uMshKQTg0Kawj8JdRJs1XMrbWnfg/YGJzF0ox7ACrrX+eRUyaKa5LEaqoaALHn/v63NZ V6YPnhFFG1bE595ypX0A9CmqHEzlE1aA/6JbtZX80C0veNdKbv6SHUIgtpGDAbWe3Kkn BNVVClH+LzPMxyNUieIi+Cd2FDHz0lsx1tPYapeyYP8slw6moShwxyjA+TzgpmcPdzij HGBkoLn1huvW1coP2TNfail/e1VFc7UXYoZrF9mIEoMsaSvu/wWlbSHucTnKdc1ii97e tZgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=KbbcdCJ8KtQuHaTDNtZbvUL1zpKQPlX2GXDyKRg7eyg=; b=fAAjxEJakje+rcHUSlCkWaPv8eHVrubiVQOZQqHI9WMR3zvQr616EiyxOxSoT1Q+Hf mqB4xBenDlHoSY2R4Q72303eHOEBgCmXp+I8hF9IWuMXaCjS0u945W5wHQifEGtOllEl LtNsypWAXeCZImpqGzmbp+zKREAZAAgA08MU5oechEQ3d+5UP4NBSyk61N3DVDxSL9zM Cype3S2MyxRLY+wreVf0Q5iWcF5cRRlIr+ZLrf2oIQeNAwyEDPGmtZjK/cFSHDd42+/F 1C7Cdy9fGMVemts45TyfAzJRbLojX9jLnJJapSYuk0O+mYcnuRZNg8kSR2wL4OUIzNax mI6g== 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 t18-20020a1709067c1200b006f39b748c48si9192294ejo.229.2022.05.07.18.18.34; Sat, 07 May 2022 18:18:35 -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 2A81268B37A; Sun, 8 May 2022 04:18:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg.qq.com (smtpbg136.qq.com [106.55.201.188]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0422D680CB2 for ; Sun, 8 May 2022 04:18:23 +0300 (EEST) X-QQ-mid: bizesmtp87t1651972697tdirpvnh Received: from localhost ( [114.245.19.167]) by bizesmtp.qq.com (ESMTP) with id ; Sun, 08 May 2022 09:18:16 +0800 (CST) X-QQ-SSF: 01100000002000Z0Z000000A0000000 X-QQ-FEAT: BsQpu45j/u1j8v3sK4CmG/Khn3wJP28ApLVK5OiFl0DnmvajDawhpEITaEXoz vxTS1eqM4zyHh0vFkei/uCLZ0FPfK4PRswL+b9vRk+R5o0UeW5ovQxo99u0QtHqU6MluHd7 9X6d+yQnfKbwH1NAi/vbNYHpjei7JUuJWKS/hJbv+pcWPqCX81KX5HAzaUA/hzPfpduamm5 hiYdz9QX7nBtyRwWlXTLk/29bre7d8OwA8RUHqrDntN4GUmbcBQYc1jBzJxgGXCZ+ZRKgg6 rkhapxBRBRHpZOjiizyhEVYLGkP6wCYFaJ0R4vLGf3b7i9KrFLw2lqC3luwOqGZzhwAA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 May 2022 09:17:21 +0800 Message-Id: <20220508011722.4072-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgspam:qybgspam7 Subject: [FFmpeg-devel] [PATCH v2 1/2] avformat/hlsenc: check discont_program_date_time before use it in parse_playlist X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Z++UUzMevbHa In parse_playlist, the discont_program_date_time should be used after EXT-X-PROGRAM-DATE-TIME tag parsed. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index d2b8215dff..b9f79e30d8 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1288,8 +1288,10 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs new_start_pos = avio_tell(vs->avf->pb); vs->size = new_start_pos - vs->start_pos; ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size); - vs->last_segment->discont_program_date_time = discont_program_date_time; - discont_program_date_time += vs->duration; + if (discont_program_date_time) { + vs->last_segment->discont_program_date_time = discont_program_date_time; + discont_program_date_time += vs->duration; + } if (ret < 0) goto fail; vs->start_pos = new_start_pos;