RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-11 03:32:39 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/vf_blackdetect: add support for >8 depth formats

Browse Source
This commit is contained in:
Paul B Mahol 2021-01-29 14:34:36 +01:00
parent 8248f7b902
commit 27b793b0cf
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libavfilter/vf_blackdetect.c
View File

@ -26,6 +26,7 @@
#include <float.h> #include <float.h>
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/timestamp.h" #include "libavutil/timestamp.h"
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
@ -45,6 +46,7 @@ typedef struct BlackDetectContext {
unsigned int nb_black_pixels; ///< number of black pixels counted so far unsigned int nb_black_pixels; ///< number of black pixels counted so far
AVRational time_base; AVRational time_base;
int depth;
} BlackDetectContext; } BlackDetectContext;
#define OFFSET(x) offsetof(BlackDetectContext, x) #define OFFSET(x) offsetof(BlackDetectContext, x)
@ -78,6 +80,19 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, AV_PIX_FMT_NV12, AV_PIX_FMT_NV21,
YUVJ_FORMATS, YUVJ_FORMATS,
AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14,
AV_PIX_FMT_GRAY16,
AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9,
AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_YUV440P10,
AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV420P12,
AV_PIX_FMT_YUV440P12,
AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV420P14,
AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16,
AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P,
AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA444P16,
AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA422P16,
AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA420P16,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
@ -91,14 +106,19 @@ static int config_input(AVFilterLink *inlink)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
BlackDetectContext *s = ctx->priv; BlackDetectContext *s = ctx->priv;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
const int depth = desc->comp[0].depth;
const int max = (1 << depth) - 1;
const int factor = (1 << (depth - 8));
s->depth = depth;
s->time_base = inlink->time_base; s->time_base = inlink->time_base;
s->black_min_duration = s->black_min_duration_time / av_q2d(s->time_base); s->black_min_duration = s->black_min_duration_time / av_q2d(s->time_base);
s->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ? s->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ?
// luminance_minimum_value + pixel_black_th * luminance_range_size // luminance_minimum_value + pixel_black_th * luminance_range_size
s->pixel_black_th * 255 : s->pixel_black_th * max :
16 + s->pixel_black_th * (235 - 16); 16 * factor + s->pixel_black_th * (235 - 16) * factor;
av_log(s, AV_LOG_VERBOSE, av_log(s, AV_LOG_VERBOSE,
"black_min_duration:%s pixel_black_th:%f pixel_black_th_i:%d picture_black_ratio_th:%f\n", "black_min_duration:%s pixel_black_th:%f pixel_black_th_i:%d picture_black_ratio_th:%f\n",
@ -126,14 +146,24 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
BlackDetectContext *s = ctx->priv; BlackDetectContext *s = ctx->priv;
double picture_black_ratio = 0; double picture_black_ratio = 0;
const uint8_t *p = picref->data[0];
int x, i;
for (i = 0; i < inlink->h; i++) { if (s->depth == 8) {
for (x = 0; x < inlink->w; x++) const uint8_t *p = picref->data[0];
for (int i = 0; i < inlink->h; i++) {
for (int x = 0; x < inlink->w; x++)
s->nb_black_pixels += p[x] <= s->pixel_black_th_i; s->nb_black_pixels += p[x] <= s->pixel_black_th_i;
p += picref->linesize[0]; p += picref->linesize[0];
} }
} else {
const uint16_t *p = (const uint16_t *)picref->data[0];
for (int i = 0; i < inlink->h; i++) {
for (int x = 0; x < inlink->w; x++)
s->nb_black_pixels += p[x] <= s->pixel_black_th_i;
p += picref->linesize[0] / 2;
}
}
picture_black_ratio = (double)s->nb_black_pixels / (inlink->w * inlink->h); picture_black_ratio = (double)s->nb_black_pixels / (inlink->w * inlink->h);