This release adds microphone processing controls and local chat controls, expands platform packages, and synchronizes the website and guides. It also fixes native H.264 input/format handling, signaling recovery, fresh STUN discovery, and UDP ownership during overlapping connections. This is **v1.8.0**. Browser/Server v23, Native control v9 and capture v7 remain unchanged, with the existing 1440p ceiling. Additional resolutions, capability negotiation and Magicsock are separate follow-up work. ## Validation - Full local Web check: 79 files / 1,317 tests, TypeScript and production build. - Full Go checks, platform builds and Windows native capture regressions/probe. - Native H.264 Host lifecycle, Browser-to-App fanout and App-exit recovery, and Native H.264 through embedded SFU: all passed with owned process/port/profile cleanup. - Website build, documentation and repository hygiene passed. Existing UI acceptance covers narrow screens, both languages/themes, architecture downloads and all 23 film checks; final packaging and Go race checks run on the merged revision in CI. - Physical macOS/Linux capture, representative public networks and unmatched field reports retain their documented evidence limits. No claim that every blur/disconnection report is resolved. ## Release notes ### 中文 这是一次功能与兼容性更新:麦克风和聊天增加了实用的小选项,App 与 Server 支持更多设备,同时修复了原生分享和连接恢复中的若干问题。现有 1.x 协议保持不变。 #### 新增与改进 - 浏览器麦克风新增「降噪与回声消除」开关,默认开启回声消除、降噪和自动增益;分享音乐或使用虚拟音频输入时,可按需关闭。 - 可调整弹幕字号和透明度,并将当前保留的聊天记录导出为 TXT。当前会话最多保留 1,000 条文字消息,刷新页面后清空;需要保存时请先导出。 - 新增 Intel Mac、Linux ARM64 App,以及 Linux ARM64 Server 和容器镜像。官网下载区可直接选择对应架构,并显示最新版本和发布时间。 - 更新官网演示、README 截图和中英文教程,明确浏览器分享也可选择窗口或屏幕;开始分享前显示房间号占位,保持底栏控件位置稳定。 - 官网新增直达问题排查的入口,补充浏览器 WebRTC 限制、校园网和 Windows 显卡相关的排查步骤。 - App 模式选择页显示免费开源说明、作者与贡献者署名,以及官方网站和源码链接。 #### 修复 - 修正部分 H.264 原生分享的格式兼容性校验,以及 Windows 编码器输入长度和输出缓冲区对齐问题。 - 清理已失效的重连任务和 Native 接收信令,避免旧连接继续影响当前会话。 - 修复 App 重连时可能复用过期公网地址的问题;重新探测使用当前地址,并处理探测丢包和过期响应,保留其他正常连接。 - 修复 App 新旧媒体连接重叠时共用端口造成的冲突,避免准备或撤销新连接打断仍在使用的画面;关闭连接时及时取消未完成的端口映射请求。 - 无站点密码时,连接恢复不再误引导用户输入站点密码。 - 房间失效或会话终止时,开播前后的原因提示统一显示在电视状态图标中,避免额外提示条。 - 修正 Linux 原生采集的时间戳与关键帧时间基准。感谢 Pedro Antonio 在 [#449](https://github.com/TNTcraftHIM/Piik/pull/449) 的贡献。 #### 使用说明 下载对应平台的完整压缩包,退出旧 App 后解压使用。Windows 继续提供 x64;macOS 提供 Apple 芯片与 Intel 版本,原生采集需要 macOS 13 或更新版本。Linux 提供 x64 与 ARM64,原生采集还需安装[系统组件](https://github.com/TNTcraftHIM/Piik/blob/main/native/capture/linux/README.md)。macOS 和 Linux 的实机覆盖仍有限,欢迎反馈。 ### English This update adds useful microphone and chat controls, brings Piik to more devices, and fixes several native-sharing and connection-recovery issues. The existing 1.x protocols remain unchanged. #### New and improved - Browser microphones now have a “Noise & echo reduction” toggle. Echo cancellation, noise suppression and automatic gain control are on by default; turn them off when appropriate for music or virtual audio inputs. - Adjust chat-overlay text size and opacity, and export retained messages as TXT. The current session keeps up to 1,000 text messages and clears on page refresh; export first if you want to keep them. - Added Intel Mac and Linux ARM64 App packages, plus Linux ARM64 Server and container images. The website provides architecture selectors and shows the latest release and publication date. - Updated the website demonstration, README screenshots and bilingual guides, clarifying that browser capture can also select windows or screens. A room-code placeholder keeps the bottom bar stable before sharing starts. - Added direct website links to troubleshooting, with steps for browser WebRTC restrictions, campus networks and Windows graphics issues. - The App mode-selection page now shows its free and open-source status, author and contributor credit, and links to the official website and source. #### Fixes - Corrected H.264 format compatibility checks and Windows encoder input-length and output-buffer alignment handling. - Retired stale reconnect tasks and Native receive signals so they cannot continue affecting the current session. - Fixed App reconnection reusing an expired public address. Fresh discovery handles lost probes and stale responses while preserving other working connections. - Fixed UDP socket conflicts between overlapping App media connections so preparing or canceling a replacement preserves the active picture. Closing a connection now cancels unfinished gateway mapping requests. - Connection recovery on passwordless sites no longer incorrectly asks for a site passphrase. - Expired-room and session-termination reasons now use the same TV status indicator before and during sharing, without an extra notice strip. - Corrected Linux native capture timestamps and keyframe time bases. Thanks to Pedro Antonio for [#449](https://github.com/TNTcraftHIM/Piik/pull/449). #### Updating Download the complete archive for your platform, quit the old App, and extract the new package. Windows remains x64-only. macOS packages support Apple silicon and Intel; native capture requires macOS 13 or newer. Linux supports x64 and ARM64 and requires additional [system components](https://github.com/TNTcraftHIM/Piik/blob/main/native/capture/linux/README.md) for native capture. Physical-device coverage on macOS and Linux remains limited; feedback is welcome. ## Attribution Co-authored-by: Pedro Antonio <wrenchwastaken@gmail.com>
356 lines
12 KiB
Go
356 lines
12 KiB
Go
package mediaedge
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/hex"
|
|
"encoding/json"
|
|
"io"
|
|
"os"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/TNTcraftHIM/Piik/internal/app/nativecapture"
|
|
"github.com/livekit/mediatransportutil"
|
|
"github.com/pion/ice/v4"
|
|
"github.com/pion/interceptor"
|
|
"github.com/pion/logging"
|
|
"github.com/pion/rtcp"
|
|
"github.com/pion/rtp"
|
|
"github.com/pion/rtp/codecs"
|
|
"github.com/pion/transport/v4/vnet"
|
|
"github.com/pion/webrtc/v4"
|
|
)
|
|
|
|
// One real VP8 derived process, no desktop capture. The link changes capacity;
|
|
// production BWE, output admission and codec controls supply every adaptation.
|
|
func TestRelayNetworkVP8Fixture(t *testing.T) {
|
|
if os.Getenv("PIIK_RELAY_NETWORK") == "" {
|
|
t.Skip("set PIIK_RELAY_NETWORK=1, PIIK_NATIVE_CAPTURE and PIIK_ENCODED_FIXTURE")
|
|
}
|
|
check := func(err error) {
|
|
t.Helper()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
input, err := os.Open(os.Getenv("PIIK_ENCODED_FIXTURE"))
|
|
check(err)
|
|
defer input.Close()
|
|
var motion [][]byte
|
|
decoder := json.NewDecoder(input)
|
|
for records := 0; ; records++ {
|
|
var row struct {
|
|
FrameIndex, Layer int
|
|
DataHex string
|
|
}
|
|
if err = decoder.Decode(&row); err == io.EOF {
|
|
break
|
|
}
|
|
check(err)
|
|
if records >= 96 || row.FrameIndex < 0 || row.FrameIndex >= 40 || row.Layer < 0 || row.Layer > 2 || len(row.DataHex) > 8*1024*1024 {
|
|
t.Fatal("encoded fixture exceeded its bounds")
|
|
}
|
|
if row.Layer == 2 && row.FrameIndex < 16 {
|
|
data, decodeErr := hex.DecodeString(row.DataHex)
|
|
check(decodeErr)
|
|
motion = append(motion, data)
|
|
}
|
|
}
|
|
if len(motion) != 16 {
|
|
t.Fatal("fixture needs its complete first sixteen high outputs")
|
|
}
|
|
ctx, cancel := context.WithTimeout(t.Context(), 40*time.Second)
|
|
defer cancel()
|
|
engine, err := NewEngine(EngineOptions{BindAddress: "127.0.0.1:0", InitialBitrate: 1_200_000})
|
|
check(err)
|
|
defer engine.Close()
|
|
source, err := engine.NewSource("vp8", 2, 2, nil)
|
|
check(err)
|
|
defer source.Close()
|
|
source.relay = &relayDerivation{source: source, options: RelayOptions{
|
|
CaptureProcess: os.Getenv("PIIK_NATIVE_CAPTURE"),
|
|
Capabilities: nativecapture.Capabilities{SoftwareVP8: true, Adapters: []nativecapture.Adapter{{Index: 0}}},
|
|
}}
|
|
check(source.SetRelayProfile(nativecapture.VideoProfile{Width: 1280, Height: 720,
|
|
Framerate: 30, Bitrate: 2_000_000, Preference: "balanced"}))
|
|
router, err := vnet.NewRouter(&vnet.RouterConfig{CIDR: "10.0.0.0/24", MinDelay: 20 * time.Millisecond,
|
|
LoggerFactory: logging.NewDefaultLoggerFactory()})
|
|
check(err)
|
|
sendNet, err := vnet.NewNet(&vnet.NetConfig{StaticIPs: []string{"10.0.0.1"}})
|
|
check(err)
|
|
check(router.AddNet(sendNet))
|
|
engine.listenPacket = sendNet.ListenPacket
|
|
engine.bindAddress = "10.0.0.1:0"
|
|
engine.settings = webrtc.SettingEngine{}
|
|
engine.settings.SetNet(sendNet)
|
|
engine.settings.SetNetworkTypes([]webrtc.NetworkType{webrtc.NetworkTypeUDP4})
|
|
engine.settings.SetICEMulticastDNSMode(ice.MulticastDNSModeDisabled)
|
|
link := vnet.NewTBFQueue(6_000_000, 2400, 2400)
|
|
type deliveredFrame struct {
|
|
Index, Layer, Width, Height int
|
|
PTS time.Duration
|
|
Recovery bool
|
|
Data []byte
|
|
ReceivedAt, DeliveryAge time.Duration
|
|
}
|
|
var receivedMu sync.Mutex
|
|
var delivered [2][]deliveredFrame
|
|
var lost [2]int
|
|
var intervalPacketFrames [2]int
|
|
var intervalPacketBytes [2]int
|
|
var intervalPacketAge [2]time.Duration
|
|
var sourceOrigin time.Time
|
|
var inputTimes []time.Time
|
|
var children [2]*Edge
|
|
var receivers [2]*webrtc.PeerConnection
|
|
for child, address := range []string{"10.0.0.2", "10.0.0.3"} {
|
|
network, netErr := vnet.NewNet(&vnet.NetConfig{StaticIPs: []string{address}})
|
|
check(netErr)
|
|
if child == 1 {
|
|
queue, queueErr := vnet.NewQueue(network, link)
|
|
check(queueErr)
|
|
defer queue.Close()
|
|
check(router.AddNet(queue))
|
|
} else {
|
|
check(router.AddNet(network))
|
|
}
|
|
settings := webrtc.SettingEngine{}
|
|
settings.SetNet(network)
|
|
settings.SetNetworkTypes([]webrtc.NetworkType{webrtc.NetworkTypeUDP4})
|
|
settings.SetICEMulticastDNSMode(ice.MulticastDNSModeDisabled)
|
|
media := &webrtc.MediaEngine{}
|
|
check(media.RegisterDefaultCodecs())
|
|
registry := &interceptor.Registry{}
|
|
check(webrtc.RegisterDefaultInterceptors(media, registry))
|
|
check(webrtc.ConfigureTWCCSender(media, registry))
|
|
receiver, createErr := webrtc.NewAPI(webrtc.WithMediaEngine(media), webrtc.WithInterceptorRegistry(registry),
|
|
webrtc.WithSettingEngine(settings)).NewPeerConnection(webrtc.Configuration{})
|
|
check(createErr)
|
|
receivers[child] = receiver
|
|
defer receiver.Close()
|
|
receiver.OnTrack(func(track *webrtc.TrackRemote, _ *webrtc.RTPReceiver) {
|
|
waitingKey, anchored := true, false
|
|
var originRTP uint32
|
|
video := relayVideoInput{codec: "vp8", onPacketDropped: func() {
|
|
waitingKey = true
|
|
receivedMu.Lock()
|
|
lost[child]++
|
|
receivedMu.Unlock()
|
|
_ = receiver.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}})
|
|
}}
|
|
for {
|
|
packet, _, readErr := track.ReadRTP()
|
|
if readErr != nil {
|
|
return
|
|
}
|
|
receivedMu.Lock()
|
|
intervalPacketBytes[child] += len(packet.Payload)
|
|
if len(packet.Payload) > 0 && packet.Marker {
|
|
intervalPacketFrames[child]++
|
|
}
|
|
if anchored && len(packet.Payload) > 0 && !packet.Padding {
|
|
inputIndex := int((uint64(packet.Timestamp-originRTP) + 1500) / 3000)
|
|
if inputIndex < len(inputTimes) {
|
|
intervalPacketAge[child] = max(intervalPacketAge[child], time.Since(inputTimes[inputIndex]))
|
|
}
|
|
}
|
|
receivedMu.Unlock()
|
|
if readErr = video.push(packet); readErr != nil {
|
|
t.Error(readErr)
|
|
return
|
|
}
|
|
for {
|
|
sample, timestamp := video.pop()
|
|
if sample == nil {
|
|
break
|
|
}
|
|
frame, frameErr := video.frame(sample.Data)
|
|
if frameErr != nil || waitingKey && !frame.KeyFrame {
|
|
continue
|
|
}
|
|
waitingKey = false
|
|
if !anchored {
|
|
for index, original := range motion {
|
|
if bytes.Equal(original, sample.Data) {
|
|
originRTP = timestamp - uint32(index*3000)
|
|
anchored = true
|
|
break
|
|
}
|
|
}
|
|
if !anchored {
|
|
continue
|
|
}
|
|
}
|
|
pts := time.Duration(uint32(timestamp-originRTP)) * time.Second / videoClockRate
|
|
now := time.Now()
|
|
receivedMu.Lock()
|
|
inputIndex := int((uint64(timestamp-originRTP) + 1500) / 3000)
|
|
age := time.Duration(-1)
|
|
if inputIndex < len(inputTimes) {
|
|
age = now.Sub(inputTimes[inputIndex])
|
|
}
|
|
if len(delivered[child]) < 1200 {
|
|
delivered[child] = append(delivered[child], deliveredFrame{Index: len(delivered[child]),
|
|
Layer: int(frame.Width / 640), Width: int(frame.Width), Height: int(frame.Height), PTS: pts,
|
|
Recovery: frame.KeyFrame, Data: sample.Data, ReceivedAt: now.Sub(sourceOrigin), DeliveryAge: age})
|
|
}
|
|
receivedMu.Unlock()
|
|
}
|
|
}
|
|
})
|
|
children[child], err = engine.NewEdge(source, EdgeOptions{ConnectionID: address})
|
|
check(err)
|
|
}
|
|
check(router.Start())
|
|
defer router.Stop()
|
|
for index, child := range children {
|
|
connectEdgeToReceiver(t, child, receivers[index])
|
|
}
|
|
packetizer := rtp.NewPacketizer(videoPacketMTU, vp8PayloadType, 1, &codecs.VP8Payloader{EnablePictureID: true}, rtp.NewRandomSequencer(), videoClockRate)
|
|
period := time.Second / 30
|
|
ticker := time.NewTicker(period)
|
|
defer ticker.Stop()
|
|
receivedMu.Lock()
|
|
sourceOrigin = time.Now()
|
|
receivedMu.Unlock()
|
|
lastReport := sourceOrigin
|
|
var inputPackets, inputBytes uint32
|
|
type observation struct {
|
|
Second float64
|
|
Capacity, CodecBudget uint32
|
|
VideoBudget int64
|
|
Target, Current int32
|
|
DerivedFrames, DerivedBytes uint64
|
|
ReceivedFrames [2]int
|
|
ReceivedBytes [2]int
|
|
MaximumAge [2]time.Duration
|
|
PacketFrames [2]int
|
|
PacketBytes [2]int
|
|
MaximumPacketAge [2]time.Duration
|
|
}
|
|
var observations []observation
|
|
var previousFrames [2]int
|
|
var process *relayRun
|
|
var processStarts []float64
|
|
var constrained, recovered bool
|
|
for frameIndex := 0; ; frameIndex++ {
|
|
select {
|
|
case <-ticker.C:
|
|
case <-ctx.Done():
|
|
t.Fatal(ctx.Err())
|
|
}
|
|
now := time.Now()
|
|
elapsed := now.Sub(sourceOrigin)
|
|
if elapsed >= 30*time.Second {
|
|
break
|
|
}
|
|
capacity := uint32(6_000_000)
|
|
if elapsed >= 5*time.Second && elapsed < 18*time.Second {
|
|
capacity = 120_000
|
|
}
|
|
link.SetRate(int(capacity))
|
|
receivedMu.Lock()
|
|
inputTimes = append(inputTimes, now)
|
|
receivedMu.Unlock()
|
|
for _, packet := range packetizer.Packetize(motion[frameIndex%len(motion)], 3000) {
|
|
check(source.WriteRTP(packet))
|
|
inputPackets++
|
|
inputBytes += uint32(len(packet.Payload))
|
|
if packet.Marker {
|
|
check(source.SenderReport(&rtcp.SenderReport{SSRC: 1, RTPTime: packet.Timestamp,
|
|
NTPTime: uint64(mediatransportutil.ToNtpTime(now)), PacketCount: inputPackets, OctetCount: inputBytes}))
|
|
}
|
|
}
|
|
source.relay.mu.Lock()
|
|
if run := source.relay.run; run != nil {
|
|
if process != nil && process != run {
|
|
select {
|
|
case <-process.done:
|
|
default:
|
|
t.Error("derived codec processes overlapped")
|
|
}
|
|
}
|
|
if process != run {
|
|
processStarts = append(processStarts, elapsed.Seconds())
|
|
}
|
|
process = run
|
|
}
|
|
source.relay.mu.Unlock()
|
|
if now.Sub(lastReport) >= time.Second {
|
|
state, plan := children[1].transport.Output.State(), source.relayPlan()
|
|
physical := 0
|
|
source.writeMu.Lock()
|
|
currentSource := children[1].transport.CurrentSource()
|
|
if group := source.groupForMedia(currentSource); group != nil {
|
|
physical = group.slot
|
|
}
|
|
source.writeMu.Unlock()
|
|
row := observation{Second: elapsed.Seconds(), Capacity: capacity, CodecBudget: plan.controls.Bitrates[physical],
|
|
VideoBudget: state.VideoBudget, Target: state.Target, Current: state.Current}
|
|
if buffer := currentSource.GetAllBuffers()[0]; buffer != nil {
|
|
if stats := buffer.GetStats(); stats != nil {
|
|
row.DerivedFrames, row.DerivedBytes = uint64(stats.Frames), stats.Bytes
|
|
}
|
|
}
|
|
receivedMu.Lock()
|
|
row.PacketFrames, row.PacketBytes, row.MaximumPacketAge = intervalPacketFrames, intervalPacketBytes, intervalPacketAge
|
|
intervalPacketFrames, intervalPacketBytes, intervalPacketAge = [2]int{}, [2]int{}, [2]time.Duration{}
|
|
for child := range delivered {
|
|
for _, output := range delivered[child][previousFrames[child]:] {
|
|
row.ReceivedFrames[child]++
|
|
row.ReceivedBytes[child] += len(output.Data)
|
|
row.MaximumAge[child] = max(row.MaximumAge[child], output.DeliveryAge)
|
|
if child == 1 && capacity == 120_000 && output.Width == 320 && state.VideoBudget < int64(plan.output.Bitrate) {
|
|
constrained = true
|
|
}
|
|
if child == 1 && elapsed > 18*time.Second && output.Width == 640 && output.PTS > 18*time.Second {
|
|
recovered = true
|
|
}
|
|
if child == 0 && output.Width != 640 {
|
|
t.Error("healthy child lost original representation")
|
|
}
|
|
}
|
|
previousFrames[child] = len(delivered[child])
|
|
}
|
|
receivedMu.Unlock()
|
|
observations = append(observations, row)
|
|
t.Logf("%+.1fs capacity=%d budget=%d codec=%d output=%d/%d assembled=%v packetFrames=%v packetBytes=%v maxPacketAge=%v maxAUAge=%v",
|
|
row.Second, row.Capacity, row.VideoBudget, row.CodecBudget, row.Target, row.Current, row.ReceivedFrames, row.PacketFrames, row.PacketBytes, row.MaximumPacketAge, row.MaximumAge)
|
|
lastReport = now
|
|
}
|
|
}
|
|
check(source.Close())
|
|
for _, receiver := range receivers {
|
|
check(receiver.Close())
|
|
}
|
|
receivedMu.Lock()
|
|
defer receivedMu.Unlock()
|
|
// The last reporting tick precedes shutdown; include its unreported tail
|
|
// with the same original-size and post-release capture-time requirements.
|
|
for _, output := range delivered[1][previousFrames[1]:] {
|
|
if output.ReceivedAt > 18*time.Second && output.Width == 640 && output.PTS > 18*time.Second {
|
|
recovered = true
|
|
}
|
|
}
|
|
outputPath := os.Getenv("PIIK_ENCODED_OUTPUT")
|
|
if outputPath == "" {
|
|
t.Fatal("PIIK_ENCODED_OUTPUT must name the ignored received-frame artifact")
|
|
}
|
|
data, err := json.Marshal(delivered)
|
|
check(err)
|
|
check(os.WriteFile(outputPath, data, 0600))
|
|
data, err = json.MarshalIndent(struct {
|
|
Observations []observation
|
|
DroppedFrames [2]int
|
|
ProcessStarts []float64
|
|
Constrained, Recovered bool
|
|
}{observations, lost, processStarts, constrained, recovered}, "", " ")
|
|
check(err)
|
|
check(os.WriteFile(outputPath+".observations.json", data, 0600))
|
|
if !constrained || !recovered || process == nil || lost[0] != 0 {
|
|
t.Fatalf("actual codec/network result: constrained=%v recovered=%v process=%v loss=%v", constrained, recovered, process != nil, lost)
|
|
}
|
|
}
|