Mercurial > libavcodec.hg
changeset 11031:b37a53d101c3 libavcodec
Fix svq3_* function declarations.
Patch by Rafa¸«³l Carr¸«±, rafael D carre A gmail
| author | cehoyos |
|---|---|
| date | Wed, 27 Jan 2010 22:22:01 +0000 |
| parents | d36fa8e050a9 |
| children | 01bd040f8607 |
| files | h264.c h264.h svq3.c |
| diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Wed Jan 27 21:31:19 2010 +0000 +++ b/h264.c Wed Jan 27 22:22:01 2010 +0000 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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); } } }
--- a/h264.h Wed Jan 27 21:31:19 2010 +0000 +++ b/h264.h Wed Jan 27 22:22:01 2010 +0000 @@ -581,6 +581,9 @@ 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
--- a/svq3.c Wed Jan 27 21:31:19 2010 +0000 +++ b/svq3.c Wed Jan 27 22:22:01 2010 +0000 @@ -126,7 +126,7 @@ }; -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 @@ } #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];