September 2024 - ffmpeg-cvslog

avformat/mov: don't return the latest stream when an item stream is expected
by James Almer 30 Sep '24

30 Sep '24

ffmpeg | branch: release/7.1 | James Almer <jamrial(a)gmail.com> | Mon Sep 30 10:59:02 2024 -0300| [12682eba2ef6047f58cb34c07726126025b6e752] | committer: James Almer avformat/mov: don't return the latest stream when an item stream is expected Otherwise, things like ICC profiles as read from the colr box meant for an item with no stream (like a grid) may end up being added to the wrong stream. Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 04182b55494b44152146e6a6bcd5eb9403f00625) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12682eba2ef6047f5… --- libavformat/mov.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a2333ac1fd..5b0b23ffc1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -188,6 +188,10 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len, return p - dst; } +/** + * Get the current stream in the parsing process. This can either be the + * latest stream added to the context, or the stream referenced by an item. + */ static AVStream *get_curr_st(MOVContext *c) { AVStream *st = NULL; @@ -206,7 +210,7 @@ static AVStream *get_curr_st(MOVContext *c) st = item->st; break; } - if (!st) + if (!st && c->cur_item_id == -1) st = c->fc->streams[c->fc->nb_streams-1]; return st;

1 0

avformat/mov: get heif image rotation from irot box
by James Almer 30 Sep '24

30 Sep '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Sep 27 15:15:05 2024 -0300| [76eb3e5ff3a35eff01dd71aca82efcda50c4441f] | committer: James Almer avformat/mov: get heif image rotation from irot box Based on a patch by Hacene Bouaroua. Fixes ticket #11171. Co-authored-by: Hacene Bouaroua <hbouaroua(a)freebox.fr> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76eb3e5ff3a35eff0… --- libavformat/isom.h | 1 + libavformat/mov.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/libavformat/isom.h b/libavformat/isom.h index 4723397048..204addbab2 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -283,6 +283,7 @@ typedef struct HEIFItem { int64_t extent_offset; int width; int height; + int rotation; int type; int is_idat_relative; } HEIFItem; diff --git a/libavformat/mov.c b/libavformat/mov.c index 5b0b23ffc1..67e87094cf 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -40,6 +40,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/dict.h" +#include "libavutil/display.h" #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/aes.h" @@ -8933,6 +8934,27 @@ static int mov_read_ispe(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_irot(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + int angle; + + angle = avio_r8(pb) & 0x3; + + av_log(c->fc, AV_LOG_TRACE, "irot: item_id %d, angle %u\n", + c->cur_item_id, angle); + + for (int i = 0; i < c->nb_heif_item; i++) { + if (c->heif_item[i].item_id == c->cur_item_id) { + // angle * 90 specifies the angle (in anti-clockwise direction) + // in units of degrees. + c->heif_item[i].rotation = angle * 90; + break; + } + } + + return 0; +} + static int mov_read_iprp(MOVContext *c, AVIOContext *pb, MOVAtom atom) { typedef struct MOVAtoms { @@ -9159,6 +9181,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('i','d','a','t'), mov_read_idat }, { MKTAG('i','r','e','f'), mov_read_iref }, { MKTAG('i','s','p','e'), mov_read_ispe }, +{ MKTAG('i','r','o','t'), mov_read_irot }, { MKTAG('i','p','r','p'), mov_read_iprp }, { MKTAG('i','i','n','f'), mov_read_iinf }, { MKTAG('a','m','v','e'), mov_read_amve }, /* ambient viewing environment box */ @@ -9828,6 +9851,26 @@ fail: return ret; } +static int set_display_matrix_from_item(AVPacketSideData **coded_side_data, int *nb_coded_side_data, + const HEIFItem *item) +{ + int32_t *matrix; + AVPacketSideData *sd = av_packet_side_data_new(coded_side_data, + nb_coded_side_data, + AV_PKT_DATA_DISPLAYMATRIX, + 9 * sizeof(*matrix), 0); + if (!sd) + return AVERROR(ENOMEM); + + matrix = (int32_t*)sd->data; + /* rotation is in the counter-clockwise direction whereas + * av_display_rotation_set() expects its argument to be + * oriented clockwise, so we need to negate it. */ + av_display_rotation_set(matrix, -item->rotation); + + return 0; +} + static int read_image_grid(AVFormatContext *s, const HEIFGrid *grid, AVStreamGroupTileGrid *tile_grid) { @@ -9861,6 +9904,14 @@ static int read_image_grid(AVFormatContext *s, const HEIFGrid *grid, tile_grid->width = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); tile_grid->height = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + /* rotation */ + if (item->rotation) { + int ret = set_display_matrix_from_item(&tile_grid->coded_side_data, + &tile_grid->nb_coded_side_data, item); + if (ret < 0) + return ret; + } + av_log(c->fc, AV_LOG_TRACE, "grid: grid_rows %d grid_cols %d output_width %d output_height %d\n", tile_rows, tile_cols, tile_grid->width, tile_grid->height); @@ -9951,6 +10002,15 @@ static int read_image_iovl(AVFormatContext *s, const HEIFGrid *grid, tile_grid->coded_width = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); tile_grid->height = tile_grid->coded_height = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + + /* rotation */ + if (item->rotation) { + int ret = set_display_matrix_from_item(&tile_grid->coded_side_data, + &tile_grid->nb_coded_side_data, item); + if (ret < 0) + return ret; + } + av_log(c->fc, AV_LOG_TRACE, "iovl: output_width %d, output_height %d\n", tile_grid->width, tile_grid->height); @@ -10153,6 +10213,13 @@ static int mov_read_header(AVFormatContext *s) if (item->item_id == mov->primary_item_id) st->disposition |= AV_DISPOSITION_DEFAULT; + if (item->rotation) { + int ret = set_display_matrix_from_item(&st->codecpar->coded_side_data, + &st->codecpar->nb_coded_side_data, item); + if (ret < 0) + return ret; + } + mov_build_index(mov, st); }

1 0

avformat/avformat: add side data to AVStreamGroupTileGrid
by James Almer 30 Sep '24

30 Sep '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Sep 27 14:57:07 2024 -0300| [50d1b89fa0d393bb019d984e989bff1b6fb81f39] | committer: James Almer avformat/avformat: add side data to AVStreamGroupTileGrid Will be used to export certain information present in HEIF samples, like rotation metadata, ICC profiles, and potentially others. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50d1b89fa0d393bb0… --- doc/APIchanges | 3 +++ libavformat/avformat.c | 2 ++ libavformat/avformat.h | 13 +++++++++++++ libavformat/dump.c | 30 ++++++++++++++++++------------ libavformat/version.h | 2 +- 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index f9a4d0e442..1939b8758f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-09-30 - xxxxxxxxxx - lavf 61.9.100 - avformat.h + Add {nb_}coded_side_data to AVStreamGroupTileGrid. + 2024-09-xx - xxxxxxxxxx - lavu 59 Deprecate av_int_list_length_for_size(), av_int_list_length(), and av_opt_set_int_list() without replacement. All AVOptions using these diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 06dcde0565..89ee669bf9 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -102,6 +102,8 @@ void ff_free_stream_group(AVStreamGroup **pstg) case AV_STREAM_GROUP_PARAMS_TILE_GRID: av_opt_free(stg->params.tile_grid); av_freep(&stg->params.tile_grid->offsets); + av_packet_side_data_free(&stg->params.tile_grid->coded_side_data, + &stg->params.tile_grid->nb_coded_side_data); av_freep(&stg->params.tile_grid); break; case AV_STREAM_GROUP_PARAMS_LCEVC: diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 56c1c80289..2e5f2dc795 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1082,6 +1082,19 @@ typedef struct AVStreamGroupTileGrid { * final image before presentation. */ int height; + + /** + * Additional data associated with the grid. + * + * Should be allocated with av_packet_side_data_new() or + * av_packet_side_data_add(), and will be freed by avformat_free_context(). + */ + AVPacketSideData *coded_side_data; + + /** + * Amount of entries in @ref coded_side_data. + */ + int nb_coded_side_data; } AVStreamGroupTileGrid; /** diff --git a/libavformat/dump.c b/libavformat/dump.c index a8e968fd86..7dc7f0ad5a 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -377,7 +377,7 @@ static void dump_ambient_viewing_environment_metadata(void *ctx, const AVPacketS av_q2d(ambient->ambient_light_y)); } -static void dump_spherical(void *ctx, const AVCodecParameters *par, +static void dump_spherical(void *ctx, int w, int h, const AVPacketSideData *sd, int log_level) { const AVSphericalMapping *spherical = (const AVSphericalMapping *)sd->data; @@ -399,7 +399,7 @@ static void dump_spherical(void *ctx, const AVCodecParameters *par, if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) { size_t l, t, r, b; - av_spherical_tile_bounds(spherical, par->width, par->height, + av_spherical_tile_bounds(spherical, w, h, &l, &t, &r, &b); av_log(ctx, log_level, "[%"SIZE_SPECIFIER", %"SIZE_SPECIFIER", %"SIZE_SPECIFIER", %"SIZE_SPECIFIER"] ", @@ -427,7 +427,7 @@ static void dump_dovi_conf(void *ctx, const AVPacketSideData *sd, dovi->dv_md_compression); } -static void dump_s12m_timecode(void *ctx, const AVStream *st, const AVPacketSideData *sd, +static void dump_s12m_timecode(void *ctx, AVRational avg_frame_rate, const AVPacketSideData *sd, int log_level) { const uint32_t *tc = (const uint32_t *)sd->data; @@ -439,7 +439,7 @@ static void dump_s12m_timecode(void *ctx, const AVStream *st, const AVPacketSide for (int j = 1; j <= tc[0]; j++) { char tcbuf[AV_TIMECODE_STR_SIZE]; - av_timecode_make_smpte_tc_string2(tcbuf, st->avg_frame_rate, tc[j], 0, 0); + av_timecode_make_smpte_tc_string2(tcbuf, avg_frame_rate, tc[j], 0, 0); av_log(ctx, log_level, "timecode - %s%s", tcbuf, j != tc[0] ? ", " : ""); } } @@ -461,16 +461,17 @@ static void dump_cropping(void *ctx, const AVPacketSideData *sd) av_log(ctx, AV_LOG_INFO, "%d/%d/%d/%d", left, right, top, bottom); } -static void dump_sidedata(void *ctx, const AVStream *st, const char *indent, - int log_level) +static void dump_sidedata(void *ctx, const AVPacketSideData *side_data, int nb_side_data, + int w, int h, AVRational avg_frame_rate, + const char *indent, int log_level) { int i; - if (st->codecpar->nb_coded_side_data) + if (nb_side_data) av_log(ctx, log_level, "%sSide data:\n", indent); - for (i = 0; i < st->codecpar->nb_coded_side_data; i++) { - const AVPacketSideData *sd = &st->codecpar->coded_side_data[i]; + for (i = 0; i < nb_side_data; i++) { + const AVPacketSideData *sd = &side_data[i]; av_log(ctx, log_level, "%s ", indent); switch (sd->type) { @@ -516,7 +517,7 @@ static void dump_sidedata(void *ctx, const AVStream *st, const char *indent, break; case AV_PKT_DATA_SPHERICAL: av_log(ctx, log_level, "spherical: "); - dump_spherical(ctx, st->codecpar, sd, log_level); + dump_spherical(ctx, w, h, sd, log_level); break; case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: dump_content_light_metadata(ctx, sd, log_level); @@ -530,7 +531,7 @@ static void dump_sidedata(void *ctx, const AVStream *st, const char *indent, break; case AV_PKT_DATA_S12M_TIMECODE: av_log(ctx, log_level, "SMPTE ST 12-1:2014: "); - dump_s12m_timecode(ctx, st, sd, log_level); + dump_s12m_timecode(ctx, avg_frame_rate, sd, log_level); break; case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT: dump_ambient_viewing_environment_metadata(ctx, sd); @@ -678,7 +679,9 @@ static void dump_stream_format(const AVFormatContext *ic, int i, dump_metadata(NULL, st->metadata, extra_indent, log_level); - dump_sidedata(NULL, st, extra_indent, log_level); + dump_sidedata(NULL, st->codecpar->coded_side_data, st->codecpar->nb_coded_side_data, + st->codecpar->width, st->codecpar->height, st->avg_frame_rate, + extra_indent, log_level); } static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed, @@ -782,6 +785,9 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed, dump_disposition(stg->disposition, AV_LOG_INFO); av_log(NULL, AV_LOG_INFO, "\n"); dump_metadata(NULL, stg->metadata, " ", AV_LOG_INFO); + dump_sidedata(NULL, tile_grid->coded_side_data, tile_grid->nb_coded_side_data, + tile_grid->width, tile_grid->height, (AVRational) {0,1}, + " ", AV_LOG_INFO); for (int i = 0; i < tile_grid->nb_tiles; i++) { const AVStream *st = stg->streams[tile_grid->offsets[i].idx]; dump_stream_format(ic, st->index, i, index, is_output, AV_LOG_VERBOSE); diff --git a/libavformat/version.h b/libavformat/version.h index 35d796d318..1b079ebce8 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 8 +#define LIBAVFORMAT_VERSION_MINOR 9 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

1 0

avformat/mov: don't return the latest stream when an item stream is expected
by James Almer 30 Sep '24

30 Sep '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Sep 30 10:59:02 2024 -0300| [04182b55494b44152146e6a6bcd5eb9403f00625] | committer: James Almer avformat/mov: don't return the latest stream when an item stream is expected Otherwise, things like ICC profiles as read from the colr box meant for an item with no stream (like a grid) may end up being added to the wrong stream. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04182b55494b44152… --- libavformat/mov.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a2333ac1fd..5b0b23ffc1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -188,6 +188,10 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len, return p - dst; } +/** + * Get the current stream in the parsing process. This can either be the + * latest stream added to the context, or the stream referenced by an item. + */ static AVStream *get_curr_st(MOVContext *c) { AVStream *st = NULL; @@ -206,7 +210,7 @@ static AVStream *get_curr_st(MOVContext *c) st = item->st; break; } - if (!st) + if (!st && c->cur_item_id == -1) st = c->fc->streams[c->fc->nb_streams-1]; return st;

1 0

fate/filter-audio: add missing aresample filter dependency to fate-filter-crazychannels
by James Almer 30 Sep '24

30 Sep '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Sep 29 09:01:21 2024 -0300| [6057cd8aeee5c2ed8397fcbf0ee74de26701b5aa] | committer: James Almer fate/filter-audio: add missing aresample filter dependency to fate-filter-crazychannels Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6057cd8aeee5c2ed8… --- tests/fate/filter-audio.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index eb8582ab31..84478740c7 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -420,7 +420,7 @@ fate-filter-atempo: REF = $(SAMPLES)/filter-reference/atempo.pcm fate-filter-crazychannels: tests/data/filtergraphs/crazychannels fate-filter-crazychannels: CMD = framecrc -auto_conversion_filters -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/crazychannels -FATE_AFILTER-$(call FILTERFRAMECRC, SINE JOIN ATRIM CHANNELMAP CHANNELSPLIT) += fate-filter-crazychannels +FATE_AFILTER-$(call FILTERFRAMECRC, ARESAMPLE SINE JOIN ATRIM CHANNELMAP CHANNELSPLIT) += fate-filter-crazychannels FATE_AFILTER-yes += fate-filter-formats fate-filter-formats: libavfilter/tests/formats$(EXESUF)

1 0

fate/hevc: add missing scale filter dependency to fate-hevc-mv-switch
by James Almer 30 Sep '24

30 Sep '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Sep 29 08:55:02 2024 -0300| [b622714573a3578a1cd7bc9cc33c1f37c773f77c] | committer: James Almer fate/hevc: add missing scale filter dependency to fate-hevc-mv-switch Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b622714573a3578a1… --- tests/fate/hevc.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 7f7ec43902..9e6fd72618 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -284,7 +284,7 @@ $(TARGET_SAMPLES)/hevc/mv_nuh_layer_id.bit|$\ $(TARGET_SAMPLES)/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|$\ $(TARGET_SAMPLES)/hevc-conformance/MVHEVCS_A.bit fate-hevc-mv-switch: CMD = framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact -FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, CONCAT_PROTOCOL) += fate-hevc-mv-switch +FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, SCALE_FILTER CONCAT_PROTOCOL) += fate-hevc-mv-switch # multiview stream, select view by position # (depends on Three Dimensional Reference Displays Information SEI)

1 0

fate/vcodec: add missing scale filter dependency to ffv1-2pass10 vsynth tests
by James Almer 30 Sep '24

30 Sep '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Sep 29 08:54:05 2024 -0300| [b1a7b0411aa4c46a659d027750eb8570d1ace29c] | committer: James Almer fate/vcodec: add missing scale filter dependency to ffv1-2pass10 vsynth tests Also, add sws_flags matching other similar tests while at it. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1a7b0411aa4c46a6… --- tests/fate/vcodec.mak | 9 +++++---- tests/ref/vsynth/vsynth1-ffv1-2pass10 | 8 ++++---- tests/ref/vsynth/vsynth2-ffv1-2pass10 | 8 ++++---- tests/ref/vsynth/vsynth3-ffv1-2pass10 | 8 ++++---- tests/ref/vsynth/vsynth_lena-ffv1-2pass10 | 8 ++++---- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 549470e592..17648aef59 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -156,10 +156,10 @@ $(FATE_VCODEC_DV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1-v0 ffv1-v2 \ ffv1-v3-yuv420p \ - ffv1-2pass \ - ffv1-2pass10 + ffv1-2pass + FATE_VCODEC_SCALE-$(call ENCDEC, FFV1, AVI) += ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ - ffv1-v3-bgr0 ffv1-v3-rgb48 + ffv1-v3-bgr0 ffv1-v3-rgb48 ffv1-2pass10 fate-vsynth%-ffv1: ENCOPTS = -slices 4 fate-vsynth%-ffv1-v0: CODEC = ffv1 fate-vsynth%-ffv1-v2: ENCOPTS = -level 2 -strict experimental @@ -179,7 +179,8 @@ fate-vsynth%-ffv1-v3-rgb48: DECOPTS = -sws_flags neighbor+bitexact fate-vsynth%-ffv1-2pass: TWOPASS = 1 fate-vsynth%-ffv1-2pass: ENCOPTS = -coder range_tab -context 1 fate-vsynth%-ffv1-2pass10: TWOPASS = 1 -fate-vsynth%-ffv1-2pass10: ENCOPTS = -coder range_tab -context 1 -pix_fmt yuv422p10 +fate-vsynth%-ffv1-2pass10: ENCOPTS = -coder range_tab -context 1 -pix_fmt yuv422p10 \ + -sws_flags neighbor+bitexact FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff FATE_VCODEC_SCALE-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16 diff --git a/tests/ref/vsynth/vsynth1-ffv1-2pass10 b/tests/ref/vsynth/vsynth1-ffv1-2pass10 index 0116995aeb..1436cde80d 100644 --- a/tests/ref/vsynth/vsynth1-ffv1-2pass10 +++ b/tests/ref/vsynth/vsynth1-ffv1-2pass10 @@ -1,4 +1,4 @@ -48d69c54e68d4f1878e2371e8b3083ad *tests/data/fate/vsynth1-ffv1-2pass10.avi -3972962 tests/data/fate/vsynth1-ffv1-2pass10.avi -c31e6caada921ffa3daad3432ef3b754 *tests/data/fate/vsynth1-ffv1-2pass10.out.rawvideo -stddev: 1.85 PSNR: 42.78 MAXDIFF: 29 bytes: 7603200/ 7603200 +1093853767c7eff69cb235895de52c1e *tests/data/fate/vsynth1-ffv1-2pass10.avi +2563110 tests/data/fate/vsynth1-ffv1-2pass10.avi +4c9d3ec84a39f77860f92538c8e542ad *tests/data/fate/vsynth1-ffv1-2pass10.out.rawvideo +stddev: 1.29 PSNR: 45.90 MAXDIFF: 21 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1-2pass10 b/tests/ref/vsynth/vsynth2-ffv1-2pass10 index b05be1c43e..9b47dc361d 100644 --- a/tests/ref/vsynth/vsynth2-ffv1-2pass10 +++ b/tests/ref/vsynth/vsynth2-ffv1-2pass10 @@ -1,4 +1,4 @@ -d65b14c77cbcd9df0e390c499ccdc4c9 *tests/data/fate/vsynth2-ffv1-2pass10.avi -5501962 tests/data/fate/vsynth2-ffv1-2pass10.avi -8bb1c449e1a2a94fd0d98841c04246bb *tests/data/fate/vsynth2-ffv1-2pass10.out.rawvideo -stddev: 0.39 PSNR: 56.17 MAXDIFF: 9 bytes: 7603200/ 7603200 +a0604ec563bcbf4c1e27fc2e779e4d80 *tests/data/fate/vsynth2-ffv1-2pass10.avi +3858802 tests/data/fate/vsynth2-ffv1-2pass10.avi +3d4c55f943e6cd8eeac5954d71f43a5d *tests/data/fate/vsynth2-ffv1-2pass10.out.rawvideo +stddev: 0.31 PSNR: 58.28 MAXDIFF: 6 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-ffv1-2pass10 b/tests/ref/vsynth/vsynth3-ffv1-2pass10 index ef813fbd62..5cc7fb8673 100644 --- a/tests/ref/vsynth/vsynth3-ffv1-2pass10 +++ b/tests/ref/vsynth/vsynth3-ffv1-2pass10 @@ -1,4 +1,4 @@ -b546cb1ef5954c92e7870c21b7782a89 *tests/data/fate/vsynth3-ffv1-2pass10.avi -85304 tests/data/fate/vsynth3-ffv1-2pass10.avi -0cf7cf68724fa5146b1667e4fa08b0e1 *tests/data/fate/vsynth3-ffv1-2pass10.out.rawvideo -stddev: 2.12 PSNR: 41.58 MAXDIFF: 26 bytes: 86700/ 86700 +f3e4a564f649e6494d1d75663be3234b *tests/data/fate/vsynth3-ffv1-2pass10.avi +57880 tests/data/fate/vsynth3-ffv1-2pass10.avi +2a99d28da942139ac8d83e44b9847347 *tests/data/fate/vsynth3-ffv1-2pass10.out.rawvideo +stddev: 1.47 PSNR: 44.75 MAXDIFF: 18 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-2pass10 b/tests/ref/vsynth/vsynth_lena-ffv1-2pass10 index 8fe82c3c15..9a5b952336 100644 --- a/tests/ref/vsynth/vsynth_lena-ffv1-2pass10 +++ b/tests/ref/vsynth/vsynth_lena-ffv1-2pass10 @@ -1,4 +1,4 @@ -4c63cb712d5a0aa5dfb4dd1d461a604d *tests/data/fate/vsynth_lena-ffv1-2pass10.avi -5359578 tests/data/fate/vsynth_lena-ffv1-2pass10.avi -a627fb50c8276200fd71383977d87ca3 *tests/data/fate/vsynth_lena-ffv1-2pass10.out.rawvideo -stddev: 0.34 PSNR: 57.43 MAXDIFF: 6 bytes: 7603200/ 7603200 +602ab4d53e2c56b77062b3720d483f3b *tests/data/fate/vsynth_lena-ffv1-2pass10.avi +3775066 tests/data/fate/vsynth_lena-ffv1-2pass10.avi +e692506c522fa6af70da9eab65cbfe49 *tests/data/fate/vsynth_lena-ffv1-2pass10.out.rawvideo +stddev: 0.26 PSNR: 59.53 MAXDIFF: 4 bytes: 7603200/ 7603200

1 0

Tag n7.2-dev : Main development, master branch after release/7.1 branched off
by git＠videolan.org 30 Sep '24

30 Sep '24

[ffmpeg] [branch: refs/tags/n7.2-dev] Tag: a682e908f56ce649b4e574a4fd920bcd44cf1fb4 > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=a682e908f56ce649b4e57… Tagger: James Almer <jamrial(a)gmail.com> Date: Mon Sep 30 09:13:00 2024 -0300 Main development, master branch after release/7.1 branched off

1 0

avformat/hlsenc: Fix missing EXT-X-DISCONTINUITY tag in subtitle streams
by Jonathan Baecker 30 Sep '24

30 Sep '24

ffmpeg | branch: master | Jonathan Baecker <jonbae77(a)gmail.com> | Thu Sep 26 09:33:54 2024 +0200| [f3d2624bfab0f3a4cc68160b5b5869c3ea2af779] | committer: Steven Liu avformat/hlsenc: Fix missing EXT-X-DISCONTINUITY tag in subtitle streams The EXT-X-DISCONTINUITY tag was not being added to subtitle streams, causing synchronization issues.i This patch ensures that the tag is applied consistently across video and subtitle streams. Reviewed-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3d2624bfab0f3a4c… --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 1e932b7b0e..571d6b2752 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1668,7 +1668,7 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) ff_hls_write_playlist_header(hls->sub_m3u8_out, hls->version, hls->allowcache, target_duration, sequence, PLAYLIST_TYPE_NONE, 0); for (en = vs->segments; en; en = en->next) { - ret = ff_hls_write_file_entry(hls->sub_m3u8_out, 0, byterange_mode, + ret = ff_hls_write_file_entry(hls->sub_m3u8_out, en->discont, byterange_mode, en->duration, 0, en->size, en->pos, hls->baseurl, en->sub_filename, NULL, 0, 0, 0); if (ret < 0) {

1 0

[ffmpeg-web] branch master updated. 602b567 web/index: fix typo (coded->codec)
by ffmpeg-git＠ffmpeg.org 30 Sep '24

30 Sep '24

The branch, master has been updated via 602b5673b319b4652935010446274c098d12d5ec (commit) from c8d16bf93bcc61a82c4dd064a1538fb80fc4eb03 (commit) - Log ----------------------------------------------------------------- commit 602b5673b319b4652935010446274c098d12d5ec Author: Lynne <dev(a)lynne.ee> AuthorDate: Mon Sep 30 12:07:21 2024 +0200 Commit: Lynne <dev(a)lynne.ee> CommitDate: Mon Sep 30 12:07:21 2024 +0200 web/index: fix typo (coded->codec) Thanks to Ramiro for pointing this out. diff --git a/src/index b/src/index index e8420f7..c0544f5 100644 --- a/src/index +++ b/src/index @@ -43,7 +43,7 @@ </p> <p> The more important highlights of the release are that the VVC decoder, merged as experimental in version 7.0, - has had enough time to mature and be optimized enough to be declared as stable. The coded is starting to gain + has had enough time to mature and be optimized enough to be declared as stable. The codec is starting to gain traction with broadcast standardization bodies.<br> Support has been added for a native AAC USAC (part of the xHE-AAC coding system) decoder, with the format starting to be adopted by streaming websites, due to its extensive volume normalization metadata.<br> ----------------------------------------------------------------------- Summary of changes: src/index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

1 0