Browse Source

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
tags/v0.6
Rafaël Carré Carl Eugen Hoyos 15 years ago
parent
commit
881b5b80da
3 changed files with 9 additions and 9 deletions
  1. +4
    -7
      libavcodec/h264.c
  2. +3
    -0
      libavcodec/h264.h
  3. +2
    -2
      libavcodec/svq3.c

+ 4
- 7
libavcodec/h264.c View File

@@ -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);
}
}
}


+ 3
- 0
libavcodec/h264.h View File

@@ -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


+ 2
- 2
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];
#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];


Loading…
Cancel
Save