August 2015 - ffmpeg-cvslog - lists.ffmpeg.org

aacenc_tns: do not limit the filter size
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Sat Aug 29 21:59:38 2015 +0100| [21bfeec27f933e18e7aac52ec025831353f47430] | committer: Rostislav Pehlivanov aacenc_tns: do not limit the filter size This was copied from the decoder, but is unneeded for the encoder. tns_max_bands is unused and set to zero which zeroed out start, end and size and thus no filter was actually applied. Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21bfeec27f933e18e… --- libavcodec/aacenc_tns.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index cf75b8a..d4d10e6 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -119,7 +119,6 @@ static void process_tns_coeffs(TemporalNoiseShaping *tns, double *coef_raw, /* Apply TNS filter */ void ff_aac_apply_tns(SingleChannelElement *sce) { - const int mmm = FFMIN(sce->ics.tns_max_bands, sce->ics.max_sfb); float *coef = sce->pcoeffs; TemporalNoiseShaping *tns = &sce->tns; int w, filt, m, i; @@ -136,8 +135,8 @@ void ff_aac_apply_tns(SingleChannelElement *sce) if (!order) continue; - start = sce->ics.swb_offset[FFMIN(bottom, mmm)]; - end = sce->ics.swb_offset[FFMIN( top, mmm)]; + start = sce->ics.swb_offset[bottom]; + end = sce->ics.swb_offset[top]; if ((size = end - start) <= 0) continue; if (tns->direction[w][filt]) {

1 0

lpc: rename ff_lpc_calc_levinsion to ff_lpc_calc_levinson
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Sat Aug 29 19:29:18 2015 +0100| [141d80ded77957eefababca52bee9dd05e3e1ba6] | committer: Rostislav Pehlivanov lpc: rename ff_lpc_calc_levinsion to ff_lpc_calc_levinson Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=141d80ded77957eef… --- libavcodec/aacenc_tns.c | 4 ++-- libavcodec/lpc.c | 6 +++--- libavcodec/lpc.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index a7433a8..cf75b8a 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -210,8 +210,8 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) coef_len = 1024 - coef_start; /* LPC */ - order = ff_lpc_calc_levinsion(&s->lpc, &sce->coeffs[coef_start], coef_len, - coefs, 0, tns_max_order, ORDER_METHOD_LOG); + order = ff_lpc_calc_levinson(&s->lpc, &sce->coeffs[coef_start], coef_len, + coefs, 0, tns_max_order, ORDER_METHOD_LOG); if (energy > threshold) { int direction = 0; diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 6699eb8..02ab61c 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -277,9 +277,9 @@ int ff_lpc_calc_coefs(LPCContext *s, * @param lpc_type LPC method for determining coefficients, * see #FFLPCType for details */ -int ff_lpc_calc_levinsion(LPCContext *s, const float *samples, int len, - double lpc[][MAX_LPC_ORDER], int min_order, - int max_order, int omethod) +int ff_lpc_calc_levinson(LPCContext *s, const float *samples, int len, + double lpc[][MAX_LPC_ORDER], int min_order, + int max_order, int omethod) { double ref[MAX_LPC_ORDER] = { 0 }; double autoc[MAX_LPC_ORDER+1]; diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h index ec59cea..00c8d96 100644 --- a/libavcodec/lpc.h +++ b/libavcodec/lpc.h @@ -100,9 +100,9 @@ int ff_lpc_calc_coefs(LPCContext *s, int ff_lpc_calc_ref_coefs(LPCContext *s, const int32_t *samples, int order, double *ref); -int ff_lpc_calc_levinsion(LPCContext *s, const float *samples, int len, - double lpc[][MAX_LPC_ORDER], int min_order, - int max_order, int omethod); +int ff_lpc_calc_levinson(LPCContext *s, const float *samples, int len, + double lpc[][MAX_LPC_ORDER], int min_order, + int max_order, int omethod); /** * Initialize LPCContext.

1 0

aacenc_tns: fix out-of-bounds array access
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Sat Aug 29 19:21:35 2015 +0100| [e924967fd5ec240cf97022f054cb02a0bc7101d9] | committer: Rostislav Pehlivanov aacenc_tns: fix out-of-bounds array access Since the coefficients are stepped up to order + 1 it was possible that it went over TNS_MAX_ORDER. Also just return in case the only coefficient is less than the threshold. Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e924967fd5ec240cf… --- libavcodec/aacenc_tns.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index 0b22b67..a7433a8 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -97,6 +97,10 @@ static void process_tns_coeffs(TemporalNoiseShaping *tns, double *coef_raw, break; } } + order = av_clip(order, 0, TNS_MAX_ORDER - 1); + *order_p = order; + if (!order) + return; /* Step up procedure, convert to LPC coeffs */ out[0] = 1.0f; @@ -109,7 +113,6 @@ static void process_tns_coeffs(TemporalNoiseShaping *tns, double *coef_raw, } out[i] = lpc[i-1]; } - *order_p = order; memcpy(lpc, out, TNS_MAX_ORDER*sizeof(float)); }

1 0

aacenc_tns: actually apply TNS filter to the coefficients
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Sat Aug 29 19:18:18 2015 +0100| [902ac9ca74d5d39752f9cf42e9432d5a910e9650] | committer: Rostislav Pehlivanov aacenc_tns: actually apply TNS filter to the coefficients The encoder-side filter isn't that important. The PSNR shouldn't change so the FATE test should still be fine. Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=902ac9ca74d5d3975… --- libavcodec/aacenc_tns.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index 5e02c4f..0b22b67 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -123,8 +123,6 @@ void ff_aac_apply_tns(SingleChannelElement *sce) int bottom, top, order, start, end, size, inc; float *lpc, tmp[TNS_MAX_ORDER+1]; - return; - for (w = 0; w < sce->ics.num_windows; w++) { bottom = sce->ics.num_swb; for (filt = 0; filt < tns->n_filt[w]; filt++) {

1 0

aacenc: initialize LPC context with MAX_LPC_ORDER
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Sat Aug 29 19:15:52 2015 +0100| [49854c56c2346a7e82ccb6b6e19fa2d2c159d4b9] | committer: Rostislav Pehlivanov aacenc: initialize LPC context with MAX_LPC_ORDER The order should never go above TNS_MAX_ORDER (and thus cause the context to be reinitialized) but this is just in case. Also fix a comparison, since the coefficients are zero-indexed. Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49854c56c2346a7e8… --- libavcodec/aacenc.c | 2 +- libavcodec/aacenc_tns.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 09dd0dd..a32f0d4 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -822,7 +822,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) goto fail; s->psypp = ff_psy_preprocess_init(avctx); s->coder = &ff_aac_coders[s->options.aac_coder]; - ff_lpc_init(&s->lpc, avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON); + ff_lpc_init(&s->lpc, avctx->frame_size, MAX_LPC_ORDER, FF_LPC_TYPE_LEVINSON); if (HAVE_MIPSDSPR1) ff_aac_coder_init_mips(s); diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index e948b32..5e02c4f 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -205,7 +205,7 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) if (sfb_len <= 0 || coef_len <= 0) continue; - if (coef_start + coef_len > 1024) + if (coef_start + coef_len >= 1024) coef_len = 1024 - coef_start; /* LPC */

1 0

aacenc_tns: fix triggering an assertion with assert-level=2
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Sat Aug 29 19:01:59 2015 +0100| [0818705bf37e2c62de1947f1c06ad63262e51fc6] | committer: Rostislav Pehlivanov aacenc_tns: fix triggering an assertion with assert-level=2 It also made no sense to actually make the filter span the entire window including the first band of the next window. Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0818705bf37e2c62d… --- libavcodec/aacenc_tns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index 912229e..e948b32 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -173,7 +173,7 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) const int is8 = sce->ics.window_sequence[0] == EIGHT_SHORT_SEQUENCE; const int tns_max_order = is8 ? 7 : s->profile == FF_PROFILE_AAC_LOW ? 12 : TNS_MAX_ORDER; - for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) { + for (w = 0; w < sce->ics.num_windows; w++) { int order = 0, filters = 1; int sfb_start = 0, sfb_len = 0; int coef_start = 0, coef_len = 0; @@ -197,7 +197,7 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) threshold += band->threshold; } if (!sfb_len) { - sfb_len = (w+sce->ics.group_len[w])*16+g - sfb_start; + sfb_len = (w+1)*16+g - sfb_start - 1; coef_len = sce->ics.swb_offset[sfb_start + sfb_len] - coef_start; } }

1 0

avfilter/af_apad: use the name 's' for the pointer to the private context
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Wed Aug 26 13:03:32 2015 -0400| [47b41feb7283dcb4622dc0ada8056cb9a2de0f53] | committer: Paul B Mahol avfilter/af_apad: use the name 's' for the pointer to the private context Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47b41feb7283dcb46… --- libavfilter/af_apad.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c index eafc705..0a2d420 100644 --- a/libavfilter/af_apad.c +++ b/libavfilter/af_apad.c @@ -57,15 +57,15 @@ AVFILTER_DEFINE_CLASS(apad); static av_cold int init(AVFilterContext *ctx) { - APadContext *apad = ctx->priv; + APadContext *s = ctx->priv; - apad->next_pts = AV_NOPTS_VALUE; - if (apad->whole_len >= 0 && apad->pad_len >= 0) { + s->next_pts = AV_NOPTS_VALUE; + if (s->whole_len >= 0 && s->pad_len >= 0) { av_log(ctx, AV_LOG_ERROR, "Both whole and pad length are set, this is not possible\n"); return AVERROR(EINVAL); } - apad->pad_len_left = apad->pad_len; - apad->whole_len_left = apad->whole_len; + s->pad_len_left = s->pad_len; + s->whole_len_left = s->whole_len; return 0; } @@ -73,38 +73,38 @@ static av_cold int init(AVFilterContext *ctx) static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; - APadContext *apad = ctx->priv; + APadContext *s = ctx->priv; - if (apad->whole_len >= 0) { - apad->whole_len_left = FFMAX(apad->whole_len_left - frame->nb_samples, 0); + if (s->whole_len >= 0) { + s->whole_len_left = FFMAX(s->whole_len_left - frame->nb_samples, 0); av_log(ctx, AV_LOG_DEBUG, - "n_out:%d whole_len_left:%"PRId64"\n", frame->nb_samples, apad->whole_len_left); + "n_out:%d whole_len_left:%"PRId64"\n", frame->nb_samples, s->whole_len_left); } - apad->next_pts = frame->pts + av_rescale_q(frame->nb_samples, (AVRational){1, inlink->sample_rate}, inlink->time_base); + s->next_pts = frame->pts + av_rescale_q(frame->nb_samples, (AVRational){1, inlink->sample_rate}, inlink->time_base); return ff_filter_frame(ctx->outputs[0], frame); } static int request_frame(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; - APadContext *apad = ctx->priv; + APadContext *s = ctx->priv; int ret; ret = ff_request_frame(ctx->inputs[0]); if (ret == AVERROR_EOF && !ctx->is_disabled) { - int n_out = apad->packet_size; + int n_out = s->packet_size; AVFrame *outsamplesref; - if (apad->whole_len >= 0 && apad->pad_len < 0) { - apad->pad_len = apad->pad_len_left = apad->whole_len_left; + if (s->whole_len >= 0 && s->pad_len < 0) { + s->pad_len = s->pad_len_left = s->whole_len_left; } - if (apad->pad_len >=0 || apad->whole_len >= 0) { - n_out = FFMIN(n_out, apad->pad_len_left); - apad->pad_len_left -= n_out; + if (s->pad_len >=0 || s->whole_len >= 0) { + n_out = FFMIN(n_out, s->pad_len_left); + s->pad_len_left -= n_out; av_log(ctx, AV_LOG_DEBUG, - "padding n_out:%d pad_len_left:%"PRId64"\n", n_out, apad->pad_len_left); + "padding n_out:%d pad_len_left:%"PRId64"\n", n_out, s->pad_len_left); } if (!n_out) @@ -122,9 +122,9 @@ static int request_frame(AVFilterLink *outlink) av_frame_get_channels(outsamplesref), outsamplesref->format); - outsamplesref->pts = apad->next_pts; - if (apad->next_pts != AV_NOPTS_VALUE) - apad->next_pts += av_rescale_q(n_out, (AVRational){1, outlink->sample_rate}, outlink->time_base); + outsamplesref->pts = s->next_pts; + if (s->next_pts != AV_NOPTS_VALUE) + s->next_pts += av_rescale_q(n_out, (AVRational){1, outlink->sample_rate}, outlink->time_base); return ff_filter_frame(outlink, outsamplesref); }

1 0

avfilter/vf_vectorscope: add yet another mode
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Aug 29 13:40:25 2015 +0000| [16229fae9c0da763061c679e766e9c66dd478b02] | committer: Paul B Mahol avfilter/vf_vectorscope: add yet another mode Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16229fae9c0da7630… --- doc/filters.texi | 5 +++++ libavfilter/vf_vectorscope.c | 25 ++++++++++++++++++++++++- tests/fate/filter-video.mak | 3 +++ tests/ref/fate/filter-vectorscope_color4 | 4 ++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index c9ac107..3b5f817 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10587,6 +10587,11 @@ Actual color components values present in video frame are displayed on graph. Similar as color2 but higher frequency of same values @code{x} and @code{y} on graph increases value of another color component, which is luminance by default values of @code{x} and @code{y}. + +@item color4 +Actual colors present in video frame are displayed on graph. If two different +colors map to same position on graph then color with higher value of component +not present in graph is picked. @end table @item x diff --git a/libavfilter/vf_vectorscope.c b/libavfilter/vf_vectorscope.c index dbcf675..88d69b7 100644 --- a/libavfilter/vf_vectorscope.c +++ b/libavfilter/vf_vectorscope.c @@ -32,6 +32,7 @@ enum VectorscopeMode { COLOR, COLOR2, COLOR3, + COLOR4, MODE_NB }; @@ -56,6 +57,7 @@ static const AVOption vectorscope_options[] = { { "color", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR}, 0, 0, FLAGS, "mode" }, { "color2", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR2}, 0, 0, FLAGS, "mode" }, { "color3", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR3}, 0, 0, FLAGS, "mode" }, + { "color4", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR4}, 0, 0, FLAGS, "mode" }, { "x", "set color component on X axis", OFFSET(x), AV_OPT_TYPE_INT, {.i64=1}, 0, 2, FLAGS}, { "y", "set color component on Y axis", OFFSET(y), AV_OPT_TYPE_INT, {.i64=2}, 0, 2, FLAGS}, { "intensity", "set intensity", OFFSET(intensity), AV_OPT_TYPE_INT, {.i64=1}, 1, 255, FLAGS}, @@ -107,7 +109,8 @@ static int query_formats(AVFilterContext *ctx) if (!ctx->inputs[0]->out_formats) { const enum AVPixelFormat *in_pix_fmts; - if ((s->x == 1 && s->y == 2) || (s->x == 2 && s->y == 1)) + if (((s->x == 1 && s->y == 2) || (s->x == 2 && s->y == 1)) && + (s->mode != COLOR4)) in_pix_fmts = in2_pix_fmts; else in_pix_fmts = in1_pix_fmts; @@ -185,6 +188,7 @@ static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd const uint8_t * const *src = (const uint8_t * const *)in->data; const int slinesizex = in->linesize[s->x]; const int slinesizey = in->linesize[s->y]; + const int slinesized = in->linesize[pd]; const int dlinesize = out->linesize[0]; const int intensity = s->intensity; int i, j, px = s->x, py = s->y; @@ -192,6 +196,7 @@ static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd const int w = s->planewidth[px]; const uint8_t *spx = src[px]; const uint8_t *spy = src[py]; + const uint8_t *spd = src[pd]; uint8_t **dst = out->data; uint8_t *dpx = dst[px]; uint8_t *dpy = dst[py]; @@ -296,6 +301,24 @@ static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd } } break; + case COLOR4: + for (i = 0; i < h; i++) { + const int iwx = i * slinesizex; + const int iwy = i * slinesizey; + const int iwd = i * slinesized; + for (j = 0; j < w; j++) { + const int x = spx[iwx + j]; + const int y = spy[iwy + j]; + const int pos = y * dlinesize + x; + + dpd[pos] = FFMAX(spd[iwd + j], dpd[pos]); + dpx[pos] = x; + dpy[pos] = y; + if (dst[3]) + dst[3][pos] = 255; + } + } + break; default: av_assert0(0); } diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 5bd5c98..c208d04 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -135,6 +135,9 @@ fate-filter-vectorscope_color2: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectors FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color3 fate-filter-vectorscope_color3: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color3 -sws_flags +accurate_rnd+bitexact -vframes 3 +FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color4 +fate-filter-vectorscope_color4: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color4 -sws_flags +accurate_rnd+bitexact -vframes 3 + FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_xy fate-filter-vectorscope_xy: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=x=0:y=1 -sws_flags +accurate_rnd+bitexact -vframes 3 diff --git a/tests/ref/fate/filter-vectorscope_color4 b/tests/ref/fate/filter-vectorscope_color4 new file mode 100644 index 0000000..137c189 --- /dev/null +++ b/tests/ref/fate/filter-vectorscope_color4 @@ -0,0 +1,4 @@ +#tb 0: 1/25 +0, 0, 0, 1, 196608, 0xb6d22af1 +0, 1, 1, 1, 196608, 0xd7c6f971 +0, 2, 2, 1, 196608, 0xfe729faa

1 0

avfilter: add allrgb
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Clément Bœsch <u(a)pkh.me> | Sun Aug 16 01:22:59 2015 +0200| [b48d8fa3ac38849eab53cf586467481b256b3a99] | committer: Clément Bœsch avfilter: add allrgb Signed-off-by: Nicolas George <george(a)nsup.org> Signed-off-by: Clément Bœsch <u(a)pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b48d8fa3ac38849ea… --- Changelog | 2 +- doc/filters.texi | 5 ++- libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vsrc_testsrc.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 89 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 70e0df7..d8c8a41 100644 --- a/Changelog +++ b/Changelog @@ -27,7 +27,7 @@ version <next>: - sidechaincompress audio filter - bitstream filter for converting HEVC from MP4 to Annex B - acrossfade audio filter -- allyuv video source +- allyuv and allrgb video sources - atadenoise video filter - OS X VideoToolbox support - aphasemeter filter diff --git a/doc/filters.texi b/doc/filters.texi index 5bef4b1..c9ac107 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11722,6 +11722,7 @@ ffplay -f lavfi life=s=300x200:mold=10:r=60:ratio=0.1:death_color=#C83232:life_c @end example @end itemize +@anchor{allrgb} @anchor{allyuv} @anchor{color} @anchor{haldclutsrc} @@ -11730,7 +11731,9 @@ ffplay -f lavfi life=s=300x200:mold=10:r=60:ratio=0.1:death_color=#C83232:life_c @anchor{smptebars} @anchor{smptehdbars} @anchor{testsrc} -@section allyuv, color, haldclutsrc, nullsrc, rgbtestsrc, smptebars, smptehdbars, testsrc +@section allrgb, allyuv, color, haldclutsrc, nullsrc, rgbtestsrc, smptebars, smptehdbars, testsrc + +The @code{allrgb} source returns frames of size 4096x4096 of all rgb colors. The @code{allyuv} source returns frames of size 4096x4096 of all yuv colors. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ac7412d..a2af794 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -241,6 +241,7 @@ OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o OBJS-$(CONFIG_ZMQ_FILTER) += f_zmq.o OBJS-$(CONFIG_ZOOMPAN_FILTER) += vf_zoompan.o +OBJS-$(CONFIG_ALLRGB_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_ALLYUV_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_CELLAUTO_FILTER) += vsrc_cellauto.o OBJS-$(CONFIG_COLOR_FILTER) += vsrc_testsrc.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9068e83..b7b3807 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -256,6 +256,7 @@ void avfilter_register_all(void) REGISTER_FILTER(ZMQ, zmq, vf); REGISTER_FILTER(ZOOMPAN, zoompan, vf); + REGISTER_FILTER(ALLRGB, allrgb, vsrc); REGISTER_FILTER(ALLYUV, allyuv, vsrc); REGISTER_FILTER(CELLAUTO, cellauto, vsrc); REGISTER_FILTER(COLOR, color, vsrc); diff --git a/libavfilter/version.h b/libavfilter/version.h index 15eb540..93fc827 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 5 -#define LIBAVFILTER_VERSION_MINOR 39 +#define LIBAVFILTER_VERSION_MINOR 40 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 3493b0f..f63c861 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -1170,3 +1170,84 @@ AVFilter ff_vsrc_allyuv = { }; #endif /* CONFIG_ALLYUV_FILTER */ + +#if CONFIG_ALLRGB_FILTER + +static const AVOption allrgb_options[] = { + COMMON_OPTIONS_NOSIZE + { NULL } +}; + +AVFILTER_DEFINE_CLASS(allrgb); + +static void allrgb_fill_picture(AVFilterContext *ctx, AVFrame *frame) +{ + unsigned x, y; + const int linesize = frame->linesize[0]; + uint8_t *line = frame->data[0]; + + for (y = 0; y < 4096; y++) { + uint8_t *dst = line; + + for (x = 0; x < 4096; x++) { + *dst++ = x; + *dst++ = y; + *dst++ = (x >> 8) | ((y >> 8) << 4); + } + line += linesize; + } +} + +static av_cold int allrgb_init(AVFilterContext *ctx) +{ + TestSourceContext *test = ctx->priv; + + test->w = test->h = 4096; + test->draw_once = 1; + test->fill_picture_fn = allrgb_fill_picture; + return init(ctx); +} + +static int allrgb_config_props(AVFilterLink *outlink) +{ + TestSourceContext *test = outlink->src->priv; + + ff_fill_rgba_map(test->rgba_map, outlink->format); + return config_props(outlink); +} + +static int allrgb_query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE + }; + + AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); + if (!fmts_list) + return AVERROR(ENOMEM); + return ff_set_common_formats(ctx, fmts_list); +} + +static const AVFilterPad avfilter_vsrc_allrgb_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .request_frame = request_frame, + .config_props = allrgb_config_props, + }, + { NULL } +}; + +AVFilter ff_vsrc_allrgb = { + .name = "allrgb", + .description = NULL_IF_CONFIG_SMALL("Generate all RGB colors."), + .priv_size = sizeof(TestSourceContext), + .priv_class = &allrgb_class, + .init = allrgb_init, + .uninit = uninit, + .query_formats = allrgb_query_formats, + .inputs = NULL, + .outputs = avfilter_vsrc_allrgb_outputs, +}; + +#endif /* CONFIG_ALLRGB_FILTER */

1 0

fate: adjust AAC encoder TNS test fuzziness
by git＠videolan.org 29 Aug '15

29 Aug '15

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Sat Aug 29 09:26:05 2015 +0100| [8323d9b8afbc0755120cbded0e0259b2ba23977c] | committer: Rostislav Pehlivanov fate: adjust AAC encoder TNS test fuzziness Tests fails on some ARM builds but it's close enough so it's okay. NEON, half-precision floats, rounding errors, who knows. Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8323d9b8afbc07551… --- tests/fate/aac.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index d04fcc2..8e0b66a 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -172,6 +172,7 @@ fate-aac-tns-encode: CMP = stddev fate-aac-tns-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-aac-tns-encode: CMP_SHIFT = -4096 fate-aac-tns-encode: CMP_TARGET = 646.19 +fate-aac-tns-encode: FUZZ = 1.8 fate-aac-tns-encode: SIZE_TOLERANCE = 3560 FATE_AAC_ENCODE += fate-aac-is-encode

1 0