April 2017 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/matroskaenc: add support for writing Content Light Level elements
by James Almer 30 Apr '17

30 Apr '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Apr 25 15:42:51 2017 -0300| [37cc1c1e9137fe72354945b1cd2851ffc972661d] | committer: James Almer avformat/matroskaenc: add support for writing Content Light Level elements Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37cc1c1e9137fe723… --- libavformat/matroskaenc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 9c7a213db9..f14936e3d2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -844,8 +844,7 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre uint8_t *colorinfo_ptr; int side_data_size = 0; int ret, colorinfo_size; - const uint8_t *side_data = av_stream_get_side_data( - st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, &side_data_size); + const uint8_t *side_data; ret = avio_open_dyn_buf(&dyn_cp); if (ret < 0) @@ -876,6 +875,18 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORCHROMASITINGHORZ, (xpos >> 7) + 1); put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORCHROMASITINGVERT, (ypos >> 7) + 1); } + + side_data = av_stream_get_side_data(st, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + &side_data_size); + if (side_data_size) { + const AVContentLightMetadata *metadata = + (const AVContentLightMetadata*)side_data; + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMAXCLL, metadata->MaxCLL); + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOCOLORMAXFALL, metadata->MaxFALL); + } + + side_data = av_stream_get_side_data(st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + &side_data_size); if (side_data_size == sizeof(AVMasteringDisplayMetadata)) { ebml_master meta_element = start_ebml_master( dyn_cp, MATROSKA_ID_VIDEOCOLORMASTERINGMETA, 0);

1 0

avformat/matroskadec: export Content Light Level metadata
by James Almer 30 Apr '17

30 Apr '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Apr 25 15:04:00 2017 -0300| [095147ae0650799437390c81ae66d1151ceb9b31] | committer: James Almer avformat/matroskadec: export Content Light Level metadata Based on a patch by Hendrik Leppkes Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=095147ae065079943… --- libavformat/matroskadec.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 47873cccd8..9e2c9bd2e2 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1869,6 +1869,21 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { avcodec_chroma_pos_to_enum((color->chroma_siting_horz - 1) << 7, (color->chroma_siting_vert - 1) << 7); } + if (color->max_cll && color->max_fall) { + size_t size = 0; + int ret; + AVContentLightMetadata *metadata = av_content_light_metadata_alloc(&size); + if (!metadata) + return AVERROR(ENOMEM); + ret = av_stream_add_side_data(st, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + (uint8_t *)metadata, size); + if (ret < 0) { + av_freep(&metadata); + return ret; + } + metadata->MaxCLL = color->max_cll; + metadata->MaxFALL = color->max_fall; + } if (has_mastering_primaries || has_mastering_luminance) { // Use similar rationals as other standards.

1 0

Merge commit 'c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f'
by James Almer 30 Apr '17

30 Apr '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Apr 30 10:23:50 2017 -0300| [d61f93bf04eb90d3998d654e233fcaa87e86768a] | committer: James Almer Merge commit 'c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f' * commit 'c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f': mpeg12dec: move setting first_field to mpeg_field_start() This commit is a noop, see 2f6f2f4f73c068979829e785d08cb1dd345c7fc8 Merged-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d61f93bf04eb90d39… ---

1 0

mpeg12dec: move setting first_field to mpeg_field_start()
by Anton Khirnov 30 Apr '17

30 Apr '17

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sat Dec 17 17:04:55 2016 +0100| [c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f] | committer: Anton Khirnov mpeg12dec: move setting first_field to mpeg_field_start() For field picture, the first_field is set based on its previous value. Before this commit, first_field is set when reading the picture coding extension. However, in corrupted files there may be multiple picture coding extension headers, so the final value of first_field that is actually used during decoding can be wrong. That can lead to various undefined behaviour, like predicting from a non-existing field. Fix this problem, by setting first_field in mpeg_field_start(), which should be called exactly once per field. CC: libav-stable(a)libav.org Bug-ID: 999 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2fa6bb0e8703a7a6… --- libavcodec/mpeg12dec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 310169becc..afdd652b6a 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1536,10 +1536,8 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) av_log(s->avctx, AV_LOG_WARNING, "invalid frame_pred_frame_dct\n"); if (s->picture_structure == PICT_FRAME) { - s->first_field = 0; s->v_edge_pos = 16 * s->mb_height; } else { - s->first_field ^= 1; s->v_edge_pos = 8 * s->mb_height; memset(s->mbskip_table, 0, s->mb_stride * s->mb_height); } @@ -1570,6 +1568,11 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) Mpeg1Context *s1 = (Mpeg1Context *) s; int ret; + if (s->picture_structure == PICT_FRAME) + s->first_field = 0; + else + s->first_field ^= 1; + /* start frame decoding */ if (s->first_field || s->picture_structure == PICT_FRAME) { AVFrameSideData *pan_scan;

1 0

tools: Eliminate codec_type complexity from fuzzer
by Michael Niedermayer 30 Apr '17

30 Apr '17

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Apr 30 11:44:51 2017 +0200| [a9b5b6a97f4f4c0a9e06ea1485c02e3de58cc0b1] | committer: Michael Niedermayer tools: Eliminate codec_type complexity from fuzzer Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9b5b6a97f4f4c0a9… --- tools/Makefile | 11 ++--------- tools/target_dec_fuzzer.c | 19 +++++++++---------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 2b9432bcc2..c4d9e90dea 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,15 +1,8 @@ TOOLS = qt-faststart trasher uncoded_frame TOOLS-$(CONFIG_ZLIB) += cws2fws -tools/target_dec_video_%_fuzzer.o: tools/target_dec_fuzzer.c - $(COMPILE_C) -DFFMPEG_CODEC=AV_CODEC_ID_$* -DFUZZ_FFMPEG_VIDEO - -tools/target_dec_audio_%_fuzzer.o: tools/target_dec_fuzzer.c - $(COMPILE_C) -DFFMPEG_CODEC=AV_CODEC_ID_$* -DFUZZ_FFMPEG_AUDIO - -tools/target_dec_subtitle_%_fuzzer.o: tools/target_dec_fuzzer.c - $(COMPILE_C) -DFFMPEG_CODEC=AV_CODEC_ID_$* -DFUZZ_FFMPEG_SUBTITLE - +tools/target_dec_%_fuzzer.o: tools/target_dec_fuzzer.c + $(COMPILE_C) -DFFMPEG_CODEC=AV_CODEC_ID_$* OBJDIRS += tools diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index e6a942cb30..ce58fe5eaf 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -74,11 +74,6 @@ static AVCodec *AVCodecInitialize(enum AVCodecID codec_id) return res; } -#if defined(FUZZ_FFMPEG_VIDEO) -#define decode_handler avcodec_decode_video2 -#elif defined(FUZZ_FFMPEG_AUDIO) -#define decode_handler avcodec_decode_audio4 -#elif defined(FUZZ_FFMPEG_SUBTITLE) static int subtitle_handler(AVCodecContext *avctx, void *frame, int *got_sub_ptr, AVPacket *avpkt) { @@ -89,11 +84,6 @@ static int subtitle_handler(AVCodecContext *avctx, void *frame, return ret; } -#define decode_handler subtitle_handler -#else -#error "Specify encoder type" // To catch mistakes -#endif - // Class to handle buffer allocation and resize for each frame typedef struct FuzzDataBuffer { size_t size_; @@ -146,10 +136,19 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { const uint8_t *last = data; const uint8_t *end = data + size; uint32_t it = 0; + int (*decode_handler)(AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, + const AVPacket *avpkt) = NULL; if (!c) c = AVCodecInitialize(FFMPEG_CODEC); // Done once. + switch (c->type) { + case AVMEDIA_TYPE_AUDIO : decode_handler = avcodec_decode_audio4; break; + case AVMEDIA_TYPE_VIDEO : decode_handler = avcodec_decode_video2; break; + case AVMEDIA_TYPE_SUBTITLE: decode_handler = subtitle_handler ; break; + } + AVCodecContext* ctx = avcodec_alloc_context3(NULL); if (!ctx) error("Failed memory allocation");

1 0

libswscale/tests/swscale: Fix uninitialized variables
by Michael Niedermayer 30 Apr '17

30 Apr '17

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Apr 29 18:46:48 2017 +0200| [7796f290653349a4126f2d448d11bb4440b9f257] | committer: Michael Niedermayer libswscale/tests/swscale: Fix uninitialized variables Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7796f290653349a41… --- libswscale/tests/swscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index bd8d098a3d..b4b8173a31 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -309,10 +309,10 @@ static int fileTest(uint8_t *ref[4], int refStride[4], int w, int h, FILE *fp, struct Results r; enum AVPixelFormat srcFormat; char srcStr[12]; - int srcW, srcH; + int srcW = 0, srcH = 0; enum AVPixelFormat dstFormat; char dstStr[12]; - int dstW, dstH; + int dstW = 0, dstH = 0; int flags; int ret;

1 0

avfilter/af_crystalizer: add support for more sample formats
by Paul B Mahol 30 Apr '17

30 Apr '17

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Apr 30 12:56:23 2017 +0200| [8dd3a53dbf7dfbca4f8a750936f0ba3849a3f0b8] | committer: Paul B Mahol avfilter/af_crystalizer: add support for more sample formats Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8dd3a53dbf7dfbca4… --- libavfilter/af_crystalizer.c | 148 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 126 insertions(+), 22 deletions(-) diff --git a/libavfilter/af_crystalizer.c b/libavfilter/af_crystalizer.c index 086549a93d..dec30aa5f4 100644 --- a/libavfilter/af_crystalizer.c +++ b/libavfilter/af_crystalizer.c @@ -29,6 +29,8 @@ typedef struct CrystalizerContext { float mult; int clip; AVFrame *prev; + void (*filter)(void **dst, void **prv, const void **src, + int nb_samples, int channels, float mult, int clip); } CrystalizerContext; #define OFFSET(x) offsetof(CrystalizerContext, x) @@ -46,10 +48,18 @@ static int query_formats(AVFilterContext *ctx) { AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layouts = NULL; + static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_NONE + }; int ret; - if ((ret = ff_add_format (&formats, AV_SAMPLE_FMT_FLT )) < 0 || - (ret = ff_set_common_formats(ctx , formats )) < 0) + formats = ff_make_format_list(sample_fmts); + if (!formats) + return AVERROR(ENOMEM); + ret = ff_set_common_formats(ctx, formats); + if (ret < 0) return ret; layouts = ff_all_channel_counts(); @@ -64,16 +74,123 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_samplerates(ctx, formats); } +static void filter_flt(void **d, void **p, const void **s, + int nb_samples, int channels, + float mult, int clip) +{ + const float *src = s[0]; + float *dst = d[0]; + float *prv = p[0]; + int n, c; + + for (n = 0; n < nb_samples; n++) { + for (c = 0; c < channels; c++) { + float current = src[c]; + + dst[c] = current + (current - prv[c]) * mult; + prv[c] = current; + if (clip) { + dst[c] = av_clipf(dst[c], -1, 1); + } + } + + dst += c; + src += c; + } +} + +static void filter_dbl(void **d, void **p, const void **s, + int nb_samples, int channels, + float mult, int clip) +{ + const double *src = s[0]; + double *dst = d[0]; + double *prv = p[0]; + int n, c; + + for (n = 0; n < nb_samples; n++) { + for (c = 0; c < channels; c++) { + double current = src[c]; + + dst[c] = current + (current - prv[c]) * mult; + prv[c] = current; + if (clip) { + dst[c] = av_clipd(dst[c], -1, 1); + } + } + + dst += c; + src += c; + } +} + +static void filter_fltp(void **d, void **p, const void **s, + int nb_samples, int channels, + float mult, int clip) +{ + int n, c; + + for (c = 0; c < channels; c++) { + const float *src = s[c]; + float *dst = d[c]; + float *prv = p[c]; + + for (n = 0; n < nb_samples; n++) { + float current = src[n]; + + dst[n] = current + (current - prv[0]) * mult; + prv[0] = current; + if (clip) { + dst[n] = av_clipf(dst[n], -1, 1); + } + } + } +} + +static void filter_dblp(void **d, void **p, const void **s, + int nb_samples, int channels, + float mult, int clip) +{ + int n, c; + + for (c = 0; c < channels; c++) { + const double *src = s[c]; + double *dst = d[c]; + double *prv = p[c]; + + for (n = 0; n < nb_samples; n++) { + double current = src[n]; + + dst[n] = current + (current - prv[0]) * mult; + prv[0] = current; + if (clip) { + dst[n] = av_clipd(dst[n], -1, 1); + } + } + } +} + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + CrystalizerContext *s = ctx->priv; + + switch (inlink->format) { + case AV_SAMPLE_FMT_FLT: s->filter = filter_flt; break; + case AV_SAMPLE_FMT_DBL: s->filter = filter_dbl; break; + case AV_SAMPLE_FMT_FLTP: s->filter = filter_fltp; break; + case AV_SAMPLE_FMT_DBLP: s->filter = filter_dblp; break; + } + + return 0; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; CrystalizerContext *s = ctx->priv; - const float *src = (const float *)in->data[0]; - const float mult = s->mult; AVFrame *out; - float *dst, *prv; - int n, c; if (!s->prev) { s->prev = ff_get_audio_buffer(inlink, 1); @@ -94,22 +211,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) av_frame_copy_props(out, in); } - dst = (float *)out->data[0]; - prv = (float *)s->prev->data[0]; - - for (n = 0; n < in->nb_samples; n++) { - for (c = 0; c < in->channels; c++) { - float current = src[c]; - - dst[c] = current + (current - prv[c]) * mult; - prv[c] = current; - if (s->clip) { - dst[c] = av_clipf(dst[c], -1, 1); - } - } - dst += c; - src += c; - } + s->filter((void **)out->extended_data, (void **)s->prev->extended_data, (const void **)in->extended_data, + in->nb_samples, in->channels, s->mult, s->clip); if (out != in) av_frame_free(&in); @@ -129,6 +232,7 @@ static const AVFilterPad inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, .filter_frame = filter_frame, + .config_props = config_input, }, { NULL } };

1 0

avcodec/pthread_frame, decode: allow errors to happen on draining
by Muhammad Faiz 29 Apr '17

29 Apr '17

ffmpeg | branch: master | Muhammad Faiz <mfcc64(a)gmail.com> | Fri Apr 28 17:19:13 2017 +0700| [d535e0c14004a15bb38ea288fa9a4f2e27d26f6b] | committer: Muhammad Faiz avcodec/pthread_frame, decode: allow errors to happen on draining So, all frames and errors are correctly reported in order. Also limit the numbers of error during draining to prevent infinite loop. This fix fate failure with THREADS>=4: make fate-h264-attachment-631 THREADS=4 This also reverts a755b725ec1d657609c8bd726ce37e7cf193d03f. Suggested-by: wm4, Ronald S. Bultje, Marton Balint Reviewed-by: w4 <nfxjfg(a)googlemail.com> Reviewed-by: Ronald S. Bultje <rsbultje(a)gmail.com> Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d535e0c14004a15bb… --- libavcodec/decode.c | 21 +++++++++++++++++++-- libavcodec/internal.h | 3 +++ libavcodec/pthread_frame.c | 15 +++++++-------- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6ff3c401ba..edfae5583c 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -568,8 +568,24 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); #endif - if (avctx->internal->draining && !got_frame) - avci->draining_done = 1; + /* do not stop draining when got_frame != 0 or ret < 0 */ + if (avctx->internal->draining && !got_frame) { + if (ret < 0) { + /* prevent infinite loop if a decoder wrongly always return error on draining */ + /* reasonable nb_errors_max = maximum b frames + thread count */ + int nb_errors_max = 20 + (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME ? + avctx->thread_count : 1); + + if (avci->nb_draining_errors++ >= nb_errors_max) { + av_log(avctx, AV_LOG_ERROR, "Too many errors when draining, this is a bug. " + "Stop draining and force EOF.\n"); + avci->draining_done = 1; + ret = AVERROR_BUG; + } + } else { + avci->draining_done = 1; + } + } avci->compat_decode_consumed += ret; @@ -1659,6 +1675,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx) { avctx->internal->draining = 0; avctx->internal->draining_done = 0; + avctx->internal->nb_draining_errors = 0; av_frame_unref(avctx->internal->buffer_frame); av_frame_unref(avctx->internal->compat_decode_frame); av_packet_unref(avctx->internal->buffer_pkt); diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 84d3362f39..caa46dcb92 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -200,6 +200,9 @@ typedef struct AVCodecInternal { int showed_multi_packet_warning; int skip_samples_multiplier; + + /* to prevent infinite loop on errors when draining */ + int nb_draining_errors; } AVCodecInternal; struct AVCodecDefault { diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 13d682842d..363b139f71 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -509,8 +509,8 @@ int ff_thread_decode_frame(AVCodecContext *avctx, /* * Return the next available frame from the oldest thread. * If we're at the end of the stream, then we have to skip threads that - * didn't output a frame, because we don't want to accidentally signal - * EOF (avpkt->size == 0 && *got_picture_ptr == 0). + * didn't output a frame/error, because we don't want to accidentally signal + * EOF (avpkt->size == 0 && *got_picture_ptr == 0 && err >= 0). */ do { @@ -526,20 +526,19 @@ int ff_thread_decode_frame(AVCodecContext *avctx, av_frame_move_ref(picture, p->frame); *got_picture_ptr = p->got_frame; picture->pkt_dts = p->avpkt.dts; - - if (p->result < 0) - err = p->result; + err = p->result; /* * A later call with avkpt->size == 0 may loop over all threads, - * including this one, searching for a frame to return before being + * including this one, searching for a frame/error to return before being * stopped by the "finished != fctx->next_finished" condition. - * Make sure we don't mistakenly return the same frame again. + * Make sure we don't mistakenly return the same frame/error again. */ p->got_frame = 0; + p->result = 0; if (finished >= avctx->thread_count) finished = 0; - } while (!avpkt->size && !*got_picture_ptr && finished != fctx->next_finished); + } while (!avpkt->size && !*got_picture_ptr && err >= 0 && finished != fctx->next_finished); update_context_from_thread(avctx, p->avctx, 1);

1 0

avfilter: add video oscilloscope filter
by Paul B Mahol 29 Apr '17

29 Apr '17

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Apr 25 19:31:05 2017 +0200| [399c7ab9c6bc9e683c5a60b34d50290ae563e2f1] | committer: Paul B Mahol avfilter: add video oscilloscope filter Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=399c7ab9c6bc9e683… --- Changelog | 2 + doc/filters.texi | 78 ++++++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_datascope.c | 381 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 463 insertions(+) diff --git a/Changelog b/Changelog index 6deda6d64d..faaaf8a493 100644 --- a/Changelog +++ b/Changelog @@ -5,6 +5,8 @@ version <next>: - deflicker video filter - doubleweave video filter - lumakey video filter +- pixscope video filter +- oscilloscope video filter version 3.3: - CrystalHD decoder moved to new decode API diff --git a/doc/filters.texi b/doc/filters.texi index 773ab246b2..119e7474a5 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10233,6 +10233,84 @@ other parameters is 0. These parameters correspond to the parameters assigned to the libopencv function @code{cvSmooth}. +@section oscilloscope + +2D Video Oscilloscope. + +Useful to measure spatial impulse, step responses, chroma delays, etc. + +It accepts the following parameters: + +@table @option +@item x +Set scope center x position. + +@item y +Set scope center y position. + +@item s +Set scope size, relative to frame diagonal. + +@item t +Set scope tilt/rotation. + +@item o +Set trace opacity. + +@item tx +Set trace center x position. + +@item ty +Set trace center y position. + +@item tw +Set trace width, relative to width of frame. + +@item th +Set trace height, relative to height of frame. + +@item c +Set which components to trace. By default it traces first three components. + +@item g +Draw trace grid. By default is enabled. + +@item st +Draw some statistics. By default is enabled. + +@item sc +Draw scope. By default is enabled. +@end table + +@subsection Examples + +@itemize +@item +Inspect full first row of video frame. +@example +oscilloscope=x=0.5:y=0:s=1 +@end example + +@item +Inspect full last row of video frame. +@example +oscilloscope=x=0.5:y=1:s=1 +@end example + +@item +Inspect full 5th line of video frame of height 1080. +@example +oscilloscope=x=0.5:y=5/1080:s=1 +@end example + +@item +Inspect full last column of video frame. +@example +oscilloscope=x=1:y=0.5:s=1:t=1 +@end example + +@end itemize + @anchor{overlay} @section overlay diff --git a/libavfilter/Makefile b/libavfilter/Makefile index e40c6fea32..66c36e4d1d 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -236,6 +236,7 @@ OBJS-$(CONFIG_NULL_FILTER) += vf_null.o OBJS-$(CONFIG_OCR_FILTER) += vf_ocr.o OBJS-$(CONFIG_OCV_FILTER) += vf_libopencv.o OBJS-$(CONFIG_OPENCL) += deshake_opencl.o unsharp_opencl.o +OBJS-$(CONFIG_OSCILLOSCOPE_FILTER) += vf_datascope.o OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o dualinput.o framesync.o OBJS-$(CONFIG_OWDENOISE_FILTER) += vf_owdenoise.o OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 0852b54e6f..8fb87eb81e 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -246,6 +246,7 @@ static void register_all(void) REGISTER_FILTER(NULL, null, vf); REGISTER_FILTER(OCR, ocr, vf); REGISTER_FILTER(OCV, ocv, vf); + REGISTER_FILTER(OSCILLOSCOPE, oscilloscope, vf); REGISTER_FILTER(OVERLAY, overlay, vf); REGISTER_FILTER(OWDENOISE, owdenoise, vf); REGISTER_FILTER(PAD, pad, vf); diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index 37425b4508..476e65f6c6 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -641,3 +641,384 @@ AVFilter ff_vf_pixscope = { .inputs = pixscope_inputs, .outputs = pixscope_outputs, }; + +typedef struct PixelValues { + uint16_t p[4]; +} PixelValues; + +typedef struct OscilloscopeContext { + const AVClass *class; + + float xpos, ypos; + float tx, ty; + float size; + float tilt; + float theight, twidth; + float o; + int components; + int grid; + int statistics; + int scope; + + int x1, y1, x2, y2; + int ox, oy; + int height, width; + + int max; + int nb_planes; + int nb_comps; + int is_rgb; + uint8_t rgba_map[4]; + FFDrawContext draw; + FFDrawColor dark; + FFDrawColor black; + FFDrawColor white; + FFDrawColor green; + FFDrawColor blue; + FFDrawColor red; + FFDrawColor cyan; + FFDrawColor magenta; + FFDrawColor gray; + FFDrawColor *colors[4]; + + int nb_values; + PixelValues *values; + + void (*pick_color)(FFDrawContext *draw, FFDrawColor *color, AVFrame *in, int x, int y, int *value); + void (*draw_trace)(struct OscilloscopeContext *s, AVFrame *frame); +} OscilloscopeContext; + +#define OOFFSET(x) offsetof(OscilloscopeContext, x) + +static const AVOption oscilloscope_options[] = { + { "x", "set scope x position", OOFFSET(xpos), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, + { "y", "set scope y position", OOFFSET(ypos), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, + { "s", "set scope size", OOFFSET(size), AV_OPT_TYPE_FLOAT, {.dbl=0.8}, 0, 1, FLAGS }, + { "t", "set scope tilt", OOFFSET(tilt), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, + { "o", "set trace opacity", OOFFSET(o), AV_OPT_TYPE_FLOAT, {.dbl=0.8}, 0, 1, FLAGS }, + { "tx", "set trace x position", OOFFSET(tx), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, + { "ty", "set trace y position", OOFFSET(ty), AV_OPT_TYPE_FLOAT, {.dbl=0.9}, 0, 1, FLAGS }, + { "tw", "set trace width", OOFFSET(twidth), AV_OPT_TYPE_FLOAT, {.dbl=0.8},.1, 1, FLAGS }, + { "th", "set trace height", OOFFSET(theight), AV_OPT_TYPE_FLOAT, {.dbl=0.3},.1, 1, FLAGS }, + { "c", "set components to trace", OOFFSET(components), AV_OPT_TYPE_INT, {.i64=7}, 0, 15, FLAGS }, + { "g", "draw trace grid", OOFFSET(grid), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS }, + { "st", "draw statistics", OOFFSET(statistics), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS }, + { "sc", "draw scope", OOFFSET(scope), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(oscilloscope); + +static void oscilloscope_uninit(AVFilterContext *ctx) +{ + OscilloscopeContext *s = ctx->priv; + + av_freep(&s->values); +} + +static void draw_line(FFDrawContext *draw, int x0, int y0, int x1, int y1, + AVFrame *out, FFDrawColor *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; + int p, i; + + for (;;) { + if (x0 >= 0 && y0 >= 0 && x0 < out->width && y0 < out->height) { + for (p = 0; p < draw->nb_planes; p++) { + if (draw->desc->comp[p].depth == 8) { + if (draw->nb_planes == 1) { + for (i = 0; i < 4; i++) { + out->data[0][y0 * out->linesize[0] + x0 * draw->pixelstep[0] + i] = color->comp[0].u8[i]; + } + } else { + out->data[p][out->linesize[p] * (y0 >> draw->vsub[p]) + (x0 >> draw->hsub[p])] = color->comp[p].u8[0]; + } + } else { + if (draw->nb_planes == 1) { + for (i = 0; i < 4; i++) { + AV_WN16(out->data[0] + y0 * out->linesize[0] + 2 * (x0 * draw->pixelstep[0] + i), color->comp[0].u16[i]); + } + } else { + AV_WN16(out->data[p] + out->linesize[p] * (y0 >> draw->vsub[p]) + (x0 >> draw->hsub[p]) * 2, color->comp[p].u16[0]); + } + } + } + } + + 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_trace8(OscilloscopeContext *s, AVFrame *frame) +{ + int i, c; + + for (i = 1; i < s->nb_values; i++) { + for (c = 0; c < s->nb_comps; c++) { + if ((1 << c) & s->components) { + int x = i * s->width / s->nb_values; + int px = (i - 1) * s->width / s->nb_values; + int py = s->height - s->values[i-1].p[c] * s->height / 256; + int y = s->height - s->values[i].p[c] * s->height / 256; + + draw_line(&s->draw, s->ox + x, s->oy + y, s->ox + px, s->oy + py, frame, s->colors[c]); + } + } + } +} + + +static void draw_trace16(OscilloscopeContext *s, AVFrame *frame) +{ + int i, c; + + for (i = 1; i < s->nb_values; i++) { + for (c = 0; c < s->nb_comps; c++) { + if ((1 << c) & s->components) { + int x = i * s->width / s->nb_values; + int px = (i - 1) * s->width / s->nb_values; + int py = s->height - s->values[i-1].p[c] * s->height / s->max; + int y = s->height - s->values[i].p[c] * s->height / s->max; + + draw_line(&s->draw, s->ox + x, s->oy + y, s->ox + px, s->oy + py, frame, s->colors[c]); + } + } + } +} + +static int oscilloscope_config_input(AVFilterLink *inlink) +{ + OscilloscopeContext *s = inlink->dst->priv; + int cx, cy, size; + double tilt; + + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + ff_draw_init(&s->draw, inlink->format, 0); + ff_draw_color(&s->draw, &s->dark, (uint8_t[]){ 0, 0, 0, s->o * 255} ); + ff_draw_color(&s->draw, &s->black, (uint8_t[]){ 0, 0, 0, 255} ); + ff_draw_color(&s->draw, &s->white, (uint8_t[]){ 255, 255, 255, 255} ); + ff_draw_color(&s->draw, &s->green, (uint8_t[]){ 0, 255, 0, 255} ); + ff_draw_color(&s->draw, &s->blue, (uint8_t[]){ 0, 0, 255, 255} ); + ff_draw_color(&s->draw, &s->red, (uint8_t[]){ 255, 0, 0, 255} ); + ff_draw_color(&s->draw, &s->cyan, (uint8_t[]){ 0, 255, 255, 255} ); + ff_draw_color(&s->draw, &s->magenta, (uint8_t[]){ 255, 0, 255, 255} ); + ff_draw_color(&s->draw, &s->gray, (uint8_t[]){ 128, 128, 128, 255} ); + s->nb_comps = s->draw.desc->nb_components; + s->is_rgb = s->draw.desc->flags & AV_PIX_FMT_FLAG_RGB; + + if (s->is_rgb) { + s->colors[0] = &s->red; + s->colors[1] = &s->green; + s->colors[2] = &s->blue; + s->colors[3] = &s->white; + ff_fill_rgba_map(s->rgba_map, inlink->format); + } else { + s->colors[0] = &s->white; + s->colors[1] = &s->cyan; + s->colors[2] = &s->magenta; + s->colors[3] = &s->white; + s->rgba_map[0] = 0; + s->rgba_map[1] = 1; + s->rgba_map[2] = 2; + s->rgba_map[3] = 3; + } + + if (s->draw.desc->comp[0].depth <= 8) { + s->pick_color = pick_color8; + s->draw_trace = draw_trace8; + } else { + s->pick_color = pick_color16; + s->draw_trace = draw_trace16; + } + + s->max = (1 << s->draw.desc->comp[0].depth); + cx = s->xpos * (inlink->w - 1); + cy = s->ypos * (inlink->h - 1); + s->height = s->theight * inlink->h; + s->width = s->twidth * inlink->w; + size = hypot(inlink->w, inlink->h); + + s->values = av_calloc(size, sizeof(*s->values)); + if (!s->values) + return AVERROR(ENOMEM); + + size *= s->size; + tilt = (s->tilt - 0.5) * M_PI; + s->x1 = cx - size / 2.0 * cos(tilt); + s->x2 = cx + size / 2.0 * cos(tilt); + s->y1 = cy - size / 2.0 * sin(tilt); + s->y2 = cy + size / 2.0 * sin(tilt); + s->ox = (inlink->w - s->width) * s->tx; + s->oy = (inlink->h - s->height) * s->ty; + + return 0; +} + +static void draw_scope(OscilloscopeContext *s, int x0, int y0, int x1, int y1, + AVFrame *out, PixelValues *p, int state) +{ + 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 (;;) { + if (x0 >= 0 && y0 >= 0 && x0 < out->width && y0 < out->height) { + FFDrawColor color = { { 0 } }; + int value[4] = { 0 }; + + s->pick_color(&s->draw, &color, out, x0, y0, value); + s->values[s->nb_values].p[0] = value[0]; + s->values[s->nb_values].p[1] = value[1]; + s->values[s->nb_values].p[2] = value[2]; + s->values[s->nb_values].p[3] = value[3]; + s->nb_values++; + + if (s->scope) { + if (s->draw.desc->comp[0].depth == 8) { + if (s->draw.nb_planes == 1) { + int i; + + for (i = 0; i < s->draw.pixelstep[0]; i++) + out->data[0][out->linesize[0] * y0 + x0 * s->draw.pixelstep[0] + i] = 255 * ((s->nb_values + state) & 1); + } else { + out->data[0][out->linesize[0] * y0 + x0] = 255 * ((s->nb_values + state) & 1); + } + } else { + if (s->draw.nb_planes == 1) { + int i; + + for (i = 0; i < s->draw.pixelstep[0]; i++) + AV_WN16(out->data[0] + out->linesize[0] * y0 + 2 * x0 * (s->draw.pixelstep[0] + i), (s->max - 1) * ((s->nb_values + state) & 1)); + } else { + AV_WN16(out->data[0] + out->linesize[0] * y0 + 2 * x0, (s->max - 1) * ((s->nb_values + state) & 1)); + } + } + } + } + + if (x0 == x1 && y0 == y1) + break; + + e2 = err; + + if (e2 >-dx) { + err -= dy; + x0 += sx; + } + + if (e2 < dy) { + err += dx; + y0 += sy; + } + } +} + +static int oscilloscope_filter_frame(AVFilterLink *inlink, AVFrame *frame) +{ + AVFilterContext *ctx = inlink->dst; + OscilloscopeContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + float average[4] = { 0 }; + int max[4] = { 0 }; + int min[4] = { INT_MAX, INT_MAX, INT_MAX, INT_MAX }; + int i, c; + + s->nb_values = 0; + draw_scope(s, s->x1, s->y1, s->x2, s->y2, frame, s->values, inlink->frame_count_in & 1); + ff_blend_rectangle(&s->draw, &s->dark, frame->data, frame->linesize, + frame->width, frame->height, + s->ox, s->oy, s->width, s->height + 20 * s->statistics); + + if (s->grid) { + ff_fill_rectangle(&s->draw, &s->gray, frame->data, frame->linesize, + s->ox, s->oy, s->width - 1, 1); + + for (i = 1; i < 5; i++) { + ff_fill_rectangle(&s->draw, &s->gray, frame->data, frame->linesize, + s->ox, s->oy + i * (s->height - 1) / 4, s->width, 1); + } + + for (i = 0; i < 10; i++) { + ff_fill_rectangle(&s->draw, &s->gray, frame->data, frame->linesize, + s->ox + i * (s->width - 1) / 10, s->oy, 1, s->height); + } + + ff_fill_rectangle(&s->draw, &s->gray, frame->data, frame->linesize, + s->ox + s->width - 1, s->oy, 1, s->height); + } + + s->draw_trace(s, frame); + + for (i = 0; i < s->nb_values; i++) { + for (c = 0; c < s->nb_comps; c++) { + if ((1 << c) & s->components) { + max[c] = FFMAX(max[c], s->values[i].p[c]); + min[c] = FFMIN(min[c], s->values[i].p[c]); + average[c] += s->values[i].p[c]; + } + } + } + for (c = 0; c < s->nb_comps; c++) { + average[c] /= s->nb_values; + } + + if (s->statistics && s->height > 10 && s->width > 280 * av_popcount(s->components)) { + for (c = 0, i = 0; c < s->nb_comps; c++) { + if ((1 << c) & s->components) { + const char rgba[4] = { 'R', 'G', 'B', 'A' }; + const char yuva[4] = { 'Y', 'U', 'V', 'A' }; + char text[128]; + + snprintf(text, sizeof(text), "%c avg:%.1f min:%d max:%d\n", s->is_rgb ? rgba[c] : yuva[c], average[s->rgba_map[c]], min[s->rgba_map[c]], max[s->rgba_map[c]]); + draw_text(&s->draw, frame, &s->white, s->ox + 2 + 280 * i++, s->oy + s->height + 4, text, 0); + } + } + } + + return ff_filter_frame(outlink, frame); +} + +static const AVFilterPad oscilloscope_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = oscilloscope_filter_frame, + .config_props = oscilloscope_config_input, + .needs_writable = 1, + }, + { NULL } +}; + +static const AVFilterPad oscilloscope_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +AVFilter ff_vf_oscilloscope = { + .name = "oscilloscope", + .description = NULL_IF_CONFIG_SMALL("2D Video Oscilloscope."), + .priv_size = sizeof(OscilloscopeContext), + .priv_class = &oscilloscope_class, + .query_formats = query_formats, + .uninit = oscilloscope_uninit, + .inputs = oscilloscope_inputs, + .outputs = oscilloscope_outputs, +};

1 0

avfilter: add pixscope filter
by Paul B Mahol 29 Apr '17

29 Apr '17

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 22 22:02:49 2017 +0200| [8341d0dd0e5fe5aecc2f4aca7e8447e6aeb7c124] | committer: Paul B Mahol avfilter: add pixscope filter Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8341d0dd0e5fe5aec… --- doc/filters.texi | 23 +++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_datascope.c | 236 +++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 255 insertions(+), 8 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index d49fec1264..773ab246b2 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10925,6 +10925,29 @@ format=monow, pixdesctest can be used to test the monowhite pixel format descriptor definition. +@section pixscope + +Display sample values of color channels. Mainly useful for checking color and levels. + +The filters accept the following options: + +@table @option +@item x +Set scope X position, offset on X axis. + +@item y +Set scope Y position, offset on Y axis. + +@item w +Set scope width. + +@item h +Set scope height. + +@item o +Set window opacity. This window also holds statistics about pixel area. +@end table + @section pp Enable the specified chain of postprocessing subfilters using libpostproc. This diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 074c6907ef..e40c6fea32 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -245,6 +245,7 @@ OBJS-$(CONFIG_PERMS_FILTER) += f_perms.o OBJS-$(CONFIG_PERSPECTIVE_FILTER) += vf_perspective.o OBJS-$(CONFIG_PHASE_FILTER) += vf_phase.o OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o +OBJS-$(CONFIG_PIXSCOPE_FILTER) += vf_datascope.o OBJS-$(CONFIG_PP_FILTER) += vf_pp.o OBJS-$(CONFIG_PP7_FILTER) += vf_pp7.o OBJS-$(CONFIG_PREMULTIPLY_FILTER) += vf_premultiply.o framesync.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index c69f79e6ac..0852b54e6f 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -255,6 +255,7 @@ static void register_all(void) REGISTER_FILTER(PERSPECTIVE, perspective, vf); REGISTER_FILTER(PHASE, phase, vf); REGISTER_FILTER(PIXDESCTEST, pixdesctest, vf); + REGISTER_FILTER(PIXSCOPE, pixscope, vf); REGISTER_FILTER(PP, pp, vf); REGISTER_FILTER(PP7, pp7, vf); REGISTER_FILTER(PREMULTIPLY, premultiply, vf); diff --git a/libavfilter/version.h b/libavfilter/version.h index 2fa8dbda95..fb232c8e8a 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 87 +#define LIBAVFILTER_VERSION_MINOR 88 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index 01a5d992b0..37425b4508 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -76,7 +76,7 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); } -static void draw_text(DatascopeContext *s, AVFrame *frame, FFDrawColor *color, +static void draw_text(FFDrawContext *draw, AVFrame *frame, FFDrawColor *color, int x0, int y0, const uint8_t *text, int vertical) { int x = x0; @@ -87,7 +87,7 @@ static void draw_text(DatascopeContext *s, AVFrame *frame, FFDrawColor *color, y0 += 8; continue; } - ff_blend_mask(&s->draw, color, frame->data, frame->linesize, + ff_blend_mask(draw, color, frame->data, frame->linesize, frame->width, frame->height, avpriv_cga_font + *text * 8, 1, 8, 8, 0, 0, x, y0); if (vertical) { @@ -201,7 +201,7 @@ static int filter_color2(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs char text[256]; snprintf(text, sizeof(text), format[C>>2], value[p]); - draw_text(s, out, &reverse, xoff + x * C * 10 + 2, yoff + y * P * 12 + p * 10 + 2, text, 0); + draw_text(&s->draw, out, &reverse, xoff + x * C * 10 + 2, yoff + y * P * 12 + p * 10 + 2, text, 0); } } } @@ -239,7 +239,7 @@ static int filter_color(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) char text[256]; snprintf(text, sizeof(text), format[C>>2], value[p]); - draw_text(s, out, &color, xoff + x * C * 10 + 2, yoff + y * P * 12 + p * 10 + 2, text, 0); + draw_text(&s->draw, out, &color, xoff + x * C * 10 + 2, yoff + y * P * 12 + p * 10 + 2, text, 0); } } } @@ -276,7 +276,7 @@ static int filter_mono(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) char text[256]; snprintf(text, sizeof(text), format[C>>2], value[p]); - draw_text(s, out, &s->white, xoff + x * C * 10 + 2, yoff + y * P * 12 + p * 10 + 2, text, 0); + draw_text(&s->draw, out, &s->white, xoff + x * C * 10 + 2, yoff + y * P * 12 + p * 10 + 2, text, 0); } } } @@ -328,7 +328,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ff_fill_rectangle(&s->draw, &s->gray, out->data, out->linesize, 0, xmaxlen + y * P * 12 + (P + 1) * P - 2, ymaxlen, 10); - draw_text(s, out, &s->yellow, 2, xmaxlen + y * P * 12 + (P + 1) * P, text, 0); + draw_text(&s->draw, out, &s->yellow, 2, xmaxlen + y * P * 12 + (P + 1) * P, text, 0); } for (x = 0; x < X; x++) { @@ -337,7 +337,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ff_fill_rectangle(&s->draw, &s->gray, out->data, out->linesize, ymaxlen + x * C * 10 + 2 * C - 2, 0, 10, xmaxlen); - draw_text(s, out, &s->yellow, ymaxlen + x * C * 10 + 2 * C, 2, text, 1); + draw_text(&s->draw, out, &s->yellow, ymaxlen + x * C * 10 + 2 * C, 2, text, 1); } } @@ -419,3 +419,225 @@ AVFilter ff_vf_datascope = { .outputs = outputs, .flags = AVFILTER_FLAG_SLICE_THREADS, }; + +typedef struct PixscopeContext { + const AVClass *class; + + float xpos, ypos; + int w, h; + float o; + + int x, y; + int ww, wh; + + int nb_planes; + int nb_comps; + int is_rgb; + uint8_t rgba_map[4]; + FFDrawContext draw; + FFDrawColor dark; + FFDrawColor black; + FFDrawColor white; + FFDrawColor green; + FFDrawColor blue; + FFDrawColor red; + FFDrawColor *colors[4]; + + void (*pick_color)(FFDrawContext *draw, FFDrawColor *color, AVFrame *in, int x, int y, int *value); +} PixscopeContext; + +#define POFFSET(x) offsetof(PixscopeContext, x) + +static const AVOption pixscope_options[] = { + { "x", "set scope x offset", POFFSET(xpos), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, + { "y", "set scope y offset", POFFSET(ypos), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, + { "w", "set scope width", POFFSET(w), AV_OPT_TYPE_INT, {.i64=7}, 1, 80, FLAGS }, + { "h", "set scope height", POFFSET(h), AV_OPT_TYPE_INT, {.i64=7}, 1, 80, FLAGS }, + { "o", "set window opacity", POFFSET(o), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(pixscope); + +static int pixscope_config_input(AVFilterLink *inlink) +{ + PixscopeContext *s = inlink->dst->priv; + + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + ff_draw_init(&s->draw, inlink->format, 0); + ff_draw_color(&s->draw, &s->dark, (uint8_t[]){ 0, 0, 0, s->o * 255} ); + ff_draw_color(&s->draw, &s->black, (uint8_t[]){ 0, 0, 0, 255} ); + ff_draw_color(&s->draw, &s->white, (uint8_t[]){ 255, 255, 255, 255} ); + ff_draw_color(&s->draw, &s->green, (uint8_t[]){ 0, 255, 0, 255} ); + ff_draw_color(&s->draw, &s->blue, (uint8_t[]){ 0, 0, 255, 255} ); + ff_draw_color(&s->draw, &s->red, (uint8_t[]){ 255, 0, 0, 255} ); + s->nb_comps = s->draw.desc->nb_components; + s->is_rgb = s->draw.desc->flags & AV_PIX_FMT_FLAG_RGB; + + if (s->is_rgb) { + s->colors[0] = &s->red; + s->colors[1] = &s->green; + s->colors[2] = &s->blue; + s->colors[3] = &s->white; + ff_fill_rgba_map(s->rgba_map, inlink->format); + } else { + s->colors[0] = &s->white; + s->colors[1] = &s->blue; + s->colors[2] = &s->red; + s->colors[3] = &s->white; + s->rgba_map[0] = 0; + s->rgba_map[1] = 1; + s->rgba_map[2] = 2; + s->rgba_map[3] = 3; + } + + if (s->draw.desc->comp[0].depth <= 8) { + s->pick_color = pick_color8; + } else { + s->pick_color = pick_color16; + } + + if (inlink->w < 640 || inlink->h < 480) { + av_log(inlink->dst, AV_LOG_ERROR, "min supported resolution is 640x480\n"); + return AVERROR(EINVAL); + } + + s->ww = 300; + s->wh = 300 * 1.6180; + s->x = s->xpos * (inlink->w - 1); + s->y = s->ypos * (inlink->h - 1); + if (s->x + s->w >= inlink->w || s->y + s->h >= inlink->h) { + av_log(inlink->dst, AV_LOG_WARNING, "scope position is out of range, clipping\n"); + s->x = FFMIN(s->x, inlink->w - s->w); + s->y = FFMIN(s->y, inlink->h - s->h); + } + + return 0; +} + +static int pixscope_filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + PixscopeContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + int max[4] = { 0 }, min[4] = { INT_MAX, INT_MAX, INT_MAX, INT_MAX }; + float average[4] = { 0 }; + double rms[4] = { 0 }; + const char rgba[4] = { 'R', 'G', 'B', 'A' }; + const char yuva[4] = { 'Y', 'U', 'V', 'A' }; + int x, y, X, Y, i, w, h; + char text[128]; + + w = s->ww / s->w; + h = s->ww / s->h; + + if (s->x <= s->ww && s->y <= s->wh) { + X = in->width - s->ww; + Y = in->height - s->wh; + } else { + X = 0; + Y = 0; + } + + ff_blend_rectangle(&s->draw, &s->dark, in->data, in->linesize, + in->width, in->height, + X, + Y, + s->ww, + s->wh); + + for (y = 0; y < s->h; y++) { + for (x = 0; x < s->w; x++) { + FFDrawColor color = { { 0 } }; + int value[4] = { 0 }; + + s->pick_color(&s->draw, &color, in, x + s->x, y + s->y, value); + ff_fill_rectangle(&s->draw, &color, in->data, in->linesize, + x * w + (s->ww - 4 - (s->w * w)) / 2 + X, y * h + 2 + Y, w, h); + for (i = 0; i < 4; i++) { + rms[i] += (double)value[i] * (double)value[i]; + average[i] += value[i]; + min[i] = FFMIN(min[i], value[i]); + max[i] = FFMAX(max[i], value[i]); + } + } + } + + ff_blend_rectangle(&s->draw, &s->black, in->data, in->linesize, + in->width, in->height, + s->x - 2, s->y - 2, s->w + 4, 1); + + ff_blend_rectangle(&s->draw, &s->white, in->data, in->linesize, + in->width, in->height, + s->x - 1, s->y - 1, s->w + 2, 1); + + ff_blend_rectangle(&s->draw, &s->white, in->data, in->linesize, + in->width, in->height, + s->x - 1, s->y - 1, 1, s->h + 2); + + ff_blend_rectangle(&s->draw, &s->black, in->data, in->linesize, + in->width, in->height, + s->x - 2, s->y - 2, 1, s->h + 4); + + ff_blend_rectangle(&s->draw, &s->white, in->data, in->linesize, + in->width, in->height, + s->x - 1, s->y + 1 + s->h, s->w + 3, 1); + + ff_blend_rectangle(&s->draw, &s->black, in->data, in->linesize, + in->width, in->height, + s->x - 2, s->y + 2 + s->h, s->w + 4, 1); + + ff_blend_rectangle(&s->draw, &s->white, in->data, in->linesize, + in->width, in->height, + s->x + 1 + s->w, s->y - 1, 1, s->h + 2); + + ff_blend_rectangle(&s->draw, &s->black, in->data, in->linesize, + in->width, in->height, + s->x + 2 + s->w, s->y - 2, 1, s->h + 5); + + for (i = 0; i < 4; i++) { + rms[i] /= s->w * s->h; + rms[i] = sqrt(rms[i]); + average[i] /= s->w * s->h; + } + + snprintf(text, sizeof(text), "CH AVG MIN MAX RMS\n"); + draw_text(&s->draw, in, &s->white, X + 28, Y + s->ww + 20, text, 0); + for (i = 0; i < s->nb_comps; i++) { + int c = s->rgba_map[i]; + + snprintf(text, sizeof(text), "%c %07.1f %05d %05d %07.1f\n", s->is_rgb ? rgba[i] : yuva[i], average[c], min[c], max[c], rms[c]); + draw_text(&s->draw, in, s->colors[i], X + 28, Y + s->ww + 20 * (i + 2), text, 0); + } + + return ff_filter_frame(outlink, in); +} + +static const AVFilterPad pixscope_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = pixscope_filter_frame, + .config_props = pixscope_config_input, + .needs_writable = 1, + }, + { NULL } +}; + +static const AVFilterPad pixscope_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +AVFilter ff_vf_pixscope = { + .name = "pixscope", + .description = NULL_IF_CONFIG_SMALL("Pixel data analysis."), + .priv_size = sizeof(PixscopeContext), + .priv_class = &pixscope_class, + .query_formats = query_formats, + .inputs = pixscope_inputs, + .outputs = pixscope_outputs, +};

1 0