July 2025 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg-fateserver] branch master updated. 8f837cc FATE.pm: Fix gitweb URL and use https
by ffmpeg-git＠ffmpeg.org 31 Jul '25

31 Jul '25

The branch, master has been updated via 8f837cc57a87d90906c0fad3fc5817de833d8967 (commit) from bdfef11e4826e703ec0638c8093dbd3cfcbec958 (commit) - Log ----------------------------------------------------------------- commit 8f837cc57a87d90906c0fad3fc5817de833d8967 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Wed Jun 18 03:21:20 2025 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Thu Jul 31 20:26:43 2025 +0200 FATE.pm: Fix gitweb URL and use https Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/FATE.pm b/FATE.pm index 0d4603f..d74fd00 100644 --- a/FATE.pm +++ b/FATE.pm @@ -43,7 +43,7 @@ our $recent_age = 3600; our $ancient_age = 3 * 86400; our $hidden_age = 30 * 86400; our $pretty_links = 0; -our $gitweb = "http://git.videolan.org/?p=ffmpeg.git"; +our $gitweb = "https://git.ffmpeg.org/?p=ffmpeg.git"; #require "$ENV{FATEWEB_CONFIG}"; ----------------------------------------------------------------------- Summary of changes: FATE.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

1 0

avcodec/flacdsp: Fix integer-overflow in flac_lpc_33_c
by Dale Curtis 31 Jul '25

31 Jul '25

ffmpeg | branch: master | Dale Curtis <dalecurtis(a)chromium.org> | Tue Jul 29 22:05:19 2025 +0000| [2ddc3cbd98ea105a16738c136102ed237618eb9a] | committer: Michael Niedermayer avcodec/flacdsp: Fix integer-overflow in flac_lpc_33_c This fix copies a couple of casts from surrounding functions. See https://crbug.com/432528781 for stack trace details. Signed-off-by: Dale Curtis <dalecurtis(a)chromium.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ddc3cbd98ea105a1… --- libavcodec/flacdsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c index f5362bf66f..b5b0609716 100644 --- a/libavcodec/flacdsp.c +++ b/libavcodec/flacdsp.c @@ -94,7 +94,7 @@ static void flac_lpc_33_c(int64_t *decoded, const int32_t *residual, int64_t sum = 0; for (j = 0; j < pred_order; j++) sum += (int64_t)coeffs[j] * (uint64_t)decoded[j]; - decoded[j] = residual[i] + (sum >> qlevel); + decoded[j] = (uint64_t)residual[i] + (uint64_t)(sum >> qlevel); } }

1 0

avcodec/apv: align APV color format support with latest liboapv version
by Dariusz Frankiewicz 31 Jul '25

31 Jul '25

ffmpeg | branch: master | Dariusz Frankiewicz <d.frankiewic(a)samsung.com> | Wed Jul 23 13:13:49 2025 +0200| [9d8469e431a216bc622dca3885695263f2774765] | committer: Michael Niedermayer avcodec/apv: align APV color format support with latest liboapv version Signed-off-by: Dariusz Frankiewicz <d.frankiewic(a)samsung.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d8469e431a216bc6… --- configure | 2 +- libavcodec/liboapvenc.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ac143f2fea..5527c20578 100755 --- a/configure +++ b/configure @@ -6983,7 +6983,7 @@ enabled jni && { [ $target_os = "android" ] && check_headers jni.h enabled ladspa && require_headers "ladspa.h dlfcn.h" enabled lcms2 && require_pkg_config lcms2 "lcms2 >= 2.13" lcms2.h cmsCreateContext enabled libaom && require_pkg_config libaom "aom >= 2.0.0" aom/aom_codec.h aom_codec_version -enabled liboapv && require_pkg_config liboapv "oapv >= 0.1.13.1" "oapv/oapv.h" oapve_encode +enabled liboapv && require_pkg_config liboapv "oapv >= 0.2.0.0" "oapv/oapv.h" oapve_encode enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new || { enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } || die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; } diff --git a/libavcodec/liboapvenc.c b/libavcodec/liboapvenc.c index e62ef57d21..7f9fbf6929 100644 --- a/libavcodec/liboapvenc.c +++ b/libavcodec/liboapvenc.c @@ -102,9 +102,27 @@ static inline int get_color_format(enum AVPixelFormat pix_fmt) int cf = OAPV_CF_UNKNOWN; switch (pix_fmt) { + case AV_PIX_FMT_GRAY10: + cf = OAPV_CF_YCBCR400; + break; case AV_PIX_FMT_YUV422P10: cf = OAPV_CF_YCBCR422; break; + case AV_PIX_FMT_YUV422P12: + cf = OAPV_CF_YCBCR422; + break; + case AV_PIX_FMT_YUV444P10: + cf = OAPV_CF_YCBCR444; + break; + case AV_PIX_FMT_YUV444P12: + cf = OAPV_CF_YCBCR444; + break; + case AV_PIX_FMT_YUVA444P10: + cf = OAPV_CF_YCBCR4444; + break; + case AV_PIX_FMT_YUVA444P12: + cf = OAPV_CF_YCBCR4444; + break; default: av_assert0(cf != OAPV_CF_UNKNOWN); } @@ -438,7 +456,13 @@ static av_cold int liboapve_close(AVCodecContext *avctx) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const enum AVPixelFormat supported_pixel_formats[] = { + AV_PIX_FMT_GRAY10, AV_PIX_FMT_YUV422P10, + AV_PIX_FMT_YUV422P12, + AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV444P12, + AV_PIX_FMT_YUVA444P10, + AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_NONE };

1 0

avfilter/avfiltergraph: add logging for filter formats
by Niklas Haas 31 Jul '25

31 Jul '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Fri Jul 25 13:52:22 2025 +0200| [03b9180fe34ebf9165d164d4aefbee25fe54b355] | committer: Niklas Haas avfilter/avfiltergraph: add logging for filter formats There is no convenient way, from the command line, to figure out which formats a filter actually supports. This commit changes that by adding a log output, at debug level, to simply print the list of formats each filter advertises on its links, before any negotiation. Furthermore, we can use the exact same helper function to also print out the corresponding filter links when there is an error during format negotiation. We need to use AV_BRINT_SIZE_UNLIMITED because the default format list for filters like vf_scale is about 1700 characters long, significantly larger than the the 1 kB default buffer. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03b9180fe34ebf916… --- libavfilter/avfiltergraph.c | 64 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 86da0b9975..bf80391869 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -440,6 +440,62 @@ static int formats_declared(AVFilterContext *f) return 1; } +static void print_formats(void *log_ctx, int level, enum AVMediaType type, + const AVFilterFormats *formats) +{ + AVBPrint bp; + av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED); + + switch (type) { + case AVMEDIA_TYPE_VIDEO: + for (unsigned i = 0; i < formats->nb_formats; i++) + av_bprintf(&bp, "%s%s", bp.len ? " " : "", av_get_pix_fmt_name(formats->formats[i])); + break; + case AVMEDIA_TYPE_AUDIO: + for (unsigned i = 0; i < formats->nb_formats; i++) + av_bprintf(&bp, "%s%s", bp.len ? " " : "", av_get_sample_fmt_name(formats->formats[i])); + break; + default: + av_bprintf(&bp, "(unknown)"); + break; + } + + if (av_bprint_is_complete(&bp)) { + av_log(log_ctx, level, "%s\n", bp.str); + } else { + av_log(log_ctx, level, "(out of memory)\n"); + } + av_bprint_finalize(&bp, NULL); +} + +static void print_link_formats(void *log_ctx, int level, const AVFilterLink *l) +{ + if (av_log_get_level() < level) + return; + + av_log(log_ctx, level, "Link '%s.%s' -> '%s.%s':\n" + " src: ", l->src->name, l->srcpad->name, l->dst->name, l->dstpad->name); + print_formats(log_ctx, level, l->type, l->incfg.formats); + av_log(log_ctx, level, " dst: "); + print_formats(log_ctx, level, l->type, l->outcfg.formats); +} + +static void print_filter_formats(void *log_ctx, int level, const AVFilterContext *f) +{ + if (av_log_get_level() < level) + return; + + av_log(log_ctx, level, "Filter '%s' formats:\n", f->name); + for (int i = 0; i < f->nb_inputs; i++) { + av_log(log_ctx, level, " in[%d] '%s': ", i, f->input_pads[i].name); + print_formats(log_ctx, level, f->inputs[i]->type, f->inputs[i]->outcfg.formats); + } + for (int i = 0; i < f->nb_outputs; i++) { + av_log(log_ctx, level, " out[%d] '%s': ", i, f->output_pads[i].name); + print_formats(log_ctx, level, f->outputs[i]->type, f->outputs[i]->incfg.formats); + } +} + /** * Perform one round of query_formats() and merging formats lists on the * filter graph. @@ -467,7 +523,10 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) if (ret < 0 && ret != AVERROR(EAGAIN)) return ret; /* note: EAGAIN could indicate a partial success, not counted yet */ - count_queried += ret >= 0; + if (ret >= 0) { + print_filter_formats(log_ctx, AV_LOG_DEBUG, f); + count_queried++; + } } /* go through and merge as many format lists as possible */ @@ -524,6 +583,7 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) "The filters '%s' and '%s' do not have a common format " "and automatic conversion is disabled.\n", link->src->name, link->dst->name); + print_link_formats(log_ctx, AV_LOG_ERROR, link); return AVERROR(EINVAL); } @@ -532,6 +592,7 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) av_log(log_ctx, AV_LOG_ERROR, "'%s' filter not present, cannot convert formats.\n", neg->conversion_filter); + print_link_formats(log_ctx, AV_LOG_ERROR, link); return AVERROR(EINVAL); } snprintf(inst_name, sizeof(inst_name), "auto_%s_%d", @@ -583,6 +644,7 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) av_log(log_ctx, AV_LOG_ERROR, "Impossible to convert between the formats supported by the filter " "'%s' and the filter '%s'\n", link->src->name, link->dst->name); + print_link_formats(log_ctx, AV_LOG_ERROR, link); return AVERROR(ENOSYS); } }

1 0

avformat/file: add missing null check in Android content resolver
by sfan5 31 Jul '25

31 Jul '25

ffmpeg | branch: master | sfan5 <sfan5(a)live.de> | Wed Jul 30 15:49:07 2025 +0200| [1a61db9797f461cbc7dd3400fa77dec4000df24e] | committer: Zhao Zhili avformat/file: add missing null check in Android content resolver openFileDescriptor() can return null in certain error conditions. Signed-off-by: sfan5 <sfan5(a)live.de> Reviewed-by: Kacper Michajłow <kasper93(a)gmail.com> Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a61db9797f461cbc… --- libavformat/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/file.c b/libavformat/file.c index 6a66040b65..a6eceff58d 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -621,6 +621,11 @@ static int android_content_open(URLContext *h, const char *filename, int flags) ret = ff_jni_exception_check(env, 1, c); if (ret < 0) goto done; + if (!parcel_file_descriptor) { + av_log(c, AV_LOG_ERROR, "file descriptor is null\n"); + ret = AVERROR_EXTERNAL; + goto done; + } fd = (*env)->CallIntMethod(env, parcel_file_descriptor, jfields.detach_fd_id); ret = ff_jni_exception_check(env, 1, c);

1 0

avfilter/vf_vibrance: Update default value of rlum/blum
by Zhao Zhili 31 Jul '25

31 Jul '25

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Tue Jul 15 17:29:32 2025 +0800| [2a49d05d1a92cd6454b4e6fc026a66b697c77e67] | committer: Zhao Zhili avfilter/vf_vibrance: Update default value of rlum/blum Fix #9195 It looks like vf_vibrance.c is similar to https://github.com/zachsaw/RenderScripts/blob/master/RenderScripts/ImagePro… and https://github.com/kevinlekiller/kwin-effect-shaders_shaders/blob/main/Vibr… Originall written by Christian Cann Schuldt Jensen ~ CeeJay.dk. They use same matrix coeff. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a49d05d1a92cd645… --- libavfilter/vf_vibrance.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_vibrance.c b/libavfilter/vf_vibrance.c index 960b7e1b13..94c3d569c6 100644 --- a/libavfilter/vf_vibrance.c +++ b/libavfilter/vf_vibrance.c @@ -423,9 +423,9 @@ static const AVOption vibrance_options[] = { { "rbal", "set the red balance value", OFFSET(balance[2]), AV_OPT_TYPE_FLOAT, {.dbl=1}, -10, 10, VF }, { "gbal", "set the green balance value", OFFSET(balance[0]), AV_OPT_TYPE_FLOAT, {.dbl=1}, -10, 10, VF }, { "bbal", "set the blue balance value", OFFSET(balance[1]), AV_OPT_TYPE_FLOAT, {.dbl=1}, -10, 10, VF }, - { "rlum", "set the red luma coefficient", OFFSET(lcoeffs[2]), AV_OPT_TYPE_FLOAT, {.dbl=0.072186}, 0, 1, VF }, + { "rlum", "set the red luma coefficient", OFFSET(lcoeffs[2]), AV_OPT_TYPE_FLOAT, {.dbl=0.212656}, 0, 1, VF }, { "glum", "set the green luma coefficient", OFFSET(lcoeffs[0]), AV_OPT_TYPE_FLOAT, {.dbl=0.715158}, 0, 1, VF }, - { "blum", "set the blue luma coefficient", OFFSET(lcoeffs[1]), AV_OPT_TYPE_FLOAT, {.dbl=0.212656}, 0, 1, VF }, + { "blum", "set the blue luma coefficient", OFFSET(lcoeffs[1]), AV_OPT_TYPE_FLOAT, {.dbl=0.072186}, 0, 1, VF }, { "alternate", "use alternate colors", OFFSET(alternate), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, VF }, { NULL } };

1 0

swscale/alphablend: don't overread alpha plane on subsampled odd size
by Niklas Haas 31 Jul '25

31 Jul '25

ffmpeg | branch: master | Niklas Haas <git(a)haasn.dev> | Wed Jul 30 13:36:21 2025 +0200| [b7946098b19af4f06661213d591a5ed9cd3d26ff] | committer: Niklas Haas swscale/alphablend: don't overread alpha plane on subsampled odd size This function overreads the input plane for odd dimensions, because the chroma plane is always rounded up, which means (xy << subsample) + 1 exceeds the actual alpha plane size. To verify: valgrind ffmpeg -pix_fmt yuva420p -f lavfi -i color -vf \ "scale=1x1,format=yuva420p,scale=alphablend=uniform_color,format=yuv420p \ -vframes 1 -f null - Fixes: https://trac.ffmpeg.org/ticket/11692 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7946098b19af4f06… --- libswscale/alphablend.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/libswscale/alphablend.c b/libswscale/alphablend.c index f9484bcc91..45db5189d2 100644 --- a/libswscale/alphablend.c +++ b/libswscale/alphablend.c @@ -25,6 +25,8 @@ int ff_sws_alphablendaway(SwsInternal *c, const uint8_t *const src[], uint8_t *const dst[], const int dstStride[]) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->opts.src_format); + const int lum_w = c->opts.src_w; + const int lum_h = c->opts.src_h; int nb_components = desc->nb_components; int plane, x, ysrc; int plane_count = isGray(c->opts.src_format) ? 1 : 3; @@ -52,7 +54,8 @@ int ff_sws_alphablendaway(SwsInternal *c, const uint8_t *const src[], int y_subsample = plane ? desc->log2_chroma_h: 0; for (ysrc = 0; ysrc < AV_CEIL_RSHIFT(srcSliceH, y_subsample); ysrc++) { int y = ysrc + (srcSliceY >> y_subsample); - if (x_subsample || y_subsample) { + int subsample_row = y_subsample && (y << y_subsample) + 1 < lum_h; + if (x_subsample || subsample_row) { int alpha; unsigned u; if (sixteen_bits) { @@ -62,21 +65,23 @@ int ff_sws_alphablendaway(SwsInternal *c, const uint8_t *const src[], uint16_t *d = ( uint16_t *)(dst[plane ] + dstStride[plane ] * y); if ((!isBE(c->opts.src_format)) == !HAVE_BIGENDIAN) { for (x = 0; x < w; x++) { - if (y_subsample) { - alpha = (a[2*x] + a[2*x + 1] + 2 + - a[2*x + alpha_step] + a[2*x + alpha_step + 1]) >> 2; + const int xnext = FFMIN(2*x + 1, lum_w - 1); + if (subsample_row) { + alpha = (a[2*x] + a[xnext] + 2 + + a[2*x + alpha_step] + a[xnext + alpha_step]) >> 2; } else - alpha = (a[2*x] + a[2*x + 1]) >> 1; + alpha = (a[2*x] + a[xnext]) >> 1; u = s[x]*alpha + target_table[((x^y)>>5)&1][plane]*(max-alpha) + off; d[x] = av_clip((u + (u >> shift)) >> shift, 0, max); } } else { for (x = 0; x < w; x++) { - if (y_subsample) { - alpha = (av_bswap16(a[2*x]) + av_bswap16(a[2*x + 1]) + 2 + - av_bswap16(a[2*x + alpha_step]) + av_bswap16(a[2*x + alpha_step + 1])) >> 2; + const int xnext = FFMIN(2*x + 1, lum_w - 1); + if (subsample_row) { + alpha = (av_bswap16(a[2*x]) + av_bswap16(a[xnext]) + 2 + + av_bswap16(a[2*x + alpha_step]) + av_bswap16(a[xnext + alpha_step])) >> 2; } else - alpha = (av_bswap16(a[2*x]) + av_bswap16(a[2*x + 1])) >> 1; + alpha = (av_bswap16(a[2*x]) + av_bswap16(a[xnext])) >> 1; u = av_bswap16(s[x])*alpha + target_table[((x^y)>>5)&1][plane]*(max-alpha) + off; d[x] = av_clip((u + (u >> shift)) >> shift, 0, max); } @@ -87,11 +92,12 @@ int ff_sws_alphablendaway(SwsInternal *c, const uint8_t *const src[], const uint8_t *a = src[plane_count] + (srcStride[plane_count] * ysrc << y_subsample); uint8_t *d = dst[plane ] + dstStride[plane] * y; for (x = 0; x < w; x++) { - if (y_subsample) { - alpha = (a[2*x] + a[2*x + 1] + 2 + - a[2*x + alpha_step] + a[2*x + alpha_step + 1]) >> 2; + const int xnext = FFMIN(2*x + 1, lum_w - 1); + if (subsample_row) { + alpha = (a[2*x] + a[xnext] + 2 + + a[2*x + alpha_step] + a[xnext + alpha_step]) >> 2; } else - alpha = (a[2*x] + a[2*x + 1]) >> 1; + alpha = (a[2*x] + a[xnext]) >> 1; u = s[x]*alpha + target_table[((x^y)>>5)&1][plane]*(255-alpha) + 128; d[x] = (257*u) >> 16; }

1 0

lavu/spherical: Add support for Spherical Immersive type
by Vittorio Giovara 31 Jul '25

31 Jul '25

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Wed Jul 23 23:42:14 2025 +0200| [119d127d05c910db0f0d31c1b124a8d60fd0d75d] | committer: Vittorio Giovara lavu/spherical: Add support for Spherical Immersive type > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=119d127d05c910db0… --- doc/APIchanges | 3 +++ libavformat/mov.c | 3 +++ libavutil/spherical.c | 1 + libavutil/spherical.h | 6 ++++++ libavutil/version.h | 2 +- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 5c40b7c13d..87e6036f18 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2025-03-28 API changes, most recent first: +2025-07-31 - xxxxxxxxxx - lavu 60.7.100 - spherical.h + Add AV_SPHERICAL_PARAMETRIC_IMMERSIVE. + 2025-07-20 - xxxxxxxxxx - lavu 60.6.100 - attributes.h, avstring.h Add av_scanf_format() and use it on av_sscanf(). diff --git a/libavformat/mov.c b/libavformat/mov.c index 1c14b6fcf9..7f88ec8220 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6858,6 +6858,9 @@ static int mov_read_vexu_proj(MOVContext *c, AVIOContext *pb, MOVAtom atom) case MKTAG('f','i','s','h'): projection = AV_SPHERICAL_FISHEYE; break; + case MKTAG('p','r','i','m'): + projection = AV_SPHERICAL_PARAMETRIC_IMMERSIVE; + break; default: av_log(c->fc, AV_LOG_ERROR, "Invalid projection type in prji box: 0x%08X\n", tag); return AVERROR_INVALIDDATA; diff --git a/libavutil/spherical.c b/libavutil/spherical.c index 64ade1d0ec..71342faea9 100644 --- a/libavutil/spherical.c +++ b/libavutil/spherical.c @@ -62,6 +62,7 @@ static const char *const spherical_projection_names[] = { [AV_SPHERICAL_HALF_EQUIRECTANGULAR] = "half equirectangular", [AV_SPHERICAL_RECTILINEAR] = "rectilinear", [AV_SPHERICAL_FISHEYE] = "fisheye", + [AV_SPHERICAL_PARAMETRIC_IMMERSIVE] = "parametric immersive", }; const char *av_spherical_projection_name(enum AVSphericalProjection projection) diff --git a/libavutil/spherical.h b/libavutil/spherical.h index 2e90f7752d..4b78978eb9 100644 --- a/libavutil/spherical.h +++ b/libavutil/spherical.h @@ -82,6 +82,12 @@ enum AVSphericalProjection { * See: https://developer.apple.com/documentation/coremedia/cmprojectiontype/fisheye */ AV_SPHERICAL_FISHEYE, + + /** + * Parametric Immersive projection (Apple). + * See: https://developer.apple.com/documentation/coremedia/cmprojectiontype/parame… + */ + AV_SPHERICAL_PARAMETRIC_IMMERSIVE, }; /** diff --git a/libavutil/version.h b/libavutil/version.h index 946429b8fc..b454106960 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 60 -#define LIBAVUTIL_VERSION_MINOR 6 +#define LIBAVUTIL_VERSION_MINOR 7 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

1 0

mov: Export frame packing information from pack box
by Vittorio Giovara 31 Jul '25

31 Jul '25

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Wed Jul 23 23:29:19 2025 +0200| [c275f3bfa16035b33ba879580512d517d11c6ddd] | committer: Vittorio Giovara mov: Export frame packing information from pack box > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c275f3bfa16035b33… --- libavformat/mov.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5ff9b5ba1b..1c14b6fcf9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6594,6 +6594,85 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_pack(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + AVStream *st; + MOVStreamContext *sc; + int size = 0; + int64_t remaining; + uint32_t tag = 0; + enum AVStereo3DType type = AV_STEREO3D_2D; + + if (c->fc->nb_streams < 1) + return 0; + + st = c->fc->streams[c->fc->nb_streams - 1]; + sc = st->priv_data; + + remaining = atom.size; + while (remaining > 0) { + size = avio_rb32(pb); + if (size < 8 || size > remaining ) { + av_log(c->fc, AV_LOG_ERROR, "Invalid child size in pack box\n"); + return AVERROR_INVALIDDATA; + } + + tag = avio_rl32(pb); + switch (tag) { + case MKTAG('p','k','i','n'): { + if (size != 16) { + av_log(c->fc, AV_LOG_ERROR, "Invalid size of pkin box: %d\n", size); + return AVERROR_INVALIDDATA; + } + avio_skip(pb, 1); // version + avio_skip(pb, 3); // flags + + tag = avio_rl32(pb); + switch (tag) { + case MKTAG('s','i','d','e'): + type = AV_STEREO3D_SIDEBYSIDE; + break; + case MKTAG('o','v','e','r'): + type = AV_STEREO3D_TOPBOTTOM; + break; + case 0: + // This means value will be set in another layer + break; + default: + av_log(c->fc, AV_LOG_WARNING, "Unknown tag in pkin: 0x%08X\n", tag); + avio_skip(pb, size - 8); + break; + } + + break; + } + default: + av_log(c->fc, AV_LOG_WARNING, "Unknown tag in pack: 0x%08X\n", tag); + avio_skip(pb, size - 8); + break; + } + remaining -= size; + } + + if (remaining != 0) { + av_log(c->fc, AV_LOG_ERROR, "Broken pack box\n"); + return AVERROR_INVALIDDATA; + } + + if (type == AV_STEREO3D_2D) + return 0; + + if (!sc->stereo3d) { + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); + if (!sc->stereo3d) + return AVERROR(ENOMEM); + } + + sc->stereo3d->type = type; + + return 0; +} + static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; @@ -7005,6 +7084,13 @@ static int mov_read_vexu(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ret; break; } + case MKTAG('p','a','c','k'): { + MOVAtom pack = { tag, size - 8 }; + int ret = mov_read_pack(c, pb, pack); + if (ret < 0) + return ret; + break; + } default: av_log(c->fc, AV_LOG_WARNING, "Unknown tag in vexu: 0x%08X\n", tag); avio_skip(pb, size - 8);

1 0

libavformat/mov.c: Fix "statement will never be executed" warning
by zhaozhenghang 31 Jul '25

31 Jul '25

ffmpeg | branch: master | zhaozhenghang <15083277223(a)163.com> | Thu Jul 31 09:27:07 2025 +0800| [eade338656b00b4264f69755803e987864ba83a0] | committer: Zhao Zhili libavformat/mov.c: Fix "statement will never be executed" warning That occurs when H261, H263, and MPEG4 decoders are disabled. Signed-off-by: zhaozhenghang <15083277223(a)163.com> Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eade338656b00b426… --- libavformat/mov.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 55b0950b5e..5ff9b5ba1b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5225,18 +5225,14 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) } switch (st->codecpar->codec_id) { -#if CONFIG_H261_DECODER case AV_CODEC_ID_H261: -#endif -#if CONFIG_H263_DECODER case AV_CODEC_ID_H263: -#endif -#if CONFIG_MPEG4_DECODER case AV_CODEC_ID_MPEG4: -#endif st->codecpar->width = 0; /* let decoder init width/height */ st->codecpar->height= 0; break; + default: + break; } // If the duration of the mp3 packets is not constant, then they could need a parser

1 0