generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_histogram: add 12bit depth support

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-03-06 19:55:02 +01:00
parent db44b59980
commit 02f8421546
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/vf_histogram.c
View File

@ -75,8 +75,10 @@ static const enum AVPixelFormat levels_in_pix_fmts[] = {
AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, 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_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10,
AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV440P12,
AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP,
AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12,
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
@ -96,6 +98,11 @@ static const enum AVPixelFormat levels_out_yuv10_pix_fmts[] = {
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
static const enum AVPixelFormat levels_out_yuv12_pix_fmts[] = {
AV_PIX_FMT_YUV444P12,
AV_PIX_FMT_NONE
};
static const enum AVPixelFormat levels_out_rgb8_pix_fmts[] = { static const enum AVPixelFormat levels_out_rgb8_pix_fmts[] = {
AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
@ -111,6 +118,11 @@ static const enum AVPixelFormat levels_out_rgb10_pix_fmts[] = {
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
static const enum AVPixelFormat levels_out_rgb12_pix_fmts[] = {
AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12,
AV_PIX_FMT_NONE
};
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
{ {
AVFilterFormats *avff; AVFilterFormats *avff;
@ -144,12 +156,16 @@ static int query_formats(AVFilterContext *ctx)
out_pix_fmts = levels_out_rgb9_pix_fmts; out_pix_fmts = levels_out_rgb9_pix_fmts;
else if (rgb && bits == 10) else if (rgb && bits == 10)
out_pix_fmts = levels_out_rgb10_pix_fmts; out_pix_fmts = levels_out_rgb10_pix_fmts;
else if (rgb && bits == 12)
out_pix_fmts = levels_out_rgb12_pix_fmts;
else if (bits == 8) else if (bits == 8)
out_pix_fmts = levels_out_yuv8_pix_fmts; out_pix_fmts = levels_out_yuv8_pix_fmts;
else if (bits == 9) else if (bits == 9)
out_pix_fmts = levels_out_yuv9_pix_fmts; out_pix_fmts = levels_out_yuv9_pix_fmts;
else if (bits == 10) else if (bits == 10)
out_pix_fmts = levels_out_yuv10_pix_fmts; out_pix_fmts = levels_out_yuv10_pix_fmts;
else if (bits == 12)
out_pix_fmts = levels_out_yuv12_pix_fmts;
else else
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats)) < 0) if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats)) < 0)
@ -173,6 +189,7 @@ static int config_input(AVFilterLink *inlink)
h->mult = h->histogram_size / 256; h->mult = h->histogram_size / 256;
switch (inlink->format) { switch (inlink->format) {
case AV_PIX_FMT_GBRP12:
case AV_PIX_FMT_GBRP10: case AV_PIX_FMT_GBRP10:
case AV_PIX_FMT_GBRP9: case AV_PIX_FMT_GBRP9:
case AV_PIX_FMT_GBRAP: case AV_PIX_FMT_GBRAP: