From 87bf9024b10b03f499627a3ba67ec032281d1df7 Mon Sep 17 00:00:00 2001 From: David Colburn Date: Thu, 3 Aug 2023 18:12:25 -0700 Subject: [PATCH] fix merge (#451) --- pkg/pipeline/input/video.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/pipeline/input/video.go b/pkg/pipeline/input/video.go index 9158b386..e9cb3bbb 100644 --- a/pkg/pipeline/input/video.go +++ b/pkg/pipeline/input/video.go @@ -80,12 +80,10 @@ func (v *videoInput) buildAppSource(p *config.PipelineConfig) error { v.src = append(v.src, src.Element) switch { case strings.EqualFold(p.VideoCodecParams.MimeType, string(types.MimeTypeH264)): - if err := src.Element.SetProperty("caps", gst.NewCapsFromString( - fmt.Sprintf( - "application/x-rtp,media=video,payload=%d,encoding-name=H264,clock-rate=%d", - p.VideoCodecParams.PayloadType, p.VideoCodecParams.ClockRate, - ), - )); err != nil { + if err := src.Element.SetProperty("caps", gst.NewCapsFromString(fmt.Sprintf( + "application/x-rtp,media=video,payload=%d,encoding-name=H264,clock-rate=%d", + p.VideoCodecParams.PayloadType, p.VideoCodecParams.ClockRate, + ))); err != nil { return errors.ErrGstPipelineError(err) } @@ -100,10 +98,11 @@ func (v *videoInput) buildAppSource(p *config.PipelineConfig) error { return errors.ErrGstPipelineError(err) } if err = caps.SetProperty("caps", gst.NewCapsFromString( - `video/x-h264,stream-format="byte-stream"`)); err != nil { + `video/x-h264,stream-format="byte-stream"`, + )); err != nil { return errors.ErrGstPipelineError(err) } - v.elements = append(v.elements, caps) + v.src = append(v.src, caps) if p.VideoTranscoding { avDecH264, err := gst.NewElement("avdec_h264")