diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go index 96eb9fa4e9..76c743fdb0 100755 --- a/ffmpeg/ffmpeg.go +++ b/ffmpeg/ffmpeg.go @@ -538,18 +538,6 @@ type CodingSizeLimit struct { WidthMax, HeightMax int } -type Size struct { - W, H int -} - -func (s *Size) Valid(l *CodingSizeLimit) bool { - if s.W < l.WidthMin || s.W > l.WidthMax || s.H < l.HeightMin || s.H > l.HeightMax { - glog.Warningf("[not valid] profile %dx%d\n", s.W, s.H) - return false - } - return true -} - func clamp(val, min, max int) int { if val <= min { return min @@ -560,76 +548,12 @@ func clamp(val, min, max int) int { return val } -func (l *CodingSizeLimit) Clamp(p *VideoProfile, format MediaFormatInfo) error { - w, h, err := VideoProfileResolution(*p) - if err != nil { - return err - } - if w <= 0 || h <= 0 { - return fmt.Errorf("input resolution invalid; probe found w=%d h=%d", w, h) - } - // detect correct rotation - outputAr := float32(w) / float32(h) - inputAr := float32(format.Width) / float32(format.Height) - if (inputAr > 1.0) != (outputAr > 1.0) { - // comparing landscape to portrait, apply rotate on chosen resolution - w, h = h, w - } - // Adjust to minimal encode dimensions keeping aspect ratio - - var adjustedWidth, adjustedHeight Size - adjustedWidth.W = clamp(w, l.WidthMin, l.WidthMax) - adjustedWidth.H = format.ScaledHeight(adjustedWidth.W) - adjustedHeight.H = clamp(h, l.HeightMin, l.HeightMax) - adjustedHeight.W = format.ScaledWidth(adjustedHeight.H) - if adjustedWidth.Valid(l) { - p.Resolution = fmt.Sprintf("%dx%d", adjustedWidth.W, adjustedWidth.H) - return nil - } - if adjustedHeight.Valid(l) { - p.Resolution = fmt.Sprintf("%dx%d", adjustedHeight.W, adjustedHeight.H) - return nil - } - // Improve error message to include calculation context - return fmt.Errorf("profile %dx%d size out of bounds %dx%d-%dx%d input=%dx%d adjusted %dx%d or %dx%d", - w, h, l.WidthMin, l.WidthMin, l.WidthMax, l.HeightMax, format.Width, format.Height, adjustedWidth.W, adjustedWidth.H, adjustedHeight.W, adjustedHeight.H) -} - // 7th Gen NVENC limits: var nvidiaCodecSizeLimts = map[VideoCodec]CodingSizeLimit{ H264: {146, 50, 4096, 4096}, H265: {132, 40, 8192, 8192}, } -func ensureEncoderLimits(outputs []TranscodeOptions, format MediaFormatInfo) error { - // not using range to be able to make inplace modifications to outputs elements - for i := 0; i < len(outputs); i++ { - if outputs[i].Accel == Nvidia { - limits, haveLimits := nvidiaCodecSizeLimts[outputs[i].Profile.Encoder] - resolutionSpecified := outputs[i].Profile.Resolution != "" - // Sometimes rendition Resolution is not specified. We skip this rendition. - if haveLimits && resolutionSpecified { - err := limits.Clamp(&outputs[i].Profile, format) - if err != nil { - // add more context to returned error - p := outputs[i].Profile - return fmt.Errorf( - "%w; profile index=%d Resolution=%s FPS=%d/%d bps=%s codec=%d input ac=%s vc=%s w=%d h=%d", - err, i, - p.Resolution, - p.Framerate, p.FramerateDen, // given FramerateDen == 0 is corrected to be 1 - p.Bitrate, - p.Encoder, - format.Acodec, format.Vcodec, - format.Width, format.Height, - ) - } - } - } - } - return nil -} - func isAudioAllDrop(ps []TranscodeOptions) bool { for _, p := range ps { if p.AudioEncoder.Name != "drop" { @@ -667,8 +591,46 @@ func createCOutputParams(input *TranscodeOptionsIn, ps []TranscodeOptions) ([]C. return params, finalizer, err } } - // preserve aspect ratio along the larger dimension when rescaling - filters := fmt.Sprintf("%s='w=if(gte(iw,ih),%d,-2):h=if(lt(iw,ih),%d,-2)'", scale_filter, w, h) + + // use these as common limits even for non-nvidia + limits := nvidiaCodecSizeLimts[param.Encoder] + w = clamp(w, limits.WidthMin, limits.WidthMax) + h = clamp(h, limits.HeightMin, limits.HeightMax) + + /* + use the larger dimension requested from the transcode resolution + and proportionally rescale the smaller side of the input down + this does imply transposing the dimensions if necessary + + if this causes the smaller side to rescale below the minimum + then set the smaller side to the minimum + and rescale the larger side instead + + NB possibility that could also blow past the maximum + but the aspect ratio would have to be super skewed + + TODO check for unsupportable aspect ratios in the C + */ + + maxD := w + if h > w { + maxD = h + } + + wExpr := fmt.Sprintf(`trunc( + if(gte(iw,ih), + if(gte(%d*ih/iw,%d),%d,-2), + if(gte(%d,%d*iw/ih),%d,-2) + )/2)*2`, maxD, limits.HeightMin, maxD, limits.WidthMin, maxD, limits.WidthMin) + + hExpr := fmt.Sprintf(`trunc( + if(gt(ih,iw), + if(gte(%d*iw/ih,%d),%d,-2), + if(gte(%d,%d*ih/iw),%d,-2) + )/2)*2`, maxD, limits.WidthMin, maxD, limits.HeightMin, maxD, limits.HeightMin) + + filters := fmt.Sprintf("%s='w=%s:h=%s'", scale_filter, wExpr, hExpr) + if interpAlgo != "" { filters = fmt.Sprintf("%s:interp_algo=%s", filters, interpAlgo) } @@ -912,16 +874,7 @@ func (t *Transcoder) Transcode(input *TranscodeOptionsIn, ps []TranscodeOptions) if err != nil { return nil, err } - videoTrackPresent := format.Vcodec != "" - if status == CodecStatusOk && videoTrackPresent { - // We don't return error in case status != CodecStatusOk because proper error would be returned later in the logic. - // Like 'TranscoderInvalidVideo' or `No such file or directory` would be replaced by error we specify here. - // here we require input size and aspect ratio - err = ensureEncoderLimits(ps, format) - if err != nil { - return nil, err - } - } + // TODO hoist the rest of this into C so we don't have to invoke GetCodecInfo if !t.started { // NeedsBypass is state where video is present in container & without any frames videoMissing := status == CodecStatusNeedsBypass || format.Vcodec == "" diff --git a/ffmpeg/ffmpeg_test.go b/ffmpeg/ffmpeg_test.go index e23c92dce5..93e184b9cc 100644 --- a/ffmpeg/ffmpeg_test.go +++ b/ffmpeg/ffmpeg_test.go @@ -155,93 +155,112 @@ func TestSegmenter_DropLatePackets(t *testing.T) { run(cmd) } -func TestTranscoder_UnevenRes(t *testing.T) { - // Ensure transcoding still works on input with uneven resolutions - // and that aspect ratio is maintained +func TestTranscoder_Resolution(t *testing.T) { + runResolutionTests_H264(t, Software) + // TODO test HEVC clamping +} + +func runResolutionTests_H264(t *testing.T, accel Acceleration) { + // Test clamping behavior of rescaler + // and that aspect ratio is still maintained + // TODO make it possible to run setupTest within sub-tests run, dir := setupTest(t) defer os.RemoveAll(dir) - // Craft an input with an uneven res - cmd := ` - # borrow the test.ts from the transcoder dir, output with 123x456 res - ffmpeg -loglevel warning -i "$1/../transcoder/test.ts" -c:a copy -c:v mpeg4 -s 123x456 test.mp4 - - # sanity check resulting resolutions - ffprobe -loglevel warning -i test.mp4 -show_streams -select_streams v | grep width=123 - ffprobe -loglevel warning -i test.mp4 -show_streams -select_streams v | grep height=456 - - # and generate another sample with an odd value in the larger dimension - ffmpeg -loglevel warning -i "$1/../transcoder/test.ts" -c:a copy -c:v mpeg4 -s 123x457 test_larger.mp4 - ffprobe -loglevel warning -i test_larger.mp4 -show_streams -select_streams v | grep width=123 - ffprobe -loglevel warning -i test_larger.mp4 -show_streams -select_streams v | grep height=457 - - ` - run(cmd) - - err := Transcode(dir+"/test.mp4", dir, []VideoProfile{P240p30fps16x9}) - if err != nil { - t.Error(err) - } - - err = Transcode(dir+"/test_larger.mp4", dir, []VideoProfile{P240p30fps16x9}) - if err != nil { - t.Error(err) - } - - // Check output resolutions - cmd = ` - ffprobe -loglevel warning -show_streams -select_streams v out0test.mp4 | grep width=64 - ffprobe -loglevel warning -show_streams -select_streams v out0test.mp4 | grep height=240 - ffprobe -loglevel warning -show_streams -select_streams v out0test_larger.mp4 | grep width=64 - ffprobe -loglevel warning -show_streams -select_streams v out0test_larger.mp4 | grep height=240 - ` - run(cmd) - - // Transpose input and do the same checks as above. - cmd = ` - ffmpeg -loglevel warning -i test.mp4 -c:a copy -c:v mpeg4 -vf transpose transposed.mp4 - - # sanity check resolutions - ffprobe -loglevel warning -show_streams -select_streams v transposed.mp4 | grep width=456 - ffprobe -loglevel warning -show_streams -select_streams v transposed.mp4 | grep height=123 - ` - run(cmd) - - err = Transcode(dir+"/transposed.mp4", dir, []VideoProfile{P240p30fps16x9}) - if err != nil { - t.Error(err) - } - - // Check output resolutions for transposed input - cmd = ` - ffprobe -loglevel warning -show_streams -select_streams v out0transposed.mp4 | grep width=426 - ffprobe -loglevel warning -show_streams -select_streams v out0transposed.mp4 | grep height=114 - ` - run(cmd) - - // check special case of square resolutions - cmd = ` - ffmpeg -loglevel warning -i test.mp4 -c:a copy -c:v mpeg4 -s 123x123 square.mp4 - - # sanity check resolutions - ffprobe -loglevel warning -show_streams -select_streams v square.mp4 | grep width=123 - ffprobe -loglevel warning -show_streams -select_streams v square.mp4 | grep height=123 - ` - run(cmd) + tests := []struct { + name string + // input width and height + input string + // target resolution + target string + // expected width and height + expected string + }{{ + name: "h > w", + input: "150x200", + target: "0x250", + expected: "188x250", + }, { + name: "h > w, rounded height", + input: "200x300", + target: "0x427", + expected: "284x426", + }, { + name: "h > w, target swapped", + input: "200x300", + target: "426x0", + expected: "284x426", + }, { + name: "h > w, w < min", + input: "123x456", + target: "0x426", + expected: "146x542", + }, { + name: "h > w, rounded width", + input: "200x300", + target: "0x428", + expected: "286x428", + }, { + name: "h > w, w < min and h < min", + input: "400x456", + target: "0x40", + expected: "146x166", // will always hit min width here + }, { + name: "w > h", + input: "456x123", + target: "426x0", + expected: "426x114", + }, { + name: "w > h, target swapped and rounded width", + input: "456x123", + target: "0x301", + expected: "300x80", + }, { + name: "w > h, w < min", + input: "456x400", + target: "100x0", + expected: "146x128", + }, { + name: "w > h, target swapped and h < min", + input: "500x100", + target: "0x200", + expected: "250x50", + }, { + name: "w > h, target swapped", + input: "456x120", + target: "0x400", + expected: "400x106", + }, { + name: "square", + input: "123x123", + target: "426x0", + expected: "426x426", + }} - err = Transcode(dir+"/square.mp4", dir, []VideoProfile{P240p30fps16x9}) - if err != nil { - t.Error(err) + for i, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // TODO optimize by reusing inputs if possible + cmd := fmt.Sprintf(` + echo '%s' + ffmpeg -loglevel warning -i "$1/../transcoder/test.ts" -c:a copy -c:v mpeg4 -s %s -t 1 test-%d.mp4 + ffprobe -hide_banner -show_entries stream=width,height -of csv=p=0:s=x test-%d.mp4 | grep %s + `, tt.name, tt.input, i, i, tt.input) + run(cmd) + _, err := Transcode3(&TranscodeOptionsIn{ + Fname: fmt.Sprintf("%s/test-%d.mp4", dir, i), + }, []TranscodeOptions{{ + Oname: fmt.Sprintf("%s/out-test-%d.mp4", dir, i), + Profile: VideoProfile{Resolution: tt.target, Bitrate: "50k"}, + Accel: accel, + }}) + assert.Nil(t, err) + cmd = fmt.Sprintf(` + echo '%s' + ffprobe -hide_banner -show_entries stream=width,height -of csv=p=0:s=x out-test-%d.mp4 | grep %s`, tt.name, i, tt.expected) + run(cmd) + }) } - - // Check output resolutions are still square - cmd = ` - ffprobe -loglevel warning -i out0square.mp4 -show_streams -select_streams v | grep width=426 - ffprobe -loglevel warning -i out0square.mp4 -show_streams -select_streams v | grep height=426 - ` - run(cmd) - // TODO set / check sar/dar values? } @@ -448,7 +467,7 @@ func TestTranscoder_Statistics_Encoded(t *testing.T) { p144p60fps := P144p30fps16x9 p144p60fps.Framerate = 60 // odd / nonstandard input just to sanity check. - podd123fps := VideoProfile{Resolution: "124x70", Framerate: 123, Bitrate: "100k"} + podd123fps := VideoProfile{Resolution: "146x82", Framerate: 123, Bitrate: "100k"} // Construct output parameters. // Quickcheck style tests would be nice here one day? @@ -532,15 +551,15 @@ func TestTranscoder_StatisticsAspectRatio(t *testing.T) { ` run(cmd) - // This will be adjusted to 124x70 by the rescaler (since source is 16:9) - pAdj := VideoProfile{Resolution: "124x456", Framerate: 16, Bitrate: "100k"} + // This will be adjusted to 146x82 by the rescaler (since source is 16:9) + pAdj := VideoProfile{Resolution: "0x123", Framerate: 16, Bitrate: "100k"} out := []TranscodeOptions{{Profile: pAdj, Oname: dir + "/adj.mp4"}} res, err := Transcode3(&TranscodeOptionsIn{Fname: dir + "/test.ts"}, out) if err != nil || len(res.Encoded) <= 0 { t.Error(err) } r := res.Encoded[0] - if r.Frames != int(pAdj.Framerate+1) || r.Pixels != int64(r.Frames*124*70) { + if r.Frames != int(pAdj.Framerate+1) || r.Pixels != int64(r.Frames*146*82) { t.Error(fmt.Errorf("Results did not match: %v ", r)) } } @@ -1879,65 +1898,6 @@ func TestTranscoder_Clip2(t *testing.T) { assert.Equal(t, int64(22155264), res.Encoded[0].Pixels) } -func TestResolution_Clamp(t *testing.T) { - // expect no error - checkError := require.NoError - test := func(limit CodingSizeLimit, profile, input, expected Size) { - p := &VideoProfile{Resolution: fmt.Sprintf("%dx%d", profile.W, profile.H)} - m := MediaFormatInfo{Width: input.W, Height: input.H} - // call function we are testing: - err := limit.Clamp(p, m) - checkError(t, err) - var resultW, resultH int - _, err = fmt.Sscanf(p.Resolution, "%dx%d", &resultW, &resultH) - require.NoError(t, err) - assert.Equal(t, expected, Size{resultW, resultH}) - } - - l := CodingSizeLimit{ - WidthMin: 70, - HeightMin: 50, - WidthMax: 700, - HeightMax: 500, - } - // use aspect ratio == 2 to easily check calculation - portrait := Size{900, 1800} - landscape := Size{1800, 900} - - // no change, fits within hw limits - test(l, Size{120, 60}, landscape, Size{120, 60}) - // h=40 too small must be 50 - test(l, Size{80, 40}, landscape, Size{100, 50}) - // In portrait mode our profile 80x40 is interpreted as 40x80, increasing h=70 - test(l, Size{80, 40}, portrait, Size{70, 140}) - // portrait 60x120 used with landscape source, rotated to 120x60, within limits - test(l, Size{60, 120}, landscape, Size{120, 60}) - // portrait 60x120 profile on portrait source does not rotate, increasing w=70 - test(l, Size{60, 120}, portrait, Size{70, 140}) - - // test choice between adjustedWidth adjustedHeight variants: - test(l, Size{30, 60}, portrait, Size{70, 140}) - test(l, Size{30, 60}, landscape, Size{100, 50}) - - // Test max values: - test(l, Size{1000, 500}, landscape, Size{700, 350}) - test(l, Size{1000, 500}, portrait, Size{250, 500}) - test(l, Size{500, 1000}, landscape, Size{700, 350}) - test(l, Size{600, 300}, portrait, Size{250, 500}) - test(l, Size{300, 600}, portrait, Size{250, 500}) - - // Test impossible limits for aspect ratio == 2 - l = CodingSizeLimit{ - WidthMin: 500, - HeightMin: 500, - WidthMax: 600, - HeightMax: 600, - } - // expect error - checkError = require.Error - test(l, Size{300, 600}, portrait, Size{300, 600}) -} - func TestTranscoder_VFR(t *testing.T) { run, dir := setupTest(t) defer os.RemoveAll(dir) diff --git a/ffmpeg/nvidia_test.go b/ffmpeg/nvidia_test.go index 8d7f0c0e8e..86c0f76a88 100755 --- a/ffmpeg/nvidia_test.go +++ b/ffmpeg/nvidia_test.go @@ -766,7 +766,7 @@ func portraitTest(t *testing.T, input string, checkResults bool, profiles []Vide return resultErr } -func TestTranscoder_Portrait(t *testing.T) { +func TestNvidia_Portrait(t *testing.T) { hevc := VideoProfile{Name: "P240p30fps16x9", Bitrate: "600k", Framerate: 30, AspectRatio: "16:9", Resolution: "426x240", Encoder: H265} // Usuall portrait input sample @@ -787,6 +787,11 @@ func TestTranscoder_Portrait(t *testing.T) { // Error should be `profile 250x62500 size out of bounds 146x146-4096x4096 input=16x4000 adjusted 250x62500 or 16x4096` } +func TestNvidia_Resolution(t *testing.T) { + runResolutionTests_H264(t, Nvidia) + // TODO HEVC clamping +} + // XXX test bframes or delayed frames func TestNvidia_DiscontinuityAudioSegment(t *testing.T) {