diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-01-27 22:22:01 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-27 22:22:01 +0000 |
| commit | 881b5b80da6bf63d01db5baa1db602a20f64b12c (patch) | |
| tree | 6c9e08f51133975e29c1dba7630ffe0538f93fb8 | |
| parent | e3d88073155f24d87eb998064026cf1d23621ab0 (diff) | |
Fix svq3_* function declarations.
Patch by Rafaël Carré, rafael D carre A gmail
Originally committed as revision 21489 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 11 | ||||
| -rw-r--r-- | libavcodec/h264.h | 3 | ||||
| -rw-r--r-- | libavcodec/svq3.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e4a47cf0d6..dcd239838d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -43,9 +43,6 @@ //#undef NDEBUG #include <assert.h> -static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); -static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc); - static const uint8_t rem6[52]={ 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, }; @@ -1181,7 +1178,7 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ else idct_add (ptr, h->mb + i*16, linesize); }else - svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); + ff_svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); } } } @@ -1193,7 +1190,7 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ if(!transform_bypass) h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[0][s->qscale][0]); }else - svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); + ff_svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); } if(h->deblocking_filter) xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0, simple); @@ -1241,7 +1238,7 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ for(i=0; i<16; i++){ if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below uint8_t * const ptr= dest_y + block_offset[i]; - svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); + ff_svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); } } } @@ -1276,7 +1273,7 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ for(i=16; i<16+8; i++){ if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i]; - svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, ff_h264_chroma_qp[s->qscale + 12] - 12, 2); + ff_svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, ff_h264_chroma_qp[s->qscale + 12] - 12, 2); } } } diff --git a/libavcodec/h264.h b/libavcodec/h264.h index e03e0e439c..51342ae9fc 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -581,6 +581,9 @@ typedef struct H264Context{ extern const uint8_t ff_h264_chroma_qp[52]; +void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); + +void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc); /** * Decode SEI diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 5d16c3b2d3..b367a7f272 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -126,7 +126,7 @@ static const uint32_t svq3_dequant_coeff[32] = { }; -void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) +void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) { const int qmul = svq3_dequant_coeff[qp]; #define stride 16 @@ -163,7 +163,7 @@ void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) } #undef stride -void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, +void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc) { const int qmul = svq3_dequant_coeff[qp]; |