September 2017 - ffmpeg-cvslog

Use the new AVIOContext destructor.
by Anton Khirnov 01 Sep '17

01 Sep '17

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Sep 1 02:16:33 2017 -0300| [78a7af823b7c2a1e3184e6680f2b49bf67101e5c] | committer: James Almer Use the new AVIOContext destructor. (cherry picked from commit 6f554521afdf7ab4edbfaa9536660a1dca946b19) Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78a7af823b7c2a1e3… --- libavformat/avidec.c | 2 +- libavformat/flac_picture.c | 4 ++-- libavformat/hdsenc.c | 2 +- libavformat/mpjpegdec.c | 2 +- libavformat/rdt.c | 2 +- libavformat/segment.c | 2 +- libavformat/smoothstreamingenc.c | 2 +- libavformat/swfdec.c | 2 +- libavformat/tests/movenc.c | 2 +- libavformat/wtvdec.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 9816a1dfac..b8a31dcff2 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1124,7 +1124,7 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt) error: av_freep(&ast->sub_ctx); - av_freep(&pb); + avio_context_free(&pb); } return 0; } diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c index a3217f02a6..38982b960d 100644 --- a/libavformat/flac_picture.c +++ b/libavformat/flac_picture.c @@ -140,14 +140,14 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) if (desc) av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL); - av_freep(&pb); + avio_context_free(&pb); return 0; fail: av_buffer_unref(&data); av_freep(&desc); - av_freep(&pb); + avio_context_free(&pb); return ret; } diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c index d01b5fa84e..72829f7257 100644 --- a/libavformat/hdsenc.c +++ b/libavformat/hdsenc.c @@ -145,7 +145,7 @@ static void hds_free(AVFormatContext *s) if (os->ctx && os->ctx_inited) av_write_trailer(os->ctx); if (os->ctx) - av_freep(&os->ctx->pb); + avio_context_free(&os->ctx->pb); if (os->ctx) avformat_free_context(os->ctx); av_freep(&os->metadata); diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index 4c7764412f..83aa70d0c9 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -126,7 +126,7 @@ static int mpjpeg_read_probe(AVProbeData *p) ret = (parse_multipart_header(pb, &size, "--", NULL) >= 0) ? AVPROBE_SCORE_MAX : 0; - av_free(pb); + avio_context_free(&pb); return ret; } diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 8670eadce6..b69827fcbf 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -323,7 +323,7 @@ get_cache: st, rdt->rmst[st->index], pkt); if (rdt->audio_pkt_cnt == 0 && st->codecpar->codec_id == AV_CODEC_ID_AAC) - av_freep(&rdt->rmctx->pb); + avio_context_free(&rdt->rmctx->pb); } pkt->stream_index = st->index; pkt->pts = *timestamp; diff --git a/libavformat/segment.c b/libavformat/segment.c index 0e8bcddb00..b0ef6dd38e 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -569,7 +569,7 @@ static int open_null_ctx(AVIOContext **ctx) static void close_null_ctxp(AVIOContext **pb) { av_freep(&(*pb)->buffer); - av_freep(pb); + avio_context_free(pb); } static int select_reference_stream(AVFormatContext *s) diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 083af49212..86618351b8 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -182,7 +182,7 @@ static void ism_free(AVFormatContext *s) if (os->ctx && os->ctx_inited) av_write_trailer(os->ctx); if (os->ctx && os->ctx->pb) - av_freep(&os->ctx->pb); + avio_context_free(&os->ctx->pb); if (os->ctx) avformat_free_context(os->ctx); av_freep(&os->private_str); diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index b91560c56c..57b619fb20 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -531,7 +531,7 @@ static av_cold int swf_read_close(AVFormatContext *avctx) inflateEnd(&s->zstream); av_freep(&s->zbuf_in); av_freep(&s->zbuf_out); - av_freep(&s->zpb); + avio_context_free(&s->zpb); return 0; } #endif diff --git a/libavformat/tests/movenc.c b/libavformat/tests/movenc.c index ab871765d9..7a66395efd 100644 --- a/libavformat/tests/movenc.c +++ b/libavformat/tests/movenc.c @@ -344,7 +344,7 @@ static void signal_init_ts(void) static void finish(void) { av_write_trailer(ctx); - av_free(ctx->pb); + avio_context_free(&ctx->pb); avformat_free_context(ctx); ctx = NULL; } diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 3ac4501306..27be5c9c04 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -305,7 +305,7 @@ static void wtvfile_close(AVIOContext *pb) av_freep(&wf->sectors); av_freep(&pb->opaque); av_freep(&pb->buffer); - av_free(pb); + avio_context_free(&pb); } /*

1 0

avio: add a destructor for AVIOContext
by Anton Khirnov 01 Sep '17

01 Sep '17

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sun Aug 27 13:26:58 2017 -0300| [b12e4d3bb8df994f042ff1216fb8de2b967aab9e] | committer: James Almer avio: add a destructor for AVIOContext Before this commit, AVIOContext is to be freed with a plain av_free(), which prevents us from adding any deeper structure to it. (cherry picked from commit 99684f3ae752fc8bfb44a2dd1482f8d7a3d8536d) Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b12e4d3bb8df994f0… --- doc/APIchanges | 3 +++ libavformat/avio.h | 8 ++++++++ libavformat/aviobuf.c | 17 ++++++++++++++--- libavformat/version.h | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 7babf5babb..1e9b29fdbb 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2017-09-01 - xxxxxxx - lavf 57.80.100 / 57.11.0 - avio.h + Add avio_context_free(). From now on it must be used for freeing AVIOContext. + 2017-08-08 - xxxxxxx - lavu 55.74.100 - pixdesc.h Add AV_PIX_FMT_FLAG_FLOAT pixel format flag. diff --git a/libavformat/avio.h b/libavformat/avio.h index f14b003ba5..ea56dad503 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -467,6 +467,14 @@ AVIOContext *avio_alloc_context( int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), int64_t (*seek)(void *opaque, int64_t offset, int whence)); +/** + * Free the supplied IO context and everything associated with it. + * + * @param s Double pointer to the IO context. This function will write NULL + * into s. + */ +void avio_context_free(AVIOContext **s); + void avio_w8(AVIOContext *s, int b); void avio_write(AVIOContext *s, const unsigned char *buf, int size); void avio_wl64(AVIOContext *s, uint64_t val); diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index ec21fc7d38..716c42eda9 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -143,6 +143,11 @@ AVIOContext *avio_alloc_context( return s; } +void avio_context_free(AVIOContext **ps) +{ + av_freep(ps); +} + static void writeout(AVIOContext *s, const uint8_t *data, int len) { if (!s->error) { @@ -1123,7 +1128,9 @@ int avio_close(AVIOContext *s) else av_log(s, AV_LOG_DEBUG, "Statistics: %"PRId64" bytes read, %d seeks\n", s->bytes_read, s->seek_count); av_opt_free(s); - av_free(s); + + avio_context_free(&s); + return ffurl_close(h); } @@ -1356,7 +1363,9 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) *pbuffer = d->buffer; size = d->size; av_free(d); - av_free(s); + + avio_context_free(&s); + return size - padding; } @@ -1399,6 +1408,8 @@ int ffio_close_null_buf(AVIOContext *s) size = d->size; av_free(d); - av_free(s); + + avio_context_free(&s); + return size; } diff --git a/libavformat/version.h b/libavformat/version.h index 3029a5e767..0af524c16b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 79 +#define LIBAVFORMAT_VERSION_MINOR 80 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

1 0

avformat/dash: move reused API to common file and header file
by Steven Liu 01 Sep '17

01 Sep '17

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Fri Sep 1 10:20:56 2017 +0800| [837580f458f2ccbbd6e82d3c7591916deb81ef02] | committer: Steven Liu avformat/dash: move reused API to common file and header file move from dashenc, move DASHTmplId and dash_fill_tmpl_params to dash.c, they will be used by dash demuxer and dash muxer. v2 fixed: 1. rename common file from dashcomm.* to dash.* Suggested-by: Hendrik Leppkes <h.leppkes(a)gmail.com> v3 fixed: 1. rename header file pre defined 2. add ff_ prefix for the internal API Suggested-by: James Almer <jamrial(a)gmail.com> Suggested-by: Timo Rothenpieler <timo(a)rothenpieler.org> Reviewed-by: wm4 <nfxjfg(a)googlemail.com> Signed-off-by: Steven Liu <lq(a)onvideo.cn> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=837580f458f2ccbbd… --- libavformat/Makefile | 2 +- libavformat/dash.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/dash.h | 39 +++++++++++++++ libavformat/dashenc.c | 130 ++--------------------------------------------- 4 files changed, 180 insertions(+), 127 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 36f5839aa8..de954af130 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -132,7 +132,7 @@ OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DATA_DEMUXER) += rawdec.o OBJS-$(CONFIG_DATA_MUXER) += rawenc.o -OBJS-$(CONFIG_DASH_MUXER) += dashenc.o +OBJS-$(CONFIG_DASH_MUXER) += dash.o dashenc.o OBJS-$(CONFIG_DAUD_DEMUXER) += dauddec.o OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DCSTR_DEMUXER) += dcstr.o diff --git a/libavformat/dash.c b/libavformat/dash.c new file mode 100644 index 0000000000..b0b1ed4f43 --- /dev/null +++ b/libavformat/dash.c @@ -0,0 +1,136 @@ +#include "config.h" +#if HAVE_UNISTD_H +#include <unistd.h> +#endif + +#include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mathematics.h" +#include "libavutil/opt.h" +#include "libavutil/rational.h" +#include "libavutil/time_internal.h" + +#include "avc.h" +#include "avformat.h" +#include "avio_internal.h" +#include "internal.h" +#include "isom.h" +#include "os_support.h" +#include "url.h" +#include "dash.h" + +static DASHTmplId dash_read_tmpl_id(const char *identifier, char *format_tag, + size_t format_tag_size, const char **ptr) { + const char *next_ptr; + DASHTmplId id_type = DASH_TMPL_ID_UNDEFINED; + + if (av_strstart(identifier, "$$", &next_ptr)) { + id_type = DASH_TMPL_ID_ESCAPE; + *ptr = next_ptr; + } else if (av_strstart(identifier, "$RepresentationID$", &next_ptr)) { + id_type = DASH_TMPL_ID_REP_ID; + // default to basic format, as $RepresentationID$ identifiers + // are not allowed to have custom format-tags. + av_strlcpy(format_tag, "%d", format_tag_size); + *ptr = next_ptr; + } else { // the following identifiers may have an explicit format_tag + if (av_strstart(identifier, "$Number", &next_ptr)) + id_type = DASH_TMPL_ID_NUMBER; + else if (av_strstart(identifier, "$Bandwidth", &next_ptr)) + id_type = DASH_TMPL_ID_BANDWIDTH; + else if (av_strstart(identifier, "$Time", &next_ptr)) + id_type = DASH_TMPL_ID_TIME; + else + id_type = DASH_TMPL_ID_UNDEFINED; + + // next parse the dash format-tag and generate a c-string format tag + // (next_ptr now points at the first '%' at the beginning of the format-tag) + if (id_type != DASH_TMPL_ID_UNDEFINED) { + const char *number_format = (id_type == DASH_TMPL_ID_TIME) ? PRId64 : "d"; + if (next_ptr[0] == '$') { // no dash format-tag + snprintf(format_tag, format_tag_size, "%%%s", number_format); + *ptr = &next_ptr[1]; + } else { + const char *width_ptr; + // only tolerate single-digit width-field (i.e. up to 9-digit width) + if (av_strstart(next_ptr, "%0", &width_ptr) && + av_isdigit(width_ptr[0]) && + av_strstart(&width_ptr[1], "d$", &next_ptr)) { + // yes, we're using a format tag to build format_tag. + snprintf(format_tag, format_tag_size, "%s%c%s", "%0", width_ptr[0], number_format); + *ptr = next_ptr; + } else { + av_log(NULL, AV_LOG_WARNING, "Failed to parse format-tag beginning with %s. Expected either a " + "closing '$' character or a format-string like '%%0[width]d', " + "where width must be a single digit\n", next_ptr); + id_type = DASH_TMPL_ID_UNDEFINED; + } + } + } + } + return id_type; +} + +void ff_dash_fill_tmpl_params(char *dst, size_t buffer_size, + const char *template, int rep_id, + int number, int bit_rate, + int64_t time) { + int dst_pos = 0; + const char *t_cur = template; + while (dst_pos < buffer_size - 1 && *t_cur) { + char format_tag[7]; // May be "%d", "%0Xd", or "%0Xlld" (for $Time$), where X is in [0-9] + int n = 0; + DASHTmplId id_type; + const char *t_next = strchr(t_cur, '$'); // copy over everything up to the first '$' character + if (t_next) { + int num_copy_bytes = FFMIN(t_next - t_cur, buffer_size - dst_pos - 1); + av_strlcpy(&dst[dst_pos], t_cur, num_copy_bytes + 1); + // advance + dst_pos += num_copy_bytes; + t_cur = t_next; + } else { // no more DASH identifiers to substitute - just copy the rest over and break + av_strlcpy(&dst[dst_pos], t_cur, buffer_size - dst_pos); + break; + } + + if (dst_pos >= buffer_size - 1 || !*t_cur) + break; + + // t_cur is now pointing to a '$' character + id_type = dash_read_tmpl_id(t_cur, format_tag, sizeof(format_tag), &t_next); + switch (id_type) { + case DASH_TMPL_ID_ESCAPE: + av_strlcpy(&dst[dst_pos], "$", 2); + n = 1; + break; + case DASH_TMPL_ID_REP_ID: + n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, rep_id); + break; + case DASH_TMPL_ID_NUMBER: + n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, number); + break; + case DASH_TMPL_ID_BANDWIDTH: + n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, bit_rate); + break; + case DASH_TMPL_ID_TIME: + n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, time); + break; + case DASH_TMPL_ID_UNDEFINED: + // copy over one byte and advance + av_strlcpy(&dst[dst_pos], t_cur, 2); + n = 1; + t_next = &t_cur[1]; + break; + } + // t_next points just past the processed identifier + // n is the number of bytes that were attempted to be written to dst + // (may have failed to write all because buffer_size). + + // advance + dst_pos += FFMIN(n, buffer_size - dst_pos - 1); + t_cur = t_next; + } +} + + diff --git a/libavformat/dash.h b/libavformat/dash.h new file mode 100644 index 0000000000..c6d9d2c331 --- /dev/null +++ b/libavformat/dash.h @@ -0,0 +1,39 @@ +/* + * MPEG-DASH ISO BMFF segmenter + * Copyright (c) 2014 Martin Storsjo + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_DASH_H +#define AVFORMAT_DASH_H +#include "avformat.h" + +// See ISO/IEC 23009-1:2014 5.3.9.4.4 +typedef enum { + DASH_TMPL_ID_UNDEFINED = -1, + DASH_TMPL_ID_ESCAPE, + DASH_TMPL_ID_REP_ID, + DASH_TMPL_ID_NUMBER, + DASH_TMPL_ID_BANDWIDTH, + DASH_TMPL_ID_TIME, +} DASHTmplId; + + +void ff_dash_fill_tmpl_params(char *dst, size_t buffer_size, const char *template, int rep_id, int number, int bit_rate, int64_t time); + +#endif /* AVFORMAT_DASH_H */ diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index bdb332c71a..6471649eb7 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -39,16 +39,7 @@ #include "isom.h" #include "os_support.h" #include "url.h" - -// See ISO/IEC 23009-1:2014 5.3.9.4.4 -typedef enum { - DASH_TMPL_ID_UNDEFINED = -1, - DASH_TMPL_ID_ESCAPE, - DASH_TMPL_ID_REP_ID, - DASH_TMPL_ID_NUMBER, - DASH_TMPL_ID_BANDWIDTH, - DASH_TMPL_ID_TIME, -} DASHTmplId; +#include "dash.h" typedef struct Segment { char file[1024]; @@ -259,119 +250,6 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext } } -static DASHTmplId dash_read_tmpl_id(const char *identifier, char *format_tag, - size_t format_tag_size, const char **ptr) { - const char *next_ptr; - DASHTmplId id_type = DASH_TMPL_ID_UNDEFINED; - - if (av_strstart(identifier, "$$", &next_ptr)) { - id_type = DASH_TMPL_ID_ESCAPE; - *ptr = next_ptr; - } else if (av_strstart(identifier, "$RepresentationID$", &next_ptr)) { - id_type = DASH_TMPL_ID_REP_ID; - // default to basic format, as $RepresentationID$ identifiers - // are not allowed to have custom format-tags. - av_strlcpy(format_tag, "%d", format_tag_size); - *ptr = next_ptr; - } else { // the following identifiers may have an explicit format_tag - if (av_strstart(identifier, "$Number", &next_ptr)) - id_type = DASH_TMPL_ID_NUMBER; - else if (av_strstart(identifier, "$Bandwidth", &next_ptr)) - id_type = DASH_TMPL_ID_BANDWIDTH; - else if (av_strstart(identifier, "$Time", &next_ptr)) - id_type = DASH_TMPL_ID_TIME; - else - id_type = DASH_TMPL_ID_UNDEFINED; - - // next parse the dash format-tag and generate a c-string format tag - // (next_ptr now points at the first '%' at the beginning of the format-tag) - if (id_type != DASH_TMPL_ID_UNDEFINED) { - const char *number_format = (id_type == DASH_TMPL_ID_TIME) ? PRId64 : "d"; - if (next_ptr[0] == '$') { // no dash format-tag - snprintf(format_tag, format_tag_size, "%%%s", number_format); - *ptr = &next_ptr[1]; - } else { - const char *width_ptr; - // only tolerate single-digit width-field (i.e. up to 9-digit width) - if (av_strstart(next_ptr, "%0", &width_ptr) && - av_isdigit(width_ptr[0]) && - av_strstart(&width_ptr[1], "d$", &next_ptr)) { - // yes, we're using a format tag to build format_tag. - snprintf(format_tag, format_tag_size, "%s%c%s", "%0", width_ptr[0], number_format); - *ptr = next_ptr; - } else { - av_log(NULL, AV_LOG_WARNING, "Failed to parse format-tag beginning with %s. Expected either a " - "closing '$' character or a format-string like '%%0[width]d', " - "where width must be a single digit\n", next_ptr); - id_type = DASH_TMPL_ID_UNDEFINED; - } - } - } - } - return id_type; -} - -static void dash_fill_tmpl_params(char *dst, size_t buffer_size, - const char *template, int rep_id, - int number, int bit_rate, - int64_t time) { - int dst_pos = 0; - const char *t_cur = template; - while (dst_pos < buffer_size - 1 && *t_cur) { - char format_tag[7]; // May be "%d", "%0Xd", or "%0Xlld" (for $Time$), where X is in [0-9] - int n = 0; - DASHTmplId id_type; - const char *t_next = strchr(t_cur, '$'); // copy over everything up to the first '$' character - if (t_next) { - int num_copy_bytes = FFMIN(t_next - t_cur, buffer_size - dst_pos - 1); - av_strlcpy(&dst[dst_pos], t_cur, num_copy_bytes + 1); - // advance - dst_pos += num_copy_bytes; - t_cur = t_next; - } else { // no more DASH identifiers to substitute - just copy the rest over and break - av_strlcpy(&dst[dst_pos], t_cur, buffer_size - dst_pos); - break; - } - - if (dst_pos >= buffer_size - 1 || !*t_cur) - break; - - // t_cur is now pointing to a '$' character - id_type = dash_read_tmpl_id(t_cur, format_tag, sizeof(format_tag), &t_next); - switch (id_type) { - case DASH_TMPL_ID_ESCAPE: - av_strlcpy(&dst[dst_pos], "$", 2); - n = 1; - break; - case DASH_TMPL_ID_REP_ID: - n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, rep_id); - break; - case DASH_TMPL_ID_NUMBER: - n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, number); - break; - case DASH_TMPL_ID_BANDWIDTH: - n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, bit_rate); - break; - case DASH_TMPL_ID_TIME: - n = snprintf(&dst[dst_pos], buffer_size - dst_pos, format_tag, time); - break; - case DASH_TMPL_ID_UNDEFINED: - // copy over one byte and advance - av_strlcpy(&dst[dst_pos], t_cur, 2); - n = 1; - t_next = &t_cur[1]; - break; - } - // t_next points just past the processed identifier - // n is the number of bytes that were attempted to be written to dst - // (may have failed to write all because buffer_size). - - // advance - dst_pos += FFMIN(n, buffer_size - dst_pos - 1); - t_cur = t_next; - } -} - static char *xmlescape(const char *str) { int outlen = strlen(str)*3/2 + 6; char *out = av_realloc(NULL, outlen + 1); @@ -660,11 +538,11 @@ static int dash_init(AVFormatContext *s) if (c->single_file) { if (c->single_file_name) - dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), c->single_file_name, i, 0, os->bit_rate, 0); + ff_dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), c->single_file_name, i, 0, os->bit_rate, 0); else snprintf(os->initfile, sizeof(os->initfile), "%s-stream%d.m4s", basename, i); } else { - dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), c->init_seg_name, i, 0, os->bit_rate, 0); + ff_dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), c->init_seg_name, i, 0, os->bit_rate, 0); } snprintf(filename, sizeof(filename), "%s%s", c->dirname, os->initfile); ret = s->io_open(s, &os->out, filename, AVIO_FLAG_WRITE, NULL); @@ -865,7 +743,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) start_pos = avio_tell(os->ctx->pb); if (!c->single_file) { - dash_fill_tmpl_params(filename, sizeof(filename), c->media_seg_name, i, os->segment_index, os->bit_rate, os->start_pts); + ff_dash_fill_tmpl_params(filename, sizeof(filename), c->media_seg_name, i, os->segment_index, os->bit_rate, os->start_pts); snprintf(full_path, sizeof(full_path), "%s%s", c->dirname, filename); snprintf(temp_path, sizeof(temp_path), use_rename ? "%s.tmp" : "%s", full_path); ret = s->io_open(s, &os->out, temp_path, AVIO_FLAG_WRITE, NULL);

1 0

avformat/mxfdec: Fix Sign error in mxf_read_primer_pack()
by 孙浩(晓黑) 01 Sep '17

01 Sep '17

ffmpeg | branch: master | 孙浩(晓黑) <tony.sh(a)alibaba-inc.com> | Tue Aug 29 23:59:21 2017 +0200| [9d00fb9d70ee8c0cc7002b89318c5be00f1bbdad] | committer: Michael Niedermayer avformat/mxfdec: Fix Sign error in mxf_read_primer_pack() Fixes: 20170829B.mxf Co-Author: 张洪亮(望初)" <wangchu.zhl(a)alibaba-inc.com> Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d00fb9d70ee8c0cc… --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 6adb77d81f..91731a7533 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -500,7 +500,7 @@ static int mxf_read_primer_pack(void *arg, AVIOContext *pb, int tag, int size, U avpriv_request_sample(pb, "Primer pack item length %d", item_len); return AVERROR_PATCHWELCOME; } - if (item_num > 65536) { + if (item_num > 65536 || item_num < 0) { av_log(mxf->fc, AV_LOG_ERROR, "item_num %d is too large\n", item_num); return AVERROR_INVALIDDATA; }

1 0

avformat/mxfdec: Fix DoS issues in mxf_read_index_entry_array()
by 孙浩(晓黑) 01 Sep '17

01 Sep '17

ffmpeg | branch: master | 孙浩(晓黑) <tony.sh(a)alibaba-inc.com> | Tue Aug 29 23:59:21 2017 +0200| [900f39692ca0337a98a7cf047e4e2611071810c2] | committer: Michael Niedermayer avformat/mxfdec: Fix DoS issues in mxf_read_index_entry_array() Fixes: 20170829A.mxf Co-Author: 张洪亮(望初)" <wangchu.zhl(a)alibaba-inc.com> Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=900f39692ca0337a9… --- libavformat/mxfdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index f8d0f9e057..6adb77d81f 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -899,6 +899,8 @@ static int mxf_read_index_entry_array(AVIOContext *pb, MXFIndexTableSegment *seg segment->nb_index_entries = avio_rb32(pb); length = avio_rb32(pb); + if(segment->nb_index_entries && length < 11) + return AVERROR_INVALIDDATA; if (!(segment->temporal_offset_entries=av_calloc(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) || !(segment->flag_entries = av_calloc(segment->nb_index_entries, sizeof(*segment->flag_entries))) || @@ -909,6 +911,8 @@ static int mxf_read_index_entry_array(AVIOContext *pb, MXFIndexTableSegment *seg } for (i = 0; i < segment->nb_index_entries; i++) { + if(avio_feof(pb)) + return AVERROR_INVALIDDATA; segment->temporal_offset_entries[i] = avio_r8(pb); avio_r8(pb); /* KeyFrameOffset */ segment->flag_entries[i] = avio_r8(pb);

1 0

avformat/nsvdec: Fix DoS due to lack of eof check in nsvs_file_offset loop.
by 孙浩(晓黑) 01 Sep '17

01 Sep '17

ffmpeg | branch: master | 孙浩(晓黑) <tony.sh(a)alibaba-inc.com> | Tue Aug 29 23:59:21 2017 +0200| [c24bcb553650b91e9eff15ef6e54ca73de2453b7] | committer: Michael Niedermayer avformat/nsvdec: Fix DoS due to lack of eof check in nsvs_file_offset loop. Fixes: 20170829.nsv Co-Author: 张洪亮(望初)" <wangchu.zhl(a)alibaba-inc.com> Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c24bcb553650b91e9… --- libavformat/nsvdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index c6ddb67bbd..d8ce656817 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -335,8 +335,11 @@ static int nsv_parse_NSVf_header(AVFormatContext *s) if (!nsv->nsvs_file_offset) return AVERROR(ENOMEM); - for(i=0;i<table_entries_used;i++) + for(i=0;i<table_entries_used;i++) { + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; nsv->nsvs_file_offset[i] = avio_rl32(pb) + size; + } if(table_entries > table_entries_used && avio_rl32(pb) == MKTAG('T','O','C','2')) {

1 0

avocdec/libopus: fix typo
by pkviet 01 Sep '17

01 Sep '17

ffmpeg | branch: master | pkviet <pkv.stream(a)gmail.com> | Fri Sep 1 00:44:11 2017 +0200| [73bed07373f2672275e33851ad31e447b73b08f9] | committer: Michael Niedermayer avocdec/libopus: fix typo Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73bed07373f267227… --- libavcodec/libopusenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index c40fcde7ba..77d8310048 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -368,7 +368,7 @@ static av_cold int libopus_encode_init(AVCodecContext *avctx) goto fail; } - /* Header includes channel mapping table if and only if mapping family is 0 */ + /* Header includes channel mapping table if and only if mapping family is NOT 0 */ header_size = 19 + (mapping_family == 0 ? 0 : 2 + avctx->channels); avctx->extradata = av_malloc(header_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!avctx->extradata) {

1 0