Skip to content

Commit

Permalink
fix merge (#451)
Browse files Browse the repository at this point in the history
  • Loading branch information
frostbyte73 authored Aug 4, 2023
1 parent b0f95b9 commit 87bf902
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions pkg/pipeline/input/video.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand All @@ -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")
Expand Down

0 comments on commit 87bf902

Please sign in to comment.