May 2018 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/idctdsp: Transmit studio_profile to init instead of using AVCodecContext profile
by Michael Niedermayer 30 May '18

30 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon May 28 21:19:08 2018 +0200| [b3332a182f8ba33a34542e4a0370f38b914ccf7d] | committer: Michael Niedermayer avcodec/idctdsp: Transmit studio_profile to init instead of using AVCodecContext profile These 2 fields are not always the same, it is simpler to always use the same field for detecting studio profile Fixes: null pointer dereference Fixes: ffmpeg_crash_3.avi Found-by: Thuan Pham <thuanpv(a)comp.nus.edu.sg>, Marcel Böhme, Andrew Santosa and Alexandru RazvanCaciulescu with AFLSmart Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3332a182f8ba33a3… --- libavcodec/idctdsp.c | 2 +- libavcodec/idctdsp.h | 2 ++ libavcodec/mpegvideo.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index 662033bd78..954066a5e3 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -258,7 +258,7 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) if (avctx->bits_per_raw_sample == 10 || avctx->bits_per_raw_sample == 9) { /* 10-bit MPEG-4 Simple Studio Profile requires a higher precision IDCT However, it only uses idct_put */ - if (avctx->codec_id == AV_CODEC_ID_MPEG4 && avctx->profile == FF_PROFILE_MPEG4_SIMPLE_STUDIO) + if (c->mpeg4_studio_profile) c->idct_put = ff_simple_idct_put_int32_10bit; else { c->idct_put = ff_simple_idct_put_int16_10bit; diff --git a/libavcodec/idctdsp.h b/libavcodec/idctdsp.h index 26221f6a9d..ca21a31a02 100644 --- a/libavcodec/idctdsp.h +++ b/libavcodec/idctdsp.h @@ -95,6 +95,8 @@ typedef struct IDCTDSPContext { */ uint8_t idct_permutation[64]; enum idct_permutation_type perm_type; + + int mpeg4_studio_profile; } IDCTDSPContext; void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 45ea0f09e9..f75c0fd9b3 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -329,6 +329,8 @@ static av_cold int dct_init(MpegEncContext *s) av_cold void ff_mpv_idct_init(MpegEncContext *s) { + if (s->codec_id == AV_CODEC_ID_MPEG4) + s->idsp.mpeg4_studio_profile = s->studio_profile; ff_idctdsp_init(&s->idsp, s->avctx); /* load & permutate scantables

1 0

avfilter/af_aiir: draw IR frequency response
by Paul B Mahol 30 May '18

30 May '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed May 30 12:43:09 2018 +0200| [1aa519245193485cd74a52aacc99fd3fec58d0b4] | committer: Paul B Mahol avfilter/af_aiir: draw IR frequency response Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1aa519245193485cd… --- doc/filters.texi | 10 ++ libavfilter/af_aiir.c | 266 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 263 insertions(+), 13 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 79a6c282cb..fb131670c7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1136,6 +1136,16 @@ single-precision floating-point 16-bit integers @end table +@item response +Show IR frequency reponse, magnitude and phase in additional video stream. +By default it is disabled. + +@item channel +Set for which IR channel to display frequency response. By default is first channel +displayed. This option is used only when @var{response} is enabled. + +@item size +Set video stream size. This option is used only when @var{response} is enabled. @end table Coefficients in @code{tf} format are separated by spaces and are in ascending diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 1f2a568c1d..65c8201137 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -22,7 +22,9 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/intreadwrite.h" #include "libavutil/opt.h" +#include "libavutil/xga_font_data.h" #include "audio.h" #include "avfilter.h" #include "internal.h" @@ -58,6 +60,11 @@ typedef struct AudioIIRContext { int format; int process; int precision; + int response; + int w, h; + int ir_channel; + + AVFrame *video; IIRChannel *iir; int channels; @@ -75,8 +82,20 @@ static int query_formats(AVFilterContext *ctx) AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE }; + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_RGB0, + AV_PIX_FMT_NONE + }; int ret; + if (s->response) { + AVFilterLink *videolink = ctx->outputs[1]; + + formats = ff_make_format_list(pix_fmts); + if ((ret = ff_formats_ref(formats, &videolink->in_formats)) < 0) + return ret; + } + layouts = ff_all_channel_counts(); if (!layouts) return AVERROR(ENOMEM); @@ -642,6 +661,166 @@ static void convert_pd2zp(AVFilterContext *ctx, int channels) } } +static void drawtext(AVFrame *pic, int x, int y, const char *txt, uint32_t color) +{ + const uint8_t *font; + int font_height; + int i; + + font = avpriv_cga_font, font_height = 8; + + for (i = 0; txt[i]; i++) { + int char_y, mask; + + uint8_t *p = pic->data[0] + y * pic->linesize[0] + (x + i * 8) * 4; + for (char_y = 0; char_y < font_height; char_y++) { + for (mask = 0x80; mask; mask >>= 1) { + if (font[txt[i] * font_height + char_y] & mask) + AV_WL32(p, color); + p += 4; + } + p += pic->linesize[0] - 8 * 4; + } + } +} + +static void draw_line(AVFrame *out, int x0, int y0, int x1, int y1, uint32_t color) +{ + int dx = FFABS(x1-x0), sx = x0 < x1 ? 1 : -1; + int dy = FFABS(y1-y0), sy = y0 < y1 ? 1 : -1; + int err = (dx>dy ? dx : -dy) / 2, e2; + + for (;;) { + AV_WL32(out->data[0] + y0 * out->linesize[0] + x0 * 4, color); + + if (x0 == x1 && y0 == y1) + break; + + e2 = err; + + if (e2 >-dx) { + err -= dy; + x0 += sx; + } + + if (e2 < dy) { + err += dx; + y0 += sy; + } + } +} + +static void draw_response(AVFilterContext *ctx, AVFrame *out) +{ + AudioIIRContext *s = ctx->priv; + float *mag, *phase, min = FLT_MAX, max = FLT_MIN; + int prev_ymag = -1, prev_yphase = -1; + char text[32]; + int ch, i, x; + + memset(out->data[0], 0, s->h * out->linesize[0]); + + phase = av_malloc_array(s->w, sizeof(*phase)); + mag = av_malloc_array(s->w, sizeof(*mag)); + if (!mag || !phase) + goto end; + + ch = av_clip(s->ir_channel, 0, s->channels - 1); + for (i = 0; i < s->w; i++) { + const double *b = s->iir[ch].ab[0]; + const double *a = s->iir[ch].ab[1]; + double w = i * M_PI / (s->w - 1); + double realz, realp; + double imagz, imagp; + double real, imag, div; + + if (s->format == 0) { + realz = 0., realp = 0.; + imagz = 0., imagp = 0.; + for (x = 0; x < s->iir[ch].nb_ab[1]; x++) { + realz += cos(-x * w) * a[x]; + imagz += sin(-x * w) * a[x]; + } + + for (x = 0; x < s->iir[ch].nb_ab[0]; x++) { + realp += cos(-x * w) * b[x]; + imagp += sin(-x * w) * b[x]; + } + + div = realp * realp + imagp * imagp; + real = (realz * realp + imagz * imagp) / div; + imag = (imagz * realp - imagp * realz) / div; + } else { + real = 1; + imag = 0; + for (x = 0; x < s->iir[ch].nb_ab[1]; x++) { + double ore, oim, re, im; + + re = cos(w) - a[2 * x]; + im = sin(w) - a[2 * x + 1]; + + ore = real; + oim = imag; + + real = ore * re - oim * im; + imag = ore * im + oim * re; + } + + for (x = 0; x < s->iir[ch].nb_ab[0]; x++) { + double ore, oim, re, im; + + re = cos(w) - b[2 * x]; + im = sin(w) - b[2 * x + 1]; + + ore = real; + oim = imag; + div = re * re + im * im; + + real = (ore * re + oim * im) / div; + imag = (oim * re - ore * im) / div; + } + } + + mag[i] = s->iir[ch].g * hypot(real, imag); + phase[i] = atan2(imag, real); + min = fminf(min, mag[i]); + max = fmaxf(max, mag[i]); + } + + for (i = 0; i < s->w; i++) { + int ymag = mag[i] / max * (s->h - 1); + int yphase = (0.5 * (1. + phase[i] / M_PI)) * (s->h - 1); + + ymag = s->h - 1 - av_clip(ymag, 0, s->h - 1); + yphase = s->h - 1 - av_clip(yphase, 0, s->h - 1); + + if (prev_ymag < 0) + prev_ymag = ymag; + if (prev_yphase < 0) + prev_yphase = yphase; + + draw_line(out, i, ymag, FFMAX(i - 1, 0), prev_ymag, 0xFFFF00FF); + draw_line(out, i, yphase, FFMAX(i - 1, 0), prev_yphase, 0xFF00FF00); + + prev_ymag = ymag; + prev_yphase = yphase; + } + + if (s->w > 400 && s->h > 100) { + drawtext(out, 2, 2, "Max Magnitude:", 0xDDDDDDDD); + snprintf(text, sizeof(text), "%.2f", max); + drawtext(out, 15 * 8 + 2, 2, text, 0xDDDDDDDD); + + drawtext(out, 2, 12, "Min Magnitude:", 0xDDDDDDDD); + snprintf(text, sizeof(text), "%.2f", min); + drawtext(out, 15 * 8 + 2, 12, text, 0xDDDDDDDD); + } + +end: + av_free(phase); + av_free(mag); +} + static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -672,6 +851,15 @@ static int config_output(AVFilterLink *outlink) convert_pd2zp(ctx, inlink->channels); } + av_frame_free(&s->video); + if (s->response) { + s->video = ff_get_video_buffer(ctx->outputs[1], s->w, s->h); + if (!s->video) + return AVERROR(ENOMEM); + + draw_response(ctx, s->video); + } + if (s->format == 0) av_log(ctx, AV_LOG_WARNING, "tf coefficients format is not recommended for too high number of zeros/poles.\n"); @@ -693,7 +881,7 @@ static int config_output(AVFilterLink *outlink) return ret; } - for (ch = 0; ch < inlink->channels; ch++) { + for (ch = 0; s->format == 0 && ch < inlink->channels; ch++) { IIRChannel *iir = &s->iir[ch]; for (i = 1; i < iir->nb_ab[0]; i++) { @@ -722,7 +910,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFilterLink *outlink = ctx->outputs[0]; ThreadData td; AVFrame *out; - int ch; + int ch, ret; if (av_frame_is_writable(in)) { out = in; @@ -749,12 +937,35 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (in != out) av_frame_free(&in); + if (s->response) { + AVFilterLink *outlink = ctx->outputs[1]; + + s->video->pts = out->pts; + ret = ff_filter_frame(outlink, av_frame_clone(s->video)); + if (ret < 0) + return ret; + } + return ff_filter_frame(outlink, out); } +static int config_video(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + AudioIIRContext *s = ctx->priv; + + outlink->sample_aspect_ratio = (AVRational){1,1}; + outlink->w = s->w; + outlink->h = s->h; + + return 0; +} + static av_cold int init(AVFilterContext *ctx) { AudioIIRContext *s = ctx->priv; + AVFilterPad pad, vpad; + int ret; if (!s->a_str || !s->b_str || !s->g_str) { av_log(ctx, AV_LOG_ERROR, "Valid coefficients are mandatory.\n"); @@ -769,6 +980,35 @@ static av_cold int init(AVFilterContext *ctx) default: return AVERROR_BUG; } + pad = (AVFilterPad){ + .name = av_strdup("default"), + .type = AVMEDIA_TYPE_AUDIO, + .config_props = config_output, + }; + + if (!pad.name) + return AVERROR(ENOMEM); + + if (s->response) { + vpad = (AVFilterPad){ + .name = av_strdup("filter_response"), + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_video, + }; + if (!vpad.name) + return AVERROR(ENOMEM); + } + + ret = ff_insert_outpad(ctx, 0, &pad); + if (ret < 0) + return ret; + + if (s->response) { + ret = ff_insert_outpad(ctx, 1, &vpad); + if (ret < 0) + return ret; + } + return 0; } @@ -788,6 +1028,11 @@ static av_cold void uninit(AVFilterContext *ctx) } } av_freep(&s->iir); + + av_freep(&ctx->output_pads[0].name); + if (s->response) + av_freep(&ctx->output_pads[1].name); + av_frame_free(&s->video); } static const AVFilterPad inputs[] = { @@ -799,17 +1044,9 @@ static const AVFilterPad inputs[] = { { NULL } }; -static const AVFilterPad outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .config_props = config_output, - }, - { NULL } -}; - #define OFFSET(x) offsetof(AudioIIRContext, x) #define AF AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM +#define VF AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM static const AVOption aiir_options[] = { { "z", "set B/numerator/zeros coefficients", OFFSET(b_str), AV_OPT_TYPE_STRING, {.str="1+0i 1-0i"}, 0, 0, AF }, @@ -830,6 +1067,9 @@ static const AVOption aiir_options[] = { { "flt", "single-precision floating-point", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "precision" }, { "i32", "32-bit integers", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, AF, "precision" }, { "i16", "16-bit integers", 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, AF, "precision" }, + { "response", "show IR frequency response", OFFSET(response), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, VF }, + { "channel", "set IR channel to display frequency response", OFFSET(ir_channel), AV_OPT_TYPE_INT, {.i64=0}, 0, 1024, VF }, + { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "hd720"}, 0, 0, VF }, { NULL }, }; @@ -844,6 +1084,6 @@ AVFilter ff_af_aiir = { .uninit = uninit, .query_formats = query_formats, .inputs = inputs, - .outputs = outputs, - .flags = AVFILTER_FLAG_SLICE_THREADS, + .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | + AVFILTER_FLAG_SLICE_THREADS, };

1 0

avfilter/af_afir: fix picking of IR channel
by Paul B Mahol 30 May '18

30 May '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed May 30 12:30:24 2018 +0200| [d0e740b8fb30f02914594d00eb311a32442a63f8] | committer: Paul B Mahol avfilter/af_afir: fix picking of IR channel Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0e740b8fb30f0291… --- libavfilter/af_afir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index cdc7d29e7e..75de14729d 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -230,7 +230,7 @@ static void draw_response(AVFilterContext *ctx, AVFrame *out) if (!mag || !phase) goto end; - channel = av_clip(s->ir_channel, 0, s->in[1]->channels); + channel = av_clip(s->ir_channel, 0, s->in[1]->channels - 1); for (i = 0; i < s->w; i++) { const float *src = (const float *)s->in[1]->extended_data[channel]; double w = i * M_PI / (s->w - 1);

1 0

flvenc: Fix sequence header update timestamps
by Alex Converse 30 May '18

30 May '18

ffmpeg | branch: master | Alex Converse <alexconv(a)twitch.tv> | Thu Apr 26 13:46:28 2018 -0700| [ea0010bf9cd2be63ab0c174abd3cac754af9ee40] | committer: Alex Converse flvenc: Fix sequence header update timestamps > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea0010bf9cd2be63a… --- libavformat/flvenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index fd140656bf..1c552a3e6b 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -485,7 +485,7 @@ static int unsupported_codec(AVFormatContext *s, return AVERROR(ENOSYS); } -static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par) { +static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, int64_t ts) { int64_t data_size; AVIOContext *pb = s->pb; FLVContext *flv = s->priv_data; @@ -497,7 +497,7 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par) { par->codec_type == AVMEDIA_TYPE_VIDEO ? FLV_TAG_TYPE_VIDEO : FLV_TAG_TYPE_AUDIO); avio_wb24(pb, 0); // size patched later - put_timestamp(pb, 0); + put_timestamp(pb, ts); avio_wb24(pb, 0); // streamid pos = avio_tell(pb); if (par->codec_id == AV_CODEC_ID_AAC) { @@ -760,7 +760,7 @@ static int flv_write_header(AVFormatContext *s) } for (i = 0; i < s->nb_streams; i++) { - flv_write_codec_header(s, s->streams[i]->codecpar); + flv_write_codec_header(s, s->streams[i]->codecpar, 0); } flv->datastart_offset = avio_tell(pb); @@ -904,7 +904,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } memcpy(par->extradata, side, side_size); par->extradata_size = side_size; - flv_write_codec_header(s, par); + flv_write_codec_header(s, par, pkt->dts); } }

1 0

flvenc: Factorize timestamp writing
by Alex Converse 30 May '18

30 May '18

ffmpeg | branch: master | Alex Converse <alexconv(a)twitch.tv> | Thu May 10 18:08:01 2018 -0700| [4d3dd167dfdfa2f36724f5613f05f46e3477c0d1] | committer: Alex Converse flvenc: Factorize timestamp writing The code is trivial but the semantics in the spec are ambiguous. This should help keep parts of the muxer interpreting them consistently. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d3dd167dfdfa2f36… --- libavformat/flvenc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index e8af48cb64..fd140656bf 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -230,12 +230,17 @@ static void put_amf_string(AVIOContext *pb, const char *str) avio_write(pb, str, len); } +// FLV timestamps are 32 bits signed, RTMP timestamps should be 32-bit unsigned +static void put_timestamp(AVIOContext *pb, int64_t ts) { + avio_wb24(pb, ts & 0xFFFFFF); + avio_w8(pb, (ts >> 24) & 0x7F); +} + static void put_avc_eos_tag(AVIOContext *pb, unsigned ts) { avio_w8(pb, FLV_TAG_TYPE_VIDEO); avio_wb24(pb, 5); /* Tag Data Size */ - avio_wb24(pb, ts); /* lower 24 bits of timestamp in ms */ - avio_w8(pb, (ts >> 24) & 0x7F); /* MSB of ts in ms */ + put_timestamp(pb, ts); avio_wb24(pb, 0); /* StreamId = 0 */ avio_w8(pb, 23); /* ub[4] FrameType = 1, ub[4] CodecId = 7 */ avio_w8(pb, 2); /* AVC end of sequence */ @@ -492,8 +497,7 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par) { par->codec_type == AVMEDIA_TYPE_VIDEO ? FLV_TAG_TYPE_VIDEO : FLV_TAG_TYPE_AUDIO); avio_wb24(pb, 0); // size patched later - avio_wb24(pb, 0); // ts - avio_w8(pb, 0); // ts ext + put_timestamp(pb, 0); avio_wb24(pb, 0); // streamid pos = avio_tell(pb); if (par->codec_id == AV_CODEC_ID_AAC) { @@ -978,8 +982,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } avio_wb24(pb, size + flags_size); - avio_wb24(pb, ts & 0xFFFFFF); - avio_w8(pb, (ts >> 24) & 0x7F); // timestamps are 32 bits _signed_ + put_timestamp(pb, ts); avio_wb24(pb, flv->reserved); if (par->codec_type == AVMEDIA_TYPE_DATA ||

1 0

lavfi/tests: Fix 16-bit vf_blend test to avoid memory not aligned to 2 bytes
by Andrey Semashev 30 May '18

30 May '18

ffmpeg | branch: master | Andrey Semashev <andrey.semashev(a)gmail.com> | Thu May 24 00:07:36 2018 +0300| [d7eb8d84757155c1fb0fe1a8269025e22e9bf0ec] | committer: Michael Niedermayer lavfi/tests: Fix 16-bit vf_blend test to avoid memory not aligned to 2 bytes Generic C implementation of vf_blend performs reads and writes of 16-bit elements, which requires the buffers to be aligned to at least 2-byte boundary. Also, the change fixes source buffer overrun caused by src_offset being added to to test handling of misaligned buffers. Fixes: #7226 Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7eb8d84757155c1f… --- tests/checkasm/vf_blend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checkasm/vf_blend.c b/tests/checkasm/vf_blend.c index 912f3a2c38..a7578fec39 100644 --- a/tests/checkasm/vf_blend.c +++ b/tests/checkasm/vf_blend.c @@ -71,7 +71,7 @@ w = WIDTH / depth; \ \ for (i = 0; i < BUF_UNITS - 1; i++) { \ - int src_offset = i * SIZE_PER_UNIT + i; /* Test various alignments */ \ + int src_offset = i * SIZE_PER_UNIT + (BUF_UNITS - 1 - i) * depth; /* Test various alignments */ \ int dst_offset = i * SIZE_PER_UNIT; /* dst must be aligned */ \ randomize_buffers(); \ call_ref(top1 + src_offset, w, bot1 + src_offset, w, \

1 0

qt-faststart - stricter input validations
by erankor 30 May '18

30 May '18

ffmpeg | branch: master | erankor <eran.kornblau(a)kaltura.com> | Tue May 29 16:18:05 2018 +0300| [500e6387116230c905b7a39baae7aa86d627a446] | committer: Michael Niedermayer qt-faststart - stricter input validations 1. validate the moov size before checking for cmov atom 2. avoid performing arithmetic operations on unvalidated numbers 3. verify the stco/co64 offset count does not overflow the stco/co64 atom (not only the moov atom) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=500e6387116230c90… --- tools/qt-faststart.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c index 97be019c58..d0ae7245f3 100644 --- a/tools/qt-faststart.c +++ b/tools/qt-faststart.c @@ -200,6 +200,11 @@ int main(int argc, char *argv[]) return 0; } + if (atom_size < 16) { + printf("bad moov atom size\n"); + goto error_out; + } + /* moov atom was, in fact, the last atom in the chunk; load the whole * moov atom */ if (fseeko(infile, -atom_size, SEEK_END)) { @@ -239,12 +244,12 @@ int main(int argc, char *argv[]) if (atom_type == STCO_ATOM) { printf(" patching stco atom...\n"); atom_size = BE_32(&moov_atom[i - 4]); - if (i + atom_size - 4 > moov_atom_size) { + if (atom_size < 16 || atom_size > moov_atom_size - i + 4) { printf(" bad atom size\n"); goto error_out; } offset_count = BE_32(&moov_atom[i + 8]); - if (i + 12 + offset_count * UINT64_C(4) > moov_atom_size) { + if (offset_count > (atom_size - 16) / 4) { printf(" bad atom size/element count\n"); goto error_out; } @@ -260,12 +265,12 @@ int main(int argc, char *argv[]) } else if (atom_type == CO64_ATOM) { printf(" patching co64 atom...\n"); atom_size = BE_32(&moov_atom[i - 4]); - if (i + atom_size - 4 > moov_atom_size) { + if (atom_size < 16 || atom_size > moov_atom_size - i + 4) { printf(" bad atom size\n"); goto error_out; } offset_count = BE_32(&moov_atom[i + 8]); - if (i + 12 + offset_count * UINT64_C(8) > moov_atom_size) { + if (offset_count > (atom_size - 16) / 8) { printf(" bad atom size/element count\n"); goto error_out; }

1 0

avcodec/qtrle: Do not output duplicated frames on insufficient input
by Michael Niedermayer 30 May '18

30 May '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun May 27 21:59:58 2018 +0200| [a9dacdeea6168787a142209bd19fdd74aefc9dd6] | committer: Michael Niedermayer avcodec/qtrle: Do not output duplicated frames on insufficient input This improves performance and makes qtrle behave more similar to other decoders. Libavcodec does generally not output known duplicated frames, instead the calling Application can insert them as it needs. Fixes: Timeout Fixes: 6383/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QTRLE_fuzzer-6199846902956032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9dacdeea6168787a… --- libavcodec/qtrle.c | 12 ++--- tests/ref/fate/qtrle-8bit | 109 ---------------------------------------------- 2 files changed, 6 insertions(+), 115 deletions(-) diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 1b0d2016b5..670690d0a4 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -433,12 +433,10 @@ static int qtrle_decode_frame(AVCodecContext *avctx, int ret; bytestream2_init(&s->g, avpkt->data, avpkt->size); - if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) - return ret; /* check if this frame is even supposed to change */ if (avpkt->size < 8) - goto done; + return avpkt->size; /* start after the chunk size */ bytestream2_seek(&s->g, 4, SEEK_SET); @@ -449,17 +447,20 @@ static int qtrle_decode_frame(AVCodecContext *avctx, /* if a header is present, fetch additional decoding parameters */ if (header & 0x0008) { if (avpkt->size < 14) - goto done; + return avpkt->size; start_line = bytestream2_get_be16(&s->g); bytestream2_skip(&s->g, 2); height = bytestream2_get_be16(&s->g); bytestream2_skip(&s->g, 2); if (height > s->avctx->height - start_line) - goto done; + return avpkt->size; } else { start_line = 0; height = s->avctx->height; } + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) + return ret; + row_ptr = s->frame->linesize[0] * start_line; switch (avctx->bits_per_coded_sample) { @@ -520,7 +521,6 @@ static int qtrle_decode_frame(AVCodecContext *avctx, memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE); } -done: if ((ret = av_frame_ref(data, s->frame)) < 0) return ret; *got_frame = 1; diff --git a/tests/ref/fate/qtrle-8bit b/tests/ref/fate/qtrle-8bit index 8da113d83e..27bb8aad71 100644 --- a/tests/ref/fate/qtrle-8bit +++ b/tests/ref/fate/qtrle-8bit @@ -4,169 +4,60 @@ #dimensions 0: 640x480 #sar 0: 0/1 0, 0, 0, 1, 921600, 0x1492e3ed -0, 1, 1, 1, 921600, 0x1492e3ed -0, 2, 2, 1, 921600, 0x1492e3ed 0, 3, 3, 1, 921600, 0x23ef4fc7 -0, 4, 4, 1, 921600, 0x23ef4fc7 0, 5, 5, 1, 921600, 0xe406d4be -0, 6, 6, 1, 921600, 0xe406d4be -0, 7, 7, 1, 921600, 0xe406d4be 0, 8, 8, 1, 921600, 0x62b8b5a1 -0, 9, 9, 1, 921600, 0x62b8b5a1 0, 10, 10, 1, 921600, 0x7d8ba674 -0, 11, 11, 1, 921600, 0x7d8ba674 -0, 12, 12, 1, 921600, 0x7d8ba674 0, 13, 13, 1, 921600, 0xfe666be7 -0, 14, 14, 1, 921600, 0xfe666be7 0, 15, 15, 1, 921600, 0x721baec0 -0, 16, 16, 1, 921600, 0x721baec0 -0, 17, 17, 1, 921600, 0x721baec0 0, 18, 18, 1, 921600, 0xc237180a -0, 19, 19, 1, 921600, 0xc237180a 0, 20, 20, 1, 921600, 0xf03a7482 -0, 21, 21, 1, 921600, 0xf03a7482 -0, 22, 22, 1, 921600, 0xf03a7482 0, 23, 23, 1, 921600, 0x5612a391 -0, 24, 24, 1, 921600, 0x5612a391 0, 25, 25, 1, 921600, 0x9dbcc46a -0, 26, 26, 1, 921600, 0x9dbcc46a -0, 27, 27, 1, 921600, 0x9dbcc46a 0, 28, 28, 1, 921600, 0xa128a5d5 -0, 29, 29, 1, 921600, 0xa128a5d5 0, 30, 30, 1, 921600, 0x63e0025c -0, 31, 31, 1, 921600, 0x63e0025c -0, 32, 32, 1, 921600, 0x63e0025c 0, 33, 33, 1, 921600, 0x262359ed -0, 34, 34, 1, 921600, 0x262359ed 0, 35, 35, 1, 921600, 0x343688e8 -0, 36, 36, 1, 921600, 0x343688e8 -0, 37, 37, 1, 921600, 0x343688e8 -0, 38, 38, 1, 921600, 0x343688e8 -0, 39, 39, 1, 921600, 0x343688e8 -0, 40, 40, 1, 921600, 0x343688e8 -0, 41, 41, 1, 921600, 0x343688e8 -0, 42, 42, 1, 921600, 0x343688e8 -0, 43, 43, 1, 921600, 0x343688e8 -0, 44, 44, 1, 921600, 0x343688e8 0, 45, 45, 1, 921600, 0xe4b29d57 -0, 46, 46, 1, 921600, 0xe4b29d57 -0, 47, 47, 1, 921600, 0xe4b29d57 0, 48, 48, 1, 921600, 0x198e8a4a -0, 49, 49, 1, 921600, 0x198e8a4a 0, 50, 50, 1, 921600, 0x0cad8dc9 -0, 51, 51, 1, 921600, 0x0cad8dc9 -0, 52, 52, 1, 921600, 0x0cad8dc9 0, 53, 53, 1, 921600, 0x1f74cf3d -0, 54, 54, 1, 921600, 0x1f74cf3d 0, 55, 55, 1, 921600, 0xec5b5449 -0, 56, 56, 1, 921600, 0xec5b5449 -0, 57, 57, 1, 921600, 0xec5b5449 0, 58, 58, 1, 921600, 0x39829711 -0, 59, 59, 1, 921600, 0x39829711 0, 60, 60, 1, 921600, 0x6de5b9c6 -0, 61, 61, 1, 921600, 0x6de5b9c6 -0, 62, 62, 1, 921600, 0x6de5b9c6 0, 63, 63, 1, 921600, 0x47b0e9d4 -0, 64, 64, 1, 921600, 0x47b0e9d4 0, 65, 65, 1, 921600, 0x756452b8 -0, 66, 66, 1, 921600, 0x756452b8 -0, 67, 67, 1, 921600, 0x756452b8 0, 68, 68, 1, 921600, 0x6fce3478 -0, 69, 69, 1, 921600, 0x6fce3478 0, 70, 70, 1, 921600, 0x372397cd -0, 71, 71, 1, 921600, 0x372397cd -0, 72, 72, 1, 921600, 0x372397cd 0, 73, 73, 1, 921600, 0xe3999ba1 -0, 74, 74, 1, 921600, 0xe3999ba1 0, 75, 75, 1, 921600, 0x6ba26b43 -0, 76, 76, 1, 921600, 0x6ba26b43 -0, 77, 77, 1, 921600, 0x6ba26b43 0, 78, 78, 1, 921600, 0x4e9ee49e -0, 79, 79, 1, 921600, 0x4e9ee49e 0, 80, 80, 1, 921600, 0xdb5fd6e7 -0, 81, 81, 1, 921600, 0xdb5fd6e7 -0, 82, 82, 1, 921600, 0xdb5fd6e7 0, 83, 83, 1, 921600, 0x8f2254a5 -0, 84, 84, 1, 921600, 0x8f2254a5 -0, 85, 85, 1, 921600, 0x8f2254a5 -0, 86, 86, 1, 921600, 0x8f2254a5 -0, 87, 87, 1, 921600, 0x8f2254a5 -0, 88, 88, 1, 921600, 0x8f2254a5 -0, 89, 89, 1, 921600, 0x8f2254a5 -0, 90, 90, 1, 921600, 0x8f2254a5 -0, 91, 91, 1, 921600, 0x8f2254a5 -0, 92, 92, 1, 921600, 0x8f2254a5 0, 93, 93, 1, 921600, 0x57e95c32 -0, 94, 94, 1, 921600, 0x57e95c32 0, 95, 95, 1, 921600, 0x41627a9b -0, 96, 96, 1, 921600, 0x41627a9b -0, 97, 97, 1, 921600, 0x41627a9b 0, 98, 98, 1, 921600, 0x7412dcee -0, 99, 99, 1, 921600, 0x7412dcee 0, 100, 100, 1, 921600, 0xaebe10ed -0, 101, 101, 1, 921600, 0xaebe10ed -0, 102, 102, 1, 921600, 0xaebe10ed 0, 103, 103, 1, 921600, 0x411a91f6 -0, 104, 104, 1, 921600, 0x411a91f6 0, 105, 105, 1, 921600, 0xb059df3f -0, 106, 106, 1, 921600, 0xb059df3f -0, 107, 107, 1, 921600, 0xb059df3f 0, 108, 108, 1, 921600, 0x4d6f5a77 -0, 109, 109, 1, 921600, 0x4d6f5a77 0, 110, 110, 1, 921600, 0xbbf06df4 -0, 111, 111, 1, 921600, 0xbbf06df4 -0, 112, 112, 1, 921600, 0xbbf06df4 0, 113, 113, 1, 921600, 0xe27f7bf6 -0, 114, 114, 1, 921600, 0xe27f7bf6 0, 115, 115, 1, 921600, 0xd7e8360e -0, 116, 116, 1, 921600, 0xd7e8360e -0, 117, 117, 1, 921600, 0xd7e8360e 0, 118, 118, 1, 921600, 0x1dd4c344 -0, 119, 119, 1, 921600, 0x1dd4c344 0, 120, 120, 1, 921600, 0x7995a7ce -0, 121, 121, 1, 921600, 0x7995a7ce -0, 122, 122, 1, 921600, 0x7995a7ce 0, 123, 123, 1, 921600, 0x2ef3c566 -0, 124, 124, 1, 921600, 0x2ef3c566 0, 125, 125, 1, 921600, 0xf296736e -0, 126, 126, 1, 921600, 0xf296736e -0, 127, 127, 1, 921600, 0xf296736e -0, 128, 128, 1, 921600, 0xf296736e -0, 129, 129, 1, 921600, 0xf296736e -0, 130, 130, 1, 921600, 0xf296736e -0, 131, 131, 1, 921600, 0xf296736e -0, 132, 132, 1, 921600, 0xf296736e -0, 133, 133, 1, 921600, 0xf296736e -0, 134, 134, 1, 921600, 0xf296736e 0, 135, 135, 1, 921600, 0x1a488311 -0, 136, 136, 1, 921600, 0x1a488311 -0, 137, 137, 1, 921600, 0x1a488311 0, 138, 138, 1, 921600, 0x9e28011b -0, 139, 139, 1, 921600, 0x9e28011b 0, 140, 140, 1, 921600, 0x84d1ea80 -0, 141, 141, 1, 921600, 0x84d1ea80 -0, 142, 142, 1, 921600, 0x84d1ea80 0, 143, 143, 1, 921600, 0x9ed41052 -0, 144, 144, 1, 921600, 0x9ed41052 0, 145, 145, 1, 921600, 0xd4db7206 -0, 146, 146, 1, 921600, 0xd4db7206 -0, 147, 147, 1, 921600, 0xd4db7206 0, 148, 148, 1, 921600, 0x55f695a9 -0, 149, 149, 1, 921600, 0x55f695a9 0, 150, 150, 1, 921600, 0x9d8c667f -0, 151, 151, 1, 921600, 0x9d8c667f -0, 152, 152, 1, 921600, 0x9d8c667f 0, 153, 153, 1, 921600, 0x9b6037ec -0, 154, 154, 1, 921600, 0x9b6037ec 0, 155, 155, 1, 921600, 0x57c5e835 -0, 156, 156, 1, 921600, 0x57c5e835 -0, 157, 157, 1, 921600, 0x57c5e835 0, 158, 158, 1, 921600, 0x476dad89 -0, 159, 159, 1, 921600, 0x476dad89 0, 160, 160, 1, 921600, 0xcfd6ad2b -0, 161, 161, 1, 921600, 0xcfd6ad2b -0, 162, 162, 1, 921600, 0xcfd6ad2b 0, 163, 163, 1, 921600, 0x3b372379 -0, 164, 164, 1, 921600, 0x3b372379 0, 165, 165, 1, 921600, 0x36f245f5 -0, 166, 166, 1, 921600, 0x36f245f5

1 0

ffplay: Print codec_name if decoder for codec_id could not be found.
by Carl Eugen Hoyos 29 May '18

29 May '18

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Wed May 30 01:09:49 2018 +0200| [53d6d4f266b50330a62cbfefdf16ca7b5f496b11] | committer: Carl Eugen Hoyos ffplay: Print codec_name if decoder for codec_id could not be found. Reviewed-by: Marton Balint > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53d6d4f266b50330a… --- fftools/ffplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index dcca9c26d8..84ba6673dc 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2578,7 +2578,7 @@ static int stream_component_open(VideoState *is, int stream_index) if (forced_codec_name) av_log(NULL, AV_LOG_WARNING, "No codec could be found with name '%s'\n", forced_codec_name); else av_log(NULL, AV_LOG_WARNING, - "No codec could be found with id %d\n", avctx->codec_id); + "No decoder could be found for codec %s\n", avcodec_get_name(avctx->codec_id)); ret = AVERROR(EINVAL); goto fail; }

1 0

[ffmpeg-web] branch master updated. 2080b81 css: remove margin from code element
by ffmpeg-git＠ffmpeg.org 29 May '18

29 May '18

The branch, master has been updated via 2080b81a83a5cf811c1037dcf44b64fa1e90012f (commit) from c112da144207019155291bc1850b92ccc479b0ea (commit) - Log ----------------------------------------------------------------- commit 2080b81a83a5cf811c1037dcf44b64fa1e90012f Author: Lou Logan <lou(a)lrcd.com> AuthorDate: Tue May 29 14:14:28 2018 -0800 Commit: Lou Logan <lou(a)lrcd.com> CommitDate: Tue May 29 14:19:35 2018 -0800 css: remove margin from code element The margin added ugly, unecessary vertical spacing that disrupted the flow of text. Especially apparent in paragraphs. Signed-off-by: Lou Logan <lou(a)lrcd.com> diff --git a/src/less/style.less b/src/less/style.less index 6588ec7..26b8862 100644 --- a/src/less/style.less +++ b/src/less/style.less @@ -251,7 +251,6 @@ code { background-color: @Cmaindark; color: @Csecondlight; display: inline-block; - margin: 5px; } .table { ----------------------------------------------------------------------- Summary of changes: src/less/style.less | 1 - 1 file changed, 1 deletion(-) hooks/post-receive --

1 0