RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-05-10 12:09:37 +00:00
Code Issues Releases Wiki Activity

call draw_slice in top-down order (fixes crash with -vf expand=...,scale)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14075 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
henry 2004-12-01 09:32:48 +00:00
parent 5caa6d592b
commit 0859bbe33a
1 changed files with 7 additions and 9 deletions

16
libmpcodecs/vf_expand.c
View File

@ -257,7 +257,14 @@ static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){
static void draw_slice(struct vf_instance_s* vf, static void draw_slice(struct vf_instance_s* vf,
unsigned char** src, int* stride, int w,int h, int x, int y){ unsigned char** src, int* stride, int w,int h, int x, int y){
// printf("draw_slice() called %d at %d\n",h,y); // printf("draw_slice() called %d at %d\n",h,y);
if(vf->priv->exp_y>0 && y == 0)
vf_next_draw_slice(vf, vf->dmpi->planes, vf->dmpi->stride,
vf->dmpi->w,vf->priv->exp_y,0,0);
vf_next_draw_slice(vf,src,stride,w,h,x+vf->priv->exp_x,y+vf->priv->exp_y); vf_next_draw_slice(vf,src,stride,w,h,x+vf->priv->exp_x,y+vf->priv->exp_y);
if(vf->priv->exp_y+vf->h<vf->dmpi->h && y+h == vf->h)
vf_next_draw_slice(vf, vf->dmpi->planes, vf->dmpi->stride,
vf->dmpi->w,vf->dmpi->h-(vf->priv->exp_y+vf->h),
0,vf->priv->exp_y+vf->h);
} }
static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
@ -265,15 +272,6 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
vf->dmpi=mpi->priv; vf->dmpi=mpi->priv;
if(!vf->dmpi) { printf("Why do we get NULL \n"); return 0; } if(!vf->dmpi) { printf("Why do we get NULL \n"); return 0; }
mpi->priv=NULL; mpi->priv=NULL;
if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){
if(vf->priv->exp_y>0)
vf_next_draw_slice(vf, vf->dmpi->planes, vf->dmpi->stride,
vf->dmpi->w,vf->priv->exp_y,0,0);
if(vf->priv->exp_y+mpi->h<vf->dmpi->h)
vf_next_draw_slice(vf, vf->dmpi->planes, vf->dmpi->stride,
vf->dmpi->w,vf->dmpi->h-(vf->priv->exp_y+mpi->h),
0,vf->priv->exp_y+mpi->h);
}
#ifdef OSD_SUPPORT #ifdef OSD_SUPPORT
if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h); if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h);
#endif #endif