diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-03-06 19:55:02 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-03-06 19:55:02 +0100 |
| commit | 02f84215461aa0a58cf7b4ca4acaaa47b112ecce (patch) | |
| tree | a1b70f2448f4b8dcea83dee3c6e117f2dd7585ef | |
| parent | db44b599805fdd96940cf2e5a336f872648bbda1 (diff) | |
| download | ffmpeg-02f84215461aa0a58cf7b4ca4acaaa47b112ecce.tar.gz | |
avfilter/vf_histogram: add 12bit depth support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavfilter/vf_histogram.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 971d9b2618..674b286639 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -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_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, 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_GBRP9, AV_PIX_FMT_GBRP10, + AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; @@ -96,6 +98,11 @@ static const enum AVPixelFormat levels_out_yuv10_pix_fmts[] = { 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[] = { AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE @@ -111,6 +118,11 @@ static const enum AVPixelFormat levels_out_rgb10_pix_fmts[] = { 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) { AVFilterFormats *avff; @@ -144,12 +156,16 @@ static int query_formats(AVFilterContext *ctx) out_pix_fmts = levels_out_rgb9_pix_fmts; else if (rgb && bits == 10) 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) out_pix_fmts = levels_out_yuv8_pix_fmts; else if (bits == 9) out_pix_fmts = levels_out_yuv9_pix_fmts; else if (bits == 10) out_pix_fmts = levels_out_yuv10_pix_fmts; + else if (bits == 12) + out_pix_fmts = levels_out_yuv12_pix_fmts; else return AVERROR(EAGAIN); 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; switch (inlink->format) { + case AV_PIX_FMT_GBRP12: case AV_PIX_FMT_GBRP10: case AV_PIX_FMT_GBRP9: case AV_PIX_FMT_GBRAP: |