From 8ba3f802161096f763e96b329475201c57e85bae Mon Sep 17 00:00:00 2001 From: arpi Date: Tue, 9 Apr 2002 14:01:53 +0000 Subject: 2 new simple filters: yuy2 and format git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5540 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/Makefile | 2 +- libmpcodecs/vf.c | 4 +++ libmpcodecs/vf_format.c | 53 +++++++++++++++++++++++++++++++++++ libmpcodecs/vf_yuy2.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 libmpcodecs/vf_format.c create mode 100644 libmpcodecs/vf_yuy2.c diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 1cbac1d475..c6d14286db 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -5,7 +5,7 @@ LIBNAME = libmpcodecs.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 +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 ifeq ($(PNG),yes) VIDEO_SRCS += vd_mpng.c diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index e8176b85f4..67dc49fe62 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -15,6 +15,8 @@ extern vf_info_t vf_info_expand; extern vf_info_t vf_info_pp; extern vf_info_t vf_info_scale; extern vf_info_t vf_info_fame; +extern vf_info_t vf_info_format; +extern vf_info_t vf_info_yuy2; char** vo_plugin_args=(char**) NULL; @@ -27,6 +29,8 @@ static vf_info_t* filter_list[]={ // &vf_info_osd, &vf_info_vo, &vf_info_fame, + &vf_info_format, + &vf_info_yuy2, NULL }; diff --git a/libmpcodecs/vf_format.c b/libmpcodecs/vf_format.c new file mode 100644 index 0000000000..3aed8db3b3 --- /dev/null +++ b/libmpcodecs/vf_format.c @@ -0,0 +1,53 @@ +#include +#include +#include +#include + +#include "../config.h" +#include "../mp_msg.h" + +#include "../libvo/img_format.h" +#include "../mp_image.h" +#include "vf.h" + +struct vf_priv_s { + unsigned int fmt; +}; + +//===========================================================================// + +static int query_format(struct vf_instance_s* vf, unsigned int fmt){ + if(fmt==vf->priv->fmt) + return vf_next_query_format(vf,fmt); + return 0; +} + +static int open(vf_instance_t *vf, char* args){ + vf->query_format=query_format; + vf->priv=malloc(sizeof(struct vf_priv_s)); + + if(args){ + if(!strcasecmp(args,"yuy2")) vf->priv->fmt=IMGFMT_YUY2; else + if(!strcasecmp(args,"yv12")) vf->priv->fmt=IMGFMT_YV12; else + if(!strcasecmp(args,"i420")) vf->priv->fmt=IMGFMT_I420; else + if(!strcasecmp(args,"iyuv")) vf->priv->fmt=IMGFMT_IYUV; else + if(!strcasecmp(args,"uyvy")) vf->priv->fmt=IMGFMT_UYVY; else + if(!strcasecmp(args,"bgr24")) vf->priv->fmt=IMGFMT_BGR24; else + if(!strcasecmp(args,"bgr32")) vf->priv->fmt=IMGFMT_BGR32; else + if(!strcasecmp(args,"bgr16")) vf->priv->fmt=IMGFMT_BGR16; else + { printf("Unknown format name: '%s'\n",args);return 0;} + } else + vf->priv->fmt=IMGFMT_YUY2; + + return 1; +} + +vf_info_t vf_info_format = { + "force output format", + "format", + "A'rpi", + "", + open +}; + +//===========================================================================// diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c new file mode 100644 index 0000000000..46d1c41988 --- /dev/null +++ b/libmpcodecs/vf_yuy2.c @@ -0,0 +1,74 @@ +#include +#include +#include +#include + +#include "../config.h" +#include "../mp_msg.h" + +#include "../libvo/img_format.h" +#include "../mp_image.h" +#include "vf.h" + +#include "../libvo/fastmemcpy.h" +#include "../postproc/rgb2rgb.h" + +//===========================================================================// + +static int config(struct vf_instance_s* vf, + int width, int height, int d_width, int d_height, + unsigned int flags, unsigned int outfmt){ + + if(vf_next_query_format(vf,IMGFMT_YUY2)<=0){ + printf("yuy2 not supported by next filter/vo :(\n"); + return 0; + } + + return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2); +} + +static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){ + mp_image_t *dmpi; + + // hope we'll get DR buffer: + dmpi=vf_get_image(vf->next,IMGFMT_YUY2, + MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, + mpi->w, mpi->h); + + yv12toyuy2(mpi->planes[0],mpi->planes[1],mpi->planes[2], dmpi->planes[0], + mpi->w,mpi->h, mpi->stride[0],mpi->stride[1],dmpi->stride[0]); + + dmpi->qscale=mpi->qscale; + dmpi->qstride=mpi->qstride; + + vf_next_put_image(vf,dmpi); +} + +//===========================================================================// + +static int query_format(struct vf_instance_s* vf, unsigned int fmt){ + switch(fmt){ + case IMGFMT_YV12: + case IMGFMT_I420: + case IMGFMT_IYUV: + return 3; //vf_next_query_format(vf,fmt); + } + return 0; +} + +static int open(vf_instance_t *vf, char* args){ + vf->config=config; + vf->put_image=put_image; + vf->query_format=query_format; + return 1; +} + +vf_info_t vf_info_yuy2 = { + "fast YV12->YUY2 conversion", + "yuy2", + "A'rpi", + "", + open +}; + +//===========================================================================// -- cgit v1.2.3