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

ffmpeg: force 128k default audio bitrate if nothing is specified and there is no specific default
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Aug 18 03:27:52 2015 +0200| [628a73f8f3768513fa6152c98d54842cf2ae1aad] | committer: Michael Niedermayer ffmpeg: force 128k default audio bitrate if nothing is specified and there is no specific default This prevents breaking existing command lines in case the "ab" default is removed from libavcodec Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=628a73f8f3768513f… --- ffmpeg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index ae02b00..9f9170e 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2604,6 +2604,11 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len) if (!av_dict_get(ost->encoder_opts, "threads", NULL, 0)) av_dict_set(&ost->encoder_opts, "threads", "auto", 0); av_dict_set(&ost->encoder_opts, "side_data_only_packets", "1", 0); + if (ost->enc->type == AVMEDIA_TYPE_AUDIO && + !codec->defaults && + !av_dict_get(ost->encoder_opts, "b", NULL, 0) && + !av_dict_get(ost->encoder_opts, "ab", NULL, 0)) + av_dict_set(&ost->encoder_opts, "b", "128000", 0); if ((ret = avcodec_open2(ost->enc_ctx, codec, &ost->encoder_opts)) < 0) { if (ret == AVERROR_EXPERIMENTAL)

1 0

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

28 Aug '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Aug 20 15:14:27 2015 +0000| [777df1ff746ea8a264971956cb09f3e199342151] | committer: Paul B Mahol avfilter/vf_dejudder: use the name 's' for the pointer to the private context This is shorter and consistent across filters. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=777df1ff746ea8a26… --- libavfilter/vf_dejudder.c | 64 ++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/libavfilter/vf_dejudder.c b/libavfilter/vf_dejudder.c index ab525b6..c4d7b6b 100644 --- a/libavfilter/vf_dejudder.c +++ b/libavfilter/vf_dejudder.c @@ -80,40 +80,40 @@ AVFILTER_DEFINE_CLASS(dejudder); static int config_out_props(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; - DejudderContext *dj = ctx->priv; + DejudderContext *s = ctx->priv; AVFilterLink *inlink = outlink->src->inputs[0]; - outlink->time_base = av_mul_q(inlink->time_base, av_make_q(1, 2 * dj->cycle)); - outlink->frame_rate = av_mul_q(inlink->frame_rate, av_make_q(2 * dj->cycle, 1)); + outlink->time_base = av_mul_q(inlink->time_base, av_make_q(1, 2 * s->cycle)); + outlink->frame_rate = av_mul_q(inlink->frame_rate, av_make_q(2 * s->cycle, 1)); - av_log(ctx, AV_LOG_VERBOSE, "cycle:%d\n", dj->cycle); + av_log(ctx, AV_LOG_VERBOSE, "cycle:%d\n", s->cycle); return 0; } static av_cold int dejudder_init(AVFilterContext *ctx) { - DejudderContext *dj = ctx->priv; + DejudderContext *s = ctx->priv; - dj->ringbuff = av_mallocz_array(dj->cycle+2, sizeof(*dj->ringbuff)); - if (!dj->ringbuff) + s->ringbuff = av_mallocz_array(s->cycle+2, sizeof(*s->ringbuff)); + if (!s->ringbuff) return AVERROR(ENOMEM); - dj->new_pts = 0; - dj->i1 = 0; - dj->i2 = 1; - dj->i3 = 2; - dj->i4 = 3; - dj->start_count = dj->cycle + 2; + s->new_pts = 0; + s->i1 = 0; + s->i2 = 1; + s->i3 = 2; + s->i4 = 3; + s->start_count = s->cycle + 2; return 0; } static av_cold void dejudder_uninit(AVFilterContext *ctx) { - DejudderContext *dj = ctx->priv; + DejudderContext *s = ctx->priv; - av_freep(&(dj->ringbuff)); + av_freep(&(s->ringbuff)); } static int filter_frame(AVFilterLink *inlink, AVFrame *frame) @@ -121,36 +121,36 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) int k; AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; - DejudderContext *dj = ctx->priv; - int64_t *judbuff = dj->ringbuff; + DejudderContext *s = ctx->priv; + int64_t *judbuff = s->ringbuff; int64_t next_pts = frame->pts; int64_t offset; if (next_pts == AV_NOPTS_VALUE) return ff_filter_frame(outlink, frame); - if (dj->start_count) { - dj->start_count--; - dj->new_pts = next_pts * 2 * dj->cycle; + if (s->start_count) { + s->start_count--; + s->new_pts = next_pts * 2 * s->cycle; } else { - if (next_pts < judbuff[dj->i2]) { - offset = next_pts + judbuff[dj->i3] - judbuff[dj->i4] - judbuff[dj->i1]; - for (k = 0; k < dj->cycle + 2; k++) + if (next_pts < judbuff[s->i2]) { + offset = next_pts + judbuff[s->i3] - judbuff[s->i4] - judbuff[s->i1]; + for (k = 0; k < s->cycle + 2; k++) judbuff[k] += offset; } - dj->new_pts += (dj->cycle - 1) * (judbuff[dj->i3] - judbuff[dj->i1]) - + (dj->cycle + 1) * (next_pts - judbuff[dj->i4]); + s->new_pts += (s->cycle - 1) * (judbuff[s->i3] - judbuff[s->i1]) + + (s->cycle + 1) * (next_pts - judbuff[s->i4]); } - judbuff[dj->i2] = next_pts; - dj->i1 = dj->i2; - dj->i2 = dj->i3; - dj->i3 = dj->i4; - dj->i4 = (dj->i4 + 1) % (dj->cycle + 2); + judbuff[s->i2] = next_pts; + s->i1 = s->i2; + s->i2 = s->i3; + s->i3 = s->i4; + s->i4 = (s->i4 + 1) % (s->cycle + 2); - frame->pts = dj->new_pts; + frame->pts = s->new_pts; - for (k = 0; k < dj->cycle + 2; k++) + for (k = 0; k < s->cycle + 2; k++) av_log(ctx, AV_LOG_DEBUG, "%"PRId64"\t", judbuff[k]); av_log(ctx, AV_LOG_DEBUG, "next=%"PRId64", new=%"PRId64"\n", next_pts, frame->pts);

1 0

ffserver: use -b instead of -ab for setting audio bitrate.
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Tue Aug 18 08:19:26 2015 -0400| [7e12a54251148f8d2756161bcf09f631a6c144db] | committer: Ronald S. Bultje ffserver: use -b instead of -ab for setting audio bitrate. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e12a54251148f8d2… --- ffserver_config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffserver_config.c b/ffserver_config.c index 06bd8ac..de8a454 100644 --- a/ffserver_config.c +++ b/ffserver_config.c @@ -230,9 +230,9 @@ static void add_codec(FFServerStream *stream, AVCodecContext *av, /* compute default parameters */ switch(av->codec_type) { case AVMEDIA_TYPE_AUDIO: - if (!av_dict_get(recommended, "ab", NULL, 0)) { + if (!av_dict_get(recommended, "b", NULL, 0)) { av->bit_rate = 64000; - av_dict_set_int(&recommended, "ab", av->bit_rate, 0); + av_dict_set_int(&recommended, "b", av->bit_rate, 0); WARNING("Setting default value for audio bit rate = %d. " "Use NoDefaults to disable it.\n", av->bit_rate); @@ -923,7 +923,7 @@ static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd, ffserver_get_arg(arg, sizeof(arg), p); ffserver_set_float_param(&f, arg, 1000, -FLT_MAX, FLT_MAX, config, "Invalid %s: '%s'\n", cmd, arg); - if (ffserver_save_avoption_int("ab", (int64_t)lrintf(f), + if (ffserver_save_avoption_int("b", (int64_t)lrintf(f), AV_OPT_FLAG_AUDIO_PARAM, config) < 0) goto nomem; } else if (!av_strcasecmp(cmd, "AudioChannels")) {

1 0

Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Mon Aug 17 12:25:39 2015 -0400| [2fb593dcb90c157a183e9e01e42405fcca73a8b8] | committer: Ronald S. Bultje Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE. The amv one probably looks suspicious, but since it's an intra-only codec, I couldn't possibly imagine what it would use the edge for, and the vsynth fate result doesn't change, so it's probably OK. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fb593dcb90c157a1… --- ffmpeg_opt.c | 2 ++ ffplay.c | 4 ++++ libavcodec/mjpegenc.c | 2 ++ libavcodec/snowenc.c | 6 +++++- libavcodec/wmv2dec.c | 2 ++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index c5e6624..42d2327 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -674,9 +674,11 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) case AVMEDIA_TYPE_VIDEO: if(!ist->dec) ist->dec = avcodec_find_decoder(dec->codec_id); +#if FF_API_EMU_EDGE if (av_codec_get_lowres(dec)) { dec->flags |= CODEC_FLAG_EMU_EDGE; } +#endif ist->resample_height = ist->dec_ctx->height; ist->resample_width = ist->dec_ctx->width; diff --git a/ffplay.c b/ffplay.c index d0e1822..74458fd 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2577,11 +2577,15 @@ static int stream_component_open(VideoState *is, int stream_index) } av_codec_set_lowres(avctx, stream_lowres); +#if FF_API_EMU_EDGE if(stream_lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE; +#endif if (fast) avctx->flags2 |= AV_CODEC_FLAG2_FAST; +#if FF_API_EMU_EDGE if(codec->capabilities & AV_CODEC_CAP_DR1) avctx->flags |= CODEC_FLAG_EMU_EDGE; +#endif opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec); if (!av_dict_get(opts, "threads", NULL, 0)) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index ee0b16e..f15de58 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -224,9 +224,11 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift); +#if FF_API_EMU_EDGE //CODEC_FLAG_EMU_EDGE have to be cleared if(s->avctx->flags & CODEC_FLAG_EMU_EDGE) return AVERROR(EINVAL); +#endif if ((avctx->height & 15) && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { av_log(avctx, AV_LOG_ERROR, diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index beb25c1..9b5a488 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1610,7 +1610,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->lambda = 0; }//else keep previous frame's qlog until after motion estimation - if (s->current_picture->data[0] && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE)) { + if (s->current_picture->data[0] +#if FF_API_EMU_EDGE + && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE) +#endif + ) { int w = s->avctx->width; int h = s->avctx->height; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index f8128dc..cd17358 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -453,7 +453,9 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) Wmv2Context *const w = avctx->priv_data; int ret; +#if FF_API_EMU_EDGE avctx->flags |= CODEC_FLAG_EMU_EDGE; +#endif if ((ret = ff_msmpeg4_decode_init(avctx)) < 0) return ret;

1 0

Changelog: Add VDPAU HEVC to the list
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Philip Langdale <philipl(a)overt.org> | Fri Aug 28 08:15:57 2015 -0700| [1e50f953fac7fb3af907a24f9fc301fa80f441b4] | committer: Philip Langdale Changelog: Add VDPAU HEVC to the list Signed-off-by: Philip Langdale <philipl(a)overt.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e50f953fac7fb3af… --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 699f72c..70e0df7 100644 --- a/Changelog +++ b/Changelog @@ -37,6 +37,7 @@ version <next>: - hstack and vstack filter - Support DNx100 (1440x1080@8) - VAAPI hevc hwaccel +- VDPAU hevc hwaccel - framerate filter - Switched default encoders for webm to VP9 and Opus

1 0

avfilter/vf_histogram: 9 and 10 bit depth support
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Aug 25 18:02:42 2015 +0000| [9f2fa95bd8e85aab31dcb24977081eff15d92359] | committer: Paul B Mahol avfilter/vf_histogram: 9 and 10 bit depth support Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f2fa95bd8e85aab3… --- libavfilter/vf_histogram.c | 136 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 106 insertions(+), 30 deletions(-) diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index a712509..e9df420 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -22,6 +22,8 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" +#include "libavutil/imgutils.h" +#include "libavutil/intreadwrite.h" #include "avfilter.h" #include "formats.h" #include "internal.h" @@ -38,7 +40,9 @@ enum HistogramMode { typedef struct HistogramContext { const AVClass *class; ///< AVClass context for log and options purpose int mode; ///< HistogramMode - unsigned histogram[256]; + unsigned histogram[256*256]; + int histogram_size; + int mult; int ncomp; const uint8_t *bg_color; const uint8_t *fg_color; @@ -94,21 +98,46 @@ static const enum AVPixelFormat levels_in_pix_fmts[] = { AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9, + AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, + AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP, + AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; -static const enum AVPixelFormat levels_out_yuv_pix_fmts[] = { +static const enum AVPixelFormat levels_out_yuv8_pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }; -static const enum AVPixelFormat levels_out_rgb_pix_fmts[] = { +static const enum AVPixelFormat levels_out_yuv9_pix_fmts[] = { + AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUV444P9, + AV_PIX_FMT_NONE +}; + +static const enum AVPixelFormat levels_out_yuv10_pix_fmts[] = { + AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_NONE +}; + +static const enum AVPixelFormat levels_out_rgb8_pix_fmts[] = { AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE }; +static const enum AVPixelFormat levels_out_rgb9_pix_fmts[] = { + AV_PIX_FMT_GBRP9, + AV_PIX_FMT_NONE +}; + +static const enum AVPixelFormat levels_out_rgb10_pix_fmts[] = { + AV_PIX_FMT_GBRP10, + AV_PIX_FMT_NONE +}; + static const enum AVPixelFormat waveform_pix_fmts[] = { AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, @@ -136,7 +165,7 @@ static int query_formats(AVFilterContext *ctx) AVFilterFormats *avff; const AVPixFmtDescriptor *desc; const enum AVPixelFormat *out_pix_fmts; - int rgb, i; + int rgb, i, bits; if (!ctx->inputs[0]->in_formats || !ctx->inputs[0]->in_formats->nb_formats) { @@ -148,16 +177,26 @@ static int query_formats(AVFilterContext *ctx) avff = ctx->inputs[0]->in_formats; desc = av_pix_fmt_desc_get(avff->formats[0]); rgb = desc->flags & AV_PIX_FMT_FLAG_RGB; + bits = desc->comp[0].depth_minus1; for (i = 1; i < avff->nb_formats; i++) { desc = av_pix_fmt_desc_get(avff->formats[i]); - if (rgb != (desc->flags & AV_PIX_FMT_FLAG_RGB)) + if ((rgb != desc->flags & AV_PIX_FMT_FLAG_RGB) || + (bits != desc->comp[0].depth_minus1)) return AVERROR(EAGAIN); } - if (rgb) - out_pix_fmts = levels_out_rgb_pix_fmts; - else - out_pix_fmts = levels_out_yuv_pix_fmts; + if (rgb && bits == 7) + out_pix_fmts = levels_out_rgb8_pix_fmts; + else if (rgb && bits == 8) + out_pix_fmts = levels_out_rgb9_pix_fmts; + else if (rgb && bits == 9) + out_pix_fmts = levels_out_rgb10_pix_fmts; + else if (bits == 7) + out_pix_fmts = levels_out_yuv8_pix_fmts; + else if (bits == 8) + out_pix_fmts = levels_out_yuv9_pix_fmts; + else // if (bits == 9) + out_pix_fmts = levels_out_yuv10_pix_fmts; ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats); return 0; @@ -188,8 +227,12 @@ static int config_input(AVFilterLink *inlink) h->desc = av_pix_fmt_desc_get(inlink->format); h->ncomp = h->desc->nb_components; + h->histogram_size = 1 << (h->desc->comp[0].depth_minus1 + 1); + h->mult = h->histogram_size / 256; switch (inlink->format) { + case AV_PIX_FMT_GBRP10: + case AV_PIX_FMT_GBRP9: case AV_PIX_FMT_GBRAP: case AV_PIX_FMT_GBRP: h->bg_color = black_gbrp_color; @@ -220,7 +263,7 @@ static int config_output(AVFilterLink *outlink) if ((1 << i) & h->components) ncomp++; } - outlink->w = 256; + outlink->w = h->histogram_size; outlink->h = (h->level_height + h->scale_height) * FFMAX(ncomp * h->display_mode, 1); break; case MODE_WAVEFORM: @@ -298,7 +341,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; AVFrame *out; - const uint8_t *src; uint8_t *dst; int i, j, k, l, m; @@ -314,10 +356,21 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const int is_chroma = (k == 1 || k == 2); const int dst_h = FF_CEIL_RSHIFT(outlink->h, (is_chroma ? h->odesc->log2_chroma_h : 0)); const int dst_w = FF_CEIL_RSHIFT(outlink->w, (is_chroma ? h->odesc->log2_chroma_w : 0)); - for (i = 0; i < dst_h ; i++) - memset(out->data[h->odesc->comp[k].plane] + - i * out->linesize[h->odesc->comp[k].plane], - h->bg_color[k], dst_w); + + if (h->histogram_size <= 256) { + for (i = 0; i < dst_h ; i++) + memset(out->data[h->odesc->comp[k].plane] + + i * out->linesize[h->odesc->comp[k].plane], + h->bg_color[k], dst_w); + } else { + const int mult = h->mult; + + for (i = 0; i < dst_h ; i++) + for (j = 0; j < dst_w; j++) + AV_WN16(out->data[h->odesc->comp[k].plane] + + i * out->linesize[h->odesc->comp[k].plane] + j * 2, + h->bg_color[k] * mult); + } } switch (h->mode) { @@ -326,21 +379,29 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const int p = h->desc->comp[k].plane; const int height = h->planeheight[p]; const int width = h->planewidth[p]; - int start; double max_hval_log; unsigned max_hval = 0; + int start; if (!((1 << k) & h->components)) continue; start = m++ * (h->level_height + h->scale_height) * h->display_mode; - for (i = 0; i < height; i++) { - src = in->data[p] + i * in->linesize[p]; - for (j = 0; j < width; j++) - h->histogram[src[j]]++; + if (h->histogram_size <= 256) { + for (i = 0; i < height; i++) { + const uint8_t *src = in->data[p] + i * in->linesize[p]; + for (j = 0; j < width; j++) + h->histogram[src[j]]++; + } + } else { + for (i = 0; i < height; i++) { + const uint16_t *src = (const uint16_t *)(in->data[p] + i * in->linesize[p]); + for (j = 0; j < width; j++) + h->histogram[src[j]]++; + } } - for (i = 0; i < 256; i++) + for (i = 0; i < h->histogram_size; i++) max_hval = FFMAX(max_hval, h->histogram[i]); max_hval_log = log2(max_hval + 1); @@ -352,19 +413,34 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) else col_height = h->level_height - (h->histogram[i] * (int64_t)h->level_height + max_hval - 1) / max_hval; - for (j = h->level_height - 1; j >= col_height; j--) { - if (h->display_mode) { - for (l = 0; l < h->ncomp; l++) - out->data[l][(j + start) * out->linesize[l] + i] = h->fg_color[l]; - } else { - out->data[p][(j + start) * out->linesize[p] + i] = 255; + if (h->histogram_size <= 256) { + for (j = h->level_height - 1; j >= col_height; j--) { + if (h->display_mode) { + for (l = 0; l < h->ncomp; l++) + out->data[l][(j + start) * out->linesize[l] + i] = h->fg_color[l]; + } else { + out->data[p][(j + start) * out->linesize[p] + i] = 255; + } + } + for (j = h->level_height + h->scale_height - 1; j >= h->level_height; j--) + out->data[p][(j + start) * out->linesize[p] + i] = i; + } else { + const int mult = h->mult; + + for (j = h->level_height - 1; j >= col_height; j--) { + if (h->display_mode) { + for (l = 0; l < h->ncomp; l++) + AV_WN16(out->data[l] + (j + start) * out->linesize[l] + i * 2, h->fg_color[l] * mult); + } else { + AV_WN16(out->data[p] + (j + start) * out->linesize[p] + i * 2, 255 * mult); + } } + for (j = h->level_height + h->scale_height - 1; j >= h->level_height; j--) + AV_WN16(out->data[p] + (j + start) * out->linesize[p] + i * 2, i); } - for (j = h->level_height + h->scale_height - 1; j >= h->level_height; j--) - out->data[p][(j + start) * out->linesize[p] + i] = i; } - memset(h->histogram, 0, 256 * sizeof(unsigned)); + memset(h->histogram, 0, h->histogram_size * sizeof(unsigned)); } break; case MODE_WAVEFORM:

1 0

doc/examples/filtering_video: better demo ffmpeg filters; demos chaining the filters
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Harshit Mittal <h.mittal83(a)gmail.com> | Wed Aug 5 12:41:49 2015 -0700| [53bf32fa4270eb60f3bf25b5bd3d1f97381d4661] | committer: Michael Niedermayer doc/examples/filtering_video: better demo ffmpeg filters; demos chaining the filters Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53bf32fa4270eb60f… --- doc/examples/filtering_video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/examples/filtering_video.c b/doc/examples/filtering_video.c index c02040a..5685380 100644 --- a/doc/examples/filtering_video.c +++ b/doc/examples/filtering_video.c @@ -38,7 +38,10 @@ #include <libavfilter/buffersrc.h> #include <libavutil/opt.h> -const char *filter_descr = "scale=78:24"; +const char *filter_descr = "scale=78:24,transpose=cclock"; +/* other way: + scale=78:24 [scl]; [scl] transpose=cclock // assumes "[in]" and "[out]" to be input output pads respectively + */ static AVFormatContext *fmt_ctx; static AVCodecContext *dec_ctx;

1 0

Changelog: Clarify that the new asf demuxer is optional.
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Fri Aug 28 11:08:28 2015 +0200| [24e0b14c4f8b8544efe07ccf951f778d856b131d] | committer: Carl Eugen Hoyos Changelog: Clarify that the new asf demuxer is optional. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24e0b14c4f8b8544e… --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index e771f84..699f72c 100644 --- a/Changelog +++ b/Changelog @@ -8,7 +8,7 @@ version <next>: - Hap decoder and encoder - DirectDraw Surface image/texture decoder - ssim filter -- rewritten ASF demuxer +- optional new ASF demuxer - showvolume filter - Many improvements to the JPEG 2000 decoder - Go2Meeting decoding support

1 0

Changelog: Mention the change of the default webm codecs.
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Thilo Borgmann <thilo.borgmann(a)mail.de> | Fri Aug 28 06:05:41 2015 +0200| [2392da164a02e4e4f7e1b933018d14afcb13ddc1] | committer: Carl Eugen Hoyos Changelog: Mention the change of the default webm codecs. Signed-off-by: Carl Eugen Hoyos <cehoyos(a)ag.or.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2392da164a02e4e4f… --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 5911761..e771f84 100644 --- a/Changelog +++ b/Changelog @@ -38,6 +38,7 @@ version <next>: - Support DNx100 (1440x1080@8) - VAAPI hevc hwaccel - framerate filter +- Switched default encoders for webm to VP9 and Opus version 2.7:

1 0

configure: Do not let the webm muxer suggest external libraries.
by git＠videolan.org 28 Aug '15

28 Aug '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Fri Aug 28 06:00:49 2015 +0200| [b009d5b1f73cd095b1bf1c1857d12f2a1b8aabbb] | committer: Carl Eugen Hoyos configure: Do not let the webm muxer suggest external libraries. This can fail as seen on fate and the usefulness of the suggestion is limited. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b009d5b1f73cd095b… --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 5913090..91f366e 100755 --- a/configure +++ b/configure @@ -2626,7 +2626,6 @@ w64_muxer_select="wav_muxer" wav_demuxer_select="riffdec" wav_muxer_select="riffenc" webm_muxer_select="riffenc" -webm_muxer_suggest="libopus_encoder libvorbis_encoder libvpx_vp8_encoder libvpx_vp9_encoder" wtv_demuxer_select="riffdec" wtv_muxer_select="riffenc" xmv_demuxer_select="riffdec"

1 0