diff --git a/core/transcoder/codecs.go b/core/transcoder/codecs.go index 76d85cca3..25564a908 100644 --- a/core/transcoder/codecs.go +++ b/core/transcoder/codecs.go @@ -16,6 +16,7 @@ type Codec interface { DisplayName() string GlobalFlags() string PixelFormat() string + Scaler() string ExtraArguments() string ExtraFilters() string VariantFlags(v *HLSVariant) string @@ -53,6 +54,11 @@ func (c *Libx264Codec) PixelFormat() string { return "yuv420p" //nolint:goconst } +// Scaler is the scaler used for resizing the video in the transcoder. +func (c *Libx264Codec) Scaler() string { + return "" +} + // ExtraArguments are the extra arguments used with this codec in the transcoder. func (c *Libx264Codec) ExtraArguments() string { return strings.Join([]string{ @@ -117,6 +123,11 @@ func (c *OmxCodec) PixelFormat() string { return "yuv420p" } +// Scaler is the scaler used for resizing the video in the transcoder. +func (c *OmxCodec) Scaler() string { + return "" +} + // ExtraArguments are the extra arguments used with this codec in the transcoder. func (c *OmxCodec) ExtraArguments() string { return strings.Join([]string{ @@ -183,6 +194,11 @@ func (c *VaapiCodec) PixelFormat() string { return "vaapi_vld" } +// Scaler is the scaler used for resizing the video in the transcoder. +func (c *VaapiCodec) Scaler() string { + return "scale_vaapi" +} + // ExtraFilters are the extra filters required for this codec in the transcoder. func (c *VaapiCodec) ExtraFilters() string { return "" @@ -245,6 +261,11 @@ func (c *NvencCodec) PixelFormat() string { return "yuv420p" } +// Scaler is the scaler used for resizing the video in the transcoder. +func (c *NvencCodec) Scaler() string { + return "" +} + // ExtraArguments are the extra arguments used with this codec in the transcoder. func (c *NvencCodec) ExtraArguments() string { return "" @@ -304,6 +325,11 @@ func (c *QuicksyncCodec) PixelFormat() string { return "nv12" } +// Scaler is the scaler used for resizing the video in the transcoder. +func (c *QuicksyncCodec) Scaler() string { + return "" +} + // ExtraArguments are the extra arguments used with this codec in the transcoder. func (c *QuicksyncCodec) ExtraArguments() string { return "" @@ -362,6 +388,11 @@ func (c *Video4Linux) PixelFormat() string { return "nv21" } +// Scaler is the scaler used for resizing the video in the transcoder. +func (c *Video4Linux) Scaler() string { + return "" +} + // ExtraArguments are the extra arguments used with this codec in the transcoder. func (c *Video4Linux) ExtraArguments() string { return "" @@ -421,6 +452,11 @@ func (c *VideoToolboxCodec) PixelFormat() string { return "nv12" } +// Scaler is the scaler used for resizing the video in the transcoder. +func (c *VideoToolboxCodec) Scaler() string { + return "" +} + // ExtraFilters are the extra filters required for this codec in the transcoder. func (c *VideoToolboxCodec) ExtraFilters() string { return "" diff --git a/core/transcoder/transcoder.go b/core/transcoder/transcoder.go index 57dbd4b9f..03a298959 100644 --- a/core/transcoder/transcoder.go +++ b/core/transcoder/transcoder.go @@ -300,7 +300,7 @@ func (v *HLSVariant) getVariantString(t *Transcoder) string { if (v.videoSize.Width != 0 || v.videoSize.Height != 0) && !v.isVideoPassthrough { // Order here matters, you must scale before changing hardware formats filters := []string{ - v.getScalingString(), + v.getScalingString(t.codec.Scaler()), } if t.codec.ExtraFilters() != "" { filters = append(filters, t.codec.ExtraFilters()) @@ -351,8 +351,11 @@ func (v *HLSVariant) SetVideoScalingHeight(height int) { v.videoSize.Height = height } -func (v *HLSVariant) getScalingString() string { - return fmt.Sprintf("scale=%s", v.videoSize.getString()) +func (v *HLSVariant) getScalingString(scaler string) string { + if scaler == "" { + scaler = "scale" + } + return fmt.Sprintf("%s=%s", scaler, v.videoSize.getString()) } // Video Quality