diff options
author | Martin Vignali <martin.vignali@gmail.com> | 2018-11-17 23:35:35 +0100 |
---|---|---|
committer | Martin Vignali <martin.vignali@gmail.com> | 2018-12-02 12:55:31 +0100 |
commit | c097a32e93b4b4d9cb576bf21014b19121806161 (patch) | |
tree | e83860e6b21db0e55fbfc9677c0a68c62f595c19 /libavcodec/proresdsp.c | |
parent | a970920026010bd9e03f99017c305212b889d4a5 (diff) | |
download | ffmpeg-c097a32e93b4b4d9cb576bf21014b19121806161.tar.gz |
avcodec/proresdec : rename dsp part for 10b and check dspinit for supported bits per raw sample
based on patch by Kieran Kunhya
Diffstat (limited to 'libavcodec/proresdsp.c')
-rw-r--r-- | libavcodec/proresdsp.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index 3c337dc433..6b15ed3add 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -27,15 +27,15 @@ #include "proresdsp.h" #include "simple_idct.h" -#define CLIP_MIN (1 << (PRORES_BITS_PER_SAMPLE - 8)) ///< minimum value for clipping resulting pixels -#define CLIP_MAX (1 << PRORES_BITS_PER_SAMPLE) - CLIP_MIN - 1 ///< maximum value for clipping resulting pixels +#define CLIP_MIN (1 << 2) ///< minimum value for clipping resulting pixels +#define CLIP_MAX_10 (1 << 10) - CLIP_MIN - 1 ///< maximum value for clipping resulting pixels -#define CLIP(x) (av_clip((x), CLIP_MIN, CLIP_MAX)) +#define CLIP_10(x) (av_clip((x), CLIP_MIN, CLIP_MAX_10)) /** * Add bias value, clamp and output pixels of a slice */ -static void put_pixels(uint16_t *dst, ptrdiff_t linesize, const int16_t *in) +static void put_pixels_10(uint16_t *dst, ptrdiff_t linesize, const int16_t *in) { int x, y, src_offset, dst_offset; @@ -43,25 +43,30 @@ static void put_pixels(uint16_t *dst, ptrdiff_t linesize, const int16_t *in) for (x = 0; x < 8; x++) { src_offset = (y << 3) + x; - dst[dst_offset + x] = CLIP(in[src_offset]); + dst[dst_offset + x] = CLIP_10(in[src_offset]); } } } -static void prores_idct_put_c(uint16_t *out, ptrdiff_t linesize, int16_t *block, const int16_t *qmat) +static void prores_idct_put_10_c(uint16_t *out, ptrdiff_t linesize, int16_t *block, const int16_t *qmat) { - ff_prores_idct(block, qmat); - put_pixels(out, linesize >> 1, block); + ff_prores_idct_10(block, qmat); + put_pixels_10(out, linesize >> 1, block); } -av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) +av_cold int ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) { - dsp->idct_put = prores_idct_put_c; + if (avctx->bits_per_raw_sample == 10) { + dsp->idct_put = prores_idct_put_10_c; dsp->idct_permutation_type = FF_IDCT_PERM_NONE; + } else { + return AVERROR_BUG; + } if (ARCH_X86) ff_proresdsp_init_x86(dsp, avctx); ff_init_scantable_permutation(dsp->idct_permutation, dsp->idct_permutation_type); + return 0; } |