From patchwork Thu Mar 26 13:56:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18412 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 E736D449BED for ; Thu, 26 Mar 2020 15:57:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C433068B5D6; Thu, 26 Mar 2020 15:57:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2672968A957 for ; Thu, 26 Mar 2020 15:57:07 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id d37so2400653pgl.1 for ; Thu, 26 Mar 2020 06:57:07 -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=L+7Lhvee+ugSYMiklBVCysevzhOuBa7Lrv0/nRhl0BQ=; b=b53YEQlBkZhTq47pVLuj/MLXTvoU1LZETOeCK9YL04EarDiGcZBg+4WuH+NpXJhwSt zKj7f9bwioI0ohxIRNFeqPUOyfo3EL6NdpPhBiS2OyJhKWtfONAoi4VDkZOOyOU1rot2 cKTCKCPnjs52akU8UvGCKNq+vfUUfFUckOIKXoO+L+EGmrXWJkMXz33tjv60iACU84P9 f96t1B096/r9zScK02F9DHZDSXL41goR4zJkUfpIAcWCr+9q16FZNMD18F1uJvINzCMx oGLx8LSHAmo21kbwX5CBj253npzfmB0q6RkVM77OyE39f1zZ0H5Qv98DZflz3ieZQePG YzpA== 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=L+7Lhvee+ugSYMiklBVCysevzhOuBa7Lrv0/nRhl0BQ=; b=UZ2beoR8fu5A/RnlzvOIBEaDpf/TpDqRN3lfn/IeRZalDYnIoP98ELhz38k9TavuOn J6AqFSmJfAj2wBJHSOpS6WIfp0+vddzakfM5gkd0nm7KxijUMpWt2PgkPGMomiZN+aqx J7YD6UnSdKPUd5/3g8bIVsw5Qyc3NbYHeW/bVgFkhsgay6NHa+9qejRDaFbpmtLhHCKu JlRELXttTUEEUnMlO3H0P04B53I3cuVuIFnW3bD/btbWfGo9NAqP1AHzLGgF6sYGlIsG eiBCLlPYMf1zMbsIuNuxDzYrDKCBu9u45uXJiWZdWsY3w9e5iO8bIrq4jJlhJE1aWxpW aPow== X-Gm-Message-State: ANhLgQ2HTaqytSAGhKeyW3bsJ8w2JAziEwuPkgiExAnAM4JeAM09g7ns 0r2wI3g0kYAm59mnCd62pXFn9Gp7 X-Google-Smtp-Source: ADFU+vu/ONq9UjHkwKJL1AzYlQv/qgvIlkzFI8EpsIUp8P/7P+ZxvZfzKXmSo9IJ12ELkTh9H52l3A== X-Received: by 2002:a63:180c:: with SMTP id y12mr2737580pgl.421.1585231024901; Thu, 26 Mar 2020 06:57:04 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b16sm1762439pfb.71.2020.03.26.06.57.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:57:04 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 21:56:57 +0800 Message-Id: <20200326135700.11167-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/4] avformat/hlsenc: remove the first slash of the relative path line in the master m3u8 file 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Please testing with the following command: ./ffmpeg -y -i input.mkv \ -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ -b:a:0 256k \ -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0\ -f hls -var_stream_map "v:0,a:0" \ -master_pl_name master.m3u8 -t 300 -hls_time 10 -hls_init_time 4 -hls_list_size \ 10 -master_pl_publish_rate 10 -hls_flags \ delete_segments+discont_start+split_by_time ./tmp/video.m3u8 then cat ./tmp/master.m3u8 before: #EXTM3U #EXT-X-VERSION:3 #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" /video.m3u8 $ ./ffmpeg -i ./tmp/master.m3u8 -c:v copy -c:a mp2 ./test.mkv [hls @ 0x7f82f9000000] Skip ('#EXT-X-VERSION:3') [hls @ 0x7f82f9000000] Opening '/video.m3u8' for reading [hls @ 0x7f82f9000000] parse_playlist error No such file or directory [/video.m3u8] ./tmp/master.m3u8: No such file or directory after: #EXTM3U #EXT-X-VERSION:3 #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" video.m3u8 Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index b4c72b6e54..a0a3a4647b 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1260,7 +1260,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur } } - return media_url + base_len; + return media_url + base_len + 1; } static int64_t get_stream_bit_rate(AVStream *stream)