From 757776530027888884add5f8c4bac0771da0aef3 Mon Sep 17 00:00:00 2001 From: arpi Date: Fri, 19 Apr 2002 02:18:46 +0000 Subject: rotation/mirror filter git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5697 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/Makefile | 2 +- libmpcodecs/vf.c | 2 + libmpcodecs/vf_rotate.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 libmpcodecs/vf_rotate.c diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index cc2381c8b5..32156f9ee2 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -6,7 +6,7 @@ LIBNAME2 = libmpencoders.a AUDIO_SRCS=dec_audio.c ad.c ad_a52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dk4adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_vorbis.c ad_libmad.c VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_zlib.c vd_mpegpes.c -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_fame.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_fame.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 07cdd44330..25d59838d4 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -19,6 +19,7 @@ extern vf_info_t vf_info_format; extern vf_info_t vf_info_yuy2; extern vf_info_t vf_info_flip; extern vf_info_t vf_info_rgb2bgr; +extern vf_info_t vf_info_rotate; char** vo_plugin_args=(char**) NULL; @@ -35,6 +36,7 @@ static vf_info_t* filter_list[]={ &vf_info_yuy2, &vf_info_flip, &vf_info_rgb2bgr, + &vf_info_rotate, NULL }; diff --git a/libmpcodecs/vf_rotate.c b/libmpcodecs/vf_rotate.c new file mode 100644 index 0000000000..02ad82c776 --- /dev/null +++ b/libmpcodecs/vf_rotate.c @@ -0,0 +1,108 @@ +#include +#include +#include +#include + +#include "../config.h" +#include "../mp_msg.h" + +#include "img_format.h" +#include "mp_image.h" +#include "vf.h" + +#include "../libvo/fastmemcpy.h" +#include "../postproc/rgb2rgb.h" + +struct vf_priv_s { + int direction; +}; + +static void rotate(unsigned char* dst,unsigned char* src,int dststride,int srcstride,int w,int h,int bpp,int dir){ + int y; + if(dir&1){ + src+=srcstride*(w-1); + srcstride*=-1; + } + if(dir&2){ + dst+=dststride*(h-1); + dststride*=-1; + } + + for(y=0;ynext,mpi->imgfmt, + MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, + mpi->h, mpi->w); + + if(mpi->flags&MP_IMGFLAG_PLANAR){ + rotate(dmpi->planes[0],mpi->planes[0], + dmpi->stride[0],mpi->stride[0], + dmpi->w,dmpi->h,1,vf->priv->direction); + rotate(dmpi->planes[1],mpi->planes[1], + dmpi->stride[1],mpi->stride[1], + dmpi->w>>1,dmpi->h>>1,1,vf->priv->direction); + rotate(dmpi->planes[2],mpi->planes[2], + dmpi->stride[2],mpi->stride[2], + dmpi->w>>1,dmpi->h>>1,1,vf->priv->direction); + } else { + rotate(dmpi->planes[0],mpi->planes[0], + dmpi->stride[0],mpi->stride[0], + dmpi->w,dmpi->h,dmpi->bpp>>3,vf->priv->direction); + } + + vf_next_put_image(vf,dmpi); +} + +//===========================================================================// + +static int open(vf_instance_t *vf, char* args){ + vf->config=config; + vf->put_image=put_image; + vf->priv=malloc(sizeof(struct vf_priv_s)); + vf->priv->direction=args?atoi(args):0; + return 1; +} + +vf_info_t vf_info_rotate = { + "rotate", + "rotate", + "A'rpi", + "", + open +}; + +//===========================================================================// -- cgit v1.2.3