RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/hpeldsp: fix loop in {avg,avg_no_rnd}_pixels16_x2_mmx 

Handle it inside the __asm__() block.
Fixes fate-vc1_ilaced_twomv when using the gcc-usan toolchain.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2014-10-23 00:43:43 -03:00
parent c5e337431b
commit 7292b0477a
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/x86/hpeldsp_rnd_template.c
View File

@ -138,27 +138,28 @@ static void DEF(put, pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_
static void DEF(avg, pixels16_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) static void DEF(avg, pixels16_x2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
{ {
MOVQ_BFE(mm6); MOVQ_BFE(mm6);
JUMPALIGN();
do {
__asm__ volatile( __asm__ volatile(
"movq %1, %%mm0 \n\t" ".p2align 3 \n\t"
"movq 1%1, %%mm1 \n\t" "1: \n\t"
"movq %0, %%mm3 \n\t" "movq (%1), %%mm0 \n\t"
"movq 1(%1), %%mm1 \n\t"
"movq (%2), %%mm3 \n\t"
PAVGB(%%mm0, %%mm1, %%mm2, %%mm6) PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
PAVGB_MMX(%%mm3, %%mm2, %%mm0, %%mm6) PAVGB_MMX(%%mm3, %%mm2, %%mm0, %%mm6)
"movq %%mm0, %0 \n\t" "movq %%mm0, (%2) \n\t"
"movq 8%1, %%mm0 \n\t" "movq 8(%1), %%mm0 \n\t"
"movq 9%1, %%mm1 \n\t" "movq 9(%1), %%mm1 \n\t"
"movq 8%0, %%mm3 \n\t" "movq 8(%2), %%mm3 \n\t"
PAVGB(%%mm0, %%mm1, %%mm2, %%mm6) PAVGB(%%mm0, %%mm1, %%mm2, %%mm6)
PAVGB_MMX(%%mm3, %%mm2, %%mm0, %%mm6) PAVGB_MMX(%%mm3, %%mm2, %%mm0, %%mm6)
"movq %%mm0, 8%0 \n\t" "movq %%mm0, 8(%2) \n\t"
:"+m"(*block) "add %3, %1 \n\t"
:"m"(*pixels) "add %3, %2 \n\t"
"subl $1, %0 \n\t"
"jnz 1b \n\t"
:"+g"(h), "+S"(pixels), "+D"(block)
:"r"((x86_reg)line_size)
:"memory"); :"memory");
pixels += line_size;
block += line_size;
} while (--h);
} }
static void DEF(avg, pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) static void DEF(avg, pixels8_y2)(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)