|
|
|
@ -1817,7 +1817,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int mb_ty |
|
|
|
|
idct_dc_add(ptr, h->mb + (i*16+p*256 << pixel_shift), linesize); |
|
|
|
|
else |
|
|
|
|
idct_add (ptr, h->mb + (i*16+p*256 << pixel_shift), linesize); |
|
|
|
|
}else |
|
|
|
|
} else if (CONFIG_SVQ3_DECODER) |
|
|
|
|
ff_svq3_add_idct_c(ptr, h->mb + i*16+p*256, linesize, qscale, 0); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -1837,7 +1837,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int mb_ty |
|
|
|
|
dctcoef_set(h->mb+(p*256 << pixel_shift), pixel_shift, dc_mapping[i], dctcoef_get(h->mb_luma_dc[p], pixel_shift, i)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}else |
|
|
|
|
} else if (CONFIG_SVQ3_DECODER) |
|
|
|
|
ff_svq3_luma_dc_dequant_idct_c(h->mb+p*256, h->mb_luma_dc[p], qscale); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -1881,7 +1881,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, int mb_type, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
} else if (CONFIG_SVQ3_DECODER) { |
|
|
|
|
for(i=0; i<16; i++){ |
|
|
|
|
if(h->non_zero_count_cache[ scan8[i+p*16] ] || h->mb[i*16+p*256]){ //FIXME benchmark weird rule, & below
|
|
|
|
|
uint8_t * const ptr= dest_y + block_offset[i]; |
|
|
|
@ -2080,7 +2080,7 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple, i |
|
|
|
|
h->h264dsp.h264_idct_add8(dest, block_offset, |
|
|
|
|
h->mb, uvlinesize, |
|
|
|
|
h->non_zero_count_cache); |
|
|
|
|
}else{ |
|
|
|
|
} else if (CONFIG_SVQ3_DECODER) { |
|
|
|
|
h->h264dsp.h264_chroma_dc_dequant_idct(h->mb + 16*16*1, h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]); |
|
|
|
|
h->h264dsp.h264_chroma_dc_dequant_idct(h->mb + 16*16*2, h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]); |
|
|
|
|
for(j=1; j<3; j++){ |
|
|
|
|