From patchwork Thu Oct 11 08:56:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Liu X-Patchwork-Id: 10590 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp1862667uaq; Thu, 11 Oct 2018 02:05:02 -0700 (PDT) X-Google-Smtp-Source: ACcGV61v/pe18MyUGquwYmwB80i4yw2LZYhHnpITa7EjPZq7zzy3QmkxX2O7iLoJ6nIhZJVqj9fN X-Received: by 2002:a1c:1d6:: with SMTP id 205-v6mr905780wmb.151.1539248702846; Thu, 11 Oct 2018 02:05:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539248702; cv=none; d=google.com; s=arc-20160816; b=jG0/rbbUABZoy8hIwI1zjYQwPwjrmWCHuxBV3LN11JoQ1dsKQ1NiqDSMDA3p6W9yq5 Ag41hvZoy8ByHxJ7Xx7E7TB8ipRamXYGoMRn4DzwHP6ZePdqMCp1CVjjfhhVF6jNkY06 7wNrjT1wmbvbkMHIDmTl03fCPsBXRv4A1Ay7tD33J5+cdXGLYq8C1lQxnnLxUcQ34jMq t4heQffccpldW91AD7zimdd621X7itV64tjgKBi/IfrnMn6h+SGIax0pbfWSeB2KtuEe QtV5BMpQuS8y363JnzQenZxmmwG2NkF3qyf0t2wvLe9W8wpZESl87IshR8WT95F+TOPQ A4ZQ== 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:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=88NoQzde7ICbiP7iIlMTsaSEt3Kaaugxhn3L1YSFuV8=; b=hC9j0s7nnIm9XxIf+aP8m2YtjWbZELA3GgrRh0fL8VdS/NDaNLdozwM1gLU9Oo1AKg p+Q9urDrTsNdQniPg73FkJd9ijwYMS3B9YQmosYflI2Vafdbht9eOyRV937aAcEWeKWu UtBga/0lyIhX1XqjvqHH1cx2cxKZnVb4gl3g5zttwPziAs0phEeL8BqHEKj9uh7QnedD GDUQNb/NnLxQwOUmGGY9IStLELFKRmUZUYsaMvoWdo6KaXPAc71yyrrPCFmvennaOWcW V00g0wBUsfRf7yduwhOO4P6tSlYA5ns4lcotNZx30DBDm538MyWbY0+0+tIarKLsmSEA CEFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fU57Nl1P; 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 n2-v6si3665520wmn.138.2018.10.11.02.05.02; Thu, 11 Oct 2018 02:05: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=fU57Nl1P; 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 9905C68A254; Thu, 11 Oct 2018 12:04:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 870236802DB for ; Thu, 11 Oct 2018 12:04:31 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id p25-v6so3900363pli.11 for ; Thu, 11 Oct 2018 02:04:54 -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 :mime-version:content-transfer-encoding; bh=M4+D5mFpWo4EgW7n9SH/QXvTNvoWTc46TP8svlp+CEU=; b=fU57Nl1P7pDVIMAl2o6/Q6I4OGjXvWJ6z7RKWb6HSlzg60qyPQgoqSNkubHcwusDY2 Jio2aYjX8PbvNGfnuWIoqLGLMuun3hYU7dHcZbdsYExAQAoz2Qmblp5qieoDX93ZNQ0Q l04ZU+5rnRdO9KdPKF3WJR9QmY/e/JBJveogtD7zmr0Nqvr/zfb39FSyHgdfdAENxD8S PBJ8RBw/iTMWSHyIirKdj2lpuyUw/rYpk7pnWAoypi/Dq/oZBuQJB12MjozTUi9mvIdo oUjiSdX0HIQ7Rsf6Uey2Q62Nn/XW6Cn172SOCzDl/5F9w279C6y7F5D+j3PWgsJkQeUa 3YDw== 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:mime-version:content-transfer-encoding; bh=M4+D5mFpWo4EgW7n9SH/QXvTNvoWTc46TP8svlp+CEU=; b=oOP/78HgCwUzvI0xn0Y3OC2LDpCnGpxA2L3yy/lrdkgRsgTDgpJ30BAvgJuyPmLlpH S/4oXOTn2KydHkn3zWd8FG+JJLXNRDZCJcQvsrQICjDYKIwWjf/nVL96tk6+y846FMn3 Z1tn34Y4W0H7Pc+eSM4eL73TL63rOm5rqfDXWa7MwXRarV8QGlA4BdzOhK7aCiIDNm9y AdwUl0sPjn/W627rRZbLYfoTU04JRI86wgX8z+ZUoIQNp0Wqio3SYKWG/rczRuEW5Ua4 Y9XQWteOcIgUxlctguEaHm1ttkVPNfK8XXLWaNE8P1N53PtfwCWxMuZPdsPzcP6G6UpX +wEg== X-Gm-Message-State: ABuFfohbRHLMh218zoI/H3n7MAHh0mqcTqQgoqfOxqk/gajw9paNjmrv gZy2ebW5O9Sfm0GPDG1QOMq8HAbhCG8= X-Received: by 2002:a17:902:6b81:: with SMTP id p1-v6mr703552plk.162.1539248238647; Thu, 11 Oct 2018 01:57:18 -0700 (PDT) Received: from localhost.localdomain ([103.20.32.163]) by smtp.gmail.com with ESMTPSA id u184-v6sm44088527pgd.27.2018.10.11.01.57.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Oct 2018 01:57:17 -0700 (PDT) From: Charles Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Oct 2018 16:56:46 +0800 Message-Id: <20181011085647.81329-4-liuchh83@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181011085647.81329-1-liuchh83@gmail.com> References: <20181011085647.81329-1-liuchh83@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avformat:hlsenc.c: the size of init.mp4 is zero. 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: Charles Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The size of init.mp4 is zero in fmp4 mode, when the input duraton smaller than the expected segment time. fix ticket: 7166 Signed-off-by: Charles Liu --- libavformat/hlsenc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 0fd5d2a995..8b3a9b78f4 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2348,6 +2348,25 @@ static int hls_write_trailer(struct AVFormatContext *s) return AVERROR(ENOMEM); } if ( hls->segment_type == SEGMENT_TYPE_FMP4) { + if (!vs->init_range_length) { + av_write_frame(vs->avf, NULL); /* Flush any buffered data */ + avio_flush(oc->pb); + + uint8_t *buffer = NULL; + int range_length = avio_close_dyn_buf(oc->pb, &buffer); + avio_write(vs->out, buffer, range_length); + av_free(buffer); + vs->init_range_length = range_length; + avio_open_dyn_buf(&oc->pb); + vs->packets_written = 0; + vs->start_pos = range_length; + int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); + if (!byterange_mode) { + ff_format_io_close(s, &vs->out); + hlsenc_io_close(s, &vs->out, vs->base_output_dirname); + } + } + int range_length = 0; if (!(hls->flags & HLS_SINGLE_FILE)) { ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL);