diff options
author | wm4 <wm4@nowhere> | 2012-11-05 17:02:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:06:14 +0100 |
commit | d4bdd0473d6f43132257c9fb3848d829755167a3 (patch) | |
tree | 8021c2f7da1841393c8c832105e20cd527826d6c /video/filter/vf_crop.c | |
parent | bd48deba77bd5582c5829d6fe73a7d2571088aba (diff) | |
download | mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2 mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz |
Rename directories, move files (step 1 of 2) (does not compile)
Tis drops the silly lib prefixes, and attempts to organize the tree in
a more logical way. Make the top-level directory less cluttered as
well.
Renames the following directories:
libaf -> audio/filter
libao2 -> audio/out
libvo -> video/out
libmpdemux -> demux
Split libmpcodecs:
vf* -> video/filter
vd*, dec_video.* -> video/decode
mp_image*, img_format*, ... -> video/
ad*, dec_audio.* -> audio/decode
libaf/format.* is moved to audio/ - this is similar to how mp_image.*
is located in video/.
Move most top-level .c/.h files to core. (talloc.c/.h is left on top-
level, because it's external.) Park some of the more annoying files
in compat/. Some of these are relicts from the time mplayer used
ffmpeg internals.
sub/ is not split, because it's too much of a mess (subtitle code is
mixed with OSD display and rendering).
Maybe the organization of core is not ideal: it mixes playback core
(like mplayer.c) and utility helpers (like bstr.c/h). Should the need
arise, the playback core will be moved somewhere else, while core
contains all helper and common code.
Diffstat (limited to 'video/filter/vf_crop.c')
-rw-r--r-- | video/filter/vf_crop.c | 196 |
1 files changed, 196 insertions, 0 deletions
diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c new file mode 100644 index 0000000000..c4e0b4253b --- /dev/null +++ b/video/filter/vf_crop.c @@ -0,0 +1,196 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "config.h" +#include "mp_msg.h" +#include "options.h" + +#include "img_format.h" +#include "mp_image.h" +#include "vf.h" + +#include "m_option.h" +#include "m_struct.h" + +static const struct vf_priv_s { + int crop_w,crop_h; + int crop_x,crop_y; +} vf_priv_dflt = { + -1,-1, + -1,-1 +}; + +//===========================================================================// + +static int config(struct vf_instance *vf, + int width, int height, int d_width, int d_height, + unsigned int flags, unsigned int outfmt){ + struct MPOpts *opts = vf->opts; + // calculate the missing parameters: + if(vf->priv->crop_w<=0 || vf->priv->crop_w>width) vf->priv->crop_w=width; + if(vf->priv->crop_h<=0 || vf->priv->crop_h>height) vf->priv->crop_h=height; + if(vf->priv->crop_x<0) vf->priv->crop_x=(width-vf->priv->crop_w)/2; + if(vf->priv->crop_y<0) vf->priv->crop_y=(height-vf->priv->crop_h)/2; + // rounding: + if(!IMGFMT_IS_RGB(outfmt) && !IMGFMT_IS_BGR(outfmt)){ + switch(outfmt){ + case IMGFMT_444P: + case IMGFMT_Y800: + case IMGFMT_Y8: + break; + case IMGFMT_YVU9: + case IMGFMT_IF09: + vf->priv->crop_y&=~3; + case IMGFMT_411P: + vf->priv->crop_x&=~3; + break; + case IMGFMT_YV12: + case IMGFMT_I420: + case IMGFMT_IYUV: + vf->priv->crop_y&=~1; + default: + vf->priv->crop_x&=~1; + } + } + // check: + if(vf->priv->crop_w+vf->priv->crop_x>width || + vf->priv->crop_h+vf->priv->crop_y>height){ + mp_tmsg(MSGT_VFILTER, MSGL_WARN, "[CROP] Bad position/width/height - cropped area outside of the original!\n"); + return 0; + } + if(!opts->screen_size_x && !opts->screen_size_y){ + d_width=d_width*vf->priv->crop_w/width; + d_height=d_height*vf->priv->crop_h/height; + } + return vf_next_config(vf,vf->priv->crop_w,vf->priv->crop_h,d_width,d_height,flags,outfmt); +} + +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ + mp_image_t *dmpi; + if (mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) + return vf_next_put_image(vf,vf->dmpi, pts); + dmpi=vf_get_image(vf->next,mpi->imgfmt, + MP_IMGTYPE_EXPORT, 0, + vf->priv->crop_w, vf->priv->crop_h); + if(mpi->flags&MP_IMGFLAG_PLANAR){ + dmpi->planes[0]=mpi->planes[0]+ + vf->priv->crop_y*mpi->stride[0]+vf->priv->crop_x; + dmpi->planes[1]=mpi->planes[1]+ + (vf->priv->crop_y>>mpi->chroma_y_shift)*mpi->stride[1]+(vf->priv->crop_x>>mpi->chroma_x_shift); + dmpi->planes[2]=mpi->planes[2]+ + (vf->priv->crop_y>>mpi->chroma_y_shift)*mpi->stride[2]+(vf->priv->crop_x>>mpi->chroma_x_shift); + dmpi->stride[1]=mpi->stride[1]; + dmpi->stride[2]=mpi->stride[2]; + } else { + dmpi->planes[0]=mpi->planes[0]+ + vf->priv->crop_y*mpi->stride[0]+ + vf->priv->crop_x*(mpi->bpp/8); + dmpi->planes[1]=mpi->planes[1]; // passthrough rgb8 palette + } + dmpi->stride[0]=mpi->stride[0]; + dmpi->width=mpi->width; + return vf_next_put_image(vf,dmpi, pts); +} + +static void start_slice(struct vf_instance *vf, mp_image_t *mpi){ + vf->dmpi = vf_get_image(vf->next, mpi->imgfmt, mpi->type, mpi->flags, + vf->priv->crop_w, vf->priv->crop_h); +} + +static void draw_slice(struct vf_instance *vf, + unsigned char** src, int* stride, int w,int h, int x, int y){ + unsigned char *src2[3]; + src2[0] = src[0]; + if (vf->dmpi->flags & MP_IMGFLAG_PLANAR) { + src2[1] = src[1]; + src2[2] = src[2]; + } + //mp_msg(MSGT_VFILTER, MSGL_V, "crop slice %d %d %d %d ->", w,h,x,y); + if ((x -= vf->priv->crop_x) < 0) { + x = -x; + src2[0] += x; + if (vf->dmpi->flags & MP_IMGFLAG_PLANAR) { + src2[1] += x>>vf->dmpi->chroma_x_shift; + src2[2] += x>>vf->dmpi->chroma_x_shift; + } + w -= x; + x = 0; + } + if ((y -= vf->priv->crop_y) < 0) { + y = -y; + src2[0] += y*stride[0]; + if (vf->dmpi->flags & MP_IMGFLAG_PLANAR) { + src2[1] += (y>>vf->dmpi->chroma_y_shift)*stride[1]; + src2[2] += (y>>vf->dmpi->chroma_y_shift)*stride[2]; + } + h -= y; + y = 0; + } + if (x+w > vf->priv->crop_w) w = vf->priv->crop_w-x; + if (y+h > vf->priv->crop_h) h = vf->priv->crop_h-y; + //mp_msg(MSGT_VFILTER, MSGL_V, "%d %d %d %d\n", w,h,x,y); + if (w <= 0 || h <= 0) return; + vf_next_draw_slice(vf,src2,stride,w,h,x,y); +} + +//===========================================================================// + +static int vf_open(vf_instance_t *vf, char *args){ + vf->config=config; + vf->put_image=put_image; + vf->start_slice=start_slice; + vf->draw_slice=draw_slice; + vf->default_reqs=VFCAP_ACCEPT_STRIDE; + mp_msg(MSGT_VFILTER, MSGL_INFO, "Crop: %d x %d, %d ; %d\n", + vf->priv->crop_w, + vf->priv->crop_h, + vf->priv->crop_x, + vf->priv->crop_y); + return 1; +} + +#define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f) +static const m_option_t vf_opts_fields[] = { + {"w", ST_OFF(crop_w), CONF_TYPE_INT, M_OPT_MIN,0 ,0, NULL}, + {"h", ST_OFF(crop_h), CONF_TYPE_INT, M_OPT_MIN,0 ,0, NULL}, + {"x", ST_OFF(crop_x), CONF_TYPE_INT, M_OPT_MIN,-1 ,0, NULL}, + {"y", ST_OFF(crop_y), CONF_TYPE_INT, M_OPT_MIN,-1 ,0, NULL}, + { NULL, NULL, 0, 0, 0, 0, NULL } +}; + +static const m_struct_t vf_opts = { + "crop", + sizeof(struct vf_priv_s), + &vf_priv_dflt, + vf_opts_fields +}; + +const vf_info_t vf_info_crop = { + "cropping", + "crop", + "A'rpi", + "", + vf_open, + &vf_opts +}; + +//===========================================================================// |