generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi: remove mp=il filter

Browse Source 
Native il video filter is now available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-02-09 21:01:54 +00:00
parent 6e9abce5e2
commit c0a8918f2a
5 changed files with 1 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/filters.texi
View File

@ -3587,7 +3587,6 @@ The list of the currently supported filters follows:
@item fil
@item fspp
@item harddup
@item il
@item ilpack
@item ivtc
@item kerndeint

1
libavfilter/Makefile
View File

@ -189,7 +189,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fil.o
#OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_filmdint.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fspp.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_harddup.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_il.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ilpack.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ivtc.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_kerndeint.o

148
libavfilter/libmpcodecs/vf_il.c
View File

@ -1,148 +0,0 @@
/*
* Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
*
* 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 <inttypes.h>
#include <assert.h>
#include "mp_msg.h"
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
#include "libvo/fastmemcpy.h"
//===========================================================================//
typedef struct FilterParam{
int interleave;
int swap;
}FilterParam;
struct vf_priv_s {
FilterParam lumaParam;
FilterParam chromaParam;
};
/***************************************************************************/
static void interleave(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int interleave, int swap){
const int a= swap;
const int b= 1-a;
const int m= h>>1;
int y;
switch(interleave){
case -1:
for(y=0; y < m; y++){
fast_memcpy(dst + dstStride* y , src + srcStride*(y*2 + a), w);
fast_memcpy(dst + dstStride*(y + m), src + srcStride*(y*2 + b), w);
}
break;
case 0:
for(y=0; y < m; y++){
fast_memcpy(dst + dstStride* y*2 , src + srcStride*(y*2 + a), w);
fast_memcpy(dst + dstStride*(y*2+1), src + srcStride*(y*2 + b), w);
}
break;
case 1:
for(y=0; y < m; y++){
fast_memcpy(dst + dstStride*(y*2+a), src + srcStride* y , w);
fast_memcpy(dst + dstStride*(y*2+b), src + srcStride*(y + m), w);
}
break;
}
}
static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
int w;
FilterParam *luma = &vf->priv->lumaParam;
FilterParam *chroma= &vf->priv->chromaParam;
mp_image_t *dmpi=ff_vf_get_image(vf->next,mpi->imgfmt,
MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
mpi->w,mpi->h);
if(mpi->flags&MP_IMGFLAG_PLANAR)
w= mpi->w;
else
w= mpi->w * mpi->bpp/8;
interleave(dmpi->planes[0], mpi->planes[0],
w, mpi->h, dmpi->stride[0], mpi->stride[0], luma->interleave, luma->swap);
if(mpi->flags&MP_IMGFLAG_PLANAR){
int cw= mpi->w >> mpi->chroma_x_shift;
int ch= mpi->h >> mpi->chroma_y_shift;
interleave(dmpi->planes[1], mpi->planes[1], cw,ch,
dmpi->stride[1], mpi->stride[1], chroma->interleave, luma->swap);
interleave(dmpi->planes[2], mpi->planes[2], cw,ch,
dmpi->stride[2], mpi->stride[2], chroma->interleave, luma->swap);
}
return ff_vf_next_put_image(vf,dmpi, pts);
}
//===========================================================================//
static void parse(FilterParam *fp, char* args){
char *pos;
char *max= strchr(args, ':');
if(!max) max= args + strlen(args);
pos= strchr(args, 's');
if(pos && pos<max) fp->swap=1;
pos= strchr(args, 'i');
if(pos && pos<max) fp->interleave=1;
pos= strchr(args, 'd');
if(pos && pos<max) fp->interleave=-1;
}
static int vf_open(vf_instance_t *vf, char *args){
vf->put_image=put_image;
// vf->get_image=get_image;
vf->priv=malloc(sizeof(struct vf_priv_s));
memset(vf->priv, 0, sizeof(struct vf_priv_s));
if(args)
{
char *arg2= strchr(args,':');
if(arg2) parse(&vf->priv->chromaParam, arg2+1);
parse(&vf->priv->lumaParam, args);
}
return 1;
}
const vf_info_t ff_vf_info_il = {
"(de)interleave",
"il",
"Michael Niedermayer",
"",
vf_open,
NULL
};
//===========================================================================//

2
libavfilter/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 37
#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \

2
libavfilter/vf_mp.c
View File

@ -133,7 +133,6 @@ extern const vf_info_t ff_vf_info_fil;
//extern const vf_info_t ff_vf_info_filmdint;
extern const vf_info_t ff_vf_info_fspp;
extern const vf_info_t ff_vf_info_harddup;
extern const vf_info_t ff_vf_info_il;
extern const vf_info_t ff_vf_info_ilpack;
extern const vf_info_t ff_vf_info_ivtc;
extern const vf_info_t ff_vf_info_kerndeint;
@ -168,7 +167,6 @@ static const vf_info_t* const filters[]={
// &ff_vf_info_filmdint, cmmx.h vd.h ‘opt_screen_size_x’
&ff_vf_info_fspp,
&ff_vf_info_harddup,
&ff_vf_info_il,
&ff_vf_info_ilpack,
&ff_vf_info_ivtc,
&ff_vf_info_kerndeint,