April 2020 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/af_adelay: Check sscanf() return value
by Limin Wang 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Sun Mar 29 08:08:05 2020 +0800| [f441fadbcffa32b71470220b522d4971a774e760] | committer: Limin Wang avfilter/af_adelay: Check sscanf() return value Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f441fadbcffa32b71… --- libavfilter/af_adelay.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index c9647771f2..6ac81c2a3e 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -155,7 +155,10 @@ static int config_input(AVFilterLink *inlink) ret = av_sscanf(arg, "%d%c", &d->delay, &type); if (ret != 2 || type != 'S') { div = type == 's' ? 1.0 : 1000.0; - av_sscanf(arg, "%f", &delay); + if (av_sscanf(arg, "%f", &delay) != 1) { + av_log(ctx, AV_LOG_ERROR, "Invalid syntax for delay.\n"); + return AVERROR(EINVAL); + } d->delay = delay * inlink->sample_rate / div; }

1 0

avfilter/vf_mix: Check sscanf() return value
by Limin Wang 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Sun Mar 29 09:08:13 2020 +0800| [ee5d6d2ef88a3a7fd480435cf931dd6165bbb688] | committer: Limin Wang avfilter/vf_mix: Check sscanf() return value Reviewed-by: Nicolas George <george(a)nsup.org> Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee5d6d2ef88a3a7fd… --- libavfilter/vf_mix.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index f418c6fba8..bdb67d8e5a 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -108,7 +108,10 @@ static av_cold int init(AVFilterContext *ctx) break; p = NULL; - av_sscanf(arg, "%f", &s->weights[i]); + if (av_sscanf(arg, "%f", &s->weights[i]) != 1) { + av_log(ctx, AV_LOG_ERROR, "Invalid syntax for weights[%d].\n", i); + return AVERROR(EINVAL); + } s->wfactor += s->weights[i]; last = i; }

1 0

oggdec: add support for proper demuxing of chained Opus files and streams
by Lynne 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Lynne <dev(a)lynne.ee> | Tue Apr 28 12:25:46 2020 +0100| [8296443a70f052a6f5c9a867d28b83a5eb7d304d] | committer: Lynne oggdec: add support for proper demuxing of chained Opus files and streams Part of this patch is based on Paul B Mahol's patch from last year. This also allows for single-stream parameter/codec changes. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8296443a70f052a6f… --- libavformat/oggdec.c | 45 +++++++++++++++++++++++++-------------------- libavformat/oggdec.h | 1 + libavformat/oggparseopus.c | 1 + 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 92dcafe2ed..c591bafddd 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -178,6 +178,7 @@ static int ogg_reset(AVFormatContext *s) if (start_pos <= s->internal->data_offset) { os->lastpts = 0; } + os->start_trimming = 0; os->end_trimming = 0; av_freep(&os->new_metadata); os->new_metadata_size = 0; @@ -206,7 +207,8 @@ static const struct ogg_codec *ogg_find_codec(uint8_t *buf, int size) * situation where a new audio stream spawn (identified with a new serial) and * must replace the previous one (track switch). */ -static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, char *magic) +static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, char *magic, + int probing) { struct ogg *ogg = s->priv_data; struct ogg_stream *os; @@ -220,24 +222,25 @@ static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, char *magic) /* Check for codecs */ codec = ogg_find_codec(magic, 8); - if (!codec) { + if (!codec && !probing) { av_log(s, AV_LOG_ERROR, "Cannot identify new stream\n"); return AVERROR_INVALIDDATA; } - /* If the codec matches, then we assume its a replacement */ - for (i = 0; i < ogg->nstreams; i++) { - if (ogg->streams[i].codec == codec) - break; - } - - /* Otherwise, create a new stream */ - if (i >= ogg->nstreams) - return ogg_new_stream(s, serial); - - os = &ogg->streams[i]; - os->serial = serial; - os->codec = codec; + /* We only have a single stream anyway, so if there's a new stream with + * a different codec just replace it */ + os = &ogg->streams[0]; + os->serial = serial; + os->codec = codec; + os->serial = serial; + os->lastpts = 0; + os->lastdts = 0; + os->start_trimming = 0; + os->end_trimming = 0; + + /* Chained files have extradata as a new packet */ + if (codec == &ff_opus_codec) + os->header = -1; return i; } @@ -294,7 +297,7 @@ static int data_packets_seen(const struct ogg *ogg) return 0; } -static int ogg_read_page(AVFormatContext *s, int *sid) +static int ogg_read_page(AVFormatContext *s, int *sid, int probing) { AVIOContext *bc = s->pb; struct ogg *ogg = s->priv_data; @@ -417,7 +420,7 @@ static int ogg_read_page(AVFormatContext *s, int *sid) /* CRC is correct so we can be 99% sure there's an actual change here */ if (idx < 0) { if (data_packets_seen(ogg)) - idx = ogg_replace_stream(s, serial, readout_buf); + idx = ogg_replace_stream(s, serial, readout_buf, probing); else idx = ogg_new_stream(s, serial); @@ -492,7 +495,7 @@ static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize, idx = ogg->curidx; while (idx < 0) { - ret = ogg_read_page(s, &idx); + ret = ogg_read_page(s, &idx, 0); if (ret < 0) return ret; } @@ -643,7 +646,7 @@ static int ogg_get_length(AVFormatContext *s) avio_seek(s->pb, end, SEEK_SET); ogg->page_pos = -1; - while (!ogg_read_page(s, &i)) { + while (!ogg_read_page(s, &i, 1)) { if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 && ogg->streams[i].codec) { s->streams[i]->duration = @@ -847,13 +850,15 @@ retry: pkt->duration = os->pduration; pkt->pos = fpos; - if (os->end_trimming) { + if (os->start_trimming || os->end_trimming) { uint8_t *side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, 10); if(!side_data) return AVERROR(ENOMEM); + AV_WL32(side_data + 0, os->start_trimming); AV_WL32(side_data + 4, os->end_trimming); + os->start_trimming = 0; os->end_trimming = 0; } diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 4a2b6ddee8..e2057c46f6 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -84,6 +84,7 @@ struct ogg_stream { int got_start; int got_data; ///< 1 if the stream got some data (non-initial packets), 0 otherwise int nb_header; ///< set to the number of parsed headers + int start_trimming; ///< set the number of packets to drop from the start int end_trimming; ///< set the number of packets to drop from the end uint8_t *new_metadata; unsigned int new_metadata_size; diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 56b53e74e8..36d691e9aa 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -59,6 +59,7 @@ static int opus_header(AVFormatContext *avf, int idx) priv->pre_skip = AV_RL16(packet + 10); st->codecpar->initial_padding = priv->pre_skip; + os->start_trimming = priv->pre_skip; /*orig_sample_rate = AV_RL32(packet + 12);*/ /*gain = AV_RL16(packet + 16);*/ /*channel_map = AV_RL8 (packet + 18);*/

1 0

oggdec: use ffio_ensure_seekback() to seek back on incorrect data
by Lynne 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Lynne <dev(a)lynne.ee> | Tue Apr 28 12:55:17 2020 +0100| [e983197cbc93420b67aa7e811be47d7278c2c8a2] | committer: Lynne oggdec: use ffio_ensure_seekback() to seek back on incorrect data This cleans up the code and simplifies it. It also speeds up parsing since the old pb position was incorrect. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e983197cbc93420b6… --- libavformat/oggdec.c | 68 +++++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index e0188c7c59..92dcafe2ed 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -206,59 +206,40 @@ static const struct ogg_codec *ogg_find_codec(uint8_t *buf, int size) * situation where a new audio stream spawn (identified with a new serial) and * must replace the previous one (track switch). */ -static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, int size) +static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, char *magic) { struct ogg *ogg = s->priv_data; struct ogg_stream *os; const struct ogg_codec *codec; int i = 0; - if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { - uint8_t magic[8]; - avio_seek(s->pb, -size, SEEK_CUR); - if (avio_read(s->pb, magic, sizeof(magic)) != sizeof(magic)) - return AVERROR_INVALIDDATA; - avio_seek(s->pb, size - sizeof(magic), SEEK_CUR); - codec = ogg_find_codec(magic, sizeof(magic)); - if (!codec) { - av_log(s, AV_LOG_ERROR, "Cannot identify new stream\n"); - return AVERROR_INVALIDDATA; - } - for (i = 0; i < ogg->nstreams; i++) { - if (ogg->streams[i].codec == codec) - break; - } - if (i >= ogg->nstreams) - return ogg_new_stream(s, serial); - } else if (ogg->nstreams != 1) { + if (ogg->nstreams != 1) { avpriv_report_missing_feature(s, "Changing stream parameters in multistream ogg"); return AVERROR_PATCHWELCOME; } - os = &ogg->streams[i]; - - os->serial = serial; - return i; + /* Check for codecs */ + codec = ogg_find_codec(magic, 8); + if (!codec) { + av_log(s, AV_LOG_ERROR, "Cannot identify new stream\n"); + return AVERROR_INVALIDDATA; + } -#if 0 - buf = os->buf; - bufsize = os->bufsize; - codec = os->codec; + /* If the codec matches, then we assume its a replacement */ + for (i = 0; i < ogg->nstreams; i++) { + if (ogg->streams[i].codec == codec) + break; + } - if (!ogg->state || ogg->state->streams[i].private != os->private) - av_freep(&ogg->streams[i].private); + /* Otherwise, create a new stream */ + if (i >= ogg->nstreams) + return ogg_new_stream(s, serial); - /* Set Ogg stream settings similar to what is done in ogg_new_stream(). We - * also re-use the ogg_stream allocated buffer */ - memset(os, 0, sizeof(*os)); - os->serial = serial; - os->bufsize = bufsize; - os->buf = buf; - os->header = -1; - os->codec = codec; + os = &ogg->streams[i]; + os->serial = serial; + os->codec = codec; return i; -#endif } static int ogg_new_stream(AVFormatContext *s, uint32_t serial) @@ -325,6 +306,7 @@ static int ogg_read_page(AVFormatContext *s, int *sid) uint32_t crc, crc_tmp; int size = 0, idx; int64_t version, page_pos; + int64_t start_pos; uint8_t sync[4]; uint8_t segments[255]; uint8_t *readout_buf; @@ -364,6 +346,10 @@ static int ogg_read_page(AVFormatContext *s, int *sid) /* 0x4fa9b05f = av_crc(AV_CRC_32_IEEE, 0x0, "OggS", 4) */ ffio_init_checksum(bc, ff_crc04C11DB7_update, 0x4fa9b05f); + /* To rewind if checksum is bad/check magic on switches - this is the max packet size */ + ffio_ensure_seekback(bc, MAX_PAGE_SIZE); + start_pos = avio_tell(bc); + version = avio_r8(bc); flags = avio_r8(bc); gp = avio_rl64(bc); @@ -414,7 +400,7 @@ static int ogg_read_page(AVFormatContext *s, int *sid) av_log(s, AV_LOG_ERROR, "CRC mismatch!\n"); if (idx < 0) av_free(readout_buf); - avio_seek(bc, -size, SEEK_CUR); + avio_seek(bc, start_pos, SEEK_SET); return 0; } @@ -424,14 +410,14 @@ static int ogg_read_page(AVFormatContext *s, int *sid) av_log(s, AV_LOG_ERROR, "Invalid Ogg vers!\n"); if (idx < 0) av_free(readout_buf); - avio_seek(bc, -size, SEEK_CUR); + avio_seek(bc, start_pos, SEEK_SET); return 0; } /* CRC is correct so we can be 99% sure there's an actual change here */ if (idx < 0) { if (data_packets_seen(ogg)) - idx = ogg_replace_stream(s, serial, size); + idx = ogg_replace_stream(s, serial, readout_buf); else idx = ogg_new_stream(s, serial);

1 0

oggdec: verify page checksum
by Lynne 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Lynne <dev(a)lynne.ee> | Tue Apr 28 12:52:11 2020 +0100| [9ad47762c17d2c6d06595aa17b88112baa91b72c] | committer: Lynne oggdec: verify page checksum This makes decoding far more robust, since OggS, the ogg magic, can be commonly found randomly in streams, which previously made the demuxer think there's a new stream or a change in such. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ad47762c17d2c6d0… --- libavformat/oggdec.c | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 7db26840b2..e0188c7c59 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -31,6 +31,7 @@ #include <stdio.h> #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" +#include "avio_internal.h" #include "oggdec.h" #include "avformat.h" #include "internal.h" @@ -321,8 +322,9 @@ static int ogg_read_page(AVFormatContext *s, int *sid) int flags, nsegs; uint64_t gp; uint32_t serial; + uint32_t crc, crc_tmp; int size = 0, idx; - int64_t page_pos; + int64_t version, page_pos; uint8_t sync[4]; uint8_t segments[255]; uint8_t *readout_buf; @@ -359,15 +361,19 @@ static int ogg_read_page(AVFormatContext *s, int *sid) return AVERROR_INVALIDDATA; } - if (avio_r8(bc) != 0) { /* version */ - av_log (s, AV_LOG_ERROR, "ogg page, unsupported version\n"); - return AVERROR_INVALIDDATA; - } + /* 0x4fa9b05f = av_crc(AV_CRC_32_IEEE, 0x0, "OggS", 4) */ + ffio_init_checksum(bc, ff_crc04C11DB7_update, 0x4fa9b05f); - flags = avio_r8(bc); - gp = avio_rl64(bc); - serial = avio_rl32(bc); - avio_skip(bc, 8); /* seq, crc */ + version = avio_r8(bc); + flags = avio_r8(bc); + gp = avio_rl64(bc); + serial = avio_rl32(bc); + avio_skip(bc, 4); /* seq */ + + crc_tmp = ffio_get_checksum(bc); + crc = avio_rb32(bc); + crc_tmp = ff_crc04C11DB7_update(crc_tmp, (uint8_t[4]){0}, 4); + ffio_init_checksum(bc, ff_crc04C11DB7_update, crc_tmp); nsegs = avio_r8(bc); page_pos = avio_tell(bc) - 27; @@ -376,9 +382,6 @@ static int ogg_read_page(AVFormatContext *s, int *sid) if (ret < nsegs) return ret < 0 ? ret : AVERROR_EOF; - if (avio_feof(bc)) - return AVERROR_EOF; - for (i = 0; i < nsegs; i++) size += segments[i]; @@ -407,6 +410,25 @@ static int ogg_read_page(AVFormatContext *s, int *sid) return ret < 0 ? ret : AVERROR_EOF; } + if (crc ^ ffio_get_checksum(bc)) { + av_log(s, AV_LOG_ERROR, "CRC mismatch!\n"); + if (idx < 0) + av_free(readout_buf); + avio_seek(bc, -size, SEEK_CUR); + return 0; + } + + /* Since we're almost sure its a valid packet, checking the version after + * the checksum lets the demuxer be more tolerant */ + if (version) { + av_log(s, AV_LOG_ERROR, "Invalid Ogg vers!\n"); + if (idx < 0) + av_free(readout_buf); + avio_seek(bc, -size, SEEK_CUR); + return 0; + } + + /* CRC is correct so we can be 99% sure there's an actual change here */ if (idx < 0) { if (data_packets_seen(ogg)) idx = ogg_replace_stream(s, serial, size);

1 0

oggdec: eliminate copies and extra buffers
by Lynne 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Lynne <dev(a)lynne.ee> | Tue Apr 28 12:41:34 2020 +0100| [f619e1ec66b89215582eff4404b681b760540b4f] | committer: Lynne oggdec: eliminate copies and extra buffers This also makes implementing CRC checking far simpler and more robust. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f619e1ec66b892155… --- libavformat/oggdec.c | 127 +++++++++++++++++++++++---------------------------- 1 file changed, 58 insertions(+), 69 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 95190589ab..7db26840b2 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -205,7 +205,7 @@ static const struct ogg_codec *ogg_find_codec(uint8_t *buf, int size) * situation where a new audio stream spawn (identified with a new serial) and * must replace the previous one (track switch). */ -static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, int nsegs) +static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, int size) { struct ogg *ogg = s->priv_data; struct ogg_stream *os; @@ -214,11 +214,10 @@ static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, int nsegs) if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { uint8_t magic[8]; - int64_t pos = avio_tell(s->pb); - avio_skip(s->pb, nsegs); + avio_seek(s->pb, -size, SEEK_CUR); if (avio_read(s->pb, magic, sizeof(magic)) != sizeof(magic)) return AVERROR_INVALIDDATA; - avio_seek(s->pb, pos, SEEK_SET); + avio_seek(s->pb, size - sizeof(magic), SEEK_CUR); codec = ogg_find_codec(magic, sizeof(magic)); if (!codec) { av_log(s, AV_LOG_ERROR, "Cannot identify new stream\n"); @@ -303,27 +302,6 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t serial) return idx; } -static int ogg_new_buf(struct ogg *ogg, int idx) -{ - struct ogg_stream *os = ogg->streams + idx; - uint8_t *nb = av_malloc(os->bufsize + AV_INPUT_BUFFER_PADDING_SIZE); - int size = os->bufpos - os->pstart; - - if (!nb) - return AVERROR(ENOMEM); - - if (os->buf) { - memcpy(nb, os->buf + os->pstart, size); - av_free(os->buf); - } - - os->buf = nb; - os->bufpos = size; - os->pstart = 0; - - return 0; -} - static int data_packets_seen(const struct ogg *ogg) { int i; @@ -343,8 +321,11 @@ static int ogg_read_page(AVFormatContext *s, int *sid) int flags, nsegs; uint64_t gp; uint32_t serial; - int size, idx; + int size = 0, idx; + int64_t page_pos; uint8_t sync[4]; + uint8_t segments[255]; + uint8_t *readout_buf; int sp = 0; ret = avio_read(bc, sync, 4); @@ -387,47 +368,73 @@ static int ogg_read_page(AVFormatContext *s, int *sid) gp = avio_rl64(bc); serial = avio_rl32(bc); avio_skip(bc, 8); /* seq, crc */ - nsegs = avio_r8(bc); + + nsegs = avio_r8(bc); + page_pos = avio_tell(bc) - 27; + + ret = avio_read(bc, segments, nsegs); + if (ret < nsegs) + return ret < 0 ? ret : AVERROR_EOF; if (avio_feof(bc)) return AVERROR_EOF; + for (i = 0; i < nsegs; i++) + size += segments[i]; + idx = ogg_find_stream(ogg, serial); + if (idx >= 0) { + os = ogg->streams + idx; + + /* Even if invalid guarantee there's enough memory to read the page */ + if (os->bufsize - os->bufpos < size) { + uint8_t *nb = av_realloc(os->buf, 2*os->bufsize + AV_INPUT_BUFFER_PADDING_SIZE); + if (!nb) + return AVERROR(ENOMEM); + os->buf = nb; + os->bufsize *= 2; + } + + readout_buf = os->buf + os->bufpos; + } else { + readout_buf = av_malloc(size); + } + + ret = avio_read(bc, readout_buf, size); + if (ret < size) { + if (idx < 0) + av_free(readout_buf); + return ret < 0 ? ret : AVERROR_EOF; + } + if (idx < 0) { if (data_packets_seen(ogg)) - idx = ogg_replace_stream(s, serial, nsegs); + idx = ogg_replace_stream(s, serial, size); else idx = ogg_new_stream(s, serial); if (idx < 0) { av_log(s, AV_LOG_ERROR, "failed to create or replace stream\n"); + av_free(readout_buf); return idx; } - } - os = ogg->streams + idx; - ogg->page_pos = - os->page_pos = avio_tell(bc) - 27; + os = ogg->streams + idx; - if (os->psize > 0) { - ret = ogg_new_buf(ogg, idx); - if (ret < 0) - return ret; + memcpy(os->buf + os->bufpos, readout_buf, size); + av_free(readout_buf); } - ret = avio_read(bc, os->segments, nsegs); - if (ret < nsegs) - return ret < 0 ? ret : AVERROR_EOF; - - os->nsegs = nsegs; - os->segp = 0; - - size = 0; - for (i = 0; i < nsegs; i++) - size += os->segments[i]; - - if (!(flags & OGG_FLAG_BOS)) - os->got_data = 1; + ogg->page_pos = page_pos; + os->page_pos = page_pos; + os->nsegs = nsegs; + os->segp = 0; + os->got_data = !(flags & OGG_FLAG_BOS); + os->bufpos += size; + os->granule = gp; + os->flags = flags; + memcpy(os->segments, segments, nsegs); + memset(os->buf + os->bufpos, 0, AV_INPUT_BUFFER_PADDING_SIZE); if (flags & OGG_FLAG_CONT || os->incomplete) { if (!os->psize) { @@ -447,26 +454,8 @@ static int ogg_read_page(AVFormatContext *s, int *sid) os->sync_pos = os->page_pos; } - if (os->bufsize - os->bufpos < size) { - uint8_t *nb = av_malloc((os->bufsize *= 2) + AV_INPUT_BUFFER_PADDING_SIZE); - if (!nb) - return AVERROR(ENOMEM); - memcpy(nb, os->buf, os->bufpos); - av_free(os->buf); - os->buf = nb; - } - - ret = avio_read(bc, os->buf + os->bufpos, size); - if (ret < size) - return ret < 0 ? ret : AVERROR_EOF; - - os->bufpos += size; - os->granule = gp; - os->flags = flags; - - memset(os->buf + os->bufpos, 0, AV_INPUT_BUFFER_PADDING_SIZE); - if (sid) - *sid = idx; + /* This function is always called with sid != NULL */ + *sid = idx; return 0; }

1 0

avformat/utils: change the duration to int64_t for update_initial_durations
by Limin Wang 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Wed Apr 29 07:49:24 2020 +0800| [8afa03a5f682cec9925b302a092d66a0532ae328] | committer: Limin Wang avformat/utils: change the duration to int64_t for update_initial_durations Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8afa03a5f682cec99… --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3b53f97bee..44109d866d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1174,7 +1174,7 @@ static void update_initial_timestamps(AVFormatContext *s, int stream_index, } static void update_initial_durations(AVFormatContext *s, AVStream *st, - int stream_index, int duration) + int stream_index, int64_t duration) { AVPacketList *pktl = s->internal->packet_buffer ? s->internal->packet_buffer : s->internal->parse_queue; int64_t cur_dts = RELATIVE_TS_BASE;

1 0

avcodec/cbs_h265: fix writing extension_data bits
by James Almer 30 Apr '20

30 Apr '20

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Apr 20 15:25:58 2020 -0300| [38d1815cc65dd447de80760895ee008cfc9a0091] | committer: James Almer avcodec/cbs_h265: fix writing extension_data bits We only care about the right most bit. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38d1815cc65dd447d… --- libavcodec/cbs_h265_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 5f5531944c..0696eeeb9e 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -80,7 +80,7 @@ static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw, } #else for (k = 0; k < current->bit_length; k++) - xu(1, extension_data, current->data[k / 8] >> (7 - k % 8), 0, 1, 0); + xu(1, extension_data, current->data[k / 8] >> (7 - k % 8) & 1, 0, 1, 0); #endif return 0; }

1 0

avcodec/v4l2_context: Log warning when all capture buffers are in userspace
by Andriy Gelman 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Andriy Gelman <andriy.gelman(a)gmail.com> | Thu Apr 30 10:58:37 2020 -0400| [2a9d62356152d4ef079416101664f26d2562c681] | committer: Andriy Gelman avcodec/v4l2_context: Log warning when all capture buffers are in userspace v4l2_m2m uses device memory mapped buffers to store dequeued frames/packets (reference counted by AVBufferRef). When the reference count drops to zero, the buffer ownership is returned back to the device, so that they can re-filled with frames/packets. There are some cases when all the capture buffers are in userspace (i.e. due to internal buffering in ffmpeg). On the s5p-mfc this causes an infinite wait when polling to dequeue the buffers, which can be prevented by increasing the total number of buffers. This commit adds a warning when all the capture buffers are dequeued. Reviewed-by: Ming Qian <ming.qian(a)nxp.com> Signed-off-by: Andriy Gelman <andriy.gelman(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a9d62356152d4ef0… --- libavcodec/v4l2_context.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c index 6c2db5c849..f70e151ec8 100644 --- a/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c @@ -291,6 +291,18 @@ static V4L2Buffer* v4l2_dequeue_v4l2buf(V4L2Context *ctx, int timeout) }; int i, ret; + if (!V4L2_TYPE_IS_OUTPUT(ctx->type) && ctx->buffers) { + for (i = 0; i < ctx->num_buffers; i++) { + if (ctx->buffers[i].status == V4L2BUF_IN_DRIVER) + break; + } + if (i == ctx->num_buffers) + av_log(logger(ctx), AV_LOG_WARNING, "All capture buffers returned to " + "userspace. Increase num_capture_buffers " + "to prevent device deadlock or dropped " + "packets/frames.\n"); + } + /* if we are draining and there are no more capture buffers queued in the driver we are done */ if (!V4L2_TYPE_IS_OUTPUT(ctx->type) && ctx_to_m2mctx(ctx)->draining) { for (i = 0; i < ctx->num_buffers; i++) {

1 0

avfoundation: Fix building on iOS
by Martin Storsjö 30 Apr '20

30 Apr '20

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Thu Apr 30 13:34:13 2020 +0300| [c810a9502cebe32e1dd08ee3d0d17053dde44aa9] | committer: Thilo Borgmann avfoundation: Fix building on iOS Apparently the changes from 3c9185bf3a83395d12a987f626dbdb985eac4320 aren't enough; even with that in place, I got errors like this when trying to build for iOS: src/libavdevice/avfoundation.m:135:5: error: 'AVCaptureDeviceTransportControlsPlaybackMode' is unavailable: not available on iOS AVCaptureDeviceTransportControlsPlaybackMode observed_mode; ^ > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c810a9502cebe32e1… --- libavdevice/avfoundation.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index 0b1888693f..59d5b0af4f 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -132,7 +132,9 @@ typedef struct CMSampleBufferRef current_audio_frame; AVCaptureDevice *observed_device; +#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 AVCaptureDeviceTransportControlsPlaybackMode observed_mode; +#endif int observed_quit; } AVFContext; @@ -200,6 +202,7 @@ static void unlock_frames(AVFContext* ctx) change:(NSDictionary *)change context:(void *)context { if (context == _context) { +#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 AVCaptureDeviceTransportControlsPlaybackMode mode = [change[NSKeyValueChangeNewKey] integerValue]; @@ -209,6 +212,7 @@ static void unlock_frames(AVFContext* ctx) } _context->observed_mode = mode; } +#endif } else { [super observeValueForKeyPath: keyPath ofObject: object

1 0