Mercurial > mplayer.hg
changeset 34876:c5f89bf5b952
corevideo: Reduce code duplication in OSD rendering code.
| author | reimar |
|---|---|
| date | Wed, 23 May 2012 19:28:03 +0000 |
| parents | 444a6a469743 |
| children | d7adf9d28abd |
| files | libvo/vo_corevideo.m |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_corevideo.m Wed May 23 19:17:30 2012 +0000 +++ b/libvo/vo_corevideo.m Wed May 23 19:28:03 2012 +0000 @@ -99,17 +99,19 @@ static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) { + unsigned char *dst = image_data + image_bytes * (y0 * image_width + x0); + int dststride = image_bytes * image_width; switch (image_format) { case IMGFMT_RGB24: - vo_draw_alpha_rgb24(w,h,src,srca,stride,image_data+3*(y0*image_width+x0),3*image_width); + vo_draw_alpha_rgb24(w,h,src,srca,stride,dst,dststride); break; case IMGFMT_ARGB: case IMGFMT_BGRA: - vo_draw_alpha_rgb32(w,h,src,srca,stride,image_data+4*(y0*image_width+x0),4*image_width); + vo_draw_alpha_rgb32(w,h,src,srca,stride,dst,dststride); break; case IMGFMT_YUY2: - vo_draw_alpha_yuy2(w,h,src,srca,stride,image_data + (x0 + y0 * image_width) * 2,image_width*2); + vo_draw_alpha_yuy2(w,h,src,srca,stride,dst,dststride); break; } }