diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-27 15:49:40 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-27 16:06:12 +0100 |
commit | 656b071a8f01c0269beb46d3fe00ded70fff079c (patch) | |
tree | 3cb203cc6dee8cd28aff876af25f5504b2b6a8e1 /libavcodec/svq3.c | |
parent | d6f01c61edee80705eca7ba1ca455b47b3648644 (diff) | |
parent | 15b0517da986b312fc2fcb364a92db328380b15b (diff) |
Merge commit '15b0517da986b312fc2fcb364a92db328380b15b'
* commit '15b0517da986b312fc2fcb364a92db328380b15b':
svq3: make the dsp functions static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 608f8172e2..492479d997 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -61,7 +61,6 @@ #endif #include "svq1.h" -#include "svq3.h" /** * @file @@ -165,7 +164,7 @@ static const uint32_t svq3_dequant_coeff[32] = { static int svq3_decode_end(AVCodecContext *avctx); -void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp) +static void svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp) { const int qmul = svq3_dequant_coeff[qp]; #define stride 16 @@ -200,8 +199,8 @@ void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp) } #undef stride -void ff_svq3_add_idct_c(uint8_t *dst, int16_t *block, - int stride, int qp, int dc) +static void svq3_add_idct_c(uint8_t *dst, int16_t *block, + int stride, int qp, int dc) { const int qmul = svq3_dequant_coeff[qp]; int i; @@ -498,8 +497,8 @@ static av_always_inline void hl_decode_mb_idct_luma(const H264Context *h, H264Sl for (i = 0; i < 16; i++) if (sl->non_zero_count_cache[scan8[i]] || sl->mb[i * 16]) { uint8_t *const ptr = dest_y + block_offset[i]; - ff_svq3_add_idct_c(ptr, sl->mb + i * 16, linesize, - sl->qscale, IS_INTRA(mb_type) ? 1 : 0); + svq3_add_idct_c(ptr, sl->mb + i * 16, linesize, + sl->qscale, IS_INTRA(mb_type) ? 1 : 0); } } } @@ -540,13 +539,12 @@ static av_always_inline void hl_decode_mb_predict_luma(const H264Context *h, h->hpc.pred4x4[dir](ptr, topright, linesize); nnz = sl->non_zero_count_cache[scan8[i]]; if (nnz) { - ff_svq3_add_idct_c(ptr, sl->mb + i * 16, linesize, qscale, 0); + svq3_add_idct_c(ptr, sl->mb + i * 16, linesize, qscale, 0); } } } else { h->hpc.pred16x16[sl->intra16x16_pred_mode](dest_y, linesize); - ff_svq3_luma_dc_dequant_idct_c(sl->mb, - sl->mb_luma_dc[0], qscale); + svq3_luma_dc_dequant_idct_c(sl->mb, sl->mb_luma_dc[0], qscale); } } @@ -593,9 +591,8 @@ static void hl_decode_mb(const H264Context *h, H264SliceContext *sl) for (i = j * 16; i < j * 16 + 4; i++) if (sl->non_zero_count_cache[scan8[i]] || sl->mb[i * 16]) { uint8_t *const ptr = dest[j - 1] + block_offset[i]; - ff_svq3_add_idct_c(ptr, sl->mb + i * 16, - uvlinesize, - ff_h264_chroma_qp[0][sl->qscale + 12] - 12, 2); + svq3_add_idct_c(ptr, sl->mb + i * 16, + uvlinesize, ff_h264_chroma_qp[0][sl->qscale + 12] - 12, 2); } } } |