mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Add code to clear left and right borders not only top and bottom.

Browse Source 
Patch by Tomas Janousek (tomi nomi cz) with small modifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24263 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-08-28 13:54:27 +00:00
parent 84157efa5a
commit bf61021b10
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libmpcodecs/vf_expand.c
View File

@ -78,8 +78,22 @@ static void remove_func(int x0,int y0, int w,int h){
if(y0>=vf->priv->exp_y+orig_h) return;
h=y-y0;
}
if(x0>=vf->priv->exp_x || x0+w<=vf->priv->exp_x+orig_w) return;
// TODO clear left and right side of the image if needed
if(x0<vf->priv->exp_x){
// it has parts on the left side of the image:
int x=x0+w;
if(x>vf->priv->exp_x) x=vf->priv->exp_x;
remove_func_2(x0,y0,x-x0,h);
if(x0+w<=vf->priv->exp_x) return;
w-=x-x0;x0=x;
}
if(x0+w>vf->priv->exp_x+orig_w){
// it has parts on the right side of the image:
int x=x0;
if(x<vf->priv->exp_x+orig_w) x=vf->priv->exp_x+orig_w;
remove_func_2(x,y0,x0+w-x,h);
if(x0>=vf->priv->exp_x+orig_w) return;
w=x-x0;
}
}
static void draw_func(int x0,int y0, int w,int h,unsigned char* src, unsigned char *srca, int stride){
@ -154,6 +168,10 @@ static void draw_osd(struct vf_instance_s* vf_,int w,int h){
remove_func_2(0,0,vf->priv->exp_w,vf->priv->exp_y);
if (vf->priv->exp_y+h < vf->priv->exp_h)
remove_func_2(0,vf->priv->exp_y+h,vf->priv->exp_w,vf->priv->exp_h-h-vf->priv->exp_y);
if (vf->priv->exp_x > 0)
remove_func_2(0,vf->priv->exp_y,vf->priv->exp_x,h);
if (vf->priv->exp_x+w < vf->priv->exp_w)
remove_func_2(vf->priv->exp_x+w,vf->priv->exp_y,vf->priv->exp_w-w-vf->priv->exp_x,h);
} else {
// partial clear:
vo_remove_text(vf->priv->exp_w,vf->priv->exp_h,remove_func);