From 9eda4e8bd759bfa9d3cc68f2a82a4de6d8eb76ca Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 11 Aug 2014 13:07:39 +0200 Subject: [PATCH] avcodec/idctdsp: move add/put_pixels_clamped_c to header This allows sharing them with the xvid IDCT Signed-off-by: Michael Niedermayer --- libavcodec/idctdsp.c | 41 ----------------------------------------- libavcodec/idctdsp.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index 94bad73cf3..4ca07344da 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -80,27 +80,6 @@ av_cold void ff_init_scantable_permutation(uint8_t *idct_permutation, } } -static void put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, - int line_size) -{ - int i; - - /* read the pixels */ - for (i = 0; i < 8; i++) { - pixels[0] = av_clip_uint8(block[0]); - pixels[1] = av_clip_uint8(block[1]); - pixels[2] = av_clip_uint8(block[2]); - pixels[3] = av_clip_uint8(block[3]); - pixels[4] = av_clip_uint8(block[4]); - pixels[5] = av_clip_uint8(block[5]); - pixels[6] = av_clip_uint8(block[6]); - pixels[7] = av_clip_uint8(block[7]); - - pixels += line_size; - block += 8; - } -} - static void put_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pixels, int line_size) { @@ -154,26 +133,6 @@ static void put_signed_pixels_clamped_c(const int16_t *block, } } -static void add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, - int line_size) -{ - int i; - - /* read the pixels */ - for (i = 0; i < 8; i++) { - pixels[0] = av_clip_uint8(pixels[0] + block[0]); - pixels[1] = av_clip_uint8(pixels[1] + block[1]); - pixels[2] = av_clip_uint8(pixels[2] + block[2]); - pixels[3] = av_clip_uint8(pixels[3] + block[3]); - pixels[4] = av_clip_uint8(pixels[4] + block[4]); - pixels[5] = av_clip_uint8(pixels[5] + block[5]); - pixels[6] = av_clip_uint8(pixels[6] + block[6]); - pixels[7] = av_clip_uint8(pixels[7] + block[7]); - pixels += line_size; - block += 8; - } -} - static void add_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pixels, int line_size) { diff --git a/libavcodec/idctdsp.h b/libavcodec/idctdsp.h index 04510b16bb..bd5e87510e 100644 --- a/libavcodec/idctdsp.h +++ b/libavcodec/idctdsp.h @@ -106,4 +106,45 @@ void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx, void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth); +static inline void put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, + int line_size) +{ + int i; + + /* read the pixels */ + for (i = 0; i < 8; i++) { + pixels[0] = av_clip_uint8(block[0]); + pixels[1] = av_clip_uint8(block[1]); + pixels[2] = av_clip_uint8(block[2]); + pixels[3] = av_clip_uint8(block[3]); + pixels[4] = av_clip_uint8(block[4]); + pixels[5] = av_clip_uint8(block[5]); + pixels[6] = av_clip_uint8(block[6]); + pixels[7] = av_clip_uint8(block[7]); + + pixels += line_size; + block += 8; + } +} + +static inline void add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, + int line_size) +{ + int i; + + /* read the pixels */ + for (i = 0; i < 8; i++) { + pixels[0] = av_clip_uint8(pixels[0] + block[0]); + pixels[1] = av_clip_uint8(pixels[1] + block[1]); + pixels[2] = av_clip_uint8(pixels[2] + block[2]); + pixels[3] = av_clip_uint8(pixels[3] + block[3]); + pixels[4] = av_clip_uint8(pixels[4] + block[4]); + pixels[5] = av_clip_uint8(pixels[5] + block[5]); + pixels[6] = av_clip_uint8(pixels[6] + block[6]); + pixels[7] = av_clip_uint8(pixels[7] + block[7]); + pixels += line_size; + block += 8; + } +} + #endif /* AVCODEC_IDCTDSP_H */