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

Initiate decoders globally #153

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Initiate decoders globally #153

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f9fe3b
Update gortsplib.go
cedricve Jan 15, 2025
81045ea
Update gortsplib.go
cedricve Jan 15, 2025
83c65fe
Merge branch 'master' into feature/global-decoder
cedricve Jan 16, 2025
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
49 changes: 30 additions & 19 deletions machinery/src/capture/gortsplib.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,25 @@ type Golibrtsp struct {
Streams []packets.Stream
}

// Init function
var H264FrameDecoder *Decoder
var H265FrameDecoder *Decoder

func init() {
var err error
// setup H264 -> raw frames decoder
H264FrameDecoder, err = newDecoder("H264")
if err != nil {
log.Log.Error("capture.golibrtsp.init(): " + err.Error())
}

// setup H265 -> raw frames decoder
H265FrameDecoder, err = newDecoder("H265")
if err != nil {
log.Log.Error("capture.golibrtsp.init(): " + err.Error())
}
}

// Connect to the RTSP server.
func (g *Golibrtsp) Connect(ctx context.Context) (err error) {

Expand Down Expand Up @@ -171,13 +190,7 @@ func (g *Golibrtsp) Connect(ctx context.Context) (err error) {
log.Log.Error("capture.golibrtsp.Connect(H264): " + err.Error())
}
g.VideoH264Decoder = rtpDec

// setup H264 -> raw frames decoder
frameDec, err := newDecoder("H264")
if err != nil {
log.Log.Error("capture.golibrtsp.Connect(H264): " + err.Error())
}
g.VideoH264FrameDecoder = frameDec
g.VideoH264FrameDecoder = H264FrameDecoder
}
}

Expand Down Expand Up @@ -227,12 +240,7 @@ func (g *Golibrtsp) Connect(ctx context.Context) (err error) {
}
g.VideoH265Decoder = rtpDec

// setup H265 -> raw frames decoder
frameDec, err := newDecoder("H265")
if err != nil {
log.Log.Error("capture.golibrtsp.Connect(H265): " + err.Error())
}
g.VideoH265FrameDecoder = frameDec
g.VideoH265FrameDecoder = H265FrameDecoder
}
}

Expand Down Expand Up @@ -882,12 +890,15 @@ func (g *Golibrtsp) GetAudioStreams() ([]packets.Stream, error) {
func (g *Golibrtsp) Close() error {
// Close the demuxer.
g.Client.Close()
if g.VideoH264Decoder != nil {
g.VideoH264FrameDecoder.Close()
}
if g.VideoH265FrameDecoder != nil {
g.VideoH265FrameDecoder.Close()
}

// We will have created the decoders globally, so we don't need to close them here.

//if g.VideoH264Decoder != nil {
// g.VideoH264FrameDecoder.Close()
//}
//if g.VideoH265FrameDecoder != nil {
// g.VideoH265FrameDecoder.Close()
//}
return nil
}

Expand Down
Loading