Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

another attempt to fix source bin removal #644

Merged
merged 1 commit into from
Mar 29, 2024
Merged

another attempt to fix source bin removal #644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions pkg/gstreamer/bin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/go-gst/go-glib/glib"
"github.com/go-gst/go-gst/gst"
"go.uber.org/atomic"

"github.com/livekit/egress/pkg/errors"
"github.com/livekit/protocol/logger"
Expand Down Expand Up @@ -218,33 +219,39 @@ func (b *Bin) probeRemoveSource(src *Bin) {
return
}

var removed atomic.Bool
srcPad := srcGhostPad.GetTarget()
srcPad.AddProbe(gst.PadProbeTypeAllBoth, func(_ *gst.Pad, _ *gst.PadProbeInfo) gst.PadProbeReturn {
if removed.Load() {
return gst.PadProbeRemove
}
return gst.PadProbeDrop
})
sinkPad := sinkGhostPad.GetTarget()
sinkPad.AddProbe(gst.PadProbeTypeBlockUpstream, func(_ *gst.Pad, _ *gst.PadProbeInfo) gst.PadProbeReturn {
// drop all upstream events
sinkPad.AddProbe(gst.PadProbeTypeAllBoth, func(_ *gst.Pad, _ *gst.PadProbeInfo) gst.PadProbeReturn {
if removed.Load() {
return gst.PadProbeRemove
}
return gst.PadProbeDrop
})

srcGhostPad.AddProbe(gst.PadProbeTypeIdle, func(_ *gst.Pad, _ *gst.PadProbeInfo) gst.PadProbeReturn {
if _, err := glib.IdleAdd(func() bool {
b.elements[0].ReleaseRequestPad(sinkPad)

srcGhostPad.Unlink(sinkGhostPad.Pad)
b.bin.RemovePad(sinkGhostPad.Pad)

if _, err := glib.IdleAdd(func() bool {
if err := b.pipeline.Remove(src.bin.Element); err != nil {
logger.Warnw("failed to remove bin", err, "bin", src.bin.GetName())
return false
}
if err := src.bin.SetState(gst.StateNull); err != nil {
logger.Warnw("failed to change bin state", err, "bin", src.bin.GetName())
}
removed.Store(true)
if err := b.pipeline.Remove(src.bin.Element); err != nil {
logger.Warnw("failed to remove bin", err, "bin", src.bin.GetName())
return false
}); err != nil {
logger.Errorw("failed to remove src bin", err, "bin", src.bin.GetName())
}

return gst.PadProbeRemove
})
if err := src.bin.SetState(gst.StateNull); err != nil {
logger.Warnw("failed to change bin state", err, "bin", src.bin.GetName())
return false
}
return false
}); err != nil {
logger.Errorw("failed to remove bin", err, "bin", src.bin.GetName())
}
}

func (b *Bin) probeRemoveSink(sink *Bin) {
Expand Down
Loading