From 000e61cc6bb56765a626a7fe88c03da94f4e4c77 Mon Sep 17 00:00:00 2001 From: waterliu99 Date: Mon, 24 May 2021 14:27:10 +0800 Subject: [PATCH] =?UTF-8?q?ts=E6=96=87=E4=BB=B6=E5=8F=82=E6=95=B0=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=94=B9=E6=88=90=E5=8F=AF=E9=85=8D=E7=BD=AE=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/JT1078.Hls/JT1078.Hls.csproj | 3 ++- src/JT1078.Hls/JT1078.Hls.xml | 10 ++++++++++ src/JT1078.Hls/M3U8FileManage.cs | 2 +- src/JT1078.Hls/Options/M3U8Option.cs | 8 ++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/JT1078.Hls/JT1078.Hls.csproj b/src/JT1078.Hls/JT1078.Hls.csproj index 27cce66..e1a4780 100644 --- a/src/JT1078.Hls/JT1078.Hls.csproj +++ b/src/JT1078.Hls/JT1078.Hls.csproj @@ -7,7 +7,8 @@ SmallChi(Koike) JT1078.Hls JT1078.Hls - 基于JT1078的Hls视频编码器 + 基于JT1078的Hls视频编码器 +ts文件路径参数名改成可配置 基于JT1078的Hls视频编码器 https://github.com/SmallChi/JT1078 https://github.com/SmallChi/JT1078 diff --git a/src/JT1078.Hls/JT1078.Hls.xml b/src/JT1078.Hls/JT1078.Hls.xml index 5777d92..c79577f 100644 --- a/src/JT1078.Hls/JT1078.Hls.xml +++ b/src/JT1078.Hls/JT1078.Hls.xml @@ -213,6 +213,16 @@ 每个ts文件的最大时长 + + + ts路径sim参数名称 + + + + + ts路径通道参数名称 + + m3u8文件 diff --git a/src/JT1078.Hls/M3U8FileManage.cs b/src/JT1078.Hls/M3U8FileManage.cs index b3604f0..87bf046 100644 --- a/src/JT1078.Hls/M3U8FileManage.cs +++ b/src/JT1078.Hls/M3U8FileManage.cs @@ -136,7 +136,7 @@ namespace JT1078.Hls { var tsFileInfo = tsFileInfoQueue.ElementAt(i); sb.AppendLine($"#EXTINF:{tsFileInfo.Duration},"); - sb.AppendLine($"{tsFileInfo.FileName}?sim={tsFileInfo.Sim}&channelNo={tsFileInfo.ChannelNo}"); + sb.AppendLine($"{tsFileInfo.FileName}?{m3U8Option.TsPathSimParamName}={tsFileInfo.Sim}&{m3U8Option.TsPathChannelParamName}={tsFileInfo.ChannelNo}"); } string m3u8FileName = Path.Combine(m3U8Option.HlsFileDirectory,$"{curTsFileInfo.Sim}_{curTsFileInfo.ChannelNo}", m3U8Option.M3U8FileName); using (FileStream fs = new FileStream(m3u8FileName, FileMode.Create, FileAccess.Write, FileShare.ReadWrite)) diff --git a/src/JT1078.Hls/Options/M3U8Option.cs b/src/JT1078.Hls/Options/M3U8Option.cs index 2c78ae2..f5bae04 100644 --- a/src/JT1078.Hls/Options/M3U8Option.cs +++ b/src/JT1078.Hls/Options/M3U8Option.cs @@ -18,6 +18,14 @@ namespace JT1078.Hls.Options /// public int TsFileMaxSecond { get; set; } = 10; /// + /// ts路径sim参数名称 + /// + public string TsPathSimParamName { get; set; } = "sim"; + /// + /// ts路径通道参数名称 + /// + public string TsPathChannelParamName { get; set; } = "channel"; + /// /// m3u8文件 /// public string M3U8FileName { get; set; } = "live.m3u8";