diff --git a/desktop/MainWindow.xaml.cs b/desktop/MainWindow.xaml.cs index 65617e7..06b56d4 100644 --- a/desktop/MainWindow.xaml.cs +++ b/desktop/MainWindow.xaml.cs @@ -1231,7 +1231,7 @@ public partial class MainWindow : Window // 限 2 是给 NVR 留余量(同时开太多回放连接会互相抢带宽)。 const int maxParallel = 2; var gate = new SemaphoreSlim(maxParallel); - var saved = new string?[streams.Count]; + var saved = new PlaybackClip?[streams.Count]; var tasks = new List(); void UpdateLine(int slot, string text) => Dispatcher.Invoke(() => @@ -1269,7 +1269,7 @@ public partial class MainWindow : Window stream.StartTime, stream.EndTime, path, progress, ct).ConfigureAwait(false); saved[slot] = file; - UpdateLine(slot, $"第 {slot + 1}/{streams.Count} 路:{stream.DisplayName} ✓ {file}"); + UpdateLine(slot, $"第 {slot + 1}/{streams.Count} 路:{stream.DisplayName} ✓ {file.Path}"); } catch (OperationCanceledException) { @@ -1289,10 +1289,10 @@ public partial class MainWindow : Window await Task.WhenAll(tasks).ConfigureAwait(true); // 保持与 streams 一一对应(失败的那路不参与合并) - var done = new List<(PackStream Stream, string Path)>(); + var done = new List<(PackStream Stream, PlaybackClip Clip)>(); for (var i = 0; i < streams.Count; i++) { - if (saved[i] is { } file) done.Add((streams[i], file)); + if (saved[i] is { } clip) done.Add((streams[i], clip)); } if (done.Count > 0) @@ -1314,9 +1314,10 @@ public partial class MainWindow : Window } else { - var target = Path.Combine(folder, Path.GetFileName(done[0].Path)); + var single = done[0].Clip.Path; + var target = Path.Combine(folder, Path.GetFileName(single)); if (File.Exists(target)) File.Delete(target); - File.Move(done[0].Path, target); + File.Move(single, target); _lastOutputFolder = folder; OpenFolderButton.Visibility = Visibility.Visible; @@ -1341,10 +1342,11 @@ public partial class MainWindow : Window } /// 合并失败时把片段从临时目录搬到用户目录(不丢数据),再清临时目录 - private void MoveSegmentsOut(List<(PackStream Stream, string Path)> done, string folder, string workDir) + private void MoveSegmentsOut(List<(PackStream Stream, PlaybackClip Clip)> done, string folder, string workDir) { - foreach (var (_, path) in done) + foreach (var (_, clip) in done) { + var path = clip.Path; try { var target = Path.Combine(folder, Path.GetFileName(path)); @@ -1385,7 +1387,7 @@ public partial class MainWindow : Window /// /// 合并成功 → 删临时目录里各路段;失败 → 把片段搬到 保住数据。 /// - private async Task ComposeAsync(PackQuery query, List<(PackStream Stream, string Path)> done, + private async Task ComposeAsync(PackQuery query, List<(PackStream Stream, PlaybackClip Clip)> done, string output, string workDir) { var merged = new List(); @@ -1394,10 +1396,13 @@ public partial class MainWindow : Window var progress = new Progress(p => ShowPlayback(string.Join(Environment.NewLine, merged) + Environment.NewLine + p.Message)); + // 各路真实起点不同(都从自己的关键帧开始)→ 按偏移摆回同一时间轴 var path = await _playback.ComposeAsync( - done.Select(item => item.Path).ToList(), + done.Select(item => item.Clip.Path).ToList(), done.Select(item => item.Stream).ToList(), - output, progress, CancellationToken.None); + output, + done.Select(item => item.Clip.StartOffset).ToList(), + progress, CancellationToken.None); merged.Add($"合并完成:{path}"); return true; diff --git a/desktop/Services/Hik/HikDeviceService.cs b/desktop/Services/Hik/HikDeviceService.cs index 3a558fd..0cef266 100644 --- a/desktop/Services/Hik/HikDeviceService.cs +++ b/desktop/Services/Hik/HikDeviceService.cs @@ -704,11 +704,22 @@ public sealed class HikDeviceService : IDisposable /// - ⚠️ NET_DVR_GetFileByTime*(直接存文件)在这台固件上不工作,不要用。 /// /// 已接收字节数(总大小未知,界面按 MB 显示) + /// + /// **第一帧的真实内容时间**(设备本地时间;拿不到为 null)。 + /// + /// 回放是从「请求时间所在关键帧」开始推的,各通道关键帧位置不同 → + /// 同一窗口开始拉的两段录像,第一帧的真实时间会差 0~几秒,合并后画面就错开。 + /// 用 NET_DVR_GetPlayBackOsdTime 在第一包数据到达时读一次,即可精确对齐。 + /// /// 实际写入字节数 public long PullPlaybackToFile(string host, int port, string userName, string password, int channel, DateTime start, DateTime end, string outputPath, - Action? onProgress = null, CancellationToken ct = default) + out DateTime? firstOsdTime, Action? onProgress = null, CancellationToken ct = default) { + firstOsdTime = null; + var osdTime = (DateTime?)null; + var osdTried = false; + Validate(host, port, userName, password); if (channel <= 0) throw new ArgumentException("channel 必须是正整数"); if (end <= start) throw new ArgumentException("结束时间必须晚于开始时间"); @@ -783,6 +794,15 @@ public sealed class HikDeviceService : IDisposable { lastSize = current; lastGrowth = DateTime.UtcNow; + + // 第一包数据到手:只试一次读当前帧的 OSD 时间(= 这一路真实内容起点)。 + // 读失败就别再试了 —— 这台固件不支持(err=12),每来一包都试会刷满日志 + if (!osdTried) + { + osdTried = true; + osdTime = TryReadPlaybackOsdTime(handle); + } + onProgress?.Invoke(current); } @@ -821,9 +841,105 @@ public sealed class HikDeviceService : IDisposable } } + firstOsdTime = osdTime; return written; } + /// + /// 读当前回放帧的 OSD 时间(录像的真实内容时间,设备本地时间) + /// 读不到 / 数值明显不合理(年份不在 2000~2100)返回 null。 + /// + private static DateTime? TryReadPlaybackOsdTime(int handle) + { + var buffer = Marshal.AllocHGlobal(TimeCfgBufferSize); + try + { + Marshal.Copy(new byte[TimeCfgBufferSize], 0, buffer, TimeCfgBufferSize); + + if (!HikSdk.NET_DVR_GetPlayBackOsdTime(handle, buffer)) + { + var err = HikSdk.NET_DVR_GetLastError(); + AppLog.Write($"[hik] 读回放 OSD 时间失败:err={err}({HikSdk.DescribeError(err)})"); + return null; + } + + var year = Marshal.ReadInt32(buffer, 0); + var month = Marshal.ReadInt32(buffer, 4); + var day = Marshal.ReadInt32(buffer, 8); + var hour = Marshal.ReadInt32(buffer, 12); + var minute = Marshal.ReadInt32(buffer, 16); + var second = Marshal.ReadInt32(buffer, 20); + + if (year < 2000 || year > 2100 || month is < 1 or > 12 || day is < 1 or > 31 + || hour is < 0 or > 23 || minute is < 0 or > 59 || second is < 0 or > 59) + { + AppLog.Write($"[hik] 回放 OSD 时间读数异常:{year}-{month}-{day} {hour}:{minute}:{second}"); + return null; + } + + return new DateTime(year, month, day, hour, minute, second, DateTimeKind.Unspecified); + } + catch (Exception ex) + { + AppLog.Write($"[hik] 读回放 OSD 时间失败:{ex.Message}"); + return null; + } + finally + { + Marshal.FreeHGlobal(buffer); + } + } + + /// + /// 只探一下「这个通道在 start 时刻的第一帧真实时间」(开一个 3 秒的小回放,读到 OSD 就停)。 + /// + /// 回放预览用的是 RTSP 实时推流,主机侧拿不到内容时间;这里先用 8000 协议问一次, + /// 得到每路真实起点后再按差值推迟出图,几路的画面内容才对得上。 + /// + public DateTime? ProbePlaybackOsdStart(string host, int port, string userName, string password, + int channel, DateTime start, int timeoutMs = 6000) + { + Validate(host, port, userName, password); + HikSdk.EnsureInitialized(); + + DateTime? osd = null; + var gate = new ManualResetEventSlim(false); + + HikSdk.PlayDataCallback callback = (_, _, _, size, _) => + { + if (size > 0) gate.Set(); + }; + + ExecuteWithSession(host, port, userName, password, userId => + { + var sdkStart = ToSdkTime(start); + var sdkStop = ToSdkTime(start.AddSeconds(3)); + + var handle = HikSdk.NET_DVR_PlayBackByTime(userId, channel, ref sdkStart, ref sdkStop, IntPtr.Zero); + if (handle < 0) return; + + try + { + if (!HikSdk.NET_DVR_SetPlayDataCallBack(handle, callback, IntPtr.Zero)) return; + if (!HikSdk.NET_DVR_PlayBackControl(handle, HikSdk.PlayStart, 0, IntPtr.Zero)) return; + + if (!gate.Wait(timeoutMs)) return; + + // 回调线程刚收到数据,等它落到解码侧一点点再读 + Thread.Sleep(60); + osd = TryReadPlaybackOsdTime(handle); + } + finally + { + HikSdk.NET_DVR_PlayBackControl(handle, HikSdk.PlayStop, 0, IntPtr.Zero); + HikSdk.NET_DVR_StopPlayBack(handle); + } + }); + + gate.Dispose(); + return osd; + } + private static HikSdk.NET_DVR_TIME ToSdkTime(DateTime time) => new() { dwYear = (uint)time.Year, diff --git a/desktop/Services/Hik/HikFfmpegService.cs b/desktop/Services/Hik/HikFfmpegService.cs index 3611dce..aceaff3 100644 --- a/desktop/Services/Hik/HikFfmpegService.cs +++ b/desktop/Services/Hik/HikFfmpegService.cs @@ -152,6 +152,28 @@ public sealed class HikFfmpegService : IDisposable } } + /// + /// 订阅这一路的**每一帧**(回调在 ffmpeg 读线程上,只做入队这类快操作)。 + /// + /// 和 的区别:那边是「只留最新一帧」,适合网页这类只关心画面的场景; + /// 但**回放对齐不能丢帧** —— ffmpeg 定位到关键帧后会把「关键帧→请求时间」的整段一次性吐出来, + /// 只留最新帧会把这串的前面全丢掉,拿到的“第一帧”可能已经是两秒后的画面, + /// 几路按它算延迟就会整体错开(现场就是这个现象)。 + /// + public IDisposable Subscribe(int handle, Action onFrame) + { + if (!_streams.TryGetValue(handle, out var stream)) return new NoopDisposable(); + return stream.AddSubscriber(onFrame); + } + + private sealed class NoopDisposable : IDisposable + { + public void Dispose() + { + // 没有订阅成功(流已关闭),什么都不用做 + } + } + public bool Close(int handle) { lock (_gate) @@ -321,6 +343,7 @@ public sealed class HikFfmpegService : IDisposable private sealed class FfmpegStream { private readonly object _sync = new(); + private readonly List> _subscribers = new(); private byte[] _latest = Array.Empty(); private long _version; @@ -331,13 +354,31 @@ public sealed class HikFfmpegService : IDisposable public Process? Process { get; set; } public string? LastError { get; set; } - /// 新帧覆盖(背压:只留最新的,慢客户端不会把内存吃掉) + /// + /// 新帧入队:覆盖「最新一帧」(背压),同时**逐帧通知订阅者**(回放对齐要每一帧) + /// public void Enqueue(byte[] frame) { + Action[] snapshot; + lock (_sync) { _latest = frame; _version++; + snapshot = _subscribers.Count == 0 ? Array.Empty>() : _subscribers.ToArray(); + } + + // 回调在 ffmpeg 读线程上:只允许做入队这类快操作 + foreach (var handler in snapshot) + { + try + { + handler(frame); + } + catch (Exception ex) + { + AppLog.Write($"[ffmpeg] 帧回调异常({Description}):{ex.Message}"); + } } } @@ -357,6 +398,35 @@ public sealed class HikFfmpegService : IDisposable } } + public IDisposable AddSubscriber(Action handler) + { + lock (_sync) _subscribers.Add(handler); + return new Subscription(this, handler); + } + + private void RemoveSubscriber(Action handler) + { + lock (_sync) _subscribers.Remove(handler); + } + + private sealed class Subscription : IDisposable + { + private FfmpegStream? _owner; + private readonly Action _handler; + + public Subscription(FfmpegStream owner, Action handler) + { + _owner = owner; + _handler = handler; + } + + public void Dispose() + { + _owner?.RemoveSubscriber(_handler); + _owner = null; + } + } + public void Terminate() { try diff --git a/desktop/Services/Hik/HikPlaybackService.cs b/desktop/Services/Hik/HikPlaybackService.cs index 5be0ba6..33473c9 100644 --- a/desktop/Services/Hik/HikPlaybackService.cs +++ b/desktop/Services/Hik/HikPlaybackService.cs @@ -25,6 +25,14 @@ public sealed record PlaybackCheck(bool HasRecord, int Frames, int LogicalChanne /// 当前状态文案 public sealed record PlaybackProgress(double? Percent, string Message); +/// 下载好的一路回放 +/// 落地文件(mp4;转封装失败时是 .ts/.ps) +/// +/// 这一路**真实起点**相对请求时间的偏移(零 = 不知道 / 正好对齐)。 +/// 多路合并要按它把各路摆回同一时间轴,否则各路的第一个关键帧不一样,画面就错开了。 +/// +public sealed record PlaybackClip(string Path, TimeSpan StartOffset); + /// /// 海康 **按时间回放**:校验有没有录像 / 拉流预览 / 下载成 mp4 /// @@ -49,6 +57,7 @@ public sealed class HikPlaybackService : IDisposable private static readonly Regex OutTimeRegex = new(@"out_time_us=(\d+)", RegexOptions.Compiled); private static readonly Regex SpeedRegex = new(@"speed=\s*([\d.]+)x", RegexOptions.Compiled); + /// RTSP socket 读超时(微秒)。回放拉完设备不再推流,靠它让 ffmpeg 收尾退出 private const string SocketTimeoutUs = "5000000"; @@ -75,6 +84,17 @@ public sealed class HikPlaybackService : IDisposable private const long ClockOffsetTtlMs = 10 * 60 * 1000; private const long ClockOffsetFailTtlMs = 60 * 1000; + /// + /// 「首个数字通道号」缓存(key = host|port|user) + /// + /// 每换算一路通道号都要问一次设备;多路回放时逐路问会让**后开的流晚好几秒**, + /// 几路画面就错开了(现场反馈的"两个流加载速度不一样"就是这个)。 + /// + private readonly ConcurrentDictionary _startDigital = + new(StringComparer.OrdinalIgnoreCase); + + private const long StartDigitalTtlMs = 30 * 60 * 1000; + public HikPlaybackService(HikDeviceService device) { _device = device; @@ -93,6 +113,21 @@ public sealed class HikPlaybackService : IDisposable /// public int LogicalChannel(string host, int port, string userName, string password, int channel) { + var startDigital = StartDigitalChannel(host, port, userName, password); + + var logical = channel - startDigital + 1; + return logical > 0 ? logical : channel; + } + + /// 设备的「首个数字通道号」(带缓存:多路回放时不用每路都问一次设备) + private int StartDigitalChannel(string host, int port, string userName, string password) + { + var key = $"{host}|{port}|{userName}"; + if (_startDigital.TryGetValue(key, out var hit) && Environment.TickCount64 - hit.At < StartDigitalTtlMs) + { + return hit.StartDigital; + } + var startDigital = 33; try { @@ -104,8 +139,8 @@ public sealed class HikPlaybackService : IDisposable AppLog.Write($"[playback] 取起始数字通道号失败,按 {startDigital} 兜底:{ex.Message}"); } - var logical = channel - startDigital + 1; - return logical > 0 ? logical : channel; + _startDigital[key] = (startDigital, Environment.TickCount64); + return startDigital; } /// @@ -226,7 +261,7 @@ public sealed class HikPlaybackService : IDisposable try { var bytes = await Task.Run(() => _device.PullPlaybackToFile(host, port, userName, password, - channel, start.LocalDateTime, probeEnd.LocalDateTime, probeFile, null, ct), ct) + channel, start.LocalDateTime, probeEnd.LocalDateTime, probeFile, out _, null, ct), ct) .ConfigureAwait(false); AppLog.Write($"[playback] SDK 探测 {host} 通道{channel}:{bytes} 字节"); @@ -303,8 +338,8 @@ public sealed class HikPlaybackService : IDisposable /// /// 回放速度实测约 0.5x~3x(跟码流大小有关),所以**必须显示进度、必须能取消**。 /// - /// 落地文件路径(mp4;转封装失败时是 .ts) - public async Task DownloadAsync(string host, int port, string userName, string password, + /// 落地文件 + 这一路的真实起点(相对请求时间;测不到就是零) + public async Task DownloadAsync(string host, int port, string userName, string password, int channel, DateTimeOffset start, DateTimeOffset end, string outputPath, IProgress? progress = null, CancellationToken ct = default) { @@ -330,8 +365,9 @@ public sealed class HikPlaybackService : IDisposable { progress?.Report(new PlaybackProgress(0, "下载中(8000 全速)…")); + DateTime? osdStart = null; var bytes = await Task.Run(() => _device.PullPlaybackToFile(host, port, userName, password, channel, - start.LocalDateTime, end.LocalDateTime, tempPs, + start.LocalDateTime, end.LocalDateTime, tempPs, out osdStart, received => progress?.Report(new PlaybackProgress(null, $"下载中(8000 全速){received / 1024.0 / 1024.0:0.0} MB")), ct), ct) .ConfigureAwait(false); @@ -341,13 +377,18 @@ public sealed class HikPlaybackService : IDisposable if (bytes > 16 * 1024) { _sdkPlayback[sdkKey] = true; + progress?.Report(new PlaybackProgress(0.99, "正在封装成 mp4…")); if (await RepackAsync(ffmpeg, tempPs, outputPath, ct).ConfigureAwait(false)) { var okSize = new FileInfo(outputPath).Length; progress?.Report(new PlaybackProgress(1, $"下载完成({Math.Round(okSize / 1024.0 / 1024.0, 1)} MB)")); AppLog.Write($"[playback] 回放已下载:{outputPath}({okSize} 字节)"); - return outputPath; + + // ⚠️ 读不到 OSD 就**按原样合并**:时长反推实测不可靠(同一窗口两次 36.1s/42.1s), + // 硬套只会让偏差更大(现场反馈"还不如直接合并") + var offset = OffsetFromOsd(osdStart, start.LocalDateTime, channel) ?? TimeSpan.Zero; + return new PlaybackClip(outputPath, offset); } // mp4 封装不了 → 把设备原始 PS 留下(PotPlayer/VLC 能直接播) @@ -356,7 +397,9 @@ public sealed class HikPlaybackService : IDisposable File.Move(tempPs, psPath); progress?.Report(new PlaybackProgress(1, "下载完成(原始封装 .ps)")); AppLog.Write($"[playback] 封装失败,保留原始录像:{psPath}"); - return psPath; + + var psOffset = OffsetFromOsd(osdStart, start.LocalDateTime, channel) ?? TimeSpan.Zero; + return new PlaybackClip(psPath, psOffset); } } catch (OperationCanceledException) @@ -437,7 +480,46 @@ public sealed class HikPlaybackService : IDisposable var finalSize = new FileInfo(result).Length; progress?.Report(new PlaybackProgress(1, $"下载完成({Math.Round(finalSize / 1024.0 / 1024.0, 1)} MB)")); AppLog.Write($"[playback] 回放已下载:{result}({finalSize} 字节)"); - return result; + // RTSP 回放拿不到真实起点(设备按关键帧推流,前后差 1~2 秒),按请求时间算 + return new PlaybackClip(result, TimeSpan.Zero); + } + + /// + /// 探这一路在 时刻的第一帧真实时间(设备本地时间)。 + /// + /// 回放预览走 RTSP 实时推流,主机侧拿不到"帧对应哪一秒";用 8000 协议开个小回放读一次 + /// NET_DVR_GetPlayBackOsdTime 即可,几路按差值推迟出图就能对齐内容。 + /// + public DateTime? ProbePlaybackStartOsd(NvrCredential credential, int channel, DateTimeOffset start) + { + var clock = ClockOffset(credential.Host, credential.Port, credential.Username, credential.Password); + + return _device.ProbePlaybackOsdStart(credential.Host, credential.Port, + credential.Username, credential.Password, channel, start.Add(clock).LocalDateTime); + } + + /// + /// 用**第一帧的 OSD 时间**算真实起点偏移(首选方案,精确到秒) + /// + /// NET_DVR_GetPlayBackOsdTime 给的是录像内容时间(设备本地时间), + /// 和请求时间的差就是这一路真实晚了/早了多少。拿不到或读数离谱时返回 null, + /// 由调用方退回「时长反推」。 + /// + private static TimeSpan? OffsetFromOsd(DateTime? osdStart, DateTime requestedDeviceStart, int channel) + { + if (osdStart is null) return null; + + var offset = osdStart.Value - requestedDeviceStart; + if (Math.Abs(offset.TotalSeconds) > 60) + { + AppLog.Write($"[playback] 通道{channel} OSD 时间 {osdStart:HH:mm:ss} 与请求时间差 " + + $"{offset.TotalSeconds:0.0} 秒(过大,疑似通道时钟不准),改用时长反推"); + return null; + } + + AppLog.Write($"[playback] 通道{channel} 首帧 OSD={osdStart.Value:HH:mm:ss}," + + $"比请求时间{(offset < TimeSpan.Zero ? "早" : "晚")} {Math.Abs(offset.TotalSeconds):0.0} 秒"); + return offset; } // ==================== ③ 按工作台布局合并成一个视频 ==================== @@ -455,9 +537,14 @@ public sealed class HikPlaybackService : IDisposable /// 用 veryfast + crf 23 折中。 /// /// 各路下载好的文件(顺序与 一一对应) + /// + /// 每路真实起点相对请求时间的偏移(见 ,null/缺项 = 不偏移)。 + /// 各路是**从各自的关键帧**开始录的,不按这个差值把时间轴错开,合并后两格会差 1~2 秒。 + /// /// 合并后文件路径 public async Task ComposeAsync(IReadOnlyList segments, IReadOnlyList streams, - string outputPath, IProgress? progress = null, CancellationToken ct = default) + string outputPath, IReadOnlyList? startOffsets = null, + IProgress? progress = null, CancellationToken ct = default) { if (segments.Count == 0) throw new HikException(uint.MaxValue, "没有可合并的片段"); if (segments.Count != streams.Count) throw new HikException(uint.MaxValue, "片段数与流数量不一致"); @@ -482,7 +569,18 @@ public sealed class HikPlaybackService : IDisposable ? streams.Max(item => item.CanvasHeight) : 1080; - var totalSec = Math.Max((streams[0].EndTime - streams[0].StartTime).TotalSeconds, 1); + // 各路真实起点不同(各自从关键帧开始):按偏移把时间轴摆回同一时刻 + var offsets = new double[segments.Count]; + for (var i = 0; i < offsets.Length; i++) + { + var offset = startOffsets is not null && i < startOffsets.Count ? startOffsets[i] : TimeSpan.Zero; + offsets[i] = Math.Abs(offset.TotalSeconds) <= 15 ? offset.TotalSeconds : 0; + } + var maxDelaySec = offsets.Length > 0 ? offsets.Max() : 0; + + // 输出要多留出「最晚开始」那一段,否则起点最晚的那路结尾会被切掉 + var totalSec = Math.Max((streams[0].EndTime - streams[0].StartTime).TotalSeconds, 1) + + Math.Max(maxDelaySec, 0); var filters = new List(); for (var i = 0; i < streams.Count; i++) @@ -492,7 +590,8 @@ public sealed class HikPlaybackService : IDisposable var height = stream.Layout.Height > 0 ? stream.Layout.Height : canvasHeight; // 帧率统一到 25(各路帧率不一样,overlay 会互相等待并对不齐) - filters.Add($"[{i + 1}:v]scale={width}:{height}:force_original_aspect_ratio=decrease," + filters.Add($"[{i + 1}:v]{TimingFilter(offsets[i])}" + + $"scale={width}:{height}:force_original_aspect_ratio=decrease," + $"fps=25,format=yuv420p,setsar=1[v{i}]"); } @@ -547,6 +646,23 @@ public sealed class HikPlaybackService : IDisposable // ==================== 内部 ==================== + /// + /// 按起点偏移给这一路做时间轴校正(拼在滤镜链最前面) + /// + /// - 起点比请求**早**(offset < 0):`trim` 掉多出来的那一段,再归零 + /// - 起点比请求**晚**(offset > 0):整体后移,前面那段留黑底 + /// - 基本对齐(|offset| < 50ms):什么都不做 + /// + private static string TimingFilter(double offset) + { + if (Math.Abs(offset) < 0.05) return string.Empty; + + var seconds = Math.Abs(offset).ToString("0.###", CultureInfo.InvariantCulture); + return offset < 0 + ? $"trim=start={seconds},setpts=PTS-STARTPTS," + : $"setpts=PTS-STARTPTS+{seconds}/TB,"; + } + /// 把设备原始录像(PS)转封装成 mp4;失败返回 false private async Task RepackAsync(string ffmpeg, string input, string outputPath, CancellationToken ct) { diff --git a/desktop/Services/Hik/HikSdk.cs b/desktop/Services/Hik/HikSdk.cs index 4c33c6d..e2dab6c 100644 --- a/desktop/Services/Hik/HikSdk.cs +++ b/desktop/Services/Hik/HikSdk.cs @@ -333,6 +333,15 @@ internal static class HikSdk [DllImport(Dll, CallingConvention = CallingConvention.StdCall)] internal static extern int NET_DVR_GetPlayBackPos(int lPlayHandle); + /// + /// 取**当前回放帧对应的 OSD 时间**(输出 NET_DVR_TIME,24 字节)。 + /// + /// 这是录像的真实内容时间(录像机回放时间轴),不是"会话相对时间"—— + /// 多路对齐只有靠它才能精确到秒:各路从哪个关键帧起播、晚了多少,读一次就知道。 + /// + [DllImport(Dll, CallingConvention = CallingConvention.StdCall)] + internal static extern bool NET_DVR_GetPlayBackOsdTime(int lPlayHandle, IntPtr lpOsdTime); + /// 初始化 SDK(幂等)。找不到 HCNetSDK.dll 时抛 internal static void EnsureInitialized() { diff --git a/desktop/Services/PlaybackDownloadService.cs b/desktop/Services/PlaybackDownloadService.cs index c2fad03..c2d30f0 100644 --- a/desktop/Services/PlaybackDownloadService.cs +++ b/desktop/Services/PlaybackDownloadService.cs @@ -93,7 +93,7 @@ public sealed class PlaybackDownloadService Directory.CreateDirectory(workDir); var warnings = new List(); - var saved = new string?[streams.Count]; + var saved = new PlaybackClip?[streams.Count]; var gate = new SemaphoreSlim(MaxParallel); var credentials = new Dictionary(); var credentialGate = new SemaphoreSlim(1, 1); @@ -147,10 +147,10 @@ public sealed class PlaybackDownloadService await Task.WhenAll(tasks).ConfigureAwait(false); - var parts = new List<(PackStream Stream, string Path)>(); + var parts = new List<(PackStream Stream, PlaybackClip Clip)>(); for (var i = 0; i < streams.Count; i++) { - if (saved[i] is { } file) parts.Add((streams[i], file)); + if (saved[i] is { } clip) parts.Add((streams[i], clip)); } if (parts.Count == 0) @@ -161,9 +161,10 @@ public sealed class PlaybackDownloadService if (parts.Count == 1) { - var target = Path.Combine(folder, Path.GetFileName(parts[0].Path)); + var single = parts[0].Clip.Path; + var target = Path.Combine(folder, Path.GetFileName(single)); if (File.Exists(target)) File.Delete(target); - File.Move(parts[0].Path, target); + File.Move(single, target); progress?.Report($"已保存:{target}"); return new PlaybackDownloadResult(folder, target, new[] { target }, warnings); } @@ -175,9 +176,10 @@ public sealed class PlaybackDownloadService try { await _playback.ComposeAsync( - parts.Select(item => item.Path).ToList(), + parts.Select(item => item.Clip.Path).ToList(), parts.Select(item => item.Stream).ToList(), merged, + parts.Select(item => item.Clip.StartOffset).ToList(), new Progress(p => progress?.Report(p.Message)), ct).ConfigureAwait(false); @@ -189,11 +191,11 @@ public sealed class PlaybackDownloadService // 合并失败不丢数据:把各路段搬到用户目录 warnings.Add($"合并失败:{ex.Message}"); var moved = new List(); - foreach (var (_, path) in parts) + foreach (var (_, clip) in parts) { - var target = Path.Combine(folder, Path.GetFileName(path)); + var target = Path.Combine(folder, Path.GetFileName(clip.Path)); if (File.Exists(target)) File.Delete(target); - File.Move(path, target); + File.Move(clip.Path, target); moved.Add(target); } return new PlaybackDownloadResult(folder, null, moved, warnings); diff --git a/desktop/Views/PlaybackPreviewWindow.xaml b/desktop/Views/PlaybackPreviewWindow.xaml index 0729152..3a7d73d 100644 --- a/desktop/Views/PlaybackPreviewWindow.xaml +++ b/desktop/Views/PlaybackPreviewWindow.xaml @@ -6,7 +6,6 @@ Background="#101216"> -