Kieran/zap-stream-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use source playlist

Browse Source
This commit is contained in:
Kieran
2023-12-11 13:18:50 +00:00
parent b75bea89e6
commit 3998db8ea1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
NostrStreamer/Services/Clips/ClipGenerator.cs
View File

@ -1,5 +1,6 @@
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using FFMpegCore; using FFMpegCore;
using NostrStreamer.Database;
namespace NostrStreamer.Services.Clips; namespace NostrStreamer.Services.Clips;
@ -30,12 +31,13 @@ public class ClipGenerator
return path; return path;
} }
public async Task<List<ClipSegment>> GetClipSegments(Guid id) public async Task<List<ClipSegment>> GetClipSegments(UserStream stream)
{ {
var ret = new List<ClipSegment>(); var ret = new List<ClipSegment>();
var playlist = new Uri(_config.DataHost, $"stream/{id}.m3u8"); var path = $"/{stream.Endpoint.App}/source/{stream.User.StreamKey}.m3u8";
var ub = new Uri(_config.SrsHttpHost, path);
var rsp = await _client.GetStreamAsync(playlist); var rsp = await _client.GetStreamAsync(ub);
using var sr = new StreamReader(rsp); using var sr = new StreamReader(rsp);
while (await sr.ReadLineAsync() is { } line) while (await sr.ReadLineAsync() is { } line)
{ {
@ -44,7 +46,7 @@ public class ClipGenerator
var trackPath = await sr.ReadLineAsync(); var trackPath = await sr.ReadLineAsync();
var seg = Regex.Match(trackPath!, @"-(\d+)\.ts"); var seg = Regex.Match(trackPath!, @"-(\d+)\.ts");
var idx = int.Parse(seg.Groups[1].Value); var idx = int.Parse(seg.Groups[1].Value);
var clipSeg = new ClipSegment(id, idx); var clipSeg = new ClipSegment(stream.Id, idx);
var outPath = clipSeg.GetPath(); var outPath = clipSeg.GetPath();
if (!File.Exists(outPath)) if (!File.Exists(outPath))
{ {

2
NostrStreamer/Services/Clips/S3ClipService.cs
View File

@ -32,7 +32,7 @@ public class S3ClipService : IClipService
return default; return default;
} }
return await _generator.GetClipSegments(streamId); return await _generator.GetClipSegments(stream);
} }
public async Task<ClipResult?> MakeClip(string takenBy, List<ClipSegment> segments, float start, float length) public async Task<ClipResult?> MakeClip(string takenBy, List<ClipSegment> segments, float start, float length)