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>
421 lines
12 KiB
Go
421 lines
12 KiB
Go
package mediaedge
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"log/slog"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/TNTcraftHIM/Piik/internal/diagnostics"
|
|
"github.com/TNTcraftHIM/Piik/internal/media/forwarding"
|
|
"github.com/pion/ice/v4"
|
|
"github.com/pion/webrtc/v4"
|
|
)
|
|
|
|
const maxPendingCandidates = 64
|
|
|
|
type EdgeEvents struct {
|
|
LocalCandidate func(*webrtc.ICECandidateInit)
|
|
ConnectionState func(webrtc.PeerConnectionState, *SelectedPair)
|
|
}
|
|
|
|
type EdgeOptions struct {
|
|
ConnectionID string
|
|
ICEServers []webrtc.ICEServer
|
|
Audio *AudioSource
|
|
Local bool
|
|
Events EdgeEvents
|
|
}
|
|
|
|
type Edge struct {
|
|
connectionID string
|
|
engine *Engine
|
|
socket *iceSocket
|
|
source *Source
|
|
audioSource *AudioSource
|
|
connection *webrtc.PeerConnection
|
|
sender *webrtc.RTPSender
|
|
audioSender *webrtc.RTPSender
|
|
targetBitrate func() (int, bool)
|
|
events EdgeEvents
|
|
transport *forwarding.Transport
|
|
local bool
|
|
|
|
mu sync.Mutex
|
|
pendingCandidates []webrtc.ICECandidateInit
|
|
remoteDescriptionSet bool
|
|
closed bool
|
|
qualityMu sync.Mutex
|
|
qualityBaseline qualityBaseline
|
|
answerMu sync.Mutex
|
|
localCandidates *localCandidateGathering
|
|
}
|
|
|
|
func (engine *Engine) NewEdge(source *Source, options EdgeOptions) (_ *Edge, err error) {
|
|
if source == nil || source.engine != engine || options.ConnectionID == "" ||
|
|
len(options.ConnectionID) > 256 {
|
|
return nil, errors.New("native media edge input is invalid")
|
|
}
|
|
if options.Audio != nil && options.Audio.engine != engine {
|
|
return nil, errors.New("native audio edge source belongs to another engine")
|
|
}
|
|
if err := source.reserve(options.Local); err != nil {
|
|
return nil, err
|
|
}
|
|
if options.Audio != nil {
|
|
if err := options.Audio.reserve(options.Local); err != nil {
|
|
source.releaseReservation(options.Local)
|
|
return nil, err
|
|
}
|
|
}
|
|
socket, err := engine.newICESocket(options.ICEServers, !options.Local)
|
|
if err != nil {
|
|
source.releaseReservation(options.Local)
|
|
if options.Audio != nil {
|
|
options.Audio.releaseReservation(options.Local)
|
|
}
|
|
return nil, err
|
|
}
|
|
defer func() {
|
|
if err != nil {
|
|
socket.close()
|
|
}
|
|
}()
|
|
var prepareMapping func() int
|
|
if socket.portMapping != nil {
|
|
prepareMapping = socket.portMapping.Prepare
|
|
}
|
|
var audio webrtc.TrackLocal
|
|
if options.Audio != nil {
|
|
audio = options.Audio.track
|
|
}
|
|
transport, err := forwarding.NewTransport(forwarding.TransportOptions{
|
|
Source: source.media.Source, Settings: socket.settings(), ConnectionID: options.ConnectionID,
|
|
InitialBitrate: engine.initialBitrate, Audio: audio,
|
|
})
|
|
if err != nil {
|
|
source.releaseReservation(options.Local)
|
|
if options.Audio != nil {
|
|
options.Audio.releaseReservation(options.Local)
|
|
}
|
|
return nil, err
|
|
}
|
|
connection := transport.PC
|
|
log := slog.Default().With("connectionId", diagnostics.ID(options.ConnectionID), "rtcPeerId", diagnostics.ID(connection.ID()))
|
|
transport.SetAudioBitrate(options.Audio.configuredBitrate())
|
|
edge := &Edge{
|
|
connectionID: options.ConnectionID,
|
|
engine: engine,
|
|
socket: socket,
|
|
source: source,
|
|
audioSource: options.Audio,
|
|
connection: connection,
|
|
transport: transport,
|
|
local: options.Local,
|
|
targetBitrate: transport.TargetBitrate,
|
|
events: options.Events,
|
|
sender: transport.VideoSender,
|
|
audioSender: transport.AudioSender,
|
|
}
|
|
if err = engine.register(edge); err != nil {
|
|
source.releaseReservation(options.Local)
|
|
if options.Audio != nil {
|
|
options.Audio.releaseReservation(options.Local)
|
|
}
|
|
_ = transport.Close()
|
|
return nil, err
|
|
}
|
|
if err = source.attach(edge, options.Local); err != nil {
|
|
if options.Audio != nil {
|
|
options.Audio.releaseReservation(options.Local)
|
|
}
|
|
engine.remove(edge)
|
|
_ = transport.Close()
|
|
return nil, err
|
|
}
|
|
if options.Audio != nil {
|
|
if err = options.Audio.attach(edge, options.Local); err != nil {
|
|
source.detach(edge)
|
|
engine.remove(edge)
|
|
_ = transport.Close()
|
|
return nil, err
|
|
}
|
|
}
|
|
edge.localCandidates = newLocalCandidateGathering(
|
|
socket,
|
|
options.ICEServers,
|
|
prepareMapping,
|
|
options.Events.LocalCandidate,
|
|
)
|
|
connection.OnICECandidate(func(candidate *webrtc.ICECandidate) {
|
|
edge.localCandidates.addPion(candidate)
|
|
})
|
|
connection.OnICEConnectionStateChange(func(state webrtc.ICEConnectionState) {
|
|
log.Debug("piik-client", "event", "media-ice-state", "direction", "outbound", "local", options.Local, "state", state.String())
|
|
})
|
|
if dtls := edge.sender.Transport(); dtls != nil {
|
|
dtls.OnStateChange(func(state webrtc.DTLSTransportState) {
|
|
log.Debug("piik-client", "event", "media-dtls-state", "direction", "outbound", "local", options.Local, "state", state.String())
|
|
})
|
|
}
|
|
connection.OnConnectionStateChange(func(state webrtc.PeerConnectionState) {
|
|
debug := slog.Default().Enabled(engine.ctx, slog.LevelDebug)
|
|
if debug {
|
|
log.Debug("piik-client", "event", "media-connection-state", "direction", "outbound", "local", options.Local, "state", state.String())
|
|
}
|
|
if state == webrtc.PeerConnectionStateConnected {
|
|
if err := edge.transport.SetConnected(); err != nil {
|
|
if debug {
|
|
log.Debug("piik-client", "event", "media-activation-failed", diagnostics.Error(err))
|
|
}
|
|
_ = connection.Close()
|
|
return
|
|
}
|
|
edge.source.RequestRecoveryFrame()
|
|
}
|
|
var selected *SelectedPair
|
|
if state == webrtc.PeerConnectionStateConnected && (edge.events.ConnectionState != nil || debug) {
|
|
if pair, pairErr := edge.SelectedPair(); pairErr == nil {
|
|
selected = &pair
|
|
if debug {
|
|
log.Debug("piik-client", "event", "media-selected-path", "direction", "outbound", "local", options.Local,
|
|
"localType", pair.Local.String(), "remoteType", pair.Remote.String(), "natTraversalPath", pair.NatTraversalPath)
|
|
}
|
|
}
|
|
}
|
|
if edge.events.ConnectionState != nil {
|
|
edge.events.ConnectionState(state, selected)
|
|
}
|
|
})
|
|
return edge, nil
|
|
}
|
|
|
|
func (edge *Edge) ConnectionID() string {
|
|
return edge.connectionID
|
|
}
|
|
|
|
// SetTargetLayer is a media-component input, not a route change or UI setting.
|
|
func (edge *Edge) SetTargetLayer(layer int) error {
|
|
source := edge.source
|
|
changed := false
|
|
source.writeMu.Lock()
|
|
defer func() {
|
|
source.writeMu.Unlock()
|
|
if changed {
|
|
source.RequestRecoveryFrame()
|
|
}
|
|
}()
|
|
source.mu.Lock()
|
|
_, attached := source.edges[edge]
|
|
closed := source.closed
|
|
source.mu.Unlock()
|
|
if closed || !attached {
|
|
return io.ErrClosedPipe
|
|
}
|
|
if layer < 0 || layer >= len(source.formats) {
|
|
return errors.New("native output layer is invalid")
|
|
}
|
|
if len(source.outputBitrates) > 0 && source.outputBitrates[layer] == 0 {
|
|
return errors.New("native output layer is unavailable")
|
|
}
|
|
changed = edge.transport.Output.MaxLayer().Spatial != int32(layer)
|
|
edge.transport.Output.SetMaxSpatialLayer(int32(layer))
|
|
return nil
|
|
}
|
|
|
|
func (edge *Edge) CreateOffer() (webrtc.SessionDescription, error) {
|
|
offer, err := edge.connection.CreateOffer(nil)
|
|
if err != nil {
|
|
return webrtc.SessionDescription{}, err
|
|
}
|
|
if err = edge.connection.SetLocalDescription(offer); err != nil {
|
|
return webrtc.SessionDescription{}, err
|
|
}
|
|
edge.localCandidates.start()
|
|
return offer, nil
|
|
}
|
|
|
|
func (edge *Edge) SetAnswer(answer webrtc.SessionDescription) error {
|
|
edge.answerMu.Lock()
|
|
defer edge.answerMu.Unlock()
|
|
if answer.Type != webrtc.SDPTypeAnswer {
|
|
return errors.New("native media edge requires an SDP answer")
|
|
}
|
|
edge.mu.Lock()
|
|
if edge.closed {
|
|
edge.mu.Unlock()
|
|
return errors.New("native media edge is closed")
|
|
}
|
|
if edge.remoteDescriptionSet {
|
|
// The connection identity fences the answer to one edge. A repeated
|
|
// answer is a retransmission; the first applied description remains
|
|
// authoritative.
|
|
edge.mu.Unlock()
|
|
return nil
|
|
}
|
|
edge.mu.Unlock()
|
|
if err := edge.connection.SetRemoteDescription(answer); err != nil {
|
|
return err
|
|
}
|
|
edge.mu.Lock()
|
|
edge.remoteDescriptionSet = true
|
|
pending := edge.pendingCandidates
|
|
edge.pendingCandidates = nil
|
|
edge.mu.Unlock()
|
|
for _, candidate := range pending {
|
|
// Candidates are disposable edge input. The connection state callback
|
|
// remains the authority for a real media failure.
|
|
if err := edge.connection.AddICECandidate(candidate); err != nil {
|
|
slog.Debug("media-candidate-rejected", "connectionId", diagnostics.ID(edge.connectionID), "stage", "drain", diagnostics.Error(err))
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (edge *Edge) AddRemoteCandidate(candidate *webrtc.ICECandidateInit) error {
|
|
if malformedRemoteCandidate(candidate) {
|
|
slog.Debug("media-candidate-rejected", "connectionId", diagnostics.ID(edge.connectionID), "stage", "malformed")
|
|
return nil
|
|
}
|
|
value := webrtc.ICECandidateInit{}
|
|
if candidate != nil {
|
|
value = *candidate
|
|
}
|
|
edge.mu.Lock()
|
|
if edge.closed {
|
|
edge.mu.Unlock()
|
|
return nil
|
|
}
|
|
if !edge.remoteDescriptionSet {
|
|
if len(edge.pendingCandidates) >= maxPendingCandidates {
|
|
edge.mu.Unlock()
|
|
slog.Debug("media-candidate-rejected", "connectionId", diagnostics.ID(edge.connectionID), "stage", "queue-full", "capacity", maxPendingCandidates)
|
|
return nil
|
|
}
|
|
edge.pendingCandidates = append(edge.pendingCandidates, value)
|
|
edge.mu.Unlock()
|
|
return nil
|
|
}
|
|
edge.mu.Unlock()
|
|
// A candidate may become stale between validation and delivery. Dropping
|
|
// that one edge input keeps the shared control session alive; ICE state
|
|
// events still report whether the edge itself can connect.
|
|
if err := edge.connection.AddICECandidate(value); err != nil {
|
|
slog.Debug("media-candidate-rejected", "connectionId", diagnostics.ID(edge.connectionID), "stage", "apply", diagnostics.Error(err))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func malformedRemoteCandidate(candidate *webrtc.ICECandidateInit) bool {
|
|
if candidate == nil || candidate.Candidate == "" {
|
|
return false
|
|
}
|
|
_, err := ice.UnmarshalCandidate(strings.TrimPrefix(candidate.Candidate, "candidate:"))
|
|
return err != nil
|
|
}
|
|
|
|
type SelectedPair struct {
|
|
Local webrtc.ICECandidateType
|
|
Remote webrtc.ICECandidateType
|
|
NatTraversalPath string
|
|
}
|
|
|
|
func (edge *Edge) SelectedPair() (SelectedPair, error) {
|
|
transport := edge.sender.Transport()
|
|
if transport == nil || transport.ICETransport() == nil {
|
|
return SelectedPair{}, errors.New("native media ICE transport is unavailable")
|
|
}
|
|
pair, err := transport.ICETransport().GetSelectedCandidatePair()
|
|
if err != nil || pair == nil {
|
|
return SelectedPair{}, errors.New("native media ICE pair is unavailable")
|
|
}
|
|
return SelectedPair{
|
|
Local: pair.Local.Typ, Remote: pair.Remote.Typ,
|
|
NatTraversalPath: selectedNatTraversalPath(
|
|
pair.Local.Foundation,
|
|
pair.Remote.Foundation,
|
|
),
|
|
}, nil
|
|
}
|
|
|
|
func selectedNatTraversalPath(foundations ...string) string {
|
|
for _, foundation := range foundations {
|
|
if len(foundation) < 3 || foundation[0] != 's' ||
|
|
(foundation[1] != 'p' && foundation[1] != 'm') {
|
|
continue
|
|
}
|
|
if _, err := strconv.Atoi(foundation[2:]); err == nil {
|
|
return "predicted"
|
|
}
|
|
}
|
|
for _, foundation := range foundations {
|
|
if foundation != "" {
|
|
return "ordinary"
|
|
}
|
|
}
|
|
return "unknown"
|
|
}
|
|
|
|
func (edge *Edge) State() webrtc.PeerConnectionState {
|
|
return edge.connection.ConnectionState()
|
|
}
|
|
|
|
func (edge *Edge) Close() error {
|
|
edge.mu.Lock()
|
|
if edge.closed {
|
|
edge.mu.Unlock()
|
|
return nil
|
|
}
|
|
edge.closed = true
|
|
if edge.localCandidates != nil {
|
|
edge.localCandidates.close()
|
|
}
|
|
edge.pendingCandidates = nil
|
|
edge.mu.Unlock()
|
|
if edge.local && slog.Default().Enabled(edge.engine.ctx, slog.LevelDebug) {
|
|
logLocalMediaCandidateCounts(edge.connection.GetStats())
|
|
}
|
|
err := edge.transport.Close()
|
|
edge.socket.close()
|
|
edge.source.detach(edge)
|
|
if edge.audioSource != nil {
|
|
edge.audioSource.detach(edge)
|
|
}
|
|
edge.engine.remove(edge)
|
|
return err
|
|
}
|
|
|
|
func logLocalMediaCandidateCounts(report webrtc.StatsReport) {
|
|
for _, direction := range []webrtc.StatsType{webrtc.StatsTypeLocalCandidate, webrtc.StatsTypeRemoteCandidate} {
|
|
for _, kind := range []webrtc.ICECandidateType{webrtc.ICECandidateTypeHost, webrtc.ICECandidateTypeSrflx, webrtc.ICECandidateTypePrflx, webrtc.ICECandidateTypeRelay} {
|
|
udp, tcp := 0, 0
|
|
for _, entry := range report {
|
|
candidate, ok := entry.(webrtc.ICECandidateStats)
|
|
if !ok || candidate.Type != direction || candidate.CandidateType != kind || candidate.Deleted {
|
|
continue
|
|
}
|
|
switch candidate.Protocol {
|
|
case "udp":
|
|
udp++
|
|
case "tcp":
|
|
tcp++
|
|
}
|
|
}
|
|
slog.Debug("piik-client", "event", "media-candidate-counts", "local", true,
|
|
"direction", string(direction), "type", kind.String(), "udp", udp, "tcp", tcp)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Shutdown must release every transport before waiting on shared source writes.
|
|
func closeEdges(edges []*Edge) {
|
|
for _, edge := range edges {
|
|
_ = edge.connection.Close()
|
|
}
|
|
for _, edge := range edges {
|
|
_ = edge.Close()
|
|
}
|
|
}
|