March 2025 - ffmpeg-cvslog - lists.ffmpeg.org

swscale/swscale_unscaled: Actually use X2->RGBA64 conversions
by Andreas Rheinhardt 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Mar 31 17:01:51 2025 +0200| [4da84d5c2b2b0cd415ef4c514f716784654cee54] | committer: Andreas Rheinhardt swscale/swscale_unscaled: Actually use X2->RGBA64 conversions The conversion functions were added in e7382b4d0101f02e61fdf5ad2c48aca500bb413f, yet they were never really enabled. Found via -ffunction-sections and --gc-sections. Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4da84d5c2b2b0cd41… --- libswscale/swscale_unscaled.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 4959963b18..b84120549e 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1901,7 +1901,8 @@ static rgbConvFn findRgbConvFn(SwsInternal *c) else if (CONV_IS(X2RGB10LE, BGR48BE) || CONV_IS(X2BGR10LE, RGB48BE)) conv = HAVE_BIGENDIAN ? x2rgb10tobgr48_nobswap : x2rgb10tobgr48_bswap; - else if (CONV_IS(X2RGB10LE, RGBA64LE) + } else if (isX2RGB(srcFormat) && isRGBA64(dstFormat)) { + if (CONV_IS(X2RGB10LE, RGBA64LE) || CONV_IS(X2BGR10LE, BGRA64LE)) conv = HAVE_BIGENDIAN ? x2rgb10to64_bswap : x2rgb10to64_nobswap; else if (CONV_IS(X2RGB10LE, RGBA64BE)

1 0

doc/encoders: Move FFV1 encoder to video encoder section
by Andreas Rheinhardt 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Mar 31 08:38:02 2025 +0200| [581a6a042ca807a3dfa0604fe893982acd50eb80] | committer: Andreas Rheinhardt doc/encoders: Move FFV1 encoder to video encoder section It is not an audio encoder. Reviewed-by: Gyan Doshi <ffmpeg(a)gyani.pro> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=581a6a042ca807a3d… --- doc/encoders.texi | 84 +++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index f987a234bc..64f8593cb3 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -518,48 +518,6 @@ Selected by Encoder (default) @end table -@anchor{ffv1} -@section ffv1 - -FFv1 Encoder - -@subsection Options - -The following options are supported by FFmpeg's FFv1 encoder. - -@table @option -@item context -Sets the context size, 0 (default) is small, 1 is big. - -@item coder -Set the coder, -@table @samp -@item rice -Golomb rice coder -@item range_def -Range coder with default table -@item range_tab -Range coder with custom table -@end table - -@item slicecrc --1 (default, automatic), 1 use crc with zero initial and final state, 2 use crc with non zero initial and final state - -@item qtable -@table @samp -@item default -default, automatic -@item 8bit -use 8bit default -@item greater8bit -use >8bit default -@end table - -@item remap_optimizer -0 - 5, default 3, how much effort the encoder puts into optimizing the remap table. - -@end table - @anchor{flac} @section flac @@ -1422,6 +1380,48 @@ Higher is better but slower. @end table +@anchor{ffv1} +@section ffv1 + +FFv1 Encoder + +@subsection Options + +The following options are supported by FFmpeg's FFv1 encoder. + +@table @option +@item context +Sets the context size, 0 (default) is small, 1 is big. + +@item coder +Set the coder, +@table @samp +@item rice +Golomb rice coder +@item range_def +Range coder with default table +@item range_tab +Range coder with custom table +@end table + +@item slicecrc +-1 (default, automatic), 1 use crc with zero initial and final state, 2 use crc with non zero initial and final state + +@item qtable +@table @samp +@item default +default, automatic +@item 8bit +use 8bit default +@item greater8bit +use >8bit default +@end table + +@item remap_optimizer +0 - 5, default 3, how much effort the encoder puts into optimizing the remap table. + +@end table + @section GIF GIF image/animation encoder.

1 0

tests/checkasm: fix wrong summation of bench time
by Niklas Haas 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Mon Mar 31 14:40:16 2025 +0200| [256a38101fd1bc26b020b870a202fd638616a0a6] | committer: Niklas Haas tests/checkasm: fix wrong summation of bench time This was changed 8 years ago with the introduction of the linux-perf path, with seemingly no justification at the time. Likely a developer oversight from testing. This bug not only made --runs completely ineffective, but also meant that we didn't actually correctly filter out outliers. Fixes: e0d56f097f42bcdbe6c3b2f57df62a4da63f2094 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=256a38101fd1bc26b… --- tests/checkasm/checkasm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 75c81317ba..131e71c56e 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -364,8 +364,8 @@ typedef struct CheckasmPerf { }\ }\ emms_c();\ - perf->cycles += t;\ - perf->iterations++;\ + perf->cycles += tsum;\ + perf->iterations += tcount;\ checkasm_set_signal_handler_state(0);\ }\ } while (0)

1 0

doc/filters: add thumbnail_cuda entry
by Danil Iashchenko 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Danil Iashchenko <danyaschenko(a)gmail.com> | Fri Mar 21 10:13:25 2025 +0000| [1015ea2ba15de8e7d4460496398c3eba6a42886d] | committer: Gyan Doshi doc/filters: add thumbnail_cuda entry Also update thumbnail_cuda filter description. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1015ea2ba15de8e7d… --- doc/filters.texi | 28 ++++++++++++++++++++++++++++ libavfilter/vf_thumbnail_cuda.c | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 37b8674756..52f67fbd0c 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -26917,6 +26917,34 @@ scale_cuda=passthrough=0 @end example @end itemize +@subsection thumbnail_cuda + +Select the most representative frame in a given sequence of consecutive frames using CUDA. + +The filter accepts the following options: + +@table @option +@item n +Set the frames batch size to analyze; in a set of @var{n} frames, the filter +will pick one of them, and then handle the next batch of @var{n} frames until +the end. Default is @code{100}. +@end table + +Since the filter keeps track of the whole frames sequence, a bigger @var{n} +value will result in a higher memory usage, so a high value is not recommended. + +@subsubsection Example + +@itemize + +@item +Thumbnails are extracted from every @var{n}=150-frame batch, selecting one per batch. Chosen frames are then scaled with @ref{scale_cuda}. +@example +./ffmpeg -hwaccel cuda -hwaccel_output_format cuda -i ./input.mp4 -vf "thumbnail_cuda=150,scale_cuda=1920:1080,hwdownload,format=nv12" ./output/out%03d.png +@end example + +@end itemize + @subsection yadif_cuda Deinterlace the input video using the @ref{yadif} algorithm, but implemented diff --git a/libavfilter/vf_thumbnail_cuda.c b/libavfilter/vf_thumbnail_cuda.c index ee09f7fa3e..121274de11 100644 --- a/libavfilter/vf_thumbnail_cuda.c +++ b/libavfilter/vf_thumbnail_cuda.c @@ -438,7 +438,7 @@ static const AVFilterPad thumbnail_cuda_outputs[] = { const FFFilter ff_vf_thumbnail_cuda = { .p.name = "thumbnail_cuda", - .p.description = NULL_IF_CONFIG_SMALL("Select the most representative frame in a given sequence of consecutive frames."), + .p.description = NULL_IF_CONFIG_SMALL("Select the most representative frame in a given sequence of consecutive frames using CUDA."), .p.priv_class = &thumbnail_cuda_class, .priv_size = sizeof(ThumbnailCudaContext), .init = init,

1 0

tests/swscale: allow setting log verbosity
by Niklas Haas 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Thu Feb 27 22:06:20 2025 +0100| [3e32dc8b0834b8a3f7487eb31c4aa41488846384] | committer: Niklas Haas tests/swscale: allow setting log verbosity Helpful for debugging the new swscale code, since it dumps the operations list in verbose logging mode. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e32dc8b0834b8a3f… --- libswscale/tests/swscale.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index d3c0cfdc43..7081058130 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -526,6 +526,8 @@ int main(int argc, char **argv) " Use the specified number of threads\n" " -cpuflags <cpuflags>\n" " Uses the specified cpuflags in the tests\n" + " -v <level>\n" + " Enable log verbosity at given level\n" ); return 0; } @@ -573,6 +575,8 @@ int main(int argc, char **argv) opts.threads = atoi(argv[i + 1]); } else if (!strcmp(argv[i], "-p")) { opts.prob = atof(argv[i + 1]); + } else if (!strcmp(argv[i], "-v")) { + av_log_set_level(atoi(argv[i + 1])); } else { bad_option: fprintf(stderr, "bad option or argument missing (%s) see -help\n", argv[i]);

1 0

tests/swscale: constrain reference SSIM for low bit depth formats
by Niklas Haas 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Tue Mar 4 15:49:50 2025 +0100| [92a57f1cfdfeb67eab3f0fac5448b494e668ea66] | committer: Niklas Haas tests/swscale: constrain reference SSIM for low bit depth formats Sometimes, the reference SSIM is significantly higher than the SSIM level expected for the test. This is the case when the source format has a much lower bit depth than the destination format. In this case, the fact that legacy swscale does not accurately preserve the source dither pattern gives it an unfair advantage in a direct comparison, leading to false positives. For example, conversion like rgb4 -> rgb565 should be lossless, but swscale low passes / downscales the input chroma, throwing away massive amounts of detail. This gives it a higher SSIM score since the lowpassed result removes some of the dither noise that was present in the source. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92a57f1cfdfeb67ea… --- libswscale/tests/swscale.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index 432de7d1fd..d3c0cfdc43 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -321,6 +321,18 @@ static int run_test(enum AVPixelFormat src_fmt, enum AVPixelFormat dst_fmt, goto error; get_ssim(ssim_sws, out, ref, comps); + + /* Legacy swscale does not perform bit accurate upconversions of low + * bit depth RGB. This artificially improves the SSIM score because the + * resulting error deletes some of the input dither noise. This gives + * it an unfair advantage when compared against a bit exact reference. + * Work around this by ensuring that the reference SSIM score is not + * higher than it theoretically "should" be. */ + if (src_var > dst_var) { + const float src_loss = (2 * ref_var + c1) / (2 * ref_var + src_var + c1); + ssim_sws[0] = FFMIN(ssim_sws[0], src_loss); + } + ssim_ref = ssim_sws; }

1 0

tests/swscale: calculate theoretical expected SSIM
by Niklas Haas 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Tue Mar 4 13:59:13 2025 +0100| [8fc9808f18a18e7f0bfcc5de62bf7d9e94f7c455] | committer: Niklas Haas tests/swscale: calculate theoretical expected SSIM We can calculate with some confidence the theoretical expected SSIM from an "ideal" conversion, by computing the reference SSIM level for an image dithered with uniformly distributed quatization noise. This gives us an additional safety net to check for regressions even in the absence of a reference to compare against. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fc9808f18a18e7f0… --- libswscale/tests/swscale.c | 74 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 12 deletions(-) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index 6056fccfb3..432de7d1fd 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -99,6 +99,29 @@ static void exit_handler(int sig) exit(sig); } +/* Estimate luma variance assuming uniform dither noise distribution */ +static float estimate_quantization_noise(enum AVPixelFormat fmt) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); + float variance = 1.0 / 12; + if (desc->comp[0].depth < 8) { + /* Extra headroom for very low bit depth output */ + variance *= (8 - desc->comp[0].depth); + } + + if (desc->flags & AV_PIX_FMT_FLAG_FLOAT) { + return 0.0; + } else if (desc->flags & AV_PIX_FMT_FLAG_RGB) { + const float r = 0.299 / (1 << desc->comp[0].depth); + const float g = 0.587 / (1 << desc->comp[1].depth); + const float b = 0.114 / (1 << desc->comp[2].depth); + return (r * r + g * g + b * b) * variance; + } else { + const float y = 1.0 / (1 << desc->comp[0].depth); + return y * y * variance; + } +} + static int fmt_comps(enum AVPixelFormat fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); @@ -156,6 +179,18 @@ static void get_ssim(float ssim[4], const AVFrame *out, const AVFrame *ref, int } } +static float get_loss(const float ssim[4]) +{ + const float weights[3] = { 0.8, 0.1, 0.1 }; /* tuned for Y'CrCr */ + + float sum = 0; + for (int i = 0; i < 3; i++) + sum += weights[i] * ssim[i]; + sum *= ssim[3]; /* ensure alpha errors get caught */ + + return 1.0 - sum; +} + static int scale_legacy(AVFrame *dst, const AVFrame *src, struct mode mode, struct options opts) { @@ -198,6 +233,18 @@ static int run_test(enum AVPixelFormat src_fmt, enum AVPixelFormat dst_fmt, int64_t time, time_ref = 0; int ret = -1; + /* Estimate the expected amount of loss from bit depth reduction */ + const float c1 = 0.01 * 0.01; /* stabilization constant */ + const float ref_var = 1.0 / 12.0; /* uniformly distributed signal */ + const float src_var = estimate_quantization_noise(src_fmt); + const float dst_var = estimate_quantization_noise(dst_fmt); + const float out_var = estimate_quantization_noise(ref->format); + const float total_var = src_var + dst_var + out_var; + const float ssim_luma = (2 * ref_var + c1) / (2 * ref_var + total_var + c1); + const float ssim_expected[4] = { ssim_luma, 1, 1, 1 }; /* for simplicity */ + const float expected_loss = get_loss(ssim_expected); + float loss; + src = av_frame_alloc(); dst = av_frame_alloc(); out = av_frame_alloc(); @@ -251,6 +298,15 @@ static int run_test(enum AVPixelFormat src_fmt, enum AVPixelFormat dst_fmt, mode.flags, mode.dither, ssim[0], ssim[1], ssim[2], ssim[3]); + loss = get_loss(ssim); + if (loss - expected_loss > 1e-4 && dst_w >= ref->width && dst_h >= ref->height) { + int bad = loss - expected_loss > 1e-2; + printf("\033[1;31m loss %g is %s by %g, expected loss %g\033[0m\n", + loss, bad ? "WORSE" : "worse", loss - expected_loss, expected_loss); + if (bad) + goto error; + } + if (!ssim_ref && sws_isSupportedInput(src->format) && sws_isSupportedOutput(dst->format)) { /* Compare against the legacy swscale API as a reference */ time_ref = av_gettime_relative(); @@ -269,18 +325,12 @@ static int run_test(enum AVPixelFormat src_fmt, enum AVPixelFormat dst_fmt, } if (ssim_ref) { - const float weights[4] = { 0.8, 0.1, 0.1, 1.0 }; /* tuned for Y'CrCr */ - float err, sum = 0, sum_ref = 0; - for (int i = 0; i < 4; i++) { - sum += weights[i] * ssim[i]; - sum_ref += weights[i] * ssim_ref[i]; - } - - err = sum_ref / sum - 1.0; /* relative error */ - if (err > 1e-4 /* 0.01% headroom for dither noise etc */) { - int bad = err > 1e-2; /* 1% */ - printf("\033[1;31m %s by %f%%, ref SSIM {Y=%f U=%f V=%f A=%f}\033[0m\n", - bad ? "WORSE" : "worse", 100.0 * err, + const float loss_ref = get_loss(ssim_ref); + if (loss - loss_ref > 1e-4) { + int bad = loss - loss_ref > 1e-2; + printf("\033[1;31m loss %g is %s by %g, ref loss %g, " + "SSIM {Y=%f U=%f V=%f A=%f}\033[0m\n", + loss, bad ? "WORSE" : "worse", loss - loss_ref, loss_ref, ssim_ref[0], ssim_ref[1], ssim_ref[2], ssim_ref[3]); if (bad) goto error;

1 0

tests/swscale: remove stray whitespace in scanf format
by Niklas Haas 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Tue Feb 25 21:13:47 2025 +0100| [9549daa9963974f485cf07bd0b0ed9e7aaab31b6] | committer: Niklas Haas tests/swscale: remove stray whitespace in scanf format > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9549daa9963974f48… --- libswscale/tests/swscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index 82065719ab..6056fccfb3 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -388,7 +388,7 @@ static int run_file_tests(const AVFrame *ref, FILE *fp, struct options opts) struct mode mode; ret = sscanf(buf, - " %20s %dx%d -> %20s %dx%d, flags=0x%x dither=%u, " + "%20s %dx%d -> %20s %dx%d, flags=0x%x dither=%u, " "SSIM {Y=%f U=%f V=%f A=%f}\n", src_fmt_str, &sw, &sh, dst_fmt_str, &dw, &dh, &mode.flags, &mode.dither,

1 0

tests/swscale: check supported inputs for legacy swscale separately
by Niklas Haas 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Tue Feb 25 21:12:56 2025 +0100| [a22faeb992b2ac1d4b0e5222c02a65ac77aeb15b] | committer: Niklas Haas tests/swscale: check supported inputs for legacy swscale separately The new code path supports more formats, so we can't test them all against the legacy implementation. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a22faeb992b2ac1d4… --- libswscale/tests/swscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index 572eab20c8..82065719ab 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -251,7 +251,7 @@ static int run_test(enum AVPixelFormat src_fmt, enum AVPixelFormat dst_fmt, mode.flags, mode.dither, ssim[0], ssim[1], ssim[2], ssim[3]); - if (!ssim_ref) { + if (!ssim_ref && sws_isSupportedInput(src->format) && sws_isSupportedOutput(dst->format)) { /* Compare against the legacy swscale API as a reference */ time_ref = av_gettime_relative(); if (scale_legacy(dst, src, mode, opts) < 0) {

1 0

tests/swscale: print performance stats on exit
by Niklas Haas 31 Mar '25

31 Mar '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Tue Feb 25 18:17:25 2025 +0100| [e1736d0d0bc50d32ae85e76695bd53b25f26726d] | committer: Niklas Haas tests/swscale: print performance stats on exit > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1736d0d0bc50d32a… --- libswscale/tests/swscale.c | 47 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index e17ced11a8..572eab20c8 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -24,6 +24,7 @@ #include <string.h> #include <inttypes.h> #include <stdarg.h> +#include <signal.h> #undef HAVE_AV_CONFIG_H #include "libavutil/cpu.h" @@ -71,6 +72,33 @@ const SwsFlags flags[] = { static FFSFC64 prng_state; static SwsContext *sws[3]; /* reused between tests for efficiency */ +static double speedup_logavg; +static double speedup_min = 1e10; +static double speedup_max = 0; +static int speedup_count; + +static const char *speedup_color(double ratio) +{ + return ratio > 1.10 ? "\033[1;32m" : /* bold green */ + ratio > 1.02 ? "\033[32m" : /* green */ + ratio > 0.98 ? "" : /* default */ + ratio > 0.95 ? "\033[33m" : /* yellow */ + ratio > 0.90 ? "\033[31m" : /* red */ + "\033[1;31m"; /* bold red */ +} + +static void exit_handler(int sig) +{ + if (speedup_count) { + double ratio = exp(speedup_logavg / speedup_count); + printf("Overall speedup=%.3fx %s%s\033[0m, min=%.3fx max=%.3fx\n", ratio, + speedup_color(ratio), ratio >= 1.0 ? "faster" : "slower", + speedup_min, speedup_max); + } + + exit(sig); +} + static int fmt_comps(enum AVPixelFormat fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); @@ -261,16 +289,16 @@ static int run_test(enum AVPixelFormat src_fmt, enum AVPixelFormat dst_fmt, if (opts.bench && time_ref) { double ratio = (double) time_ref / time; - const char *color = ratio > 1.10 ? "\033[1;32m" : /* bold green */ - ratio > 1.02 ? "\033[32m" : /* green */ - ratio > 0.98 ? "" : /* default */ - ratio > 0.95 ? "\033[33m" : /* yellow */ - ratio > 0.90 ? "\033[31m" : /* red */ - "\033[1;31m"; /* bold red */ + if (FFMIN(time, time_ref) > 100 /* don't pollute stats with low precision */) { + speedup_min = FFMIN(speedup_min, ratio); + speedup_max = FFMAX(speedup_max, ratio); + speedup_logavg += log(ratio); + speedup_count++; + } printf(" time=%"PRId64" us, ref=%"PRId64" us, speedup=%.3fx %s%s\033[0m\n", - time / opts.iters, time_ref / opts.iters, ratio, color, - ratio >= 1.0 ? "faster" : "slower"); + time / opts.iters, time_ref / opts.iters, ratio, + speedup_color(ratio), ratio >= 1.0 ? "faster" : "slower"); } else if (opts.bench) { printf(" time=%"PRId64" us\n", time / opts.iters); } @@ -492,6 +520,7 @@ bad_option: ff_sfc64_init(&prng_state, 0, 0, 0, 12); av_lfg_init(&rand, 1); + signal(SIGINT, exit_handler); for (int i = 0; i < 3; i++) { sws[i] = sws_alloc_context(); @@ -537,5 +566,5 @@ error: av_frame_free(&ref); if (fp) fclose(fp); - return ret; + exit_handler(ret); }

1 0