* Alpha optimized DSP utils
* Copyright (c) 2002 Falk Hueffner <falk@debian.org>
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
#include "asm.h"
-#include "../dsputil.h"
-#include "../mpegvideo.h"
-static void dct_unquantize_h263_axp(MpegEncContext *s, DCTELEM *block,
- int n, int qscale)
+static void dct_unquantize_h263_axp(DCTELEM *block, int n_coeffs,
+ uint64_t qscale, uint64_t qadd)
{
- int i, n_coeffs;
- uint64_t qmul, qadd;
- uint64_t correction;
- DCTELEM *orig_block = block;
- DCTELEM block0;
-
- if (s->mb_intra) {
- if (!s->h263_aic) {
- if (n < 4)
- block0 = block[0] * s->y_dc_scale;
- else
- block0 = block[0] * s->c_dc_scale;
- }
- n_coeffs = 64; // does not always use zigzag table
- } else {
- n_coeffs = s->intra_scantable.raster_end[s->block_last_index[n]];
- }
+ uint64_t qmul = qscale << 1;
+ uint64_t correction = WORD_VEC(qmul * 255 >> 8);
+ int i;
- qmul = qscale << 1;
- qadd = WORD_VEC((qscale - 1) | 1);
- /* This mask kills spill from negative subwords to the next subword. */
- correction = WORD_VEC((qmul - 1) + 1); /* multiplication / addition */
+ qadd = WORD_VEC(qadd);
- for(i = 0; i < n_coeffs; block += 4, i += 4) {
- uint64_t levels, negmask, zeros, add;
+ for(i = 0; i <= n_coeffs; block += 4, i += 4) {
+ uint64_t levels, negmask, zeros, add, sub;
levels = ldq(block);
if (levels == 0)
#ifdef __alpha_max__
/* I don't think the speed difference justifies runtime
detection. */
- ASM_ACCEPT_MVI;
negmask = maxsw4(levels, -1); /* negative -> ffff (-1) */
negmask = minsw4(negmask, 0); /* positive -> 0000 (0) */
#else
levels *= qmul;
levels -= correction & (negmask << 16);
- /* Negate qadd for negative levels. */
- add = qadd ^ negmask;
- add += WORD_VEC(0x0001) & negmask;
+ add = qadd & ~negmask;
+ sub = qadd & negmask;
/* Set qadd to 0 for levels == 0. */
add = zap(add, zeros);
-
levels += add;
+ levels -= sub;
stq(levels, block);
}
+}
+
+static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
+ int n, int qscale)
+{
+ int n_coeffs;
+ uint64_t qadd;
+ DCTELEM block0 = block[0];
+
+ if (!s->h263_aic) {
+ if (n < 4)
+ block0 *= s->y_dc_scale;
+ else
+ block0 *= s->c_dc_scale;
+ qadd = (qscale - 1) | 1;
+ } else {
+ qadd = 0;
+ }
+
+ if(s->ac_pred)
+ n_coeffs = 63;
+ else
+ n_coeffs = s->inter_scantable.raster_end[s->block_last_index[n]];
+
+ dct_unquantize_h263_axp(block, n_coeffs, qscale, qadd);
- if (s->mb_intra && !s->h263_aic)
- orig_block[0] = block0;
+ block[0] = block0;
+}
+
+static void dct_unquantize_h263_inter_axp(MpegEncContext *s, DCTELEM *block,
+ int n, int qscale)
+{
+ int n_coeffs = s->inter_scantable.raster_end[s->block_last_index[n]];
+ dct_unquantize_h263_axp(block, n_coeffs, qscale, (qscale - 1) | 1);
}
void MPV_common_init_axp(MpegEncContext *s)
{
- /* disabled for now, buggy */
- //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;
}