Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed yv12toyuy2

Browse Source 
Originally committed as revision 2724 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
pull/126/head
Michael Niedermayer 23 years ago
parent ebbe52f1da
commit 42b5fcb890
3 changed files with 118 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 101
      postproc/rgb2rgb.c
  2. 4
      postproc/rgb2rgb.h
  3. 101
      postproc/rgb2rgb_template.c

101
postproc/rgb2rgb.c
Unescape View File

@ -291,56 +291,71 @@ void palette8torgb15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, cons
} }
/** /**
* *
* num_pixels must be a multiple of 16 for the MMX version * width must be a multiple of 16 for the MMX version
*/ */
void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, unsigned num_pixels) void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
int width, int height, int lumStride, int chromStride, int dstStride)
{ {
int y;
const int chromWidth= width>>1;
for(y=0; y<height; y++)
{
#ifdef HAVE_MMX #ifdef HAVE_MMX
asm volatile( //FIXME handle 2 lines a once (fewer prefetch, reuse some chrom, but very likely limited by mem anyway)
"xorl %%eax, %%eax \n\t" asm volatile(
"1: \n\t" "xorl %%eax, %%eax \n\t"
PREFETCH" 32(%1, %%eax, 2) \n\t" "1: \n\t"
PREFETCH" 32(%2, %%eax) \n\t" PREFETCH" 32(%1, %%eax, 2) \n\t"
PREFETCH" 32(%3, %%eax) \n\t" PREFETCH" 32(%2, %%eax) \n\t"
"movq (%2, %%eax), %%mm0 \n\t" // U(0) PREFETCH" 32(%3, %%eax) \n\t"
"movq %%mm0, %%mm2 \n\t" // U(0) "movq (%2, %%eax), %%mm0 \n\t" // U(0)
"movq (%3, %%eax), %%mm1 \n\t" // V(0) "movq %%mm0, %%mm2 \n\t" // U(0)
"punpcklbw %%mm1, %%mm0 \n\t" // UVUV UVUV(0) "movq (%3, %%eax), %%mm1 \n\t" // V(0)
"punpckhbw %%mm1, %%mm2 \n\t" // UVUV UVUV(8) "punpcklbw %%mm1, %%mm0 \n\t" // UVUV UVUV(0)
"punpckhbw %%mm1, %%mm2 \n\t" // UVUV UVUV(8)
"movq (%1, %%eax,2), %%mm3 \n\t" // Y(0)
"movq 8(%1, %%eax,2), %%mm5 \n\t" // Y(8)
"movq %%mm3, %%mm4 \n\t" // Y(0)
"movq %%mm5, %%mm6 \n\t" // Y(8)
"punpcklbw %%mm0, %%mm3 \n\t" // YUYV YUYV(0)
"punpckhbw %%mm0, %%mm4 \n\t" // YUYV YUYV(4)
"punpcklbw %%mm2, %%mm5 \n\t" // YUYV YUYV(8)
"punpckhbw %%mm2, %%mm6 \n\t" // YUYV YUYV(12)
MOVNTQ" %%mm3, (%0, %%eax, 4) \n\t" "movq (%1, %%eax,2), %%mm3 \n\t" // Y(0)
MOVNTQ" %%mm4, 8(%0, %%eax, 4) \n\t" "movq 8(%1, %%eax,2), %%mm5 \n\t" // Y(8)
MOVNTQ" %%mm5, 16(%0, %%eax, 4) \n\t" "movq %%mm3, %%mm4 \n\t" // Y(0)
MOVNTQ" %%mm6, 24(%0, %%eax, 4) \n\t" "movq %%mm5, %%mm6 \n\t" // Y(8)
"punpcklbw %%mm0, %%mm3 \n\t" // YUYV YUYV(0)
"punpckhbw %%mm0, %%mm4 \n\t" // YUYV YUYV(4)
"punpcklbw %%mm2, %%mm5 \n\t" // YUYV YUYV(8)
"punpckhbw %%mm2, %%mm6 \n\t" // YUYV YUYV(12)
"addl $8, %%eax \n\t" MOVNTQ" %%mm3, (%0, %%eax, 4) \n\t"
"cmpl %4, %%eax \n\t" MOVNTQ" %%mm4, 8(%0, %%eax, 4) \n\t"
" jb 1b \n\t" MOVNTQ" %%mm5, 16(%0, %%eax, 4) \n\t"
EMMS" \n\t" MOVNTQ" %%mm6, 24(%0, %%eax, 4) \n\t"
SFENCE
::"r"(dst), "r"(ysrc), "r"(usrc), "r"(vsrc), "r" (num_pixels>>1)
: "memory", "%eax"
);
"addl $8, %%eax \n\t"
"cmpl %4, %%eax \n\t"
" jb 1b \n\t"
::"r"(dst), "r"(ysrc), "r"(usrc), "r"(vsrc), "r" (chromWidth)
: "%eax"
);
#else #else
int i; int i;
num_pixels>>=1; for(i=0; i<chromWidth; i++)
for(i=0; i<num_pixels; i++) {
{ dst[4*i+0] = ysrc[2*i+0];
dst[4*i+0] = ysrc[2*i+0]; dst[4*i+1] = usrc[i];
dst[4*i+1] = usrc[i]; dst[4*i+2] = ysrc[2*i+1];
dst[4*i+2] = ysrc[2*i+1]; dst[4*i+3] = vsrc[i];
dst[4*i+3] = vsrc[i]; }
#endif
if(y&1)
{
usrc += chromStride;
vsrc += chromStride;
}
ysrc += lumStride;
dst += dstStride;
} }
#ifdef HAVE_MMX
asm( EMMS" \n\t"
SFENCE" \n\t"
:::"memory");
#endif #endif
} }
@ -410,4 +425,4 @@ void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
vdst[i] = src[4*i+3]; vdst[i] = src[4*i+3];
} }
#endif #endif
} }

4
postproc/rgb2rgb.h
Unescape View File

@ -21,8 +21,8 @@ extern void palette8torgb16(const uint8_t *src, uint8_t *dst, unsigned num_pixel
extern void palette8torgb15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette); extern void palette8torgb15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
extern void palette8torgb24(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette); extern void palette8torgb24(const uint8_t *src, uint8_t *dst, unsigned num_pixels, const uint8_t *palette);
extern void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, unsigned num_pixels); extern void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
int width, int height, int lumStride, int chromStride, int dstStride);
extern void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, unsigned num_pixels); extern void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, unsigned num_pixels);
#endif #endif

101
postproc/rgb2rgb_template.c
Unescape View File

@ -291,56 +291,71 @@ void palette8torgb15(const uint8_t *src, uint8_t *dst, unsigned num_pixels, cons
} }
/** /**
* *
* num_pixels must be a multiple of 16 for the MMX version * width must be a multiple of 16 for the MMX version
*/ */
void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, unsigned num_pixels) void yv12toyuy2(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst,
int width, int height, int lumStride, int chromStride, int dstStride)
{ {
int y;
const int chromWidth= width>>1;
for(y=0; y<height; y++)
{
#ifdef HAVE_MMX #ifdef HAVE_MMX
asm volatile( //FIXME handle 2 lines a once (fewer prefetch, reuse some chrom, but very likely limited by mem anyway)
"xorl %%eax, %%eax \n\t" asm volatile(
"1: \n\t" "xorl %%eax, %%eax \n\t"
PREFETCH" 32(%1, %%eax, 2) \n\t" "1: \n\t"
PREFETCH" 32(%2, %%eax) \n\t" PREFETCH" 32(%1, %%eax, 2) \n\t"
PREFETCH" 32(%3, %%eax) \n\t" PREFETCH" 32(%2, %%eax) \n\t"
"movq (%2, %%eax), %%mm0 \n\t" // U(0) PREFETCH" 32(%3, %%eax) \n\t"
"movq %%mm0, %%mm2 \n\t" // U(0) "movq (%2, %%eax), %%mm0 \n\t" // U(0)
"movq (%3, %%eax), %%mm1 \n\t" // V(0) "movq %%mm0, %%mm2 \n\t" // U(0)
"punpcklbw %%mm1, %%mm0 \n\t" // UVUV UVUV(0) "movq (%3, %%eax), %%mm1 \n\t" // V(0)
"punpckhbw %%mm1, %%mm2 \n\t" // UVUV UVUV(8) "punpcklbw %%mm1, %%mm0 \n\t" // UVUV UVUV(0)
"punpckhbw %%mm1, %%mm2 \n\t" // UVUV UVUV(8)
"movq (%1, %%eax,2), %%mm3 \n\t" // Y(0)
"movq 8(%1, %%eax,2), %%mm5 \n\t" // Y(8)
"movq %%mm3, %%mm4 \n\t" // Y(0)
"movq %%mm5, %%mm6 \n\t" // Y(8)
"punpcklbw %%mm0, %%mm3 \n\t" // YUYV YUYV(0)
"punpckhbw %%mm0, %%mm4 \n\t" // YUYV YUYV(4)
"punpcklbw %%mm2, %%mm5 \n\t" // YUYV YUYV(8)
"punpckhbw %%mm2, %%mm6 \n\t" // YUYV YUYV(12)
MOVNTQ" %%mm3, (%0, %%eax, 4) \n\t" "movq (%1, %%eax,2), %%mm3 \n\t" // Y(0)
MOVNTQ" %%mm4, 8(%0, %%eax, 4) \n\t" "movq 8(%1, %%eax,2), %%mm5 \n\t" // Y(8)
MOVNTQ" %%mm5, 16(%0, %%eax, 4) \n\t" "movq %%mm3, %%mm4 \n\t" // Y(0)
MOVNTQ" %%mm6, 24(%0, %%eax, 4) \n\t" "movq %%mm5, %%mm6 \n\t" // Y(8)
"punpcklbw %%mm0, %%mm3 \n\t" // YUYV YUYV(0)
"punpckhbw %%mm0, %%mm4 \n\t" // YUYV YUYV(4)
"punpcklbw %%mm2, %%mm5 \n\t" // YUYV YUYV(8)
"punpckhbw %%mm2, %%mm6 \n\t" // YUYV YUYV(12)
"addl $8, %%eax \n\t" MOVNTQ" %%mm3, (%0, %%eax, 4) \n\t"
"cmpl %4, %%eax \n\t" MOVNTQ" %%mm4, 8(%0, %%eax, 4) \n\t"
" jb 1b \n\t" MOVNTQ" %%mm5, 16(%0, %%eax, 4) \n\t"
EMMS" \n\t" MOVNTQ" %%mm6, 24(%0, %%eax, 4) \n\t"
SFENCE
::"r"(dst), "r"(ysrc), "r"(usrc), "r"(vsrc), "r" (num_pixels>>1)
: "memory", "%eax"
);
"addl $8, %%eax \n\t"
"cmpl %4, %%eax \n\t"
" jb 1b \n\t"
::"r"(dst), "r"(ysrc), "r"(usrc), "r"(vsrc), "r" (chromWidth)
: "%eax"
);
#else #else
int i; int i;
num_pixels>>=1; for(i=0; i<chromWidth; i++)
for(i=0; i<num_pixels; i++) {
{ dst[4*i+0] = ysrc[2*i+0];
dst[4*i+0] = ysrc[2*i+0]; dst[4*i+1] = usrc[i];
dst[4*i+1] = usrc[i]; dst[4*i+2] = ysrc[2*i+1];
dst[4*i+2] = ysrc[2*i+1]; dst[4*i+3] = vsrc[i];
dst[4*i+3] = vsrc[i]; }
#endif
if(y&1)
{
usrc += chromStride;
vsrc += chromStride;
}
ysrc += lumStride;
dst += dstStride;
} }
#ifdef HAVE_MMX
asm( EMMS" \n\t"
SFENCE" \n\t"
:::"memory");
#endif #endif
} }
@ -410,4 +425,4 @@ void yuy2toyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
vdst[i] = src[4*i+3]; vdst[i] = src[4*i+3];
} }
#endif #endif
} }

Write Preview
Loading…
Cancel
Save