mediaconvert: apply an adaptive deinterlacer for video presets (#151)

* mediaconvert: apply an adaptive deinterlacer for video presets

* fix: update deinterlace mode

* testing: update tests to check for deinterlacer

Author: zsiec

go.mod

@@ -5,6 +5,7 @@ replace github.com/bitmovin/bitmovin-api-sdk-go => github.com/zsiec/bitmovin-api
 require (
 	github.com/NYTimes/gizmo v1.3.5
 	github.com/NYTimes/gziphandler v1.1.1
+	github.com/aws/aws-sdk-go v1.29.24
 	github.com/aws/aws-sdk-go-v2 v0.20.0
 	github.com/aws/aws-xray-sdk-go v1.0.0-rc.15
 	github.com/bitmovin/bitmovin-api-sdk-go v1.36.0-alpha.0

provider/mediaconvert/h264.go

@@ -37,11 +37,6 @@ func h264CodecSettingsFrom(preset db.Preset) (*mediaconvert.VideoCodecSettings,
 		return nil, err
 	}
 
-	interlaceMode, err := h264InterlaceModeFrom(preset.Video.InterlaceMode)
-	if err != nil {
-		return nil, err
-	}
-
 	tuning := mediaconvert.H264QualityTuningLevelSinglePassHq
 	if preset.TwoPass {
 		tuning = mediaconvert.H264QualityTuningLevelMultiPassHq
@@ -56,7 +51,7 @@ func h264CodecSettingsFrom(preset db.Preset) (*mediaconvert.VideoCodecSettings,
 			RateControlMode:    rateControl,
 			CodecProfile:       profile,
 			CodecLevel:         mediaconvert.H264CodecLevelAuto,
-			InterlaceMode:      interlaceMode,
+			InterlaceMode:      mediaconvert.H264InterlaceModeProgressive,
 			QualityTuningLevel: tuning,
 		},
 	}, nil
@@ -101,13 +96,3 @@ func h264CodecProfileFrom(profile string) (mediaconvert.H264CodecProfile, error)
 		return "", fmt.Errorf("h264 profile %q is not supported with mediaconvert", profile)
 	}
 }
-
-func h264InterlaceModeFrom(mode string) (mediaconvert.H264InterlaceMode, error) {
-	mode = strings.ToLower(mode)
-	switch mode {
-	case "", "progressive":
-		return mediaconvert.H264InterlaceModeProgressive, nil
-	default:
-		return "", fmt.Errorf("h264 interlace mode %q is not supported with mediaconvert", mode)
-	}
-}

provider/mediaconvert/h265.go

@@ -42,11 +42,6 @@ func h265CodecSettingsFrom(preset db.Preset) (*mediaconvert.VideoCodecSettings,
 		return nil, err
 	}
 
-	interlaceMode, err := h265InterlaceModeFrom(preset.Video.InterlaceMode)
-	if err != nil {
-		return nil, err
-	}
-
 	tuning := mediaconvert.H265QualityTuningLevelSinglePassHq
 	if preset.TwoPass {
 		tuning = mediaconvert.H265QualityTuningLevelMultiPassHq
@@ -61,7 +56,7 @@ func h265CodecSettingsFrom(preset db.Preset) (*mediaconvert.VideoCodecSettings,
 			RateControlMode:                rateControl,
 			CodecProfile:                   profile,
 			CodecLevel:                     level,
-			InterlaceMode:                  interlaceMode,
+			InterlaceMode:                  mediaconvert.H265InterlaceModeProgressive,
 			QualityTuningLevel:             tuning,
 			WriteMp4PackagingType:          mediaconvert.H265WriteMp4PackagingTypeHvc1,
 			AlternateTransferFunctionSei:   mediaconvert.H265AlternateTransferFunctionSeiDisabled,
@@ -135,13 +130,3 @@ func h265CodecLevelFrom(level string) (mediaconvert.H265CodecLevel, error) {
 		return "", fmt.Errorf("h265 level %q is not supported with mediaconvert", level)
 	}
 }
-
-func h265InterlaceModeFrom(mode string) (mediaconvert.H265InterlaceMode, error) {
-	mode = strings.ToLower(mode)
-	switch mode {
-	case "", "progressive":
-		return mediaconvert.H265InterlaceModeProgressive, nil
-	default:
-		return "", fmt.Errorf("h265 interlace mode %q is not supported with mediaconvert", mode)
-	}
-}

provider/mediaconvert/mediaconvert_test.go

@@ -417,6 +417,13 @@ func Test_mcProvider_Transcode(t *testing.T) {
 										ScalingBehavior:   mediaconvert.ScalingBehaviorDefault,
 										TimecodeInsertion: mediaconvert.VideoTimecodeInsertionDisabled,
 										AntiAlias:         mediaconvert.AntiAliasEnabled,
+										VideoPreprocessors: &mediaconvert.VideoPreprocessor{
+											Deinterlacer: &mediaconvert.Deinterlacer{
+												Algorithm: mediaconvert.DeinterlaceAlgorithmInterpolate,
+												Control:   mediaconvert.DeinterlacerControlNormal,
+												Mode:      mediaconvert.DeinterlacerModeAdaptive,
+											},
+										},
 										CodecSettings: &mediaconvert.VideoCodecSettings{
 											Codec: mediaconvert.VideoCodecH264,
 											H264Settings: &mediaconvert.H264Settings{
@@ -501,6 +508,13 @@ func Test_mcProvider_Transcode(t *testing.T) {
 										ScalingBehavior:   mediaconvert.ScalingBehaviorDefault,
 										TimecodeInsertion: mediaconvert.VideoTimecodeInsertionDisabled,
 										AntiAlias:         mediaconvert.AntiAliasEnabled,
+										VideoPreprocessors: &mediaconvert.VideoPreprocessor{
+											Deinterlacer: &mediaconvert.Deinterlacer{
+												Algorithm: mediaconvert.DeinterlaceAlgorithmInterpolate,
+												Control:   mediaconvert.DeinterlacerControlNormal,
+												Mode:      mediaconvert.DeinterlacerModeAdaptive,
+											},
+										},
 										CodecSettings: &mediaconvert.VideoCodecSettings{
 											Codec: mediaconvert.VideoCodecH265,
 											H265Settings: &mediaconvert.H265Settings{
@@ -579,6 +593,13 @@ func Test_mcProvider_Transcode(t *testing.T) {
 										ScalingBehavior:   mediaconvert.ScalingBehaviorDefault,
 										TimecodeInsertion: mediaconvert.VideoTimecodeInsertionDisabled,
 										AntiAlias:         mediaconvert.AntiAliasEnabled,
+										VideoPreprocessors: &mediaconvert.VideoPreprocessor{
+											Deinterlacer: &mediaconvert.Deinterlacer{
+												Algorithm: mediaconvert.DeinterlaceAlgorithmInterpolate,
+												Control:   mediaconvert.DeinterlacerControlNormal,
+												Mode:      mediaconvert.DeinterlacerModeAdaptive,
+											},
+										},
 										CodecSettings: &mediaconvert.VideoCodecSettings{
 											Codec: mediaconvert.VideoCodecAv1,
 											Av1Settings: &mediaconvert.Av1Settings{

provider/mediaconvert/preset_mapping.go

@@ -163,6 +163,16 @@ func videoPresetFrom(preset db.Preset) (*mediaconvert.VideoDescription, error) {
 		return nil, fmt.Errorf("video codec %q is not yet supported with mediaconvert", codec)
 	}
 
+	if videoPreset.VideoPreprocessors == nil {
+		videoPreset.VideoPreprocessors = &mediaconvert.VideoPreprocessor{}
+	}
+
+	videoPreset.VideoPreprocessors.Deinterlacer = &mediaconvert.Deinterlacer{
+		Algorithm: mediaconvert.DeinterlaceAlgorithmInterpolate,
+		Control:   mediaconvert.DeinterlacerControlNormal,
+		Mode:      mediaconvert.DeinterlacerModeAdaptive,
+	}
+
 	return &videoPreset, nil
 }