February 2024 - ffmpeg-cvslog

lavc/me_cmp: R-V V vsse vsad
by sunyuechi 25 Feb '24

25 Feb '24

ffmpeg | branch: master | sunyuechi <sunyuechi(a)iscas.ac.cn> | Tue Feb 6 23:18:51 2024 +0800| [925b55a5e889ed585f331dd09b7f7eb9f8299634] | committer: Rémi Denis-Courmont lavc/me_cmp: R-V V vsse vsad C908: vsad_0_c: 936.0 vsad_0_rvv_i32: 236.2 vsad_1_c: 424.0 vsad_1_rvv_i32: 190.2 vsse_0_c: 877.0 vsse_0_rvv_i32: 204.2 vsse_1_c: 439.0 vsse_1_rvv_i32: 140.2 Signed-off-by: Rémi Denis-Courmont <remi(a)remlab.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=925b55a5e889ed585… --- libavcodec/riscv/me_cmp_init.c | 10 +++++ libavcodec/riscv/me_cmp_rvv.S | 98 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index 85ecc22cbc..a6ef5addd0 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -46,6 +46,11 @@ int ff_sse8_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, int ff_sse4_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int ff_vsse16_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int ff_vsse8_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int ff_vsad16_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int ff_vsad8_rvv(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); + av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { #if HAVE_RVV @@ -64,6 +69,11 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->sse[0] = ff_sse16_rvv; c->sse[1] = ff_sse8_rvv; c->sse[2] = ff_sse4_rvv; + + c->vsse[0] = ff_vsse16_rvv; + c->vsse[1] = ff_vsse8_rvv; + c->vsad[0] = ff_vsad16_rvv; + c->vsad[1] = ff_vsad8_rvv; } #endif } diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index 11848f3f21..25b15c74ce 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -231,3 +231,101 @@ func ff_sse4_rvv, zve32x vmv.x.s a0, v0 ret endfunc + +.macro vabsaddu dst src tmp + vneg.v \tmp, \src + vmax.vv \tmp, \src, \tmp + vwaddu.wv \dst, \dst, \tmp +.endm + +.macro vsad_vsse16 type + vsetivli t0, 16, e32, m4, ta, ma + addi a4, a4, -1 + add t1, a1, a3 + add t2, a2, a3 + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, m1, tu, ma + vle8.v v4, (a1) + vle8.v v8, (t1) + vle8.v v12, (a2) + vle8.v v16, (t2) + addi a4, a4, -1 + vwsubu.vv v28, v4, v12 + vwsubu.wv v12, v28, v8 + vwaddu.wv v28, v12, v16 + vsetvli zero, zero, e16, m2, tu, ma + +.ifc \type,abs + vabsaddu v24, v28, v12 +.endif +.ifc \type,square + vwmacc.vv v24, v28, v28 +.endif + + add a1, a1, a3 + add a2, a2, a3 + add t1, t1, a3 + add t2, t2, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m4, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +.endm + +.macro vsad_vsse8 type + vsetivli t0, 8, e32, m2, ta, ma + addi a4, a4, -1 + add t1, a1, a3 + add t2, a2, a3 + vmv.v.x v24, zero + vmv.s.x v0, zero +1: + vsetvli zero, zero, e8, mf2, tu, ma + vle8.v v4, (a1) + vle8.v v8, (t1) + vle8.v v12, (a2) + vle8.v v16, (t2) + addi a4, a4, -1 + vwsubu.vv v28, v4, v12 + vwsubu.wv v12, v28, v8 + vwaddu.wv v28, v12, v16 + vsetvli zero, zero, e16, m1, tu, ma + +.ifc \type,abs + vabsaddu v24, v28, v12 +.endif +.ifc \type,square + vwmacc.vv v24, v28, v28 +.endif + + add a1, a1, a3 + add a2, a2, a3 + add t1, t1, a3 + add t2, t2, a3 + bnez a4, 1b + + vsetvli zero, zero, e32, m2, tu, ma + vredsum.vs v0, v24, v0 + vmv.x.s a0, v0 + ret +.endm + +func ff_vsse16_rvv, zve32x + vsad_vsse16 square +endfunc + +func ff_vsse8_rvv, zve32x + vsad_vsse8 square +endfunc + +func ff_vsad16_rvv, zve32x + vsad_vsse16 abs +endfunc + +func ff_vsad8_rvv, zve32x + vsad_vsse8 abs +endfunc

1 0

avutil/hwcontext: Don't check before av_buffer_unref()
by Andreas Rheinhardt 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Feb 11 19:08:44 2024 +0100| [2e4e424ac237e34fe106dca4c224a46eabefb4c9] | committer: Andreas Rheinhardt avutil/hwcontext: Don't check before av_buffer_unref() av_buffer_unref() can handle AVBufferRef** that point to a NULL AVBufferRef*. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e4e424ac237e34fe… --- libavutil/hwcontext.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index e23bad230f..63fc1a6a22 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -297,8 +297,7 @@ AVBufferRef *av_hwframe_ctx_alloc(AVBufferRef *device_ref_in) return buf; fail: - if (device_ref) - av_buffer_unref(&device_ref); + av_buffer_unref(&device_ref); if (ctx->internal) av_freep(&ctx->internal->priv); av_freep(&ctx->internal);

1 0

avutil/opt: Use correct function pointer type
by Andreas Rheinhardt 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Feb 21 21:49:32 2024 +0100| [f705b8b5b4fb9390e2d1aeb9e864c099c8592d9d] | committer: Andreas Rheinhardt avutil/opt: Use correct function pointer type av_get_sample/pix_fmt() return their respective enums and are therefore not of the type int (*)(const char*), yet they are called as-if they were of this type. This works in practice, but is actually undefined behaviour. With Clang 17 UBSan these violations are flagged, affecting lots of tests. The number of failing tests went down from 3363 to 164 here with this patch. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f705b8b5b4fb9390e… --- libavutil/opt.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index d13b1ab504..0681b19896 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -444,16 +444,26 @@ static int set_string_fmt(void *obj, const AVOption *o, const char *val, uint8_t return 0; } +static int get_pix_fmt(const char *name) +{ + return av_get_pix_fmt(name); +} + static int set_string_pixel_fmt(void *obj, const AVOption *o, const char *val, uint8_t *dst) { return set_string_fmt(obj, o, val, dst, - AV_PIX_FMT_NB, av_get_pix_fmt, "pixel format"); + AV_PIX_FMT_NB, get_pix_fmt, "pixel format"); +} + +static int get_sample_fmt(const char *name) +{ + return av_get_sample_fmt(name); } static int set_string_sample_fmt(void *obj, const AVOption *o, const char *val, uint8_t *dst) { return set_string_fmt(obj, o, val, dst, - AV_SAMPLE_FMT_NB, av_get_sample_fmt, "sample format"); + AV_SAMPLE_FMT_NB, get_sample_fmt, "sample format"); } static int set_string_dict(void *obj, const AVOption *o, const char *val, uint8_t **dst)

1 0

avcodec/cbs_h266_syntax_template: Don't omit unused function parameter
by Andreas Rheinhardt 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Feb 21 21:16:17 2024 +0100| [484e7716bc9c79ead7b345e38197d414d5cdccc8] | committer: Andreas Rheinhardt avcodec/cbs_h266_syntax_template: Don't omit unused function parameter The calls to the sei_decoded_picture_hash read and write functions are performed with four pointer arguments; just because one of them is unused by the callees does not mean that they can be omitted: This is undefined behaviour. (This was not recognized because the SEI_MESSAGE_RW macro contains casts.) Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=484e7716bc9c79ead… --- libavcodec/cbs_h266_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 26ee7a420b..e75f2f6971 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -3430,7 +3430,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, static int FUNC(sei_decoded_picture_hash) (CodedBitstreamContext *ctx, RWContext *rw, H266RawSEIDecodedPictureHash * - current) + current, SEIMessageState *unused) { int err, c_idx, i;

1 0

fftools/ffprobe: Use int64_t instead of long long int
by Andreas Rheinhardt 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Feb 22 01:27:52 2024 +0100| [b31ee084a94aa1eb83c7b53e8fab665994783073] | committer: Andreas Rheinhardt fftools/ffprobe: Use int64_t instead of long long int This makes ffprobe match the rest of the codebase. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b31ee084a94aa1eb8… --- fftools/ffprobe.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 31081d19e2..ea225f14ab 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -397,14 +397,14 @@ static void log_callback(void *ptr, int level, const char *fmt, va_list vl) } struct unit_value { - union { double d; long long int i; } val; + union { double d; int64_t i; } val; const char *unit; }; static char *value_string(char *buf, int buf_size, struct unit_value uv) { double vald; - long long int vali; + int64_t vali; int show_float = 0; if (uv.unit == unit_second_str) { @@ -427,15 +427,15 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) const char *prefix_string = ""; if (use_value_prefix && vald > 1) { - long long int index; + int64_t index; if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { - index = (long long int) (log2(vald)) / 10; + index = (int64_t) (log2(vald)) / 10; index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1); vald /= si_prefixes[index].bin_val; prefix_string = si_prefixes[index].bin_str; } else { - index = (long long int) (log10(vald)) / 3; + index = (int64_t) (log10(vald)) / 3; index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1); vald /= si_prefixes[index].dec_val; prefix_string = si_prefixes[index].dec_str; @@ -443,10 +443,10 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) vali = vald; } - if (show_float || (use_value_prefix && vald != (long long int)vald)) + if (show_float || (use_value_prefix && vald != (int64_t)vald)) snprintf(buf, buf_size, "%f", vald); else - snprintf(buf, buf_size, "%lld", vali); + snprintf(buf, buf_size, "%"PRId64, vali); av_strlcatf(buf, buf_size, "%s%s%s", *prefix_string || show_value_unit ? " " : "", prefix_string, show_value_unit ? uv.unit : ""); } @@ -478,7 +478,7 @@ typedef struct Writer { void (*print_section_header)(WriterContext *wctx, const void *data); void (*print_section_footer)(WriterContext *wctx); - void (*print_integer) (WriterContext *wctx, const char *, long long int); + void (*print_integer) (WriterContext *wctx, const char *, int64_t); void (*print_rational) (WriterContext *wctx, AVRational *q, char *sep); void (*print_string) (WriterContext *wctx, const char *, const char *); int flags; ///< a combination or WRITER_FLAG_* @@ -772,7 +772,7 @@ static inline void writer_print_section_footer(WriterContext *wctx) } static inline void writer_print_integer(WriterContext *wctx, - const char *key, long long int val) + const char *key, int64_t val) { const struct section *section = wctx->section[wctx->level]; @@ -1105,13 +1105,13 @@ static void default_print_str(WriterContext *wctx, const char *key, const char * writer_printf(wctx, "%s\n", value); } -static void default_print_int(WriterContext *wctx, const char *key, long long int value) +static void default_print_int(WriterContext *wctx, const char *key, int64_t value) { DefaultContext *def = wctx->priv; if (!def->nokey) writer_printf(wctx, "%s%s=", wctx->section_pbuf[wctx->level].str, key); - writer_printf(wctx, "%lld\n", value); + writer_printf(wctx, "%"PRId64"\n", value); } static const Writer default_writer = { @@ -1303,14 +1303,14 @@ static void compact_print_str(WriterContext *wctx, const char *key, const char * av_bprint_finalize(&buf, NULL); } -static void compact_print_int(WriterContext *wctx, const char *key, long long int value) +static void compact_print_int(WriterContext *wctx, const char *key, int64_t value) { CompactContext *compact = wctx->priv; if (wctx->nb_item[wctx->level]) writer_w8(wctx, compact->item_sep); if (!compact->nokey) writer_printf(wctx, "%s%s=", wctx->section_pbuf[wctx->level].str, key); - writer_printf(wctx, "%lld", value); + writer_printf(wctx, "%"PRId64, value); } static const Writer compact_writer = { @@ -1451,9 +1451,9 @@ static void flat_print_section_header(WriterContext *wctx, const void *data) } } -static void flat_print_int(WriterContext *wctx, const char *key, long long int value) +static void flat_print_int(WriterContext *wctx, const char *key, int64_t value) { - writer_printf(wctx, "%s%s=%lld\n", wctx->section_pbuf[wctx->level].str, key, value); + writer_printf(wctx, "%s%s=%"PRId64"\n", wctx->section_pbuf[wctx->level].str, key, value); } static void flat_print_str(WriterContext *wctx, const char *key, const char *value) @@ -1569,9 +1569,9 @@ static void ini_print_str(WriterContext *wctx, const char *key, const char *valu av_bprint_finalize(&buf, NULL); } -static void ini_print_int(WriterContext *wctx, const char *key, long long int value) +static void ini_print_int(WriterContext *wctx, const char *key, int64_t value) { - writer_printf(wctx, "%s=%lld\n", key, value); + writer_printf(wctx, "%s=%"PRId64"\n", key, value); } static const Writer ini_writer = { @@ -1722,7 +1722,7 @@ static void json_print_str(WriterContext *wctx, const char *key, const char *val json_print_item_str(wctx, key, value); } -static void json_print_int(WriterContext *wctx, const char *key, long long int value) +static void json_print_int(WriterContext *wctx, const char *key, int64_t value) { JSONContext *json = wctx->priv; const struct section *parent_section = wctx->level ? @@ -1735,7 +1735,7 @@ static void json_print_int(WriterContext *wctx, const char *key, long long int v JSON_INDENT(); av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED); - writer_printf(wctx, "\"%s\": %lld", json_escape_str(&buf, key, wctx), value); + writer_printf(wctx, "\"%s\": %"PRId64, json_escape_str(&buf, key, wctx), value); av_bprint_finalize(&buf, NULL); } @@ -1861,7 +1861,7 @@ static void xml_print_section_footer(WriterContext *wctx) } static void xml_print_value(WriterContext *wctx, const char *key, - const char *str, long long int num, const int is_int) + const char *str, int64_t num, const int is_int) { AVBPrint buf; XMLContext *xml = wctx->priv; @@ -1879,7 +1879,7 @@ static void xml_print_value(WriterContext *wctx, const char *key, av_bprint_clear(&buf); if (is_int) { - writer_printf(wctx, " value=\"%lld\"/>\n", num); + writer_printf(wctx, " value=\"%"PRId64"\"/>\n", num); } else { av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); @@ -1891,7 +1891,7 @@ static void xml_print_value(WriterContext *wctx, const char *key, writer_w8(wctx, ' '); if (is_int) { - writer_printf(wctx, "%s=\"%lld\"", key, num); + writer_printf(wctx, "%s=\"%"PRId64"\"", key, num); } else { av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); @@ -1906,7 +1906,8 @@ static inline void xml_print_str(WriterContext *wctx, const char *key, const cha xml_print_value(wctx, key, value, 0, 0); } -static inline void xml_print_int(WriterContext *wctx, const char *key, long long int value) { +static void xml_print_int(WriterContext *wctx, const char *key, int64_t value) +{ xml_print_value(wctx, key, NULL, value, 1); }

1 0

fftools/ffprobe: Simplify printing xml values
by Andreas Rheinhardt 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Feb 22 01:09:24 2024 +0100| [08328463d51b9fb4f38aa7a2342825230049547c] | committer: Andreas Rheinhardt fftools/ffprobe: Simplify printing xml values Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08328463d51b9fb4f… --- fftools/ffprobe.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index e63935baba..31081d19e2 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1860,7 +1860,8 @@ static void xml_print_section_footer(WriterContext *wctx) } } -static void xml_print_value(WriterContext *wctx, const char *key, const void *value, const int is_int) +static void xml_print_value(WriterContext *wctx, const char *key, + const char *str, long long int num, const int is_int) { AVBPrint buf; XMLContext *xml = wctx->priv; @@ -1878,9 +1879,9 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va av_bprint_clear(&buf); if (is_int) { - writer_printf(wctx, " value=\"%lld\"/>\n", *(long long int *)value); + writer_printf(wctx, " value=\"%lld\"/>\n", num); } else { - av_bprint_escape(&buf, (const char *)value, NULL, + av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); writer_printf(wctx, " value=\"%s\"/>\n", buf.str); } @@ -1890,9 +1891,9 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va writer_w8(wctx, ' '); if (is_int) { - writer_printf(wctx, "%s=\"%lld\"", key, *(long long int *)value); + writer_printf(wctx, "%s=\"%lld\"", key, num); } else { - av_bprint_escape(&buf, (const char *)value, NULL, + av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); writer_printf(wctx, "%s=\"%s\"", key, buf.str); } @@ -1902,11 +1903,11 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va } static inline void xml_print_str(WriterContext *wctx, const char *key, const char *value) { - xml_print_value(wctx, key, (const void *)value, 0); + xml_print_value(wctx, key, value, 0, 0); } static inline void xml_print_int(WriterContext *wctx, const char *key, long long int value) { - xml_print_value(wctx, key, (const void *)&value, 1); + xml_print_value(wctx, key, NULL, value, 1); } static Writer xml_writer = {

1 0

fftools/ffprobe: Constify printing section header
by Andreas Rheinhardt 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Feb 22 01:00:16 2024 +0100| [ed5bf403d7b56f2e882f111e96aab4dc6161a558] | committer: Andreas Rheinhardt fftools/ffprobe: Constify printing section header Allows to avoid casting const away. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed5bf403d7b56f2e8… --- fftools/ffprobe.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 95643f9a23..e63935baba 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -228,16 +228,18 @@ struct section { const char *element_name; ///< name of the contained element, if provided const char *unique_name; ///< unique section name, in case the name is ambiguous AVDictionary *entries_to_show; - const char *(* get_type)(void *data); ///< function returning a type if defined, must be defined when SECTION_FLAG_HAS_TYPE is defined + const char *(* get_type)(const void *data); ///< function returning a type if defined, must be defined when SECTION_FLAG_HAS_TYPE is defined int show_all_entries; }; -static const char *get_packet_side_data_type(void *data) { +static const char *get_packet_side_data_type(const void *data) +{ const AVPacketSideData *sd = (const AVPacketSideData *)data; return av_x_if_null(av_packet_side_data_name(sd->type), "unknown"); } -static const char *get_frame_side_data_type(void *data) { +static const char *get_frame_side_data_type(const void *data) +{ const AVFrameSideData *sd = (const AVFrameSideData *)data; return av_x_if_null(av_frame_side_data_name(sd->type), "unknown"); } @@ -474,7 +476,7 @@ typedef struct Writer { int (*init) (WriterContext *wctx); void (*uninit)(WriterContext *wctx); - void (*print_section_header)(WriterContext *wctx, void *data); + void (*print_section_header)(WriterContext *wctx, const void *data); void (*print_section_footer)(WriterContext *wctx); void (*print_integer) (WriterContext *wctx, const char *, long long int); void (*print_rational) (WriterContext *wctx, AVRational *q, char *sep); @@ -728,7 +730,7 @@ fail: } static inline void writer_print_section_header(WriterContext *wctx, - void *data, + const void *data, int section_id) { int parent_section_id; @@ -1056,7 +1058,7 @@ static inline char *upcase_string(char *dst, size_t dst_size, const char *src) return dst; } -static void default_print_section_header(WriterContext *wctx, void *data) +static void default_print_section_header(WriterContext *wctx, const void *data) { DefaultContext *def = wctx->priv; char buf[32]; @@ -1226,7 +1228,7 @@ static av_cold int compact_init(WriterContext *wctx) return 0; } -static void compact_print_section_header(WriterContext *wctx, void *data) +static void compact_print_section_header(WriterContext *wctx, const void *data) { CompactContext *compact = wctx->priv; const struct section *section = wctx->section[wctx->level]; @@ -1423,7 +1425,7 @@ static const char *flat_escape_value_str(AVBPrint *dst, const char *src) return dst->str; } -static void flat_print_section_header(WriterContext *wctx, void *data) +static void flat_print_section_header(WriterContext *wctx, const void *data) { FlatContext *flat = wctx->priv; AVBPrint *buf = &wctx->section_pbuf[wctx->level]; @@ -1523,7 +1525,7 @@ static char *ini_escape_str(AVBPrint *dst, const char *src) return dst->str; } -static void ini_print_section_header(WriterContext *wctx, void *data) +static void ini_print_section_header(WriterContext *wctx, const void *data) { INIContext *ini = wctx->priv; AVBPrint *buf = &wctx->section_pbuf[wctx->level]; @@ -1634,7 +1636,7 @@ static const char *json_escape_str(AVBPrint *dst, const char *src, void *log_ctx #define JSON_INDENT() writer_printf(wctx, "%*c", json->indent_level * 4, ' ') -static void json_print_section_header(WriterContext *wctx, void *data) +static void json_print_section_header(WriterContext *wctx, const void *data) { JSONContext *json = wctx->priv; AVBPrint buf; @@ -1795,7 +1797,7 @@ static av_cold int xml_init(WriterContext *wctx) #define XML_INDENT() writer_printf(wctx, "%*c", xml->indent_level * 4, ' ') -static void xml_print_section_header(WriterContext *wctx, void *data) +static void xml_print_section_header(WriterContext *wctx, const void *data) { XMLContext *xml = wctx->priv; const struct section *section = wctx->section[wctx->level]; @@ -2334,7 +2336,7 @@ static void print_pkt_side_data(WriterContext *w, { const char *name = av_packet_side_data_name(sd->type); - writer_print_section_header(w, (void *)sd, id_data); + writer_print_section_header(w, sd, id_data); print_str("side_data_type", name ? name : "unknown"); if (sd->type == AV_PKT_DATA_DISPLAYMATRIX && sd->size >= 9*4) { double rotation = av_display_rotation_get((int32_t *)sd->data); @@ -2635,7 +2637,7 @@ static void print_frame_side_data(WriterContext *w, const AVFrameSideData *sd = frame->side_data[i]; const char *name; - writer_print_section_header(w, (void *)sd, SECTION_ID_FRAME_SIDE_DATA); + writer_print_section_header(w, sd, SECTION_ID_FRAME_SIDE_DATA); name = av_frame_side_data_name(sd->type); print_str("side_data_type", name ? name : "unknown"); if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 9*4) {

1 0

fftools/ffprobe: Don't cast const away needlessly
by Andreas Rheinhardt 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Feb 22 00:55:43 2024 +0100| [0f20e48e3d3efbb012d16bd2a26a68f7c98bb8ea] | committer: Andreas Rheinhardt fftools/ffprobe: Don't cast const away needlessly Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f20e48e3d3efbb01… --- fftools/ffprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index aa1153e709..95643f9a23 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -789,7 +789,7 @@ static inline int validate_string(WriterContext *wctx, char **dstp, const char * av_bprint_init(&dstbuf, 0, AV_BPRINT_SIZE_UNLIMITED); endp = src + strlen(src); - for (p = (uint8_t *)src; *p;) { + for (p = src; *p;) { uint32_t code; int invalid = 0; const uint8_t *p0 = p;

1 0

fate/mxf: fix mxf-probe-j2k on big endian systems
by Marton Balint 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Thu Feb 22 00:31:05 2024 +0100| [569257735ba983217e664f5600b29e55d6dc4893] | committer: Marton Balint fate/mxf: fix mxf-probe-j2k on big endian systems Jpeg2000 decoder is decoding in native endian, so let's use the same workaround as in fate-mxf-probe-applehdr10. Fixes ticket #10868. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=569257735ba983217… --- tests/fate/mxf.mak | 2 +- tests/ref/fate/mxf-probe-j2k | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak index 8430b01d51..3e0e70e28b 100644 --- a/tests/fate/mxf.mak +++ b/tests/fate/mxf.mak @@ -29,7 +29,7 @@ fate-mxf-probe-dnxhd: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)" FATE_MXF_PROBE-$(call DEMDEC, MXF, JPEG2000) += fate-mxf-probe-j2k fate-mxf-probe-j2k: SRC = $(TARGET_SAMPLES)/imf/countdown/countdown-small.mxf -fate-mxf-probe-j2k: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)" +fate-mxf-probe-j2k: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)" | sed -e "s/rgb48../rgb48/" FATE_MXF_PROBE-$(call DEMDEC, MXF, DVVIDEO PCM_S16LE) += fate-mxf-probe-dv25 fate-mxf-probe-dv25: SRC = $(TARGET_SAMPLES)/mxf/Avid-00005.mxf diff --git a/tests/ref/fate/mxf-probe-j2k b/tests/ref/fate/mxf-probe-j2k index 149b3ea0b6..517fbb99a3 100644 --- a/tests/ref/fate/mxf-probe-j2k +++ b/tests/ref/fate/mxf-probe-j2k @@ -14,7 +14,7 @@ film_grain=0 has_b_frames=0 sample_aspect_ratio=1:1 display_aspect_ratio=16:9 -pix_fmt=rgb48le +pix_fmt=rgb48 level=-99 color_range=unknown color_space=unknown

1 0

avformat/libsrt: use SRT_EPOLL_IN for waiting for an incoming connection
by Marton Balint 25 Feb '24

25 Feb '24

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Tue Feb 20 22:34:37 2024 +0100| [87677c2195e86b126c3438439a05d0a46ae5bb50] | committer: Marton Balint avformat/libsrt: use SRT_EPOLL_IN for waiting for an incoming connection This is the proper poll mode for waiting for an incoming connection according to the SRT API docs. Fixes ticket #9142. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87677c2195e86b126… --- libavformat/libsrt.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index a1d732f841..a7aafea536 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -250,7 +250,7 @@ static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t if (srt_listen(fd, 1)) return libsrt_neterrno(h); - ret = libsrt_network_wait_fd_timeout(h, eid, 1, timeout, &h->interrupt_callback); + ret = libsrt_network_wait_fd_timeout(h, eid, 0, timeout, &h->interrupt_callback); if (ret < 0) return ret; @@ -391,7 +391,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) char hostname[1024],proto[1024],path[1024]; char portstr[10]; int64_t open_timeout = 0; - int eid, write_eid; + int eid; av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); @@ -455,18 +455,21 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags) if (libsrt_socket_nonblock(fd, 1) < 0) av_log(h, AV_LOG_DEBUG, "libsrt_socket_nonblock failed\n"); - ret = write_eid = libsrt_epoll_create(h, fd, 1); - if (ret < 0) - goto fail1; if (s->mode == SRT_MODE_LISTENER) { + int read_eid = ret = libsrt_epoll_create(h, fd, 0); + if (ret < 0) + goto fail1; // multi-client - ret = libsrt_listen(write_eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, s->listen_timeout); - srt_epoll_release(write_eid); + ret = libsrt_listen(read_eid, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, h, s->listen_timeout); + srt_epoll_release(read_eid); if (ret < 0) goto fail1; srt_close(fd); fd = ret; } else { + int write_eid = ret = libsrt_epoll_create(h, fd, 1); + if (ret < 0) + goto fail1; if (s->mode == SRT_MODE_RENDEZVOUS) { if (srt_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen)) { ret = libsrt_neterrno(h);

1 0