April 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/agm: Check output size before allocation
by Michael Niedermayer 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Apr 24 17:41:13 2019 +0200| [19af948e53fb8a8d26eb57785420feffd91b619d] | committer: Michael Niedermayer avcodec/agm: Check output size before allocation Fixes: OOM Fixes: 14198/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5723579234123776 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=19af948e53fb8a8d2… --- libavcodec/agm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/agm.c b/libavcodec/agm.c index 332e33897c..a499c09082 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -1049,6 +1049,9 @@ static int decode_huffman2(AVCodecContext *avctx, int header, int size) s->output_size = get_bits_long(gb, 32); + if (s->output_size > avctx->width * avctx->height * 9LL + 10000) + return AVERROR_INVALIDDATA; + av_fast_padded_malloc(&s->output, &s->padded_output_size, s->output_size); if (!s->output) return AVERROR(ENOMEM);

1 0

avcodec/truemotion2: Fix 2 integer overflows in tm2_update_block()
by Michael Niedermayer 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Apr 20 01:05:44 2019 +0200| [f4a1b8d409639b2394589efe20ad55410cce391c] | committer: Michael Niedermayer avcodec/truemotion2: Fix 2 integer overflows in tm2_update_block() Fixes: signed integer overflow: -2147483648 + -1 cannot be represented in type 'int' Fixes: 14107/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5694078680825856 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=f4a1b8d409639b239… --- libavcodec/truemotion2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 100880c257..03c516cc86 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -687,8 +687,8 @@ static inline void tm2_update_block(TM2Context *ctx, AVFrame *pic, int bx, int b /* update chroma */ for (j = 0; j < 2; j++) { for (i = 0; i < 2; i++) { - U[i] = Uo[i] + GET_TOK(ctx, TM2_UPD); - V[i] = Vo[i] + GET_TOK(ctx, TM2_UPD); + U[i] = Uo[i] + (unsigned)GET_TOK(ctx, TM2_UPD); + V[i] = Vo[i] + (unsigned)GET_TOK(ctx, TM2_UPD); } U += Ustride; V += Vstride;

1 0

avcodec/cinepak: Check slice_size before allocating image
by Michael Niedermayer 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Apr 27 23:37:26 2019 +0200| [b606493717db6424d693e1a944f51171e9e72905] | committer: Michael Niedermayer avcodec/cinepak: Check slice_size before allocating image Fixes: Timeout (16sec -> 125msec) Fixes: 14283/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CINEPAK_fuzzer-5742851457024000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Tomas Härdin <tjoppen(a)acc.umu.se> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b606493717db6424d… --- libavcodec/cinepak.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 9b0077402f..d26c505222 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -353,6 +353,13 @@ static int cinepak_predecode_check (CinepakContext *s) if (s->size < 10 + s->sega_film_skip_bytes + num_strips * 12) return AVERROR_INVALIDDATA; + if (num_strips) { + uint8_t *data = s->data + 10 + s->sega_film_skip_bytes; + int strip_size = AV_RB24 (data + 1); + if (strip_size < 12 || strip_size > encoded_buf_size) + return AVERROR_INVALIDDATA; + } + return 0; }

1 0

avfilter/avf_showspectrum: convert some doubles to floats
by Paul B Mahol 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Apr 30 20:33:14 2019 +0200| [5a39b797ac46bbf992e76ea363f2c5fab7ebc29f] | committer: Paul B Mahol avfilter/avf_showspectrum: convert some doubles to floats > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a39b797ac46bbf99… --- libavfilter/avf_showspectrum.c | 68 +++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 8186023a0a..f175bf1cb5 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -392,29 +392,29 @@ static int run_channel_fft(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo } if (s->stop) { - double theta, phi, psi, a, b, S, c; + float theta, phi, psi, a, b, S, c; FFTComplex *g = s->fft_data[ch]; FFTComplex *h = s->fft_scratch[ch]; int L = s->buf_size; int N = s->win_size; int M = s->win_size / 2; - phi = 2.0 * M_PI * (s->stop - s->start) / (double)inlink->sample_rate / (M - 1); - theta = 2.0 * M_PI * s->start / (double)inlink->sample_rate; + phi = 2.f * M_PI * (s->stop - s->start) / (float)inlink->sample_rate / (M - 1); + theta = 2.f * M_PI * s->start / (float)inlink->sample_rate; for (int n = 0; n < M; n++) { - h[n].re = cos(n * n / 2.0 * phi); - h[n].im = sin(n * n / 2.0 * phi); + h[n].re = cosf(n * n / 2.f * phi); + h[n].im = sinf(n * n / 2.f * phi); } for (int n = M; n < L; n++) { - h[n].re = 0.0; - h[n].im = 0.0; + h[n].re = 0.f; + h[n].im = 0.f; } for (int n = L - N; n < L; n++) { - h[n].re = cos((L - n) * (L - n) / 2.0 * phi); - h[n].im = sin((L - n) * (L - n) / 2.0 * phi); + h[n].re = cosf((L - n) * (L - n) / 2.f * phi); + h[n].im = sinf((L - n) * (L - n) / 2.f * phi); } for (int n = 0; n < N; n++) { @@ -423,14 +423,14 @@ static int run_channel_fft(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo } for (int n = N; n < L; n++) { - g[n].re = 0.; - g[n].im = 0.; + g[n].re = 0.f; + g[n].im = 0.f; } for (int n = 0; n < N; n++) { - psi = n * theta + n * n / 2.0 * phi; - c = cos(psi); - S = -sin(psi); + psi = n * theta + n * n / 2.f * phi; + c = cosf(psi); + S = -sinf(psi); a = c * g[n].re - S * g[n].im; b = S * g[n].re + c * g[n].im; g[n].re = a; @@ -457,9 +457,9 @@ static int run_channel_fft(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo av_fft_calc(s->ifft[ch], g); for (int k = 0; k < M; k++) { - psi = k * k / 2.0 * phi; - c = cos(psi); - S = -sin(psi); + psi = k * k / 2.f * phi; + c = cosf(psi); + S = -sinf(psi); a = c * g[k].re - S * g[k].im; b = S * g[k].re + c * g[k].im; s->fft_data[ch][k].re = a; @@ -555,15 +555,15 @@ static void color_range(ShowSpectrumContext *s, int ch, if (s->color_mode == CHANNEL) { if (s->nb_display_channels > 1) { - *uf *= 0.5 * sin((2 * M_PI * ch) / s->nb_display_channels + M_PI * s->rotation); - *vf *= 0.5 * cos((2 * M_PI * ch) / s->nb_display_channels + M_PI * s->rotation); + *uf *= 0.5f * sinf((2 * M_PI * ch) / s->nb_display_channels + M_PI * s->rotation); + *vf *= 0.5f * cosf((2 * M_PI * ch) / s->nb_display_channels + M_PI * s->rotation); } else { - *uf *= 0.5 * sin(M_PI * s->rotation); - *vf *= 0.5 * cos(M_PI * s->rotation + M_PI_2); + *uf *= 0.5f * sinf(M_PI * s->rotation); + *vf *= 0.5f * cosf(M_PI * s->rotation + M_PI_2); } } else { - *uf += *uf * sin(M_PI * s->rotation); - *vf += *vf * cos(M_PI * s->rotation + M_PI_2); + *uf += *uf * sinf(M_PI * s->rotation); + *vf += *vf * cosf(M_PI * s->rotation + M_PI_2); } *uf *= s->saturation; @@ -854,7 +854,7 @@ static int draw_legend(AVFilterContext *ctx, int samples) } for (y = 0; ch == 0 && y < h; y += h / 10) { - float value = 120.0 * log10(1. - y / (float)h); + float value = 120.f * log10f(1.f - y / (float)h); char *text; if (value < -120) @@ -896,19 +896,19 @@ static float get_value(AVFilterContext *ctx, int ch, int y) a = av_clipf(a, 0, 1); break; case SQRT: - a = av_clipf(sqrt(a), 0, 1); + a = av_clipf(sqrtf(a), 0, 1); break; case CBRT: - a = av_clipf(cbrt(a), 0, 1); + a = av_clipf(cbrtf(a), 0, 1); break; case FOURTHRT: - a = av_clipf(sqrt(sqrt(a)), 0, 1); + a = av_clipf(sqrtf(sqrtf(a)), 0, 1); break; case FIFTHRT: - a = av_clipf(pow(a, 0.20), 0, 1); + a = av_clipf(powf(a, 0.20), 0, 1); break; case LOG: - a = 1 + log10(av_clipd(a, 1e-6, 1)) / 6; // zero = -120dBFS + a = 1.f + log10f(av_clipf(a, 1e-6, 1)) / 6.f; // zero = -120dBFS break; default: av_assert0(0); @@ -1128,7 +1128,7 @@ static int config_output(AVFilterLink *outlink) generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap); if (s->overlap == 1) s->overlap = overlap; - s->hop_size = (1. - s->overlap) * s->win_size; + s->hop_size = (1.f - s->overlap) * s->win_size; if (s->hop_size < 1) { av_log(ctx, AV_LOG_ERROR, "overlap %f too big\n", s->overlap); return AVERROR(EINVAL); @@ -1137,7 +1137,7 @@ static int config_output(AVFilterLink *outlink) for (s->win_scale = 0, i = 0; i < s->win_size; i++) { s->win_scale += s->window_func_lut[i] * s->window_func_lut[i]; } - s->win_scale = 1. / sqrt(s->win_scale); + s->win_scale = 1.f / sqrtf(s->win_scale); /* prepare the initial picref buffer (black frame) */ av_frame_free(&s->outpicref); @@ -1198,8 +1198,8 @@ static int config_output(AVFilterLink *outlink) #define RE(y, ch) s->fft_data[ch][y].re #define IM(y, ch) s->fft_data[ch][y].im -#define MAGNITUDE(y, ch) hypot(RE(y, ch), IM(y, ch)) -#define PHASE(y, ch) atan2(IM(y, ch), RE(y, ch)) +#define MAGNITUDE(y, ch) hypotf(RE(y, ch), IM(y, ch)) +#define PHASE(y, ch) atan2f(IM(y, ch), RE(y, ch)) static int calc_channel_magnitudes(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { @@ -1639,7 +1639,7 @@ static int showspectrumpic_request_frame(AVFilterLink *outlink) if (consumed >= spb) { int h = s->orientation == VERTICAL ? s->h : s->w; - scale_magnitudes(s, 1. / (consumed / spf)); + scale_magnitudes(s, 1.f / (consumed / spf)); plot_spectrum_column(inlink, fin); consumed = 0; x++;

1 0

swscale/ppc: VSX-optimize hscale_fast
by Lauri Kasanen 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Lauri Kasanen <cand(a)gmx.com> | Tue Apr 23 14:54:46 2019 +0300| [d0e4d0429ed2841283e31d5f2cb6b1c56210382c] | committer: Lauri Kasanen swscale/ppc: VSX-optimize hscale_fast ./ffmpeg -f lavfi -i yuvtestsrc=duration=1:size=1200x1440 -sws_flags fast_bilinear \ -s 2400x720 -f rawvideo -vframes 5 -pix_fmt abgr -nostats test.raw 4.27 speedup for hyscale_fast: 24796 UNITS in hyscale_fast, 4096 runs, 0 skips 5797 UNITS in hyscale_fast, 4096 runs, 0 skips 4.48 speedup for hcscale_fast: 19911 UNITS in hcscale_fast, 4095 runs, 1 skips 4437 UNITS in hcscale_fast, 4096 runs, 0 skips > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0e4d0429ed284128… --- libswscale/ppc/swscale_vsx.c | 196 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/libswscale/ppc/swscale_vsx.c b/libswscale/ppc/swscale_vsx.c index ba00791dcb..2e20ab388a 100644 --- a/libswscale/ppc/swscale_vsx.c +++ b/libswscale/ppc/swscale_vsx.c @@ -1661,6 +1661,198 @@ YUV2PACKEDWRAPPER(yuv2, 422, yuyv422, AV_PIX_FMT_YUYV422) YUV2PACKEDWRAPPER(yuv2, 422, yvyu422, AV_PIX_FMT_YVYU422) YUV2PACKEDWRAPPER(yuv2, 422, uyvy422, AV_PIX_FMT_UYVY422) +static void hyscale_fast_vsx(SwsContext *c, int16_t *dst, int dstWidth, + const uint8_t *src, int srcW, int xInc) +{ + int i; + unsigned int xpos = 0, xx; + vector uint8_t vin, vin2, vperm; + vector int8_t vmul, valpha; + vector int16_t vtmp, vtmp2, vtmp3, vtmp4; + vector uint16_t vd_l, vd_r, vcoord16[2]; + vector uint32_t vcoord[4]; + const vector uint32_t vadd = (vector uint32_t) { + 0, + xInc * 1, + xInc * 2, + xInc * 3, + }; + const vector uint16_t vadd16 = (vector uint16_t) { // Modulo math + 0, + xInc * 1, + xInc * 2, + xInc * 3, + xInc * 4, + xInc * 5, + xInc * 6, + xInc * 7, + }; + const vector uint32_t vshift16 = vec_splats((uint32_t) 16); + const vector uint16_t vshift9 = vec_splat_u16(9); + const vector uint8_t vzero = vec_splat_u8(0); + const vector uint16_t vshift = vec_splat_u16(7); + + for (i = 0; i < dstWidth; i += 16) { + vcoord16[0] = vec_splats((uint16_t) xpos); + vcoord16[1] = vec_splats((uint16_t) (xpos + xInc * 8)); + + vcoord16[0] = vec_add(vcoord16[0], vadd16); + vcoord16[1] = vec_add(vcoord16[1], vadd16); + + vcoord16[0] = vec_sr(vcoord16[0], vshift9); + vcoord16[1] = vec_sr(vcoord16[1], vshift9); + valpha = (vector int8_t) vec_pack(vcoord16[0], vcoord16[1]); + + xx = xpos >> 16; + vin = vec_vsx_ld(0, &src[xx]); + + vcoord[0] = vec_splats(xpos & 0xffff); + vcoord[1] = vec_splats((xpos & 0xffff) + xInc * 4); + vcoord[2] = vec_splats((xpos & 0xffff) + xInc * 8); + vcoord[3] = vec_splats((xpos & 0xffff) + xInc * 12); + + vcoord[0] = vec_add(vcoord[0], vadd); + vcoord[1] = vec_add(vcoord[1], vadd); + vcoord[2] = vec_add(vcoord[2], vadd); + vcoord[3] = vec_add(vcoord[3], vadd); + + vcoord[0] = vec_sr(vcoord[0], vshift16); + vcoord[1] = vec_sr(vcoord[1], vshift16); + vcoord[2] = vec_sr(vcoord[2], vshift16); + vcoord[3] = vec_sr(vcoord[3], vshift16); + + vcoord16[0] = vec_pack(vcoord[0], vcoord[1]); + vcoord16[1] = vec_pack(vcoord[2], vcoord[3]); + vperm = vec_pack(vcoord16[0], vcoord16[1]); + + vin = vec_perm(vin, vin, vperm); + + vin2 = vec_vsx_ld(1, &src[xx]); + vin2 = vec_perm(vin2, vin2, vperm); + + vmul = (vector int8_t) vec_sub(vin2, vin); + vtmp = vec_mule(vmul, valpha); + vtmp2 = vec_mulo(vmul, valpha); + vtmp3 = vec_mergeh(vtmp, vtmp2); + vtmp4 = vec_mergel(vtmp, vtmp2); + + vd_l = (vector uint16_t) vec_mergeh(vin, vzero); + vd_r = (vector uint16_t) vec_mergel(vin, vzero); + vd_l = vec_sl(vd_l, vshift); + vd_r = vec_sl(vd_r, vshift); + + vd_l = vec_add(vd_l, (vector uint16_t) vtmp3); + vd_r = vec_add(vd_r, (vector uint16_t) vtmp4); + + vec_st((vector int16_t) vd_l, 0, &dst[i]); + vec_st((vector int16_t) vd_r, 0, &dst[i + 8]); + + xpos += xInc * 16; + } + for (i=dstWidth-1; (i*xInc)>>16 >=srcW-1; i--) + dst[i] = src[srcW-1]*128; +} + +#define HCSCALE(in, out) \ + vin = vec_vsx_ld(0, &in[xx]); \ + vin = vec_perm(vin, vin, vperm); \ +\ + vin2 = vec_vsx_ld(1, &in[xx]); \ + vin2 = vec_perm(vin2, vin2, vperm); \ +\ + vtmp = vec_mule(vin, valphaxor); \ + vtmp2 = vec_mulo(vin, valphaxor); \ + vtmp3 = vec_mergeh(vtmp, vtmp2); \ + vtmp4 = vec_mergel(vtmp, vtmp2); \ +\ + vtmp = vec_mule(vin2, valpha); \ + vtmp2 = vec_mulo(vin2, valpha); \ + vd_l = vec_mergeh(vtmp, vtmp2); \ + vd_r = vec_mergel(vtmp, vtmp2); \ +\ + vd_l = vec_add(vd_l, vtmp3); \ + vd_r = vec_add(vd_r, vtmp4); \ +\ + vec_st((vector int16_t) vd_l, 0, &out[i]); \ + vec_st((vector int16_t) vd_r, 0, &out[i + 8]) + +static void hcscale_fast_vsx(SwsContext *c, int16_t *dst1, int16_t *dst2, + int dstWidth, const uint8_t *src1, + const uint8_t *src2, int srcW, int xInc) +{ + int i; + unsigned int xpos = 0, xx; + vector uint8_t vin, vin2, vperm; + vector uint8_t valpha, valphaxor; + vector uint16_t vtmp, vtmp2, vtmp3, vtmp4; + vector uint16_t vd_l, vd_r, vcoord16[2]; + vector uint32_t vcoord[4]; + const vector uint8_t vxor = vec_splats((uint8_t) 127); + const vector uint32_t vadd = (vector uint32_t) { + 0, + xInc * 1, + xInc * 2, + xInc * 3, + }; + const vector uint16_t vadd16 = (vector uint16_t) { // Modulo math + 0, + xInc * 1, + xInc * 2, + xInc * 3, + xInc * 4, + xInc * 5, + xInc * 6, + xInc * 7, + }; + const vector uint32_t vshift16 = vec_splats((uint32_t) 16); + const vector uint16_t vshift9 = vec_splat_u16(9); + + for (i = 0; i < dstWidth; i += 16) { + vcoord16[0] = vec_splats((uint16_t) xpos); + vcoord16[1] = vec_splats((uint16_t) (xpos + xInc * 8)); + + vcoord16[0] = vec_add(vcoord16[0], vadd16); + vcoord16[1] = vec_add(vcoord16[1], vadd16); + + vcoord16[0] = vec_sr(vcoord16[0], vshift9); + vcoord16[1] = vec_sr(vcoord16[1], vshift9); + valpha = vec_pack(vcoord16[0], vcoord16[1]); + valphaxor = vec_xor(valpha, vxor); + + xx = xpos >> 16; + + vcoord[0] = vec_splats(xpos & 0xffff); + vcoord[1] = vec_splats((xpos & 0xffff) + xInc * 4); + vcoord[2] = vec_splats((xpos & 0xffff) + xInc * 8); + vcoord[3] = vec_splats((xpos & 0xffff) + xInc * 12); + + vcoord[0] = vec_add(vcoord[0], vadd); + vcoord[1] = vec_add(vcoord[1], vadd); + vcoord[2] = vec_add(vcoord[2], vadd); + vcoord[3] = vec_add(vcoord[3], vadd); + + vcoord[0] = vec_sr(vcoord[0], vshift16); + vcoord[1] = vec_sr(vcoord[1], vshift16); + vcoord[2] = vec_sr(vcoord[2], vshift16); + vcoord[3] = vec_sr(vcoord[3], vshift16); + + vcoord16[0] = vec_pack(vcoord[0], vcoord[1]); + vcoord16[1] = vec_pack(vcoord[2], vcoord[3]); + vperm = vec_pack(vcoord16[0], vcoord16[1]); + + HCSCALE(src1, dst1); + HCSCALE(src2, dst2); + + xpos += xInc * 16; + } + for (i=dstWidth-1; (i*xInc)>>16 >=srcW-1; i--) { + dst1[i] = src1[srcW-1]*128; + dst2[i] = src2[srcW-1]*128; + } +} + +#undef HCSCALE + #endif /* !HAVE_BIGENDIAN */ #endif /* HAVE_VSX */ @@ -1677,6 +1869,10 @@ av_cold void ff_sws_init_swscale_vsx(SwsContext *c) #if !HAVE_BIGENDIAN if (c->srcBpc == 8 && c->dstBpc <= 14) { c->hyScale = c->hcScale = hScale_real_vsx; + if (c->flags & SWS_FAST_BILINEAR && c->dstW >= c->srcW && c->chrDstW >= c->chrSrcW) { + c->hyscale_fast = hyscale_fast_vsx; + c->hcscale_fast = hcscale_fast_vsx; + } } if (!is16BPS(dstFormat) && !isNBPS(dstFormat) && dstFormat != AV_PIX_FMT_NV12 && dstFormat != AV_PIX_FMT_NV21 &&

1 0

lavu/hwcontext_qsv: Fix the realign check for hwupload
by Linjie Fu 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Linjie Fu <linjie.fu(a)intel.com> | Mon Apr 15 21:23:40 2019 +0800| [2d81acaa1adf2280d74d280491f05f0baa4a31d9] | committer: Zhong Li lavu/hwcontext_qsv: Fix the realign check for hwupload Fix the aligned check in hwupload, input surface should be 16 aligned too. Partly fix #7830. Signed-off-by: Linjie Fu <linjie.fu(a)intel.com> Signed-off-by: Zhong Li <zhong.li(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d81acaa1adf2280d… --- libavutil/hwcontext_qsv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 8f9838d7d8..49b5952cef 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -892,8 +892,7 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, if (ret < 0) return ret; - - if (src->height & 16 || src->linesize[0] & 16) { + if (src->height & 15 || src->linesize[0] & 15) { realigned = 1; memset(&tmp_frame, 0, sizeof(tmp_frame)); tmp_frame.format = src->format;

1 0

avfilter/af_asoftclip: add timeline support
by Paul B Mahol 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Apr 30 11:02:36 2019 +0200| [38c170d54c008ab920d2c1b273fc69ca7a34447c] | committer: Paul B Mahol avfilter/af_asoftclip: add timeline support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38c170d54c008ab92… --- libavfilter/af_asoftclip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/af_asoftclip.c b/libavfilter/af_asoftclip.c index f7c7b51cd1..a42b56dff4 100644 --- a/libavfilter/af_asoftclip.c +++ b/libavfilter/af_asoftclip.c @@ -284,4 +284,5 @@ AVFilter ff_af_asoftclip = { .priv_class = &asoftclip_class, .inputs = inputs, .outputs = outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, };

1 0

avfilter/af_dynaudnorm: add timeline support
by Paul B Mahol 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Apr 30 10:54:45 2019 +0200| [9cc10418b3d8653ac9f1a1370828cfa6171299e2] | committer: Paul B Mahol avfilter/af_dynaudnorm: add timeline support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cc10418b3d8653ac… --- libavfilter/af_dynaudnorm.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c index 7c87ebce27..fd430884d7 100644 --- a/libavfilter/af_dynaudnorm.c +++ b/libavfilter/af_dynaudnorm.c @@ -74,6 +74,8 @@ typedef struct DynamicAudioNormalizerContext { cqueue **gain_history_original; cqueue **gain_history_minimum; cqueue **gain_history_smoothed; + + cqueue *is_enabled; } DynamicAudioNormalizerContext; #define OFFSET(x) offsetof(DynamicAudioNormalizerContext, x) @@ -282,6 +284,9 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->gain_history_minimum); av_freep(&s->gain_history_smoothed); + cqueue_free(s->is_enabled); + s->is_enabled = NULL; + av_freep(&s->weights); ff_bufqueue_discard_all(&s->queue); @@ -308,10 +313,11 @@ static int config_input(AVFilterLink *inlink) s->gain_history_minimum = av_calloc(inlink->channels, sizeof(*s->gain_history_minimum)); s->gain_history_smoothed = av_calloc(inlink->channels, sizeof(*s->gain_history_smoothed)); s->weights = av_malloc_array(s->filter_size, sizeof(*s->weights)); + s->is_enabled = cqueue_create(s->filter_size); if (!s->prev_amplification_factor || !s->dc_correction_value || !s->compress_threshold || !s->fade_factors[0] || !s->fade_factors[1] || !s->gain_history_original || !s->gain_history_minimum || - !s->gain_history_smoothed || !s->weights) + !s->gain_history_smoothed || !s->is_enabled || !s->weights) return AVERROR(ENOMEM); for (c = 0; c < inlink->channels; c++) { @@ -631,7 +637,7 @@ static void analyze_frame(DynamicAudioNormalizerContext *s, AVFrame *frame) } } -static void amplify_frame(DynamicAudioNormalizerContext *s, AVFrame *frame) +static void amplify_frame(DynamicAudioNormalizerContext *s, AVFrame *frame, int enabled) { int c, i; @@ -641,7 +647,7 @@ static void amplify_frame(DynamicAudioNormalizerContext *s, AVFrame *frame) cqueue_dequeue(s->gain_history_smoothed[c], &current_amplification_factor); - for (i = 0; i < frame->nb_samples; i++) { + for (i = 0; i < frame->nb_samples && enabled; i++) { const double amplification_factor = fade(s->prev_amplification_factor[c], current_amplification_factor, i, s->fade_factors); @@ -664,13 +670,17 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) int ret = 1; if (!cqueue_empty(s->gain_history_smoothed[0])) { + double is_enabled; AVFrame *out = ff_bufqueue_get(&s->queue); - amplify_frame(s, out); + cqueue_dequeue(s->is_enabled, &is_enabled); + + amplify_frame(s, out, is_enabled > 0.); ret = ff_filter_frame(outlink, out); } av_frame_make_writable(in); + cqueue_enqueue(s->is_enabled, !ctx->is_disabled); analyze_frame(s, in); ff_bufqueue_add(ctx, &s->queue, in); @@ -795,4 +805,5 @@ AVFilter ff_af_dynaudnorm = { .inputs = avfilter_af_dynaudnorm_inputs, .outputs = avfilter_af_dynaudnorm_outputs, .priv_class = &dynaudnorm_class, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, };

1 0

avfilter/af_dynaudnorm: always update delay when flushing
by Paul B Mahol 30 Apr '19

30 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Apr 30 10:05:23 2019 +0200| [c82d81ba4217d41bbe54bf738a014c6379398e95] | committer: Paul B Mahol avfilter/af_dynaudnorm: always update delay when flushing > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c82d81ba4217d41bb… --- libavfilter/af_dynaudnorm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c index 6f6541cc49..7c87ebce27 100644 --- a/libavfilter/af_dynaudnorm.c +++ b/libavfilter/af_dynaudnorm.c @@ -715,6 +715,7 @@ static int flush(AVFilterLink *outlink) s->pts = out->pts; ret = ff_filter_frame(outlink, out); + s->delay = s->queue.available; } return ret;

1 0

avfilter/vf_normalize: add timeline support
by Paul B Mahol 29 Apr '19

29 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Apr 29 23:28:40 2019 +0200| [ac551c54b13834f1ddf2b0f2196d6c8d817c4fcd] | committer: Paul B Mahol avfilter/vf_normalize: add timeline support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac551c54b13834f1d… --- libavfilter/vf_normalize.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_normalize.c b/libavfilter/vf_normalize.c index 5c1fe98c60..b95bb4d100 100644 --- a/libavfilter/vf_normalize.c +++ b/libavfilter/vf_normalize.c @@ -383,4 +383,5 @@ AVFilter ff_vf_normalize = { .query_formats = query_formats, .inputs = inputs, .outputs = outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, };

1 0