[Mplayer-cvslog] CVS: main/libmpcodecs vf_tinterlace.c,NONE,1.1 Makefile,1.102,1.103 vf.c,1.86,1.87
Alex Beregszaszi
alex at mplayerhq.hu
Mon Aug 11 22:04:33 CEST 2003
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv24763/libmpcodecs
Modified Files:
Makefile vf.c
Added Files:
vf_tinterlace.c
Log Message:
'tinterlace' filter (partial inverse of tfields) by Not Zed <notzed at ximian.com> (with minor fixes for current cvs by me)
--- NEW FILE ---
/*
Copyright (C) 2003 Michael Zucchi <notzed at ximian.com>
This program 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.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../config.h"
#include "../mp_msg.h"
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
#include "../libvo/fastmemcpy.h"
struct vf_priv_s {
int mode;
int frame;
mp_image_t *dmpi;
};
static int put_image(struct vf_instance_s* vf, mp_image_t *mpi)
{
int ret = 0;
mp_image_t *dmpi;
switch (vf->priv->mode) {
case 0:
dmpi = vf->priv->dmpi;
if (dmpi == NULL) {
dmpi = vf_get_image(vf->next, mpi->imgfmt,
MP_IMGTYPE_STATIC, MP_IMGFLAG_ACCEPT_STRIDE |
MP_IMGFLAG_PRESERVE | MP_IMGFLAG_READABLE,
mpi->width, mpi->height*2);
vf->priv->dmpi = dmpi;
memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h,
dmpi->stride[0]*2, mpi->stride[0]);
if (mpi->flags & MP_IMGFLAG_PLANAR) {
memcpy_pic(dmpi->planes[1], mpi->planes[1],
mpi->chroma_width, mpi->chroma_height,
dmpi->stride[1]*2, mpi->stride[1]);
memcpy_pic(dmpi->planes[2], mpi->planes[2],
mpi->chroma_width, mpi->chroma_height,
dmpi->stride[2]*2, mpi->stride[2]);
}
} else {
vf->priv->dmpi = NULL;
memcpy_pic(dmpi->planes[0]+dmpi->stride[0], mpi->planes[0], mpi->w, mpi->h,
dmpi->stride[0]*2, mpi->stride[0]);
if (mpi->flags & MP_IMGFLAG_PLANAR) {
memcpy_pic(dmpi->planes[1]+dmpi->stride[1], mpi->planes[1],
mpi->chroma_width, mpi->chroma_height,
dmpi->stride[1]*2, mpi->stride[1]);
memcpy_pic(dmpi->planes[2]+dmpi->stride[2], mpi->planes[2],
mpi->chroma_width, mpi->chroma_height,
dmpi->stride[2]*2, mpi->stride[2]);
}
ret = vf_next_put_image(vf, dmpi);
}
break;
case 1:
if (vf->priv->frame & 1)
ret = vf_next_put_image(vf, mpi);
break;
case 2:
if ((vf->priv->frame & 1) == 0)
ret = vf_next_put_image(vf, mpi);
break;
case 3:
dmpi = vf_get_image(vf->next, mpi->imgfmt,
MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
mpi->width, mpi->height*2);
/* fixme, just clear alternate lines */
vf_mpi_clear(dmpi, 0, 0, dmpi->w, dmpi->h);
if ((vf->priv->frame & 1) == 0) {
memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h,
dmpi->stride[0]*2, mpi->stride[0]);
if (mpi->flags & MP_IMGFLAG_PLANAR) {
memcpy_pic(dmpi->planes[1], mpi->planes[1],
mpi->chroma_width, mpi->chroma_height,
dmpi->stride[1]*2, mpi->stride[1]);
memcpy_pic(dmpi->planes[2], mpi->planes[2],
mpi->chroma_width, mpi->chroma_height,
dmpi->stride[2]*2, mpi->stride[2]);
}
} else {
memcpy_pic(dmpi->planes[0]+dmpi->stride[0], mpi->planes[0], mpi->w, mpi->h,
dmpi->stride[0]*2, mpi->stride[0]);
if (mpi->flags & MP_IMGFLAG_PLANAR) {
memcpy_pic(dmpi->planes[1]+dmpi->stride[1], mpi->planes[1],
mpi->chroma_width, mpi->chroma_height,
dmpi->stride[1]*2, mpi->stride[1]);
memcpy_pic(dmpi->planes[2]+dmpi->stride[2], mpi->planes[2],
mpi->chroma_width, mpi->chroma_height,
dmpi->stride[2]*2, mpi->stride[2]);
}
}
ret = vf_next_put_image(vf, dmpi);
break;
}
vf->priv->frame++;
return ret;
}
static int query_format(struct vf_instance_s* vf, unsigned int fmt)
{
/* FIXME - figure out which other formats work */
switch (fmt) {
case IMGFMT_YV12:
case IMGFMT_IYUV:
case IMGFMT_I420:
return vf_next_query_format(vf, fmt);
}
return 0;
}
static int config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt)
{
switch (vf->priv->mode) {
case 0:
case 3:
return vf_next_config(vf,width,height*2,d_width,d_height*2,flags,outfmt);
case 1: /* odd frames */
case 2: /* even frames */
return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
return 0;
}
static void uninit(struct vf_instance_s* vf)
{
free(vf->priv);
}
static int open(vf_instance_t *vf, char* args)
{
struct vf_priv_s *p;
vf->config = config;
vf->put_image = put_image;
vf->query_format = query_format;
vf->uninit = uninit;
vf->default_reqs = VFCAP_ACCEPT_STRIDE;
vf->priv = p = calloc(1, sizeof(struct vf_priv_s));
vf->priv->mode = 0;
if (args)
sscanf(args, "%d", &vf->priv->mode);
vf->priv->frame = 0;
return 1;
}
vf_info_t vf_info_tinterlace = {
"temporal field interlacing",
"tinterlace",
"Michael Zucchi",
"",
open,
NULL
};
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- Makefile 3 Aug 2003 12:09:58 -0000 1.102
+++ Makefile 11 Aug 2003 20:04:30 -0000 1.103
@@ -14,7 +14,7 @@
VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c vd_theora.c
VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
-VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c
+VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c
ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c ve_nuv.c
NATIVE_SRCS=native/RTjpegN.c native/cinepak.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 native/decode144.c native/decode288.c
Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- vf.c 3 Aug 2003 12:09:58 -0000 1.86
+++ vf.c 11 Aug 2003 20:04:30 -0000 1.87
@@ -64,6 +64,7 @@
extern vf_info_t vf_info_hqdn3d;
extern vf_info_t vf_info_detc;
extern vf_info_t vf_info_telecine;
+extern vf_info_t vf_info_tinterlace;
extern vf_info_t vf_info_tfields;
extern vf_info_t vf_info_ivtc;
extern vf_info_t vf_info_ilpack;
@@ -123,6 +124,7 @@
&vf_info_hqdn3d,
&vf_info_detc,
&vf_info_telecine,
+ &vf_info_tinterlace,
&vf_info_tfields,
&vf_info_ivtc,
&vf_info_ilpack,
More information about the MPlayer-cvslog
mailing list