July 2023 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/avf_showcwt: make read only variable const
by Paul B Mahol 24 Jul '23

24 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jul 23 09:04:46 2023 +0200| [9fb2efe3b33e9b589f6e93a32b5128b3aef98ab1] | committer: Paul B Mahol avfilter/avf_showcwt: make read only variable const > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fb2efe3b33e9b589… --- libavfilter/avf_showcwt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 0661afbcdd..8badfbd34e 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -577,7 +577,7 @@ static int run_channel_cwt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo { ShowCWTContext *s = ctx->priv; const int ch = *(int *)arg; - AVComplexFloat *dst = (AVComplexFloat *)s->fft_out->extended_data[ch]; + const AVComplexFloat *fft_out = (const AVComplexFloat *)s->fft_out->extended_data[ch]; const int output_padding_size = s->output_padding_size; const int ihop_size = s->ihop_size; const int ioffset = (output_padding_size - ihop_size) >> 1; @@ -597,7 +597,7 @@ static int run_channel_cwt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo const int kernel_stop = s->kernel_stop[y]; const int kernel_range = kernel_stop - kernel_start; - memcpy(srcx, dst + kernel_start, sizeof(*dst) * kernel_range); + memcpy(srcx, fft_out + kernel_start, sizeof(*fft_out) * kernel_range); s->fdsp->vector_fmul((float *)dstx, (const float *)srcx, (const float *)kernel, FFALIGN(kernel_range * 2, 16));

1 0

avcodec/evc*: Improve included headers
by Andreas Rheinhardt 24 Jul '23

24 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Jul 17 02:56:57 2023 +0200| [6e5e74c55bb71e17dcfc7519c6badf3334644f48] | committer: Andreas Rheinhardt avcodec/evc*: Improve included headers In particular, don't include avcodec.h in evc_frame_merge_bsf.c. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e5e74c55bb71e17d… --- libavcodec/evc_frame_merge_bsf.c | 3 +-- libavcodec/evc_parse.c | 1 - libavcodec/evc_parse.h | 1 - libavcodec/evc_parser.c | 2 +- libavcodec/evc_ps.c | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index cfdf24c69e..7b8e6b1c9e 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -18,13 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "get_bits.h" -#include "golomb.h" #include "bsf.h" #include "bsf_internal.h" -#include "avcodec.h" #include "evc.h" #include "evc_parse.h" +#include "evc_ps.h" // Access unit data typedef struct AccessUnitBuffer { diff --git a/libavcodec/evc_parse.c b/libavcodec/evc_parse.c index 447f6195c2..bd3a4416f2 100644 --- a/libavcodec/evc_parse.c +++ b/libavcodec/evc_parse.c @@ -17,7 +17,6 @@ */ #include "golomb.h" -#include "parser.h" #include "evc.h" #include "evc_parse.h" diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h index 55cdd553ea..4712310826 100644 --- a/libavcodec/evc_parse.h +++ b/libavcodec/evc_parse.h @@ -28,7 +28,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" -#include "libavutil/rational.h" #include "evc.h" #include "evc_ps.h" diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c index 76790d8111..8590ebcdaf 100644 --- a/libavcodec/evc_parser.c +++ b/libavcodec/evc_parser.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "parser.h" +#include "avcodec.h" #include "bytestream.h" #include "evc.h" #include "evc_parse.h" diff --git a/libavcodec/evc_ps.c b/libavcodec/evc_ps.c index fc2105b352..04ee6a45e6 100644 --- a/libavcodec/evc_ps.c +++ b/libavcodec/evc_ps.c @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "get_bits.h" #include "golomb.h" -#include "parser.h" #include "evc.h" #include "evc_ps.h"

1 0

avcodec/vvc_mp4toannexb_bsf: Improve included headers
by Andreas Rheinhardt 24 Jul '23

24 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Jul 17 02:37:02 2023 +0200| [3fe98db7bbe7132a5d0893597ed5d68923902965] | committer: Andreas Rheinhardt avcodec/vvc_mp4toannexb_bsf: Improve included headers A BSF should never include avcodec.h at all. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fe98db7bbe7132a5… --- libavcodec/vvc_mp4toannexb_bsf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/vvc_mp4toannexb_bsf.c b/libavcodec/vvc_mp4toannexb_bsf.c index 9e606cdc27..25c3726918 100644 --- a/libavcodec/vvc_mp4toannexb_bsf.c +++ b/libavcodec/vvc_mp4toannexb_bsf.c @@ -24,14 +24,12 @@ #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" -#include "avcodec.h" #include "bsf.h" #include "bsf_internal.h" #include "bytestream.h" +#include "defs.h" #include "vvc.h" -#include "libavcodec/get_bits.h" - #define MIN_VVCC_LENGTH 23 typedef struct VVCBSFContext {

1 0

lavd/opengl_enc: fix a compiler error
by Haihao Xiang 24 Jul '23

24 Jul '23

ffmpeg | branch: master | Haihao Xiang <haihao.xiang(a)intel.com> | Wed Jul 19 15:54:04 2023 +0800| [5b11ee94299fe4e07d3921a3b8f29fff72e1daa1] | committer: Haihao Xiang lavd/opengl_enc: fix a compiler error glcontext was added under CONFIG_SDL2 libavdevice/opengl_enc.c: In function ‘opengl_draw’: libavdevice/opengl_enc.c:1204:15: error: ‘OpenGLContext’ has no member named ‘glcontext’ Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b11ee94299fe4e07… --- libavdevice/opengl_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 8d059343fb..f9dc846bf1 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -1200,11 +1200,11 @@ static int opengl_draw(AVFormatContext *h, void *input, int repaint, int is_pkt) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); int ret; +#if CONFIG_SDL2 /* At this point, opengl->glcontext implies opengl->glcontext */ if (opengl->glcontext) SDL_GL_MakeCurrent(opengl->window, opengl->glcontext); -#if CONFIG_SDL2 if (!opengl->no_window && (ret = opengl_sdl_process_events(h)) < 0) goto fail; #endif

1 0

libavfilter/vf_dnn_detect: bbox index may bigger than bbox number
by Wenbin Chen 24 Jul '23

24 Jul '23

ffmpeg | branch: master | Wenbin Chen <wenbin.chen(a)intel.com> | Mon Jul 17 13:33:01 2023 +0800| [13f49a7c62094035ca169201b0313c853365651f] | committer: Guo Yejun libavfilter/vf_dnn_detect: bbox index may bigger than bbox number Fix a bug that queried bbox index may bigger than bbox's total number. Signed-off-by: Wenbin Chen <wenbin.chen(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13f49a7c62094035c… --- libavfilter/vf_dnn_detect.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 06efce02a6..6ef04e0958 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -106,12 +106,11 @@ static int dnn_detect_post_proc_ov(AVFrame *frame, DNNData *output, AVFilterCont float x1 = detections[i * detect_size + 5]; float y1 = detections[i * detect_size + 6]; - bbox = av_get_detection_bbox(header, i); - if (conf < conf_threshold) { continue; } + bbox = av_get_detection_bbox(header, header->nb_bboxes - nb_bboxes); bbox->x = (int)(x0 * frame->width); bbox->w = (int)(x1 * frame->width) - bbox->x; bbox->y = (int)(y0 * frame->height);

1 0

avcodec/aacdec_template: Fix undefined signed interger operations
by Michael Niedermayer 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Apr 24 18:21:28 2023 +0200| [87f76d3bee083d33707ed2cb459507186e32fc12] | committer: Michael Niedermayer avcodec/aacdec_template: Fix undefined signed interger operations Fixed: signed integer overflow: -2 * -1085502286 cannot be represented in type 'int' Fixed: 57986/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5123651145170944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87f76d3bee083d337… --- libavcodec/aacdec_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 2385ea58b0..e8dcd460a0 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -2856,8 +2856,8 @@ static void imdct_and_windowing_eld(AACContext *ac, SingleChannelElement *sce) ac->mdct512_fn(ac->mdct512, buf, in, sizeof(INTFLOAT)); for (i = 0; i < n; i+=2) { - buf[i + 0] = -(USE_FIXED + 1)*buf[i + 0]; - buf[i + 1] = (USE_FIXED + 1)*buf[i + 1]; + buf[i + 0] = -(int)(USE_FIXED + 1U)*buf[i + 0]; + buf[i + 1] = (int)(USE_FIXED + 1U)*buf[i + 1]; } // Like with the regular IMDCT at this point we still have the middle half // of a transform but with even symmetry on the left and odd symmetry on

1 0

avcodec/wavarc: Fix k limit
by Michael Niedermayer 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Apr 24 18:16:05 2023 +0200| [40cec0b46570bb27a5a0145ceab932d0318e6e52] | committer: Michael Niedermayer avcodec/wavarc: Fix k limit The implementation does not support k=32 Fixes: shift exponent 32 is too large for 32-bit type 'unsigned int' Fixes: 57976/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-5911925807775744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40cec0b46570bb27a… --- libavcodec/wavarc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index 6daad6a5a1..8e4c7d17dc 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -205,7 +205,7 @@ static int decode_1dif(AVCodecContext *avctx, if (block_type < 4 && block_type >= 0) { k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = get_urice(gb, k) + 1; - if (k > 32) + if (k >= 32) return AVERROR_INVALIDDATA; } @@ -297,7 +297,7 @@ static int decode_2slp(AVCodecContext *avctx, if (block_type < 5 && block_type >= 0) { k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = get_urice(gb, k) + 1; - if (k > 32) + if (k >= 32) return AVERROR_INVALIDDATA; }

1 0

fftools/ffmpeg_opt: Reduce scope of variables for deprecated code
by Andreas Rheinhardt 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Jul 22 20:57:12 2023 +0200| [071c625ad71ce328075408d564bbd9d6fbd42c5b] | committer: Andreas Rheinhardt fftools/ffmpeg_opt: Reduce scope of variables for deprecated code Reviewed-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=071c625ad71ce3280… --- fftools/ffmpeg_opt.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 1860e9d329..dc6044120a 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -372,9 +372,6 @@ static int opt_map(void *optctx, const char *opt, const char *arg) StreamMap *m = NULL; int i, negative = 0, file_idx, disabled = 0; int ret; -#if FFMPEG_OPT_MAP_SYNC - char *sync; -#endif char *map, *p; char *allow_unused; @@ -387,10 +384,14 @@ static int opt_map(void *optctx, const char *opt, const char *arg) return AVERROR(ENOMEM); #if FFMPEG_OPT_MAP_SYNC - /* parse sync stream first, just pick first matching stream */ - if (sync = strchr(map, ',')) { - *sync = 0; - av_log(NULL, AV_LOG_WARNING, "Specifying a sync stream is deprecated and has no effect\n"); + { + /* parse sync stream first, just pick first matching stream */ + char *sync = strchr(map, ','); + + if (sync) { + *sync = 0; + av_log(NULL, AV_LOG_WARNING, "Specifying a sync stream is deprecated and has no effect\n"); + } } #endif

1 0

fftools/ffmpeg_opt: Fix leak on error
by Andreas Rheinhardt 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Jul 22 20:55:10 2023 +0200| [8bb1bcf47d532c6f67dbc444bb7893f6f94f4c8a] | committer: Andreas Rheinhardt fftools/ffmpeg_opt: Fix leak on error Fixes Coverity id #1539096. Reviewed-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bb1bcf47d532c6f6… --- fftools/ffmpeg_opt.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index f7606ae6f6..1860e9d329 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -401,13 +401,14 @@ static int opt_map(void *optctx, const char *opt, const char *arg) ret = GROW_ARRAY(o->stream_maps, o->nb_stream_maps); if (ret < 0) - return ret; + goto fail; m = &o->stream_maps[o->nb_stream_maps - 1]; m->linklabel = av_get_token(&c, "]"); if (!m->linklabel) { av_log(NULL, AV_LOG_ERROR, "Invalid output link label: %s.\n", map); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto fail; } } else { if (allow_unused = strchr(map, '?')) @@ -415,7 +416,8 @@ static int opt_map(void *optctx, const char *opt, const char *arg) file_idx = strtol(map, &p, 0); if (file_idx >= nb_input_files || file_idx < 0) { av_log(NULL, AV_LOG_FATAL, "Invalid input file index: %d.\n", file_idx); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto fail; } if (negative) /* disable some already defined maps */ @@ -438,7 +440,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg) } ret = GROW_ARRAY(o->stream_maps, o->nb_stream_maps); if (ret < 0) - return ret; + goto fail; m = &o->stream_maps[o->nb_stream_maps - 1]; @@ -453,16 +455,19 @@ static int opt_map(void *optctx, const char *opt, const char *arg) } else if (disabled) { av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches disabled streams.\n" "To ignore this, add a trailing '?' to the map.\n", arg); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto fail; } else { av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n" "To ignore this, add a trailing '?' to the map.\n", arg); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto fail; } } - + ret = 0; +fail: av_freep(&map); - return 0; + return ret; } static int opt_attach(void *optctx, const char *opt, const char *arg)

1 0

fftools/opt_common: Fix leak on error
by Andreas Rheinhardt 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Jul 22 20:41:04 2023 +0200| [0368ded1a9fab23077cfc50f8878a0193dfd0510] | committer: Andreas Rheinhardt fftools/opt_common: Fix leak on error Fixes Coverity issue #743443. Reviewed-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0368ded1a9fab2307… --- fftools/opt_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fftools/opt_common.c b/fftools/opt_common.c index 913932c914..7c996f140d 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -1165,6 +1165,7 @@ int init_report(const char *env, FILE **file) av_log(NULL, AV_LOG_FATAL, "Invalid report file level\n"); av_free(key); av_free(val); + av_free(filename_template); return AVERROR(EINVAL); } envlevel = 1;

1 0

fftools/ffmpeg_opt: Fix leak on error
by Andreas Rheinhardt 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Jul 22 20:34:18 2023 +0200| [2654347d7adba61ab8a8cce470d657958f6f00f9] | committer: Andreas Rheinhardt fftools/ffmpeg_opt: Fix leak on error Fixes Coverity issue #1539097. Reviewed-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2654347d7adba61ab… --- fftools/ffmpeg_opt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 700db706a1..f7606ae6f6 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -497,7 +497,7 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) ret = GROW_ARRAY(o->audio_channel_maps, o->nb_audio_channel_maps); if (ret < 0) - return ret; + goto end; m = &o->audio_channel_maps[o->nb_audio_channel_maps - 1]; @@ -559,11 +559,13 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) } } + ret = 0; +end: av_free(mapchan); - return 0; + return ret; fail: - av_free(mapchan); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto end; } #endif

1 0

fftools/ffmpeg_mux_init: Fix leak on error
by Andreas Rheinhardt 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Jul 22 20:28:25 2023 +0200| [2a44c4bc9e2623e623981efe9f2510a45fce84f1] | committer: Andreas Rheinhardt fftools/ffmpeg_mux_init: Fix leak on error Fixes Coverity issue #1539098. Reviewed-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a44c4bc9e2623e62… --- fftools/ffmpeg_mux_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 86521417ec..0289cdabad 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -361,7 +361,7 @@ static int enc_stats_init(OutputStream *ost, EncStats *es, int pre, ret = GROW_ARRAY(es->components, es->nb_components); if (ret < 0) - return ret; + goto fail; c = &es->components[es->nb_components - 1];

1 0

avfilter/vf_libplacebo: fix skip_aa option range
by Niklas Haas 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Sun Jul 23 17:49:29 2023 +0200| [e9e37ea2f111cefa8654367cb3f920c1997e3760] | committer: Niklas Haas avfilter/vf_libplacebo: fix skip_aa option range Max incorrectly specified as 0, should be 1. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9e37ea2f111cefa8… --- libavfilter/vf_libplacebo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 3b92719225..0733211d0b 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -1453,7 +1453,7 @@ static const AVOption libplacebo_options[] = { { "custom_shader_bin", "Custom user shader as binary (mpv .hook format)", OFFSET(shader_bin), AV_OPT_TYPE_BINARY, .flags = STATIC }, /* Performance/quality tradeoff options */ - { "skip_aa", "Skip anti-aliasing", OFFSET(skip_aa), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 0, DYNAMIC }, + { "skip_aa", "Skip anti-aliasing", OFFSET(skip_aa), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC }, { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },

1 0

avcodec/nvenc: stop using deprecated rc modes with SDK 12.1
by Timo Rothenpieler 23 Jul '23

23 Jul '23

ffmpeg | branch: release/6.0 | Timo Rothenpieler <timo(a)rothenpieler.org> | Thu Jun 1 23:46:46 2023 +0200| [1ebb0e43f9a15a12cd94db44e4bc5424f8a5b0c9] | committer: Timo Rothenpieler avcodec/nvenc: stop using deprecated rc modes with SDK 12.1 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ebb0e43f9a15a12c… --- libavcodec/nvenc.c | 11 +++++++++++ libavcodec/nvenc.h | 5 +++++ libavcodec/nvenc_h264.c | 12 ++++++++++++ libavcodec/nvenc_hevc.c | 12 ++++++++++++ 4 files changed, 40 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 15dd819a58..3c68ed3930 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -43,9 +43,14 @@ #define CHECK_CU(x) FF_CUDA_CHECK_DL(avctx, dl_fn->cuda_dl, x) #define NVENC_CAP 0x30 + +#ifndef NVENC_NO_DEPRECATED_RC #define IS_CBR(rc) (rc == NV_ENC_PARAMS_RC_CBR || \ rc == NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ || \ rc == NV_ENC_PARAMS_RC_CBR_HQ) +#else +#define IS_CBR(rc) (rc == NV_ENC_PARAMS_RC_CBR) +#endif const enum AVPixelFormat ff_nvenc_pix_fmts[] = { AV_PIX_FMT_YUV420P, @@ -904,6 +909,7 @@ static void nvenc_override_rate_control(AVCodecContext *avctx) case NV_ENC_PARAMS_RC_CONSTQP: set_constqp(avctx); return; +#ifndef NVENC_NO_DEPRECATED_RC case NV_ENC_PARAMS_RC_VBR_MINQP: if (avctx->qmin < 0) { av_log(avctx, AV_LOG_WARNING, @@ -914,12 +920,15 @@ static void nvenc_override_rate_control(AVCodecContext *avctx) } /* fall through */ case NV_ENC_PARAMS_RC_VBR_HQ: +#endif case NV_ENC_PARAMS_RC_VBR: set_vbr(avctx); break; case NV_ENC_PARAMS_RC_CBR: +#ifndef NVENC_NO_DEPRECATED_RC case NV_ENC_PARAMS_RC_CBR_HQ: case NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ: +#endif break; } @@ -1193,12 +1202,14 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->outputPictureTimingSEI = 1; +#ifndef NVENC_NO_DEPRECATED_RC if (cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ || cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR_HQ || cc->rcParams.rateControlMode == NV_ENC_PARAMS_RC_VBR_HQ) { h264->adaptiveTransformMode = NV_ENC_H264_ADAPTIVE_TRANSFORM_ENABLE; h264->fmoMode = NV_ENC_H264_FMO_DISABLE; } +#endif if (ctx->flags & NVENC_LOSSLESS) { h264->qpPrimeYZeroTransformBypassFlag = 1; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 6cedd5bc27..3a4b456a41 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -78,6 +78,11 @@ typedef void ID3D11Device; #define NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH #endif +// SDK 12.1 compile time feature checks +#if NVENCAPI_CHECK_VERSION(12, 1) +#define NVENC_NO_DEPRECATED_RC +#endif + typedef struct NvencSurface { NV_ENC_INPUT_PTR input_surface; diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 5dc2961c3b..698615855b 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -100,6 +100,7 @@ static const AVOption options[] = { { "constqp", "Constant QP mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CONSTQP }, 0, 0, VE, "rc" }, { "vbr", "Variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_VBR }, 0, 0, VE, "rc" }, { "cbr", "Constant bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CBR }, 0, 0, VE, "rc" }, +#ifndef NVENC_NO_DEPRECATED_RC { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_MINQP) }, 0, 0, VE, "rc" }, { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_2_PASS_QUALITY) }, 0, 0, VE, "rc" }, @@ -109,6 +110,17 @@ static const AVOption options[] = { { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) }, 0, 0, VE, "rc" }, { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_HQ) }, 0, 0, VE, "rc" }, { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_HQ) }, 0, 0, VE, "rc" }, +#else + { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" }, + { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)", + 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" }, + { "ll_2pass_size", "Multi-pass optimized for constant frame size (deprecated)", + 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" }, + { "vbr_2pass", "Multi-pass variable bitrate mode (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" }, + { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" }, + { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" }, + { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" }, +#endif { "rc-lookahead", "Number of frames to look ahead for rate-control", OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_REGISTERED_FRAMES, VE }, diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 1362a927c8..d99077f170 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -89,6 +89,7 @@ static const AVOption options[] = { { "constqp", "Constant QP mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CONSTQP }, 0, 0, VE, "rc" }, { "vbr", "Variable bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_VBR }, 0, 0, VE, "rc" }, { "cbr", "Constant bitrate mode", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CBR }, 0, 0, VE, "rc" }, +#ifndef NVENC_NO_DEPRECATED_RC { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_MINQP) }, 0, 0, VE, "rc" }, { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_2_PASS_QUALITY) }, 0, 0, VE, "rc" }, @@ -98,6 +99,17 @@ static const AVOption options[] = { { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) }, 0, 0, VE, "rc" }, { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR_HQ) }, 0, 0, VE, "rc" }, { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR_HQ) }, 0, 0, VE, "rc" }, +#else + { "vbr_minqp", "Variable bitrate mode with MinQP (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" }, + { "ll_2pass_quality", "Multi-pass optimized for image quality (deprecated)", + 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" }, + { "ll_2pass_size", "Multi-pass optimized for constant frame size (deprecated)", + 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" }, + { "vbr_2pass", "Multi-pass variable bitrate mode (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" }, + { "cbr_ld_hq", "Constant bitrate low delay high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" }, + { "cbr_hq", "Constant bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_CBR) }, 0, 0, VE, "rc" }, + { "vbr_hq", "Variable bitrate high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = RCD(NV_ENC_PARAMS_RC_VBR) }, 0, 0, VE, "rc" }, +#endif { "rc-lookahead", "Number of frames to look ahead for rate-control", OFFSET(rc_lookahead), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "surfaces", "Number of concurrent surfaces", OFFSET(nb_surfaces), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, MAX_REGISTERED_FRAMES, VE },

1 0

configure: use non-deprecated nvenc GUID for conftest
by Timo Rothenpieler 23 Jul '23

23 Jul '23

ffmpeg | branch: release/6.0 | Timo Rothenpieler <timo(a)rothenpieler.org> | Thu Jun 1 23:24:43 2023 +0200| [9212b53ed5b2f7346036936d500e7954190fb08b] | committer: Timo Rothenpieler configure: use non-deprecated nvenc GUID for conftest > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9212b53ed5b2f7346… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index b6616f00b6..3cd3bdfb44 100755 --- a/configure +++ b/configure @@ -7042,7 +7042,7 @@ enabled nvenc && test_cc -I$source_path <<EOF || disable nvenc #include <ffnvcodec/nvEncodeAPI.h> NV_ENCODE_API_FUNCTION_LIST flist; -void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_PRESET_HQ_GUID } }; } +void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_CODEC_H264_GUID } }; } int main(void) { return 0; } EOF

1 0

avfilter: add transpose_vt for videotoolbox pix_fmt
by Zhao Zhili 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Sun Jul 16 17:13:29 2023 +0800| [89f5124d0a7cea568ab670614b8a67e458cd002e] | committer: Zhao Zhili avfilter: add transpose_vt for videotoolbox pix_fmt Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89f5124d0a7cea568… --- Changelog | 1 + configure | 2 + doc/filters.texi | 48 +++++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_transpose_vt.c | 246 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 300 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index dadaf15de6..bbda4f4fd4 100644 --- a/Changelog +++ b/Changelog @@ -26,6 +26,7 @@ version <next>: - Bitstream filter for editing metadata in VVC streams - Bitstream filter for converting VVC from MP4 to Annex B - scale_vt filter for videotoolbox +- transpose_vt filter for videotoolbox version 6.0: - Radiance HDR image support diff --git a/configure b/configure index 1ceea4c9ca..99388e7664 100755 --- a/configure +++ b/configure @@ -3821,6 +3821,7 @@ tonemap_vaapi_filter_deps="vaapi VAProcFilterParameterBufferHDRToneMapping" tonemap_opencl_filter_deps="opencl const_nan" transpose_opencl_filter_deps="opencl" transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags" +transpose_vt_filter_deps="videotoolbox VTPixelRotationSessionCreate" transpose_vulkan_filter_deps="vulkan spirv_compiler" unsharp_opencl_filter_deps="opencl" uspp_filter_deps="gpl avcodec" @@ -6465,6 +6466,7 @@ check_headers termios.h check_headers unistd.h check_headers valgrind/valgrind.h check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox +check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox check_headers windows.h check_headers asm/types.h diff --git a/doc/filters.texi b/doc/filters.texi index b1d9eb3dd2..6f47428aa0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -27670,6 +27670,54 @@ Default value is @code{0}. @end table +@section transpose_vt + +Transpose rows with columns in the input video and optionally flip it. +For more in depth examples see the @ref{transpose} video filter, which shares mostly the same options. + +It accepts the following parameters: + +@table @option + +@item dir +Specify the transposition direction. + +Can assume the following values: +@table @samp +@item cclock_flip +Rotate by 90 degrees counterclockwise and vertically flip. (default) + +@item clock +Rotate by 90 degrees clockwise. + +@item cclock +Rotate by 90 degrees counterclockwise. + +@item clock_flip +Rotate by 90 degrees clockwise and vertically flip. + +@item hflip +Flip the input video horizontally. + +@item vflip +Flip the input video vertically. + +@end table + +@item passthrough +Do not apply the transposition if the input geometry matches the one +specified by the specified value. It accepts the following values: +@table @samp +@item none +Always apply transposition. (default) +@item portrait +Preserve portrait geometry (when @var{height} >= @var{width}). +@item landscape +Preserve landscape geometry (when @var{width} >= @var{height}). +@end table + +@end table + @section transpose_vulkan Transpose rows with columns in the input video and optionally flip it. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ef2c87104f..30a0e22ef8 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -525,6 +525,7 @@ OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o OBJS-$(CONFIG_TRANSPOSE_NPP_FILTER) += vf_transpose_npp.o OBJS-$(CONFIG_TRANSPOSE_OPENCL_FILTER) += vf_transpose_opencl.o opencl.o opencl/transpose.o OBJS-$(CONFIG_TRANSPOSE_VAAPI_FILTER) += vf_transpose_vaapi.o vaapi_vpp.o +OBJS-$(CONFIG_TRANSPOSE_VT_FILTER) += vf_transpose_vt.o OBJS-$(CONFIG_TRANSPOSE_VULKAN_FILTER) += vf_transpose_vulkan.o vulkan.o vulkan_filter.o OBJS-$(CONFIG_TRIM_FILTER) += trim.o OBJS-$(CONFIG_UNPREMULTIPLY_FILTER) += vf_premultiply.o framesync.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index fefaa94d2b..089ad3a0ed 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -492,6 +492,7 @@ extern const AVFilter ff_vf_transpose; extern const AVFilter ff_vf_transpose_npp; extern const AVFilter ff_vf_transpose_opencl; extern const AVFilter ff_vf_transpose_vaapi; +extern const AVFilter ff_vf_transpose_vt; extern const AVFilter ff_vf_transpose_vulkan; extern const AVFilter ff_vf_trim; extern const AVFilter ff_vf_unpremultiply; diff --git a/libavfilter/version.h b/libavfilter/version.h index 77f38cb9b4..4a69d6be98 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 9 +#define LIBAVFILTER_VERSION_MINOR 10 #define LIBAVFILTER_VERSION_MICRO 100 diff --git a/libavfilter/vf_transpose_vt.c b/libavfilter/vf_transpose_vt.c new file mode 100644 index 0000000000..197ea5707c --- /dev/null +++ b/libavfilter/vf_transpose_vt.c @@ -0,0 +1,246 @@ +/* + * Copyright (c) 2023 Zhao Zhili <zhilizhao(a)tencent.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <VideoToolbox/VideoToolbox.h> + +#include "libavutil/hwcontext.h" +#include "libavutil/hwcontext_videotoolbox.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "internal.h" +#include "transpose.h" + +typedef struct TransposeVtContext { + AVClass *class; + + VTPixelRotationSessionRef session; + int dir; + int passthrough; +} TransposeVtContext; + +static av_cold int transpose_vt_init(AVFilterContext *avctx) +{ + TransposeVtContext *s = avctx->priv; + int ret; + + ret = VTPixelRotationSessionCreate(kCFAllocatorDefault, &s->session); + if (ret != noErr) { + av_log(avctx, AV_LOG_ERROR, "Rotation session create failed, %d\n", ret); + return AVERROR_EXTERNAL; + } + + return 0; +} + +static av_cold void transpose_vt_uninit(AVFilterContext *avctx) +{ + TransposeVtContext *s = avctx->priv; + + if (s->session) { + VTPixelRotationSessionInvalidate(s->session); + CFRelease(s->session); + s->session = NULL; + } +} + +static int transpose_vt_filter_frame(AVFilterLink *link, AVFrame *in) +{ + int ret; + AVFilterContext *ctx = link->dst; + TransposeVtContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + CVPixelBufferRef src; + CVPixelBufferRef dst; + + if (s->passthrough) + return ff_filter_frame(outlink, in); + + AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + ret = AVERROR(ENOMEM); + goto fail; + } + + ret = av_frame_copy_props(out, in); + if (ret < 0) + goto fail; + + src = (CVPixelBufferRef)in->data[3]; + dst = (CVPixelBufferRef)out->data[3]; + ret = VTPixelRotationSessionRotateImage(s->session, src, dst); + if (ret != noErr) { + av_log(ctx, AV_LOG_ERROR, "transfer image failed, %d\n", ret); + ret = AVERROR_EXTERNAL; + goto fail; + } + + av_frame_free(&in); + + return ff_filter_frame(outlink, out); + +fail: + av_frame_free(&in); + av_frame_free(&out); + return ret; +} + +static int transpose_vt_config_output(AVFilterLink *outlink) +{ + int err; + AVFilterContext *avctx = outlink->src; + TransposeVtContext *s = avctx->priv; + AVFilterLink *inlink = outlink->src->inputs[0]; + CFStringRef rotation = kVTRotation_0; + CFBooleanRef vflip = kCFBooleanFalse; + CFBooleanRef hflip = kCFBooleanFalse; + int swap_w_h = 0; + + if ((inlink->w >= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_LANDSCAPE) || + (inlink->w <= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_PORTRAIT)) { + av_log(avctx, AV_LOG_VERBOSE, + "w:%d h:%d -> w:%d h:%d (passthrough mode)\n", + inlink->w, inlink->h, inlink->w, inlink->h); + return 0; + } + + s->passthrough = TRANSPOSE_PT_TYPE_NONE; + + switch (s->dir) { + case TRANSPOSE_CCLOCK_FLIP: + rotation = kVTRotation_CCW90; + vflip = kCFBooleanTrue; + swap_w_h = 1; + break; + case TRANSPOSE_CCLOCK: + rotation = kVTRotation_CCW90; + swap_w_h = 1; + break; + case TRANSPOSE_CLOCK: + rotation = kVTRotation_CW90; + swap_w_h = 1; + break; + case TRANSPOSE_CLOCK_FLIP: + rotation = kVTRotation_CW90; + vflip = kCFBooleanTrue; + swap_w_h = 1; + break; + case TRANSPOSE_REVERSAL: + rotation = kVTRotation_180; + break; + case TRANSPOSE_HFLIP: + hflip = kCFBooleanTrue; + break; + case TRANSPOSE_VFLIP: + vflip = kCFBooleanTrue; + break; + default: + av_log(avctx, AV_LOG_ERROR, "Failed to set direction to %d\n", s->dir); + return AVERROR(EINVAL); + } + + err = VTSessionSetProperty(s->session, kVTPixelRotationPropertyKey_Rotation, + rotation); + if (err != noErr) { + av_log(avctx, AV_LOG_ERROR, "Set rotation property failed, %d\n", err); + return AVERROR_EXTERNAL; + } + err = VTSessionSetProperty(s->session, kVTPixelRotationPropertyKey_FlipVerticalOrientation, + vflip); + if (err != noErr) { + av_log(avctx, AV_LOG_ERROR, "Set vertical flip property failed, %d\n", err); + return AVERROR_EXTERNAL; + } + err = VTSessionSetProperty(s->session, kVTPixelRotationPropertyKey_FlipHorizontalOrientation, + hflip); + if (err != noErr) { + av_log(avctx, AV_LOG_ERROR, "Set horizontal flip property failed, %d\n", err); + return AVERROR_EXTERNAL; + } + + if (swap_w_h) { + outlink->w = inlink->h; + outlink->h = inlink->w; + } + + return 0; +} + +#define OFFSET(x) offsetof(TransposeVtContext, x) +#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) +static const AVOption transpose_vt_options[] = { + { "dir", "set transpose direction", + OFFSET(dir), AV_OPT_TYPE_INT, { .i64 = TRANSPOSE_CCLOCK_FLIP }, 0, 6, FLAGS, "dir" }, + { "cclock_flip", "rotate counter-clockwise with vertical flip", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, + { "clock", "rotate clockwise", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK }, .flags=FLAGS, .unit = "dir" }, + { "cclock", "rotate counter-clockwise", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK }, .flags=FLAGS, .unit = "dir" }, + { "clock_flip", "rotate clockwise with vertical flip", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, + { "reversal", "rotate by half-turn", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_REVERSAL }, .flags=FLAGS, .unit = "dir" }, + { "hflip", "flip horizontally", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_HFLIP }, .flags=FLAGS, .unit = "dir" }, + { "vflip", "flip vertically", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_VFLIP }, .flags=FLAGS, .unit = "dir" }, + + { "passthrough", "do not apply transposition if the input matches the specified geometry", + OFFSET(passthrough), AV_OPT_TYPE_INT, { .i64=TRANSPOSE_PT_TYPE_NONE }, 0, INT_MAX, FLAGS, "passthrough" }, + { "none", "always apply transposition", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_PT_TYPE_NONE }, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { "portrait", "preserve portrait geometry", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_PT_TYPE_PORTRAIT }, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { "landscape", "preserve landscape geometry", + 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_PT_TYPE_LANDSCAPE }, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + + { NULL } +}; + +AVFILTER_DEFINE_CLASS(transpose_vt); + +static const AVFilterPad transpose_vt_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = &transpose_vt_filter_frame, + }, +}; + +static const AVFilterPad transpose_vt_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = &transpose_vt_config_output, + }, +}; + +const AVFilter ff_vf_transpose_vt = { + .name = "transpose_vt", + .description = NULL_IF_CONFIG_SMALL("Transpose Videotoolbox frames"), + .priv_size = sizeof(TransposeVtContext), + .init = transpose_vt_init, + .uninit = transpose_vt_uninit, + FILTER_INPUTS(transpose_vt_inputs), + FILTER_OUTPUTS(transpose_vt_outputs), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VIDEOTOOLBOX), + .priv_class = &transpose_vt_class, + .flags = AVFILTER_FLAG_HWDEVICE, +};

1 0

avfilter: add scale_vt for videotoolbox pix_fmt
by Zhao Zhili 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Sun Jul 16 17:13:28 2023 +0800| [c2c96c4c2419859c4d1b11e6f907e58afb6dfa3c] | committer: Zhao Zhili avfilter: add scale_vt for videotoolbox pix_fmt For example, ./ffmpeg -hwaccel videotoolbox \ -hwaccel_output_format videotoolbox_vld \ -i ios-265.mov \ -c:v hevc_videotoolbox \ -profile:v main \ -b:v 3M \ -vf scale_vt=w=iw/2:h=ih/2:color_matrix=bt709:color_primaries=bt709:color_transfer=bt709 \ -c:a copy \ -tag:v hvc1 \ /tmp/test.mp4 Input: hevc (Main 10) (hvc1 / 0x31637668), yuv420p10le(tv, bt2020nc/bt2020/arib-std-b67), 3840x2160 Output: hevc (Main) (hvc1 / 0x31637668), yuv420p(tv, bt709, progressive), 1920x1080 Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2c96c4c2419859c4… --- Changelog | 1 + configure | 1 + doc/filters.texi | 21 ++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 4 +- libavfilter/vf_scale_vt.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 271 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 3876082844..dadaf15de6 100644 --- a/Changelog +++ b/Changelog @@ -25,6 +25,7 @@ version <next>: - Raw VVC bitstream parser, muxer and demuxer - Bitstream filter for editing metadata in VVC streams - Bitstream filter for converting VVC from MP4 to Annex B +- scale_vt filter for videotoolbox version 6.0: - Radiance HDR image support diff --git a/configure b/configure index eb2fe392b4..1ceea4c9ca 100755 --- a/configure +++ b/configure @@ -3833,6 +3833,7 @@ zmq_filter_deps="libzmq" zoompan_filter_deps="swscale" zscale_filter_deps="libzimg const_nan" scale_vaapi_filter_deps="vaapi" +scale_vt_filter_deps="videotoolbox" scale_vulkan_filter_deps="vulkan spirv_compiler" vpp_qsv_filter_deps="libmfx" vpp_qsv_filter_select="qsvvpp" diff --git a/doc/filters.texi b/doc/filters.texi index 9690332092..b1d9eb3dd2 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21184,6 +21184,27 @@ Scale a logo to 1/10th the height of a video, while preserving its display aspec @end example @end itemize +@section scale_vt + +Scale and convert the color parameters using VTPixelTransferSession. + +The filter accepts the following options: +@table @option +@item w +@item h +Set the output video dimension expression. Default value is the input dimension. + +@item color_matrix +Set the output colorspace matrix. + +@item color_primaries +Set the output color primaries. + +@item color_transfer +Set the output transfer characteristics. + +@end table + @section scharr Apply scharr operator to input video stream. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 9b7813575a..ef2c87104f 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -457,6 +457,7 @@ OBJS-$(CONFIG_SCALE_CUDA_FILTER) += vf_scale_cuda.o scale_eval.o \ OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o scale_eval.o OBJS-$(CONFIG_SCALE_QSV_FILTER) += vf_vpp_qsv.o OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o scale_eval.o vaapi_vpp.o +OBJS-$(CONFIG_SCALE_VT_FILTER) += vf_scale_vt.o scale_eval.o OBJS-$(CONFIG_SCALE_VULKAN_FILTER) += vf_scale_vulkan.o vulkan.o vulkan_filter.o OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o scale_eval.o OBJS-$(CONFIG_SCALE2REF_NPP_FILTER) += vf_scale_npp.o scale_eval.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9a7fadc58d..fefaa94d2b 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -427,6 +427,7 @@ extern const AVFilter ff_vf_scale_cuda; extern const AVFilter ff_vf_scale_npp; extern const AVFilter ff_vf_scale_qsv; extern const AVFilter ff_vf_scale_vaapi; +extern const AVFilter ff_vf_scale_vt; extern const AVFilter ff_vf_scale_vulkan; extern const AVFilter ff_vf_scale2ref; extern const AVFilter ff_vf_scale2ref_npp; diff --git a/libavfilter/version.h b/libavfilter/version.h index c001693e3c..77f38cb9b4 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 8 -#define LIBAVFILTER_VERSION_MICRO 102 +#define LIBAVFILTER_VERSION_MINOR 9 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_scale_vt.c b/libavfilter/vf_scale_vt.c new file mode 100644 index 0000000000..a7f72c8de9 --- /dev/null +++ b/libavfilter/vf_scale_vt.c @@ -0,0 +1,244 @@ +/* + * Copyright (c) 2023 Zhao Zhili <zhilizhao(a)tencent.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <VideoToolbox/VideoToolbox.h> + +#include "libavutil/hwcontext.h" +#include "libavutil/hwcontext_videotoolbox.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "internal.h" +#include "scale_eval.h" + +typedef struct ScaleVtContext { + AVClass *class; + + VTPixelTransferSessionRef transfer; + int output_width; + int output_height; + char *w_expr; + char *h_expr; + + enum AVColorPrimaries colour_primaries; + enum AVColorTransferCharacteristic colour_transfer; + enum AVColorSpace colour_matrix; + char *colour_primaries_string; + char *colour_transfer_string; + char *colour_matrix_string; +} ScaleVtContext; + +static av_cold int scale_vt_init(AVFilterContext *avctx) +{ + ScaleVtContext *s = avctx->priv; + int ret; + CFStringRef value; + + ret = VTPixelTransferSessionCreate(kCFAllocatorDefault, &s->transfer); + if (ret != noErr) { + av_log(avctx, AV_LOG_ERROR, "transfer session create failed, %d\n", ret); + return AVERROR_EXTERNAL; + } + +#define STRING_OPTION(var_name, func_name, default_value) \ + do { \ + if (s->var_name##_string) { \ + int var = av_##func_name##_from_name(s->var_name##_string); \ + if (var < 0) { \ + av_log(avctx, AV_LOG_ERROR, "Invalid %s.\n", #var_name); \ + return AVERROR(EINVAL); \ + } \ + s->var_name = var; \ + } else { \ + s->var_name = default_value; \ + } \ + } while (0) + + STRING_OPTION(colour_primaries, color_primaries, AVCOL_PRI_UNSPECIFIED); + STRING_OPTION(colour_transfer, color_transfer, AVCOL_TRC_UNSPECIFIED); + STRING_OPTION(colour_matrix, color_space, AVCOL_SPC_UNSPECIFIED); + + if (s->colour_primaries != AVCOL_PRI_UNSPECIFIED) { + value = av_map_videotoolbox_color_primaries_from_av(s->colour_primaries); + if (!value) { + av_log(avctx, AV_LOG_ERROR, + "Doesn't support converting to colour primaries %s\n", + s->colour_primaries_string); + return AVERROR(ENOTSUP); + } + VTSessionSetProperty(s->transfer, kVTPixelTransferPropertyKey_DestinationColorPrimaries, value); + } + + if (s->colour_transfer != AVCOL_TRC_UNSPECIFIED) { + value = av_map_videotoolbox_color_trc_from_av(s->colour_transfer); + if (!value) { + av_log(avctx, AV_LOG_ERROR, + "Doesn't support converting to trc %s\n", + s->colour_transfer_string); + return AVERROR(ENOTSUP); + } + VTSessionSetProperty(s->transfer, kVTPixelTransferPropertyKey_DestinationTransferFunction, value); + } + + if (s->colour_matrix != AVCOL_SPC_UNSPECIFIED) { + value = av_map_videotoolbox_color_matrix_from_av(s->colour_matrix); + if (!value) { + av_log(avctx, AV_LOG_ERROR, + "Doesn't support converting to colorspace %s\n", + s->colour_matrix_string); + return AVERROR(ENOTSUP); + } + VTSessionSetProperty(s->transfer, kVTPixelTransferPropertyKey_DestinationYCbCrMatrix, value); + } + + return 0; +} + +static av_cold void scale_vt_uninit(AVFilterContext *avctx) +{ + ScaleVtContext *s = avctx->priv; + + if (s->transfer) { + VTPixelTransferSessionInvalidate(s->transfer); + CFRelease(s->transfer); + s->transfer = NULL; + } +} + +static int scale_vt_filter_frame(AVFilterLink *link, AVFrame *in) +{ + int ret; + AVFilterContext *ctx = link->dst; + ScaleVtContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + CVPixelBufferRef src; + CVPixelBufferRef dst; + + AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + ret = AVERROR(ENOMEM); + goto fail; + } + + ret = av_frame_copy_props(out, in); + if (ret < 0) + goto fail; + + av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den, + (int64_t)in->sample_aspect_ratio.num * outlink->h * link->w, + (int64_t)in->sample_aspect_ratio.den * outlink->w * link->h, + INT_MAX); + if (s->colour_primaries != AVCOL_PRI_UNSPECIFIED) + out->color_primaries = s->colour_primaries; + if (s->colour_transfer != AVCOL_TRC_UNSPECIFIED) + out->color_trc = s->colour_transfer; + if (s->colour_matrix != AVCOL_SPC_UNSPECIFIED) + out->colorspace = s->colour_matrix; + + src = (CVPixelBufferRef)in->data[3]; + dst = (CVPixelBufferRef)out->data[3]; + ret = VTPixelTransferSessionTransferImage(s->transfer, src, dst); + if (ret != noErr) { + av_log(ctx, AV_LOG_ERROR, "transfer image failed, %d\n", ret); + ret = AVERROR_EXTERNAL; + goto fail; + } + + av_frame_free(&in); + + return ff_filter_frame(outlink, out); + +fail: + av_frame_free(&in); + av_frame_free(&out); + return ret; +} + +static int scale_vt_config_output(AVFilterLink *outlink) +{ + int err; + AVFilterContext *avctx = outlink->src; + ScaleVtContext *s = avctx->priv; + AVFilterLink *inlink = outlink->src->inputs[0]; + + err = ff_scale_eval_dimensions(s, s->w_expr, s->h_expr, inlink, outlink, + &s->output_width, + &s->output_height); + if (err < 0) + return err; + + outlink->w = s->output_width; + outlink->h = s->output_height; + + if (inlink->sample_aspect_ratio.num) { + AVRational r = {outlink->h * inlink->w, outlink->w * inlink->h}; + outlink->sample_aspect_ratio = av_mul_q(r, inlink->sample_aspect_ratio); + } else { + outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; + } + + return 0; +} + +#define OFFSET(x) offsetof(ScaleVtContext, x) +#define FLAGS (AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) +static const AVOption scale_vt_options[] = { + { "w", "Output video width", + OFFSET(w_expr), AV_OPT_TYPE_STRING, {.str = "iw"}, .flags = FLAGS }, + { "h", "Output video height", + OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, .flags = FLAGS }, + { "color_matrix", "Output colour matrix coefficient set", + OFFSET(colour_matrix_string), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, + { "color_primaries", "Output colour primaries", + OFFSET(colour_primaries_string), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, + { "color_transfer", "Output colour transfer characteristics", + OFFSET(colour_transfer_string), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, + { NULL }, +}; + +AVFILTER_DEFINE_CLASS(scale_vt); + +static const AVFilterPad scale_vt_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = &scale_vt_filter_frame, + }, +}; + +static const AVFilterPad scale_vt_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = &scale_vt_config_output, + }, +}; + +const AVFilter ff_vf_scale_vt = { + .name = "scale_vt", + .description = NULL_IF_CONFIG_SMALL("Scale Videotoolbox frames"), + .priv_size = sizeof(ScaleVtContext), + .init = scale_vt_init, + .uninit = scale_vt_uninit, + FILTER_INPUTS(scale_vt_inputs), + FILTER_OUTPUTS(scale_vt_outputs), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VIDEOTOOLBOX), + .priv_class = &scale_vt_class, + .flags = AVFILTER_FLAG_HWDEVICE, +};

1 0

avcodec/videotoolboxenc: use color parameters conversion from avutil
by Zhao Zhili 23 Jul '23

23 Jul '23

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Sun Jul 16 17:13:27 2023 +0800| [6c90fcd9e606c1222271f5f867f761abeafbe51e] | committer: Zhao Zhili avcodec/videotoolboxenc: use color parameters conversion from avutil Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c90fcd9e606c1222… --- libavcodec/videotoolboxenc.c | 137 ++++--------------------------------------- 1 file changed, 13 insertions(+), 124 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 6114351392..8e493c4f7a 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1001,132 +1001,20 @@ pbinfo_nomem: return AVERROR(ENOMEM); } -static int get_cv_color_primaries(AVCodecContext *avctx, - CFStringRef *primaries) -{ - enum AVColorPrimaries pri = avctx->color_primaries; - switch (pri) { - case AVCOL_PRI_UNSPECIFIED: - *primaries = NULL; - break; - - case AVCOL_PRI_BT470BG: - *primaries = kCVImageBufferColorPrimaries_EBU_3213; - break; - - case AVCOL_PRI_SMPTE170M: - *primaries = kCVImageBufferColorPrimaries_SMPTE_C; - break; - - case AVCOL_PRI_BT709: - *primaries = kCVImageBufferColorPrimaries_ITU_R_709_2; - break; - - case AVCOL_PRI_BT2020: - *primaries = compat_keys.kCVImageBufferColorPrimaries_ITU_R_2020; - break; - - default: - av_log(avctx, AV_LOG_ERROR, "Color primaries %s is not supported.\n", av_color_primaries_name(pri)); - *primaries = NULL; - return -1; - } - - return 0; -} - -static int get_cv_transfer_function(AVCodecContext *avctx, - CFStringRef *transfer_fnc, - CFNumberRef *gamma_level) +static int get_cv_gamma(AVCodecContext *avctx, + CFNumberRef *gamma_level) { enum AVColorTransferCharacteristic trc = avctx->color_trc; - Float32 gamma; + Float32 gamma = 0; *gamma_level = NULL; - switch (trc) { - case AVCOL_TRC_UNSPECIFIED: - *transfer_fnc = NULL; - break; - - case AVCOL_TRC_BT709: - *transfer_fnc = kCVImageBufferTransferFunction_ITU_R_709_2; - break; - - case AVCOL_TRC_SMPTE240M: - *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_240M_1995; - break; - -#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ - case AVCOL_TRC_SMPTE2084: - *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ; - break; -#endif -#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR - case AVCOL_TRC_LINEAR: - *transfer_fnc = kCVImageBufferTransferFunction_Linear; - break; -#endif -#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG - case AVCOL_TRC_ARIB_STD_B67: - *transfer_fnc = kCVImageBufferTransferFunction_ITU_R_2100_HLG; - break; -#endif - - case AVCOL_TRC_GAMMA22: - gamma = 2.2; - *transfer_fnc = kCVImageBufferTransferFunction_UseGamma; - *gamma_level = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma); - break; - - case AVCOL_TRC_GAMMA28: - gamma = 2.8; - *transfer_fnc = kCVImageBufferTransferFunction_UseGamma; - *gamma_level = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma); - break; - - case AVCOL_TRC_BT2020_10: - case AVCOL_TRC_BT2020_12: - *transfer_fnc = compat_keys.kCVImageBufferTransferFunction_ITU_R_2020; - break; - - default: - *transfer_fnc = NULL; - av_log(avctx, AV_LOG_ERROR, "Transfer function %s is not supported.\n", av_color_transfer_name(trc)); - return -1; - } - - return 0; -} - -static int get_cv_ycbcr_matrix(AVCodecContext *avctx, CFStringRef *matrix) { - switch(avctx->colorspace) { - case AVCOL_SPC_BT709: - *matrix = kCVImageBufferYCbCrMatrix_ITU_R_709_2; - break; - - case AVCOL_SPC_UNSPECIFIED: - case AVCOL_SPC_RGB: - *matrix = NULL; - break; - - case AVCOL_SPC_BT470BG: - case AVCOL_SPC_SMPTE170M: - *matrix = kCVImageBufferYCbCrMatrix_ITU_R_601_4; - break; - - case AVCOL_SPC_SMPTE240M: - *matrix = kCVImageBufferYCbCrMatrix_SMPTE_240M_1995; - break; - - case AVCOL_SPC_BT2020_NCL: - *matrix = compat_keys.kCVImageBufferYCbCrMatrix_ITU_R_2020; - break; - - default: - av_log(avctx, AV_LOG_ERROR, "Color space %s is not supported.\n", av_color_space_name(avctx->colorspace)); - return -1; - } + if (trc == AVCOL_TRC_GAMMA22) + gamma = 2.2; + else if (trc == AVCOL_TRC_GAMMA28) + gamma = 2.8; + if (gamma != 0) + *gamma_level = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma); return 0; } @@ -1694,9 +1582,10 @@ static int vtenc_configure_encoder(AVCodecContext *avctx) vtctx->dts_delta = vtctx->has_b_frames ? -1 : 0; - get_cv_transfer_function(avctx, &vtctx->transfer_function, &gamma_level); - get_cv_ycbcr_matrix(avctx, &vtctx->ycbcr_matrix); - get_cv_color_primaries(avctx, &vtctx->color_primaries); + get_cv_gamma(avctx, &gamma_level); + vtctx->transfer_function = av_map_videotoolbox_color_trc_from_av(avctx->color_trc); + vtctx->ycbcr_matrix = av_map_videotoolbox_color_matrix_from_av(avctx->colorspace); + vtctx->color_primaries = av_map_videotoolbox_color_primaries_from_av(avctx->color_primaries); if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {

1 0

avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
by Rémi Denis-Courmont 22 Jul '23

22 Jul '23

ffmpeg | branch: release/5.1 | Rémi Denis-Courmont <remi(a)remlab.net> | Sun Jul 16 18:18:02 2023 +0300| [25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e] | committer: James Almer avcodec/x86/mathops: clip constants used with shift instructions within inline assembly Fixes assembling with binutil as >= 2.41 Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25cd95a9dc3510c3c… --- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h index 6298f5ed19..ca7e2dffc1 100644 --- a/libavcodec/x86/mathops.h +++ b/libavcodec/x86/mathops.h @@ -35,12 +35,20 @@ static av_always_inline av_const int MULL(int a, int b, unsigned shift) { int rt, dummy; + if (__builtin_constant_p(shift)) __asm__ ( "imull %3 \n\t" "shrdl %4, %%edx, %%eax \n\t" :"=a"(rt), "=d"(dummy) - :"a"(a), "rm"(b), "ci"((uint8_t)shift) + :"a"(a), "rm"(b), "i"(shift & 0x1F) ); + else + __asm__ ( + "imull %3 \n\t" + "shrdl %4, %%edx, %%eax \n\t" + :"=a"(rt), "=d"(dummy) + :"a"(a), "rm"(b), "c"((uint8_t)shift) + ); return rt; } @@ -113,19 +121,31 @@ __asm__ volatile(\ // avoid +32 for shift optimization (gcc should do that ...) #define NEG_SSR32 NEG_SSR32 static inline int32_t NEG_SSR32( int32_t a, int8_t s){ + if (__builtin_constant_p(s)) __asm__ ("sarl %1, %0\n\t" : "+r" (a) - : "ic" ((uint8_t)(-s)) + : "i" (-s & 0x1F) ); + else + __asm__ ("sarl %1, %0\n\t" + : "+r" (a) + : "c" ((uint8_t)(-s)) + ); return a; } #define NEG_USR32 NEG_USR32 static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ + if (__builtin_constant_p(s)) __asm__ ("shrl %1, %0\n\t" : "+r" (a) - : "ic" ((uint8_t)(-s)) + : "i" (-s & 0x1F) ); + else + __asm__ ("shrl %1, %0\n\t" + : "+r" (a) + : "c" ((uint8_t)(-s)) + ); return a; }

1 0

avfilter/avf_showcwt: reduce memory usage
by Paul B Mahol 22 Jul '23

22 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jul 22 21:45:48 2023 +0200| [b2ceed406b4648d34e233cb456072ce040dea483] | committer: Paul B Mahol avfilter/avf_showcwt: reduce memory usage > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2ceed406b4648d34… --- libavfilter/avf_showcwt.c | 92 ++++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 120ce63b62..0661afbcdd 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -78,7 +78,7 @@ typedef struct ShowCWTContext { int64_t old_pts; int64_t eof_pts; float *frequency_band; - AVFrame *kernel; + AVComplexFloat **kernel; unsigned *index; int *kernel_start, *kernel_stop; AVFrame *cache; @@ -87,7 +87,6 @@ typedef struct ShowCWTContext { AVFrame *fft_out; AVFrame *dst_x; AVFrame *src_x; - AVFrame *kernel_x; AVFrame *ifft_in; AVFrame *ifft_out; AVFrame *ch_out; @@ -169,14 +168,12 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->kernel_stop); av_freep(&s->index); - av_frame_free(&s->kernel); av_frame_free(&s->cache); av_frame_free(&s->outpicref); av_frame_free(&s->fft_in); av_frame_free(&s->fft_out); av_frame_free(&s->dst_x); av_frame_free(&s->src_x); - av_frame_free(&s->kernel_x); av_frame_free(&s->ifft_in); av_frame_free(&s->ifft_out); av_frame_free(&s->ch_out); @@ -194,6 +191,12 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->ifft); } + if (s->kernel) { + for (int n = 0; n < s->frequency_band_count; n++) + av_freep(&s->kernel[n]); + } + av_freep(&s->kernel); + av_freep(&s->fdsp); } @@ -588,18 +591,16 @@ static int run_channel_cwt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo AVComplexFloat *chout = ((AVComplexFloat *)s->ch_out->extended_data[ch]) + y * ihop_size; AVComplexFloat *dstx = (AVComplexFloat *)s->dst_x->extended_data[jobnr]; AVComplexFloat *srcx = (AVComplexFloat *)s->src_x->extended_data[jobnr]; - AVComplexFloat *kernelx = (AVComplexFloat *)s->kernel_x->extended_data[jobnr]; - const AVComplexFloat *kernel = (const AVComplexFloat *)s->kernel->extended_data[y]; + const AVComplexFloat *kernel = s->kernel[y]; const unsigned *index = (const unsigned *)s->index; const int kernel_start = s->kernel_start[y]; const int kernel_stop = s->kernel_stop[y]; const int kernel_range = kernel_stop - kernel_start; - memcpy(kernelx, kernel + kernel_start, sizeof(*kernel) * kernel_range); memcpy(srcx, dst + kernel_start, sizeof(*dst) * kernel_range); s->fdsp->vector_fmul((float *)dstx, (const float *)srcx, - (const float *)kernelx, FFALIGN(kernel_range * 2, 16)); + (const float *)kernel, FFALIGN(kernel_range * 2, 16)); memset(isrc, 0, sizeof(*isrc) * output_padding_size); for (int i = 0; i < kernel_range; i++) { @@ -629,41 +630,63 @@ static int compute_kernel(AVFilterContext *ctx) int *kernel_stop = s->kernel_stop; unsigned *index = s->index; int kernel_min = INT_MAX; - int kernel_max = 0; + int kernel_max = 0, ret = 0; + float *tkernel; + + tkernel = av_malloc_array(size, sizeof(*tkernel)); + if (!tkernel) + return AVERROR(ENOMEM); for (int y = 0; y < fsize; y++) { - AVComplexFloat *kernel = (AVComplexFloat *)s->kernel->extended_data[y]; + AVComplexFloat *kernel = s->kernel[y]; + int start = 0, stop = 0; float frequency = s->frequency_band[y*2] * correction; float deviation = 1.f / (s->frequency_band[y*2+1] * output_sample_count * correction); + memset(tkernel, 0, size * sizeof(*tkernel)); for (int n = 0; n < size; n++) { float ff, f = fabsf(n-frequency); ff = expf(-f*f*deviation) * scale_factor; - kernel[n].re = ff; - kernel[n].im = ff; + tkernel[n] = ff; } for (int n = 0; n < size; n++) { - if (kernel[n].re != 0.f) { - if (kernel[n].re > FLT_MIN) + if (tkernel[n] != 0.f) { + if (tkernel[n] > FLT_MIN) av_log(ctx, AV_LOG_DEBUG, "out of range kernel\n"); - kernel_start[y] = n; - kernel_min = FFMIN(kernel_start[y], kernel_min); + start = n; + kernel_min = FFMIN(start, kernel_min); break; } } for (int n = 0; n < size; n++) { - if (kernel[size - n - 1].re != 0.f) { - if (kernel[size - n - 1].re > FLT_MIN) + if (tkernel[size - n - 1] != 0.f) { + if (tkernel[size - n - 1] > FLT_MIN) av_log(ctx, AV_LOG_DEBUG, "out of range kernel\n"); - kernel_stop[y] = size - n - 1; - kernel_max = FFMAX(kernel_stop[y], kernel_max); + stop = size - n - 1; + kernel_max = FFMAX(stop, kernel_max); break; } } + + kernel_start[y] = start; + kernel_stop[y] = stop; + + kernel = av_calloc(FFALIGN(stop - start + 1, 16), sizeof(*kernel)); + if (!kernel) { + ret = AVERROR(ENOMEM); + break; + } + + for (int n = start; n <= stop; n++) { + kernel[n - start].re = tkernel[n]; + kernel[n - start].im = tkernel[n]; + } + + s->kernel[y] = kernel; } for (int n = 0; n < size; n++) @@ -673,7 +696,9 @@ static int compute_kernel(AVFilterContext *ctx) av_log(ctx, AV_LOG_DEBUG, "kernel_max: %d\n", kernel_max); av_log(ctx, AV_LOG_DEBUG, "kernel_range: %d\n", kernel_max - kernel_min); - return kernel_max - kernel_min; + av_freep(&tkernel); + + return ret; } static int config_output(AVFilterLink *outlink) @@ -762,19 +787,18 @@ static int config_output(AVFilterLink *outlink) s->fft_out = ff_get_audio_buffer(inlink, s->fft_out_size * 2); s->dst_x = av_frame_alloc(); s->src_x = av_frame_alloc(); - s->kernel_x = av_frame_alloc(); + s->kernel = av_calloc(s->frequency_band_count, sizeof(*s->kernel)); s->cache = ff_get_audio_buffer(inlink, s->fft_in_size * 2); s->ch_out = ff_get_audio_buffer(inlink, s->frequency_band_count * 2 * s->ihop_size); s->bh_out = ff_get_audio_buffer(inlink, s->frequency_band_count); s->ifft_in = av_frame_alloc(); s->ifft_out = av_frame_alloc(); - s->kernel = av_frame_alloc(); s->index = av_calloc(s->input_padding_size, sizeof(*s->index)); s->kernel_start = av_calloc(s->frequency_band_count, sizeof(*s->kernel_start)); s->kernel_stop = av_calloc(s->frequency_band_count, sizeof(*s->kernel_stop)); - if (!s->outpicref || !s->fft_in || !s->fft_out || !s->src_x || !s->dst_x || !s->kernel_x || + if (!s->outpicref || !s->fft_in || !s->fft_out || !s->src_x || !s->dst_x || !s->ifft_in || !s->ifft_out || !s->kernel_start || !s->kernel_stop || !s->ch_out || - !s->frequency_band || !s->kernel || !s->cache || !s->index || !s->bh_out) + !s->frequency_band || !s->cache || !s->index || !s->bh_out || !s->kernel) return AVERROR(ENOMEM); s->ifft_in->format = inlink->format; @@ -791,13 +815,6 @@ static int config_output(AVFilterLink *outlink) if (ret < 0) return ret; - s->kernel->format = inlink->format; - s->kernel->nb_samples = s->input_padding_size * 2; - s->kernel->ch_layout.nb_channels = s->frequency_band_count; - ret = av_frame_get_buffer(s->kernel, 0); - if (ret < 0) - return ret; - s->src_x->format = inlink->format; s->src_x->nb_samples = s->fft_out_size * 2; s->src_x->ch_layout.nb_channels = s->nb_threads; @@ -812,13 +829,6 @@ static int config_output(AVFilterLink *outlink) if (ret < 0) return ret; - s->kernel_x->format = inlink->format; - s->kernel_x->nb_samples = s->fft_out_size * 2; - s->kernel_x->ch_layout.nb_channels = s->nb_threads; - ret = av_frame_get_buffer(s->kernel_x, 0); - if (ret < 0) - return ret; - s->outpicref->sample_aspect_ratio = (AVRational){1,1}; for (int y = 0; y < outlink->h; y++) { @@ -899,7 +909,9 @@ static int config_output(AVFilterLink *outlink) outlink->frame_rate = s->frame_rate; outlink->time_base = av_inv_q(outlink->frame_rate); - compute_kernel(ctx); + ret = compute_kernel(ctx); + if (ret < 0) + return ret; return 0; }

1 0

checkasm: improve Linux perf error message
by Rémi Denis-Courmont 22 Jul '23

22 Jul '23

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Fri Jul 14 20:08:37 2023 +0300| [f25ad0fe022a8daeb654bd67e6b4433f66ee5642] | committer: Rémi Denis-Courmont checkasm: improve Linux perf error message Report the failing system call name, as is convention, rather than just a rather unhelpful "syscall". > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f25ad0fe022a8daeb… --- tests/checkasm/checkasm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 30e2dc6fed..f521d30b7c 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -667,7 +667,7 @@ static int bench_init_linux(void) state.sysfd = syscall(__NR_perf_event_open, &attr, 0, -1, -1, 0); if (state.sysfd == -1) { - perror("syscall"); + perror("perf_event_open"); return -1; } return 0;

1 0

macos_kperf: fix incomplete prototype
by Rémi Denis-Courmont 22 Jul '23

22 Jul '23

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Wed Jul 19 20:23:57 2023 +0300| [983af7445210271852dc8edaadf927d4bfb4f90c] | committer: Rémi Denis-Courmont macos_kperf: fix incomplete prototype > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=983af744521027185… --- libavutil/macos_kperf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/macos_kperf.c b/libavutil/macos_kperf.c index 9fc04c6349..9fb047eeee 100644 --- a/libavutil/macos_kperf.c +++ b/libavutil/macos_kperf.c @@ -102,7 +102,7 @@ void ff_kperf_init(void) ff_thread_once(&init_static_once, kperf_init); } -uint64_t ff_kperf_cycles() +uint64_t ff_kperf_cycles(void) { uint64_t counters[COUNTERS_COUNT]; if (kpc_get_thread_counters(0, COUNTERS_COUNT, counters)) {

1 0

timer: don't leak perf FD if zero
by Rémi Denis-Courmont 22 Jul '23

22 Jul '23

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Wed Jul 19 20:12:11 2023 +0300| [c644aabec8e1144ca5646dc7da2583dd82092119] | committer: Rémi Denis-Courmont timer: don't leak perf FD if zero > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c644aabec8e1144ca… --- libavutil/timer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/timer.h b/libavutil/timer.h index 861ba7e9d7..2cd299eca3 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -105,9 +105,9 @@ #if CONFIG_LINUX_PERF #define START_TIMER \ - static int linux_perf_fd; \ + static int linux_perf_fd = -1; \ uint64_t tperf; \ - if (!linux_perf_fd) { \ + if (linux_perf_fd == -1) { \ struct perf_event_attr attr = { \ .type = PERF_TYPE_HARDWARE, \ .size = sizeof(struct perf_event_attr), \

1 0

avfilter/avf_showcwt: extend min frequency accepted range
by Paul B Mahol 22 Jul '23

22 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jul 22 17:25:06 2023 +0200| [ffa3edbf5137f1180e85b10d958c2e096d955831] | committer: Paul B Mahol avfilter/avf_showcwt: extend min frequency accepted range Also always check that min frequency is lower than max frequency. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffa3edbf5137f1180… --- libavfilter/avf_showcwt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index d83aad57f5..120ce63b62 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -133,8 +133,8 @@ static const AVOption showcwt_options[] = { { "sqrt", "sqrt", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_SQRT}, 0, 0, FLAGS, "scale" }, { "cbrt", "cbrt", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_CBRT}, 0, 0, FLAGS, "scale" }, { "qdrt", "qdrt", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_QDRT}, 0, 0, FLAGS, "scale" }, - { "min", "set minimum frequency", OFFSET(minimum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20.}, 1, 2000, FLAGS }, - { "max", "set maximum frequency", OFFSET(maximum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20000.}, 0, 192000, FLAGS }, + { "min", "set minimum frequency", OFFSET(minimum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20.}, 1, 192000, FLAGS }, + { "max", "set maximum frequency", OFFSET(maximum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20000.}, 1, 192000, FLAGS }, { "logb", "set logarithmic basis", OFFSET(logarithmic_basis), AV_OPT_TYPE_FLOAT, {.dbl = 0.0001}, 0, 1, FLAGS }, { "deviation", "set frequency deviation", OFFSET(deviation), AV_OPT_TYPE_FLOAT, {.dbl = 1.}, 0, 10, FLAGS }, { "pps", "set pixels per second", OFFSET(pps), AV_OPT_TYPE_INT, {.i64 = 64}, 1, 1024, FLAGS }, @@ -686,6 +686,12 @@ static int config_output(AVFilterLink *outlink) float scale = 1.f, factor; int ret; + if (minimum_frequency >= maximum_frequency) { + av_log(ctx, AV_LOG_ERROR, "min frequency (%f) >= (%f) max frequency\n", + minimum_frequency, maximum_frequency); + return AVERROR(EINVAL); + } + uninit(ctx); s->fdsp = avpriv_float_dsp_alloc(0);

1 0

avfilter/avf_showcwt: no need for big forward FFT with small sample rates
by Paul B Mahol 22 Jul '23

22 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Jul 22 17:16:33 2023 +0200| [c24c7bcc951056c2a47bbb292edb56737fb436da] | committer: Paul B Mahol avfilter/avf_showcwt: no need for big forward FFT with small sample rates > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c24c7bcc951056c2a… --- libavfilter/avf_showcwt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index ef6798e9cf..d83aad57f5 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -709,7 +709,7 @@ static int config_output(AVFilterLink *outlink) s->nb_channels = inlink->ch_layout.nb_channels; s->old_pts = AV_NOPTS_VALUE; s->eof_pts = AV_NOPTS_VALUE; - s->nb_consumed_samples = 65536; + s->nb_consumed_samples = FFMIN(65536, inlink->sample_rate); s->input_sample_count = s->nb_consumed_samples; s->input_padding_size = 1 << (32 - ff_clz(s->input_sample_count));

1 0