RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

add 'aspect' and 'round' params to vf_expand.

Browse Source 
(my first commit! I hope I did this correctly ;)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15940 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ods15 2005-07-07 19:54:58 +00:00
parent 38d2e2afc8
commit 808c269a08
2 changed files with 36 additions and 18 deletions
DOCS/man/en
mplayer.1
libmpcodecs
vf_expand.c

15
DOCS/man/en/mplayer.1
View File

@ -4177,7 +4177,7 @@ top left corner position (default: -1, uppermost leftmost)
.PD 1
.
.TP
.B expand[=w:h:x:y:o]
.B expand[=w:h:x:y:o:a:r]
Expands (not scales) movie resolution to the given value and places the
unscaled original at coordinates x, y.
Can be used for placing subtitles/\:OSD in the resulting black bands.
@ -4202,6 +4202,19 @@ OSD/\:subtitle rendering
.br
1: enable
.REss
.IPs <a>\ \
Expands to an aspect instead of a resolution. (default: 0)
.sp 1
.I EXAMPLE:
.PD 0
.RSs
.IP expand=800::::3/4
Expands to 800x600, unless the movie is higher resolution, then it
expands to fill a 3/4 aspect.
.RE
.PD 1
.IPs <r>\ \
Rounds up to make both width and height divisable by r. (default: 1)
.RE
.
.TP

39
libmpcodecs/vf_expand.c
View File

@ -27,12 +27,16 @@ static struct vf_priv_s {
int exp_w,exp_h;
int exp_x,exp_y;
int osd;
double aspect;
int round;
unsigned char* fb_ptr;
int first_slice;
} vf_priv_dflt = {
-1,-1,
-1,-1,
0,
0.,
1,
NULL,
0
};
@ -178,6 +182,18 @@ static int config(struct vf_instance_s* vf,
else if ( vf->priv->exp_h < -1 ) vf->priv->exp_h=height - vf->priv->exp_h;
else if( vf->priv->exp_h<height ) vf->priv->exp_h=height;
#endif
if (vf->priv->aspect) {
if (vf->priv->exp_h < vf->priv->exp_w * vf->priv->aspect) {
vf->priv->exp_h = vf->priv->exp_w * vf->priv->aspect;
} else {
vf->priv->exp_w = vf->priv->exp_h / vf->priv->aspect;
}
}
if (vf->priv->round > 1) {
vf->priv->exp_w = (1 + (vf->priv->exp_w - 1) / vf->priv->round) * vf->priv->round;
vf->priv->exp_h = (1 + (vf->priv->exp_h - 1) / vf->priv->round) * vf->priv->round;
}
if(vf->priv->exp_x<0 || vf->priv->exp_x+width>vf->priv->exp_w) vf->priv->exp_x=(vf->priv->exp_w-width)/2;
if(vf->priv->exp_y<0 || vf->priv->exp_y+height>vf->priv->exp_h) vf->priv->exp_y=(vf->priv->exp_h-height)/2;
vf->priv->fb_ptr=NULL;
@ -377,27 +393,14 @@ static int open(vf_instance_t *vf, char* args){
vf->draw_slice=draw_slice;
vf->get_image=get_image;
vf->put_image=put_image;
if(!vf->priv) {
vf->priv=malloc(sizeof(struct vf_priv_s));
vf->priv->exp_x=
vf->priv->exp_y=
vf->priv->exp_w=
vf->priv->exp_h=-1;
vf->priv->osd=0;
// parse args ->
} // if(!vf->priv)
if(args) sscanf(args, "%d:%d:%d:%d:%d",
&vf->priv->exp_w,
&vf->priv->exp_h,
&vf->priv->exp_x,
&vf->priv->exp_y,
&vf->priv->osd);
mp_msg(MSGT_VFILTER, MSGL_INFO, "Expand: %d x %d, %d ; %d (-1=autodetect) osd: %d\n",
mp_msg(MSGT_VFILTER, MSGL_INFO, "Expand: %d x %d, %d ; %d, osd: %d, aspect: %lf, round: %d\n",
vf->priv->exp_w,
vf->priv->exp_h,
vf->priv->exp_x,
vf->priv->exp_y,
vf->priv->osd);
vf->priv->osd,
vf->priv->aspect,
vf->priv->round);
return 1;
}
@ -408,6 +411,8 @@ static m_option_t vf_opts_fields[] = {
{"x", ST_OFF(exp_x), CONF_TYPE_INT, M_OPT_MIN, -1, 0, NULL},
{"y", ST_OFF(exp_y), CONF_TYPE_INT, M_OPT_MIN, -1, 0, NULL},
{"osd", ST_OFF(osd), CONF_TYPE_FLAG, 0 , 0, 1, NULL},
{"aspect", ST_OFF(aspect), CONF_TYPE_DOUBLE, M_OPT_MIN, 0, 0, NULL},
{"round", ST_OFF(round), CONF_TYPE_INT, M_OPT_MIN, 1, 0, NULL},
{ NULL, NULL, 0, 0, 0, 0, NULL }
};