March 2018 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] avcodec/texturedspenc: Fix indexing in color distribution determination
by Michael Niedermayer 08 Jun '22

08 Jun '22

Fixes CID1396405 Untested except fate which does not test this, please someone test this Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/texturedspenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c index 8b2863033b..5171c69d82 100644 --- a/libavcodec/texturedspenc.c +++ b/libavcodec/texturedspenc.c @@ -255,11 +255,11 @@ static void optimize_colors(const uint8_t *block, ptrdiff_t stride, muv = minv = maxv = bp[0]; for (y = 0; y < 4; y++) { - for (x = 4; x < 4; x += 4) { + for (x = 0; x < 4; x++) { muv += bp[x * 4 + y * stride]; - if (bp[x] < minv) + if (bp[x * 4 + y * stride] < minv) minv = bp[x * 4 + y * stride]; - else if (bp[x] > maxv) + else if (bp[x * 4 + y * stride] > maxv) maxv = bp[x * 4 + y * stride]; } } -- 2.11.0

4 6

[PATCH] avcodec/ac3dec: Check expacc
by Michael Niedermayer 04 Mar '22

04 Mar '22

Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/ac3dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index a95c204..499971a 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -426,6 +426,10 @@ static int decode_exponents(AC3DecodeContext *s, group_size = exp_strategy + (exp_strategy == EXP_D45); for (grp = 0, i = 0; grp < ngrps; grp++) { expacc = get_bits(gbc, 7); + if (expacc >= 125) { + av_log(s->avctx, AV_LOG_ERROR, "expacc %d is out-of-range\n", expacc); + return AVERROR_INVALIDDATA; + } dexp[i++] = ungroup_3_in_7_bits_tab[expacc][0]; dexp[i++] = ungroup_3_in_7_bits_tab[expacc][1]; dexp[i++] = ungroup_3_in_7_bits_tab[expacc][2]; -- 2.10.2

3 4

[PATCH 1/9] avcodec/videotoolboxenc: remove spurious warning
by Aman Gupta 04 Sep '20

04 Sep '20

From: Aman Gupta <aman(a)tmm1.net> --- libavcodec/videotoolboxenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index eba6cc672f..a7bef72da8 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1853,8 +1853,6 @@ static int get_cv_pixel_info( "Color range not set for %s. Using MPEG range.\n", av_get_pix_fmt_name(av_format)); } - - av_log(avctx, AV_LOG_WARNING, ""); } switch (av_format) { -- 2.13.5 (Apple Git-94)

5 16

[PATCH] fate: remove "-v 0" from ffprobe tests.
by Nicolas George 24 Aug '20

24 Aug '20

The FATE scripts separate stdout from stderr. Having a first idea about what went wrong in the log file is more convenient. Signed-off-by: Nicolas George <george(a)nsup.org> --- tests/fate-run.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 3d58080..4b31b62 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -84,7 +84,7 @@ runecho(){ } probefmt(){ - run ffprobe${PROGSUF} -show_entries format=format_name -print_format default=nw=1:nk=1 -v 0 "$@" + run ffprobe${PROGSUF} -show_entries format=format_name -print_format default=nw=1:nk=1 "$@" } runlocal(){ @@ -93,24 +93,24 @@ runlocal(){ } probeframes(){ - run ffprobe${PROGSUF} -show_frames -v 0 "$@" + run ffprobe${PROGSUF} -show_frames "$@" } probechapters(){ - run ffprobe${PROGSUF} -show_chapters -v 0 "$@" + run ffprobe${PROGSUF} -show_chapters "$@" } probegaplessinfo(){ filename="$1" shift - run ffprobe${PROGSUF} -bitexact -select_streams a -show_entries format=start_time,duration:stream=index,start_pts,duration_ts -v 0 "$filename" "$@" + run ffprobe${PROGSUF} -bitexact -select_streams a -show_entries format=start_time,duration:stream=index,start_pts,duration_ts "$filename" "$@" pktfile1="${outdir}/${test}.pkts" framefile1="${outdir}/${test}.frames" cleanfiles="$cleanfiles $pktfile1 $framefile1" - run ffprobe${PROGSUF} -bitexact -select_streams a -of compact -count_packets -show_entries packet=pts,dts,duration:stream=nb_read_packets -v 0 "$filename" "$@" > "$pktfile1" + run ffprobe${PROGSUF} -bitexact -select_streams a -of compact -count_packets -show_entries packet=pts,dts,duration:stream=nb_read_packets "$filename" "$@" > "$pktfile1" head -n 8 "$pktfile1" tail -n 9 "$pktfile1" - run ffprobe${PROGSUF} -bitexact -select_streams a -of compact -count_frames -show_entries frame=pkt_pts,pkt_dts,best_effort_timestamp,pkt_duration,nb_samples:stream=nb_read_frames -v 0 "$filename" "$@" > "$framefile1" + run ffprobe${PROGSUF} -bitexact -select_streams a -of compact -count_frames -show_entries frame=pkt_pts,pkt_dts,best_effort_timestamp,pkt_duration,nb_samples:stream=nb_read_frames "$filename" "$@" > "$framefile1" head -n 8 "$framefile1" tail -n 9 "$framefile1" } @@ -306,10 +306,10 @@ concat(){ awk "{gsub(/%SRCFILE%/, \"$sample\"); print}" $template > $concatfile if [ "$mode" = "md5" ]; then - run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $concatfile | tr -d '\r' > $packetfile + run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -fflags keepside -safe 0 $extra_args $concatfile | tr -d '\r' > $packetfile do_md5sum $packetfile else - run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile + run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile fi } -- 2.8.1

2 4

[PATCH] doc/utils: document the "ms" and "us" suffixes for durations
by Moritz Barsnick 08 Jun '20

08 Jun '20

These suffixes were recently introduced in 61c972384d311508d07f9360d196909e27195655 and completed in 8218249f1f04de65904f58519bde21948e5a0783. Signed-off-by: Moritz Barsnick <barsnick(a)gmx.net> --- I chose not to document the suffixes in the section describing the HH:MM:SS.mmm syntax, even though they work there (with expected, but quite difficult to explain effects). doc/utils.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/utils.texi b/doc/utils.texi index d55dd315c3..a094ee151c 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -110,11 +110,12 @@ maximum of 2 digits. The @var{m} at the end expresses decimal value for @emph{or} @example -[-]@var{S}+[.@var{m}...] +[-]@var{S}+[.@var{m}...][ms|us] @end example @var{S} expresses the number of seconds, with the optional decimal part -@var{m}. +@var{m}. The optional literal suffixes @samp{ms} or @samp{us} indicate to +interpret the value as milliseconds or microseconds, respectively. In both expressions, the optional @samp{-} indicates negative duration. -- 2.14.3

3 4

[PATCH 0/5] Add lavfi api & remove device iteration
by Josh de Kock 17 Apr '20

17 Apr '20

This set is an alternative to the previous set I posted, it makes it so that the current behaviour is kept (devices are returned in by the iteration functions but must be loaded in manually). It is a compromise between what Nicolas George suggested and a full rewrite. I personally would like to just 'get this done', and I feel other than completely rewriting the API from scratch (and the previous set I posted), merging lavf and lavd is the only other option. -- Josh

8 22

[PATCH]lavf/gdv: Improve palette saturation
by Carl Eugen Hoyos 12 Apr '20

12 Apr '20

Hi! Attached patch slightly improves the saturation of the gdv palette. Please comment, Carl Eugen

3 5

[PATCH] lavf/matroskadec: Demux the PixelCrop* values
by Nic Wolfe 30 Mar '20

30 Mar '20

The Matroska spec defines PixelCropTop, PixelCropBottom, PixelCropLeft, and PixelCropRight elements: https://www.matroska.org/technical/specs/index.html This commit adds support for demuxing these values so that applications using libav* are able to use them when playing the stream. They're added to the AVStream's metadata if they are set to something non-zero. My official patch is base64 encoded and attached but I will also include the diff below for (hopefully) convenience. Thanks, Nic diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d788232..72537df 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -139,6 +139,10 @@ typedef struct MatroskaTrackVideo { EbmlBin color_space; uint64_t stereo_mode; uint64_t alpha_mode; + uint64_t crop_bottom; + uint64_t crop_top; + uint64_t crop_left; + uint64_t crop_right; } MatroskaTrackVideo; typedef struct MatroskaTrackAudio { @@ -364,10 +368,10 @@ static const EbmlSyntax matroska_track_video[] = { { MATROSKA_ID_VIDEOPIXELHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo, pixel_height) }, { MATROSKA_ID_VIDEOCOLORSPACE, EBML_BIN, 0, offsetof(MatroskaTrackVideo, color_space) }, { MATROSKA_ID_VIDEOALPHAMODE, EBML_UINT, 0, offsetof(MatroskaTrackVideo, alpha_mode) }, - { MATROSKA_ID_VIDEOPIXELCROPB, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPT, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE }, - { MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE }, + { MATROSKA_ID_VIDEOPIXELCROPB, EBML_UINT, 0, offsetof(MatroskaTrackVideo, crop_bottom) }, + { MATROSKA_ID_VIDEOPIXELCROPT, EBML_UINT, 0, offsetof(MatroskaTrackVideo, crop_top) }, + { MATROSKA_ID_VIDEOPIXELCROPL, EBML_UINT, 0, offsetof(MatroskaTrackVideo, crop_left) }, + { MATROSKA_ID_VIDEOPIXELCROPR, EBML_UINT, 0, offsetof(MatroskaTrackVideo, crop_right) }, { MATROSKA_ID_VIDEODISPLAYUNIT, EBML_NONE }, { MATROSKA_ID_VIDEOFLAGINTERLACED, EBML_NONE }, { MATROSKA_ID_VIDEOSTEREOMODE, EBML_UINT, 0, offsetof(MatroskaTrackVideo, stereo_mode), { .u = MATROSKA_VIDEO_STEREOMODE_TYPE_NB } }, @@ -2152,6 +2156,16 @@ static int matroska_parse_tracks(AVFormatContext *s) if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) av_dict_set(&st->metadata, "stereo_mode", ff_matroska_video_stereo_mode[track->video.stereo_mode], 0); + /* export the matroska crop settings as metadata */ + if (track->video.crop_bottom != 0) + av_dict_set_int(&st->metadata, "crop_bottom", track->video.crop_bottom, 0); + if (track->video.crop_top != 0) + av_dict_set_int(&st->metadata, "crop_top", track->video.crop_top, 0); + if (track->video.crop_left != 0) + av_dict_set_int(&st->metadata, "crop_left", track->video.crop_left, 0); + if (track->video.crop_right != 0) + av_dict_set_int(&st->metadata, "crop_right", track->video.crop_right, 0); + /* export alpha mode flag as metadata tag */ if (track->video.alpha_mode) av_dict_set(&st->metadata, "alpha_mode", "1", 0);

5 7

[PATCH] avfilter: add Audio Video Sync Test filter
by Paul B Mahol 12 Mar '20

12 Mar '20

Hi, patch attached.

3 25

[PATCH] avformat/avlanguage: deprecate av_convert_lang_to and make it internal
by James Almer 27 Nov '19

27 Nov '19

The header was never installed and the function is only used in libavformat Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavformat/asfdec_f.c | 2 +- libavformat/asfdec_o.c | 2 +- libavformat/asfenc.c | 2 +- libavformat/avienc.c | 2 +- libavformat/avlanguage.c | 11 +++++++++-- libavformat/avlanguage.h | 7 +++++++ libavformat/matroskaenc.c | 2 +- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 2c81b13..b973eff 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -912,7 +912,7 @@ static int asf_read_header(AVFormatContext *s) const char *rfc1766 = asf->stream_languages[asf->streams[i].stream_language_index]; if (rfc1766 && strlen(rfc1766) > 1) { const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any - const char *iso6392 = av_convert_lang_to(primary_tag, + const char *iso6392 = ff_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL); if (iso6392) av_dict_set(&st->metadata, "language", iso6392, 0); diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 1c564a8..f8caf16 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -829,7 +829,7 @@ static void set_language(AVFormatContext *s, const char *rfc1766, AVDictionary * // language abbr should contain at least 2 chars if (rfc1766 && strlen(rfc1766) > 1) { const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any - const char *iso6392 = av_convert_lang_to(primary_tag, + const char *iso6392 = ff_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL); if (iso6392) if (av_dict_set(met, "language", iso6392, 0) < 0) diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index cfa4fad..93ab167 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -431,7 +431,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, entry = av_dict_get(s->streams[n]->metadata, "language", NULL, 0); if (entry) { - const char *iso6391lang = av_convert_lang_to(entry->value, AV_LANG_ISO639_1); + const char *iso6391lang = ff_convert_lang_to(entry->value, AV_LANG_ISO639_1); if (iso6391lang) { int i; for (i = 0; i < asf->nb_languages; i++) { diff --git a/libavformat/avienc.c b/libavformat/avienc.c index c908c21..59ad2b2 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -435,7 +435,7 @@ static int avi_write_header(AVFormatContext *s) } if (par->codec_id == AV_CODEC_ID_XSUB && (t = av_dict_get(s->streams[i]->metadata, "language", NULL, 0))) { - const char* langstr = av_convert_lang_to(t->value, AV_LANG_ISO639_1); + const char* langstr = ff_convert_lang_to(t->value, AV_LANG_ISO639_1); t = NULL; if (langstr) { char* str = av_asprintf("Subtitle - %s-xx;02", langstr); diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index 39f2560..f5d2ddf 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -733,7 +733,7 @@ static int lang_table_compare(const void *lhs, const void *rhs) return strcmp(lhs, ((const LangEntry *)rhs)->str); } -const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace) +const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace) { int i; const LangEntry *entry = NULL; @@ -759,7 +759,14 @@ const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_cod entry = lang_table + entry->next_equivalent; if (target_codespace == AV_LANG_ISO639_2_TERM) - return av_convert_lang_to(lang, AV_LANG_ISO639_2_BIBL); + return ff_convert_lang_to(lang, AV_LANG_ISO639_2_BIBL); return NULL; } + +#if LIBAVFORMAT_VERSION_MAJOR < 58 +const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace) +{ + return ff_convert_lang_to(lang, target_codespace); +} +#endif diff --git a/libavformat/avlanguage.h b/libavformat/avlanguage.h index 7fb8968..8b91b2a 100644 --- a/libavformat/avlanguage.h +++ b/libavformat/avlanguage.h @@ -21,6 +21,9 @@ #ifndef AVFORMAT_AVLANGUAGE_H #define AVFORMAT_AVLANGUAGE_H +#include "libavutil/attributes.h" +#include "libavformat/version.h" + /** * Known language codespaces */ @@ -34,6 +37,10 @@ enum AVLangCodespace { * Convert a language code to a target codespace. The source codespace is guessed. * @return NULL if the provided lang is null or invalid. */ +const char *ff_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace); +#if LIBAVFORMAT_VERSION_MAJOR < 58 +attribute_deprecated const char *av_convert_lang_to(const char *lang, enum AVLangCodespace target_codespace); +#endif #endif /* AVFORMAT_AVLANGUAGE_H */ diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4cd9878..2bf9b30 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1257,7 +1257,7 @@ static int mkv_write_simpletag(AVIOContext *pb, AVDictionaryEntry *t) return AVERROR(ENOMEM); if ((p = strrchr(p, '-')) && - (lang = av_convert_lang_to(p + 1, AV_LANG_ISO639_2_BIBL))) + (lang = ff_convert_lang_to(p + 1, AV_LANG_ISO639_2_BIBL))) *p = 0; p = key; -- 2.8.1

3 5