generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

100l (forgot alpha & ppc)

Browse Source 
Originally committed as revision 2611 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-12-15 09:21:28 +00:00
parent 31b1ec5d38
commit 2393e65431
2 changed files with 66 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libavcodec/alpha/mpegvideo_alpha.c
View File

@ -21,7 +21,7 @@
#include "../dsputil.h"
#include "../mpegvideo.h"
static void dct_unquantize_h263_axp(MpegEncContext *s, DCTELEM *block,
static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
int n, int qscale)
{
int i, n_coeffs;
@ -35,7 +35,6 @@ static void dct_unquantize_h263_axp(MpegEncContext *s, DCTELEM *block,
/* This mask kills spill from negative subwords to the next subword. */
correction = WORD_VEC((qmul - 1) + 1); /* multiplication / addition */
if (s->mb_intra) {
if (!s->h263_aic) {
if (n < 4)
block0 = block[0] * s->y_dc_scale;
@ -45,9 +44,6 @@ static void dct_unquantize_h263_axp(MpegEncContext *s, DCTELEM *block,
qadd = 0;
}
n_coeffs = 63; // does not always use zigzag table
} else {
n_coeffs = s->intra_scantable.raster_end[s->block_last_index[n]];
}
for(i = 0; i <= n_coeffs; block += 4, i += 4) {
uint64_t levels, negmask, zeros, add;
@ -90,7 +86,62 @@ static void dct_unquantize_h263_axp(MpegEncContext *s, DCTELEM *block,
orig_block[0] = block0;
}
static void dct_unquantize_h263_inter_axp(MpegEncContext *s, DCTELEM *block,
int n, int qscale)
{
int i, n_coeffs;
uint64_t qmul, qadd;
uint64_t correction;
DCTELEM *orig_block = block;
DCTELEM block0;
qadd = WORD_VEC((qscale - 1) | 1);
qmul = qscale << 1;
/* This mask kills spill from negative subwords to the next subword. */
correction = WORD_VEC((qmul - 1) + 1); /* multiplication / addition */
n_coeffs = s->intra_scantable.raster_end[s->block_last_index[n]];
for(i = 0; i <= n_coeffs; block += 4, i += 4) {
uint64_t levels, negmask, zeros, add;
levels = ldq(block);
if (levels == 0)
continue;
#ifdef __alpha_max__
/* I don't think the speed difference justifies runtime
detection. */
negmask = maxsw4(levels, -1); /* negative -> ffff (-1) */
negmask = minsw4(negmask, 0); /* positive -> 0000 (0) */
#else
negmask = cmpbge(WORD_VEC(0x7fff), levels);
negmask &= (negmask >> 1) | (1 << 7);
negmask = zap(-1, negmask);
#endif
zeros = cmpbge(0, levels);
zeros &= zeros >> 1;
/* zeros |= zeros << 1 is not needed since qadd <= 255, so
zapping the lower byte suffices. */
levels *= qmul;
levels -= correction & (negmask << 16);
/* Negate qadd for negative levels. */
add = qadd ^ negmask;
add += WORD_VEC(0x0001) & negmask;
/* Set qadd to 0 for levels == 0. */
add = zap(add, zeros);
levels += add;
stq(levels, block);
}
}
void MPV_common_init_axp(MpegEncContext *s)
{
s->dct_unquantize_h263 = dct_unquantize_h263_axp;
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_axp;
s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_axp;
}

3
libavcodec/ppc/mpegvideo_ppc.c
View File

@ -72,7 +72,8 @@ void MPV_common_init_ppc(MpegEncContext *s)
(s->avctx->dct_algo == FF_DCT_ALTIVEC))
{
s->dct_quantize = dct_quantize_altivec;
s->dct_unquantize_h263 = dct_unquantize_h263_altivec;
s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec;
s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec;
}
} else
#endif