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

x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()

Browse Source 
Also undo the changes to ra144enc.c from previous commits.
Should fix ticket #3429

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer 2014-03-05 19:44:36 -03:00 committed by Michael Niedermayer
parent 69ead9af75
commit 9e0e1f9067
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/ra144enc.c
View File

@ -34,7 +34,6 @@
#include "mathops.h"
#include "put_bits.h"
#include "ra144.h"
#include "libavutil/x86/cpu.h"
static av_cold int ra144_encode_close(AVCodecContext *avctx)
{
@ -376,8 +375,6 @@ static void ra144_encode_subblock(RA144Context *ractx,
ff_copy_and_dup(ractx->buffer_a, ractx->adapt_cb, cba_idx + BLOCKSIZE / 2 - 1);
m[0] = (ff_irms(&ractx->dsp, ractx->buffer_a) * rms) >> 12;
if (!EXTERNAL_SSE2(av_get_cpu_flags()))
emms_c();
}
fixed_cb_search(work + LPC_ORDER, coefs, data, cba_idx, &cb1_idx, &cb2_idx);
for (i = 0; i < BLOCKSIZE; i++) {

3
libavcodec/x86/dsputil.asm
View File

@ -61,6 +61,9 @@ cglobal scalarproduct_int16, 3,3,3, v1, v2, order
%endif
paddd m2, m0
movd eax, m2
%if mmsize == 8
emms
%endif
RET
; int scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3, int order, int mul)