mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
lavfi: remove telecine libmpcodecs wrapper
Native, with more features, filter is available. Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
parent
10b1cc63c2
commit
32a7b858c9
@ -209,7 +209,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_qp.o
|
||||
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_sab.o
|
||||
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o
|
||||
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_spp.o
|
||||
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o
|
||||
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_tinterlace.o
|
||||
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_uspp.o
|
||||
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
|
||||
|
||||
@ -1,158 +0,0 @@
|
||||
/*
|
||||
* 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 "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#include "libvo/fastmemcpy.h"
|
||||
|
||||
struct vf_priv_s {
|
||||
int frame;
|
||||
};
|
||||
|
||||
static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
|
||||
{
|
||||
mp_image_t *dmpi;
|
||||
int ret;
|
||||
int w = (IMGFMT_IS_YUVP16(mpi->imgfmt) ? 2 : 1) * mpi->w;
|
||||
int chroma_width = (IMGFMT_IS_YUVP16(mpi->imgfmt) ? 2 : 1) * mpi->chroma_width;
|
||||
|
||||
vf->priv->frame = (vf->priv->frame+1)%4;
|
||||
|
||||
dmpi = ff_vf_get_image(vf->next, mpi->imgfmt,
|
||||
MP_IMGTYPE_STATIC, MP_IMGFLAG_ACCEPT_STRIDE |
|
||||
MP_IMGFLAG_PRESERVE, mpi->width, mpi->height);
|
||||
|
||||
ret = 0;
|
||||
// 0/0 1/1 2/2 2/3 3/0
|
||||
switch (vf->priv->frame) {
|
||||
case 0:
|
||||
my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0],
|
||||
mpi->planes[0]+mpi->stride[0], w, mpi->h/2,
|
||||
dmpi->stride[0]*2, mpi->stride[0]*2);
|
||||
if (mpi->flags & MP_IMGFLAG_PLANAR) {
|
||||
my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1],
|
||||
mpi->planes[1]+mpi->stride[1],
|
||||
chroma_width, mpi->chroma_height/2,
|
||||
dmpi->stride[1]*2, mpi->stride[1]*2);
|
||||
my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2],
|
||||
mpi->planes[2]+mpi->stride[2],
|
||||
chroma_width, mpi->chroma_height/2,
|
||||
dmpi->stride[2]*2, mpi->stride[2]*2);
|
||||
}
|
||||
ret = ff_vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
|
||||
/* Fallthrough */
|
||||
case 1:
|
||||
case 2:
|
||||
memcpy_pic(dmpi->planes[0], mpi->planes[0], w, mpi->h,
|
||||
dmpi->stride[0], mpi->stride[0]);
|
||||
if (mpi->flags & MP_IMGFLAG_PLANAR) {
|
||||
memcpy_pic(dmpi->planes[1], mpi->planes[1],
|
||||
chroma_width, mpi->chroma_height,
|
||||
dmpi->stride[1], mpi->stride[1]);
|
||||
memcpy_pic(dmpi->planes[2], mpi->planes[2],
|
||||
chroma_width, mpi->chroma_height,
|
||||
dmpi->stride[2], mpi->stride[2]);
|
||||
}
|
||||
return ff_vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE) || ret;
|
||||
case 3:
|
||||
my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0],
|
||||
mpi->planes[0]+mpi->stride[0], w, mpi->h/2,
|
||||
dmpi->stride[0]*2, mpi->stride[0]*2);
|
||||
if (mpi->flags & MP_IMGFLAG_PLANAR) {
|
||||
my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1],
|
||||
mpi->planes[1]+mpi->stride[1],
|
||||
chroma_width, mpi->chroma_height/2,
|
||||
dmpi->stride[1]*2, mpi->stride[1]*2);
|
||||
my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2],
|
||||
mpi->planes[2]+mpi->stride[2],
|
||||
chroma_width, mpi->chroma_height/2,
|
||||
dmpi->stride[2]*2, mpi->stride[2]*2);
|
||||
}
|
||||
ret = ff_vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
|
||||
my_memcpy_pic(dmpi->planes[0], mpi->planes[0], w, mpi->h/2,
|
||||
dmpi->stride[0]*2, mpi->stride[0]*2);
|
||||
if (mpi->flags & MP_IMGFLAG_PLANAR) {
|
||||
my_memcpy_pic(dmpi->planes[1], mpi->planes[1],
|
||||
chroma_width, mpi->chroma_height/2,
|
||||
dmpi->stride[1]*2, mpi->stride[1]*2);
|
||||
my_memcpy_pic(dmpi->planes[2], mpi->planes[2],
|
||||
chroma_width, mpi->chroma_height/2,
|
||||
dmpi->stride[2]*2, mpi->stride[2]*2);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static int query_format(struct vf_instance *vf, unsigned int fmt)
|
||||
{
|
||||
/* FIXME - figure out which other formats work */
|
||||
switch (fmt) {
|
||||
case IMGFMT_YV12:
|
||||
case IMGFMT_IYUV:
|
||||
case IMGFMT_I420:
|
||||
return ff_vf_next_query_format(vf, fmt);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int config(struct vf_instance *vf,
|
||||
int width, int height, int d_width, int d_height,
|
||||
unsigned int flags, unsigned int outfmt)
|
||||
{
|
||||
return ff_vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void uninit(struct vf_instance *vf)
|
||||
{
|
||||
free(vf->priv);
|
||||
}
|
||||
|
||||
static int vf_open(vf_instance_t *vf, char *args)
|
||||
{
|
||||
//vf->config = config;
|
||||
vf->put_image = put_image;
|
||||
//vf->query_format = query_format;
|
||||
vf->uninit = uninit;
|
||||
vf->default_reqs = VFCAP_ACCEPT_STRIDE;
|
||||
vf->priv = calloc(1, sizeof(struct vf_priv_s));
|
||||
vf->priv->frame = 1;
|
||||
if (args) sscanf(args, "%d", &vf->priv->frame);
|
||||
vf->priv->frame--;
|
||||
return 1;
|
||||
}
|
||||
|
||||
const vf_info_t ff_vf_info_telecine = {
|
||||
"telecine filter",
|
||||
"telecine",
|
||||
"Rich Felker",
|
||||
"",
|
||||
vf_open,
|
||||
NULL
|
||||
};
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
#define LIBAVFILTER_VERSION_MAJOR 3
|
||||
#define LIBAVFILTER_VERSION_MINOR 52
|
||||
#define LIBAVFILTER_VERSION_MICRO 100
|
||||
#define LIBAVFILTER_VERSION_MICRO 101
|
||||
|
||||
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
|
||||
LIBAVFILTER_VERSION_MINOR, \
|
||||
|
||||
@ -143,7 +143,6 @@ extern const vf_info_t ff_vf_info_qp;
|
||||
extern const vf_info_t ff_vf_info_sab;
|
||||
extern const vf_info_t ff_vf_info_softpulldown;
|
||||
extern const vf_info_t ff_vf_info_spp;
|
||||
extern const vf_info_t ff_vf_info_telecine;
|
||||
extern const vf_info_t ff_vf_info_tinterlace;
|
||||
extern const vf_info_t ff_vf_info_uspp;
|
||||
|
||||
@ -170,7 +169,6 @@ static const vf_info_t* const filters[]={
|
||||
&ff_vf_info_sab,
|
||||
&ff_vf_info_softpulldown,
|
||||
&ff_vf_info_spp,
|
||||
&ff_vf_info_telecine,
|
||||
&ff_vf_info_tinterlace,
|
||||
&ff_vf_info_uspp,
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user