gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor after #2160

Browse Source
This commit is contained in:
Sergey Krashevich
2026-03-21 13:45:29 +03:00
parent 0b6ac18043
commit da908ca6c1
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/webcodecs/consumer.go
+8 -7
View File
@@ -5,6 +5,7 @@ import (
"errors" "errors"
"io" "io"
"sync" "sync"
"sync/atomic"
"github.com/AlexxIT/go2rtc/pkg/aac" "github.com/AlexxIT/go2rtc/pkg/aac"
"github.com/AlexxIT/go2rtc/pkg/core" "github.com/AlexxIT/go2rtc/pkg/core"
@@ -25,7 +26,7 @@ type Consumer struct {
core.Connection core.Connection
wr *core.WriteBuffer wr *core.WriteBuffer
mu sync.Mutex mu sync.Mutex
start bool start atomic.Bool
UseGOP bool UseGOP bool
} }
@@ -92,11 +93,11 @@ func (c *Consumer) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiv
clockRate := codec.ClockRate clockRate := codec.ClockRate
handler.Handler = func(packet *rtp.Packet) { handler.Handler = func(packet *rtp.Packet) {
keyframe := h264.IsKeyframe(packet.Payload) keyframe := h264.IsKeyframe(packet.Payload)
if !c.start { if !c.start.Load() {
if !keyframe { if !keyframe {
return return
} }
c.start = true c.start.Store(true)
} }
payload := annexb.DecodeAVCC(packet.Payload, true) payload := annexb.DecodeAVCC(packet.Payload, true)
@@ -123,11 +124,11 @@ func (c *Consumer) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiv
clockRate := codec.ClockRate clockRate := codec.ClockRate
handler.Handler = func(packet *rtp.Packet) { handler.Handler = func(packet *rtp.Packet) {
keyframe := h265.IsKeyframe(packet.Payload) keyframe := h265.IsKeyframe(packet.Payload)
if !c.start { if !c.start.Load() {
if !keyframe { if !keyframe {
return return
} }
c.start = true c.start.Store(true)
} }
payload := annexb.DecodeAVCC(packet.Payload, true) payload := annexb.DecodeAVCC(packet.Payload, true)
@@ -153,7 +154,7 @@ func (c *Consumer) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiv
default: default:
clockRate := codec.ClockRate clockRate := codec.ClockRate
handler.Handler = func(packet *rtp.Packet) { handler.Handler = func(packet *rtp.Packet) {
if !c.start { if !c.start.Load() {
return return
} }
@@ -245,7 +246,7 @@ func (c *Consumer) GetInitInfo() *InitInfo {
func (c *Consumer) WriteTo(wr io.Writer) (int64, error) { func (c *Consumer) WriteTo(wr io.Writer) (int64, error) {
if len(c.Senders) == 1 && c.Senders[0].Codec.IsAudio() { if len(c.Senders) == 1 && c.Senders[0].Codec.IsAudio() {
c.start = true c.start.Store(true)
} }
return c.wr.WriteTo(wr) return c.wr.WriteTo(wr)
www/video-renderer.js
+1 -1
View File
@@ -213,7 +213,7 @@ class WebGL2Tier {
gl.useProgram(this.program); gl.useProgram(this.program);
gl.bindTexture(gl.TEXTURE_2D, this.texture); gl.bindTexture(gl.TEXTURE_2D, this.texture);
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, frame); gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, frame);
gl.drawArrays(gl.TRIANGLES, 0, 3); gl.drawArrays(gl.TRIANGLES, 0, 6);
} }
destroy() { destroy() {
www/video-rtc.js
+1 -1
View File
@@ -543,7 +543,7 @@ export class VideoRTC extends HTMLElement {
}; };
this.ondata = data => { this.ondata = data => {
this._wc.feed(data); if (this._wc) this._wc.feed(data);
}; };
this.send({type: 'webcodecs', value: ''}); this.send({type: 'webcodecs', value: ''});
www/video-webcodecs.js
+7 -2
View File
@@ -170,6 +170,10 @@ export class WebCodecsPlayer {
this._renderer.destroy(); this._renderer.destroy();
this._renderer = null; this._renderer = null;
} }
if (this._fsHandler) {
document.removeEventListener('fullscreenchange', this._fsHandler);
this._fsHandler = null;
}
if (this._container?.parentElement) { if (this._container?.parentElement) {
this._container.remove(); this._container.remove();
} }
@@ -247,11 +251,12 @@ export class WebCodecsPlayer {
container.requestFullscreen().catch(() => {}); container.requestFullscreen().catch(() => {});
} }
}); });
document.addEventListener('fullscreenchange', () => { this._fsHandler = () => {
const isFS = document.fullscreenElement === container; const isFS = document.fullscreenElement === container;
btnFS.innerHTML = svgIcon(isFS ? ICONS.fsExit : ICONS.fs); btnFS.innerHTML = svgIcon(isFS ? ICONS.fsExit : ICONS.fs);
btnFS.title = isFS ? 'Exit fullscreen' : 'Fullscreen'; btnFS.title = isFS ? 'Exit fullscreen' : 'Fullscreen';
}); };
document.addEventListener('fullscreenchange', this._fsHandler);
controls.append(btnPlay, timeLabel, spacer, btnMute, volume, btnFS); controls.append(btnPlay, timeLabel, spacer, btnMute, volume, btnFS);
container.append(controls); container.append(controls);