RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-11 03:32:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix svq3_* function declarations.

Browse Source 
Patch by Rafaël Carré, rafael D carre A gmail

Originally committed as revision 21489 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Rafaël Carré 2010-01-27 22:22:01 +00:00 committed by Carl Eugen Hoyos
parent e3d8807315
commit 881b5b80da
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h264.c
View File

@ -43,9 +43,6 @@
//#undef NDEBUG //#undef NDEBUG
#include <assert.h> #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]={ 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, 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 else
idct_add (ptr, h->mb + i*16, linesize); idct_add (ptr, h->mb + i*16, linesize);
}else }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) if(!transform_bypass)
h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[0][s->qscale][0]); h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[0][s->qscale][0]);
}else }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) if(h->deblocking_filter)
xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0, simple); 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++){ for(i=0; i<16; i++){
if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below 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]; 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++){ for(i=16; i<16+8; i++){
if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i]; 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);
} }
} }
} }

3
libavcodec/h264.h
View File

@ -581,6 +581,9 @@ typedef struct H264Context{
extern const uint8_t ff_h264_chroma_qp[52]; 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 * Decode SEI

4
libavcodec/svq3.c
View File

@ -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]; const int qmul = svq3_dequant_coeff[qp];
#define stride 16 #define stride 16
@ -163,7 +163,7 @@ void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp)
} }
#undef stride #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) int dc)
{ {
const int qmul = svq3_dequant_coeff[qp]; const int qmul = svq3_dequant_coeff[qp];