1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 11:47:45 +00:00

Patch to improve/consistify coding style.

Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28005 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-11-23 18:50:39 +00:00
parent d86a77d8ba
commit 97eeb07265

View File

@ -601,9 +601,9 @@ static void check_events(void)
*/ */
static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y ) static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y )
{ {
char *Src; /**< Pointer to the source image */ char *my_src; /**< Pointer to the source image */
char *Dst; /**< Pointer to the destination image */ char *dst; /**< Pointer to the destination image */
int UVstride; /**< Stride of the U/V planes */ int uv_stride; /**< Stride of the U/V planes */
/* Lock the offscreen surface if it's not already locked. */ /* Lock the offscreen surface if it's not already locked. */
if (!priv->locked_rect.pBits) { if (!priv->locked_rect.pBits) {
@ -614,37 +614,37 @@ static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y )
} }
} }
UVstride = priv->locked_rect.Pitch / 2; uv_stride = priv->locked_rect.Pitch / 2;
/* Copy Y */ /* Copy Y */
Dst = priv->locked_rect.pBits; dst = priv->locked_rect.pBits;
Dst = Dst + priv->locked_rect.Pitch * y + x; dst = dst + priv->locked_rect.Pitch * y + x;
Src=src[0]; my_src=src[0];
memcpy_pic(Dst, Src, w, h, priv->locked_rect.Pitch, stride[0]); memcpy_pic(dst, my_src, w, h, priv->locked_rect.Pitch, stride[0]);
w/=2;h/=2;x/=2;y/=2; w/=2;h/=2;x/=2;y/=2;
/* Copy U */ /* Copy U */
Dst = priv->locked_rect.pBits; dst = priv->locked_rect.pBits;
Dst = Dst + priv->locked_rect.Pitch * priv->src_height dst = dst + priv->locked_rect.Pitch * priv->src_height
+ UVstride * y + x; + uv_stride * y + x;
if (priv->movie_src_fmt == MAKEFOURCC('Y','V','1','2')) if (priv->movie_src_fmt == MAKEFOURCC('Y','V','1','2'))
Src=src[2]; my_src=src[2];
else else
Src=src[1]; my_src=src[1];
memcpy_pic(Dst, Src, w, h, UVstride, stride[1]); memcpy_pic(dst, my_src, w, h, uv_stride, stride[1]);
/* Copy V */ /* Copy V */
Dst = priv->locked_rect.pBits; dst = priv->locked_rect.pBits;
Dst = Dst + priv->locked_rect.Pitch * priv->src_height dst = dst + priv->locked_rect.Pitch * priv->src_height
+ UVstride * (priv->src_height / 2) + UVstride * y + x; + uv_stride * (priv->src_height / 2) + uv_stride * y + x;
if (priv->movie_src_fmt == MAKEFOURCC('Y','V','1','2')) if (priv->movie_src_fmt == MAKEFOURCC('Y','V','1','2'))
Src=src[1]; my_src=src[1];
else else
Src=src[2]; my_src=src[2];
memcpy_pic(Dst, Src, w, h, UVstride, stride[2]); memcpy_pic(dst, my_src, w, h, uv_stride, stride[2]);
return 0; /* Success */ return 0; /* Success */
} }