History

vf_mp: remove boxblur wrapper

It is natively included in libavfilter.

Stefano Sabatini committed 15 years ago

Commit 4bd28571 parent 8bc3a485 files · +1 −219Browse files

Unified · Split

5 files
  1. doc/filters.texi +0 −1
  2. libavfilter/Makefile +0 −1
  3. libavfilter/avfilter.h +1 −1
  4. libavfilter/libmpcodecs/vf_boxblur.c +0 −214
  5. libavfilter/vf_mp.c +0 −2
doc/filters.texi+0−1
@@ -896,7 +896,6 @@ The list of the currently supported filters follows: · 895 unmodified lines
896896 @table @var
897897 @item 2xsai
898898 @item blackframe
899−@item boxblur
900899 @item cropdetect
901900 @item decimate
902901 @item delogo
libavfilter/Makefile+0−1
@@ -79,7 +79,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o · 78 unmodified lines
7979 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o
8080 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_2xsai.o
8181 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_blackframe.o
82−OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_boxblur.o
8382 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_cropdetect.o
8483 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_decimate.o
8584 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_delogo.o
libavfilter/avfilter.h+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030
3131 #define LIBAVFILTER_VERSION_MAJOR 2
3232 #define LIBAVFILTER_VERSION_MINOR 25
33−#define LIBAVFILTER_VERSION_MICRO 0
33+#define LIBAVFILTER_VERSION_MICRO 1
3434
3535 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
3636 LIBAVFILTER_VERSION_MINOR, \
libavfilter/libmpcodecs/vf_boxblur.c+0−214
@@ -1,214 +0,0 @@
1−/*
2− * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
3− *
4− * This file is part of MPlayer.
5− *
6− * MPlayer is free software; you can redistribute it and/or modify
7− * it under the terms of the GNU General Public License as published by
8− * the Free Software Foundation; either version 2 of the License, or
9− * (at your option) any later version.
10− *
11− * MPlayer is distributed in the hope that it will be useful,
12− * but WITHOUT ANY WARRANTY; without even the implied warranty of
13− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14− * GNU General Public License for more details.
15− *
16− * You should have received a copy of the GNU General Public License along
17− * with MPlayer; if not, write to the Free Software Foundation, Inc.,
18− * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19− */
20−
21−#include <stdio.h>
22−#include <stdlib.h>
23−#include <string.h>
24−#include <inttypes.h>
25−#include <assert.h>
26−
27−#include "mp_msg.h"
28−#include "img_format.h"
29−#include "mp_image.h"
30−#include "vf.h"
31−
32−
33−//===========================================================================//
34−
35−typedef struct FilterParam{
36− int radius;
37− int power;
38−}FilterParam;
39−
40−struct vf_priv_s {
41− FilterParam lumaParam;
42− FilterParam chromaParam;
43−};
44−
45−
46−/***************************************************************************/
47−
48−
49−static int config(struct vf_instance *vf,
50− int width, int height, int d_width, int d_height,
51− unsigned int flags, unsigned int outfmt){
52−
53− return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
54−}
55−
56−static inline void blur(uint8_t *dst, uint8_t *src, int w, int radius, int dstStep, int srcStep){
57− int x;
58− const int length= radius*2 + 1;
59− const int inv= ((1<<16) + length/2)/length;
60−
61− int sum= 0;
62−
63− for(x=0; x<radius; x++){
64− sum+= src[x*srcStep]<<1;
65− }
66− sum+= src[radius*srcStep];
67−
68− for(x=0; x<=radius; x++){
69− sum+= src[(radius+x)*srcStep] - src[(radius-x)*srcStep];
70− dst[x*dstStep]= (sum*inv + (1<<15))>>16;
71− }
72−
73− for(; x<w-radius; x++){
74− sum+= src[(radius+x)*srcStep] - src[(x-radius-1)*srcStep];
75− dst[x*dstStep]= (sum*inv + (1<<15))>>16;
76− }
77−
78− for(; x<w; x++){
79− sum+= src[(2*w-radius-x-1)*srcStep] - src[(x-radius-1)*srcStep];
80− dst[x*dstStep]= (sum*inv + (1<<15))>>16;
81− }
82−}
83−
84−static inline void blur2(uint8_t *dst, uint8_t *src, int w, int radius, int power, int dstStep, int srcStep){
85− uint8_t temp[2][4096];
86− uint8_t *a= temp[0], *b=temp[1];
87−
88− if(radius){
89− blur(a, src, w, radius, 1, srcStep);
90− for(; power>2; power--){
91− uint8_t *c;
92− blur(b, a, w, radius, 1, 1);
93− c=a; a=b; b=c;
94− }
95− if(power>1)
96− blur(dst, a, w, radius, dstStep, 1);
97− else{
98− int i;
99− for(i=0; i<w; i++)
100− dst[i*dstStep]= a[i];
101− }
102− }else{
103− int i;
104− for(i=0; i<w; i++)
105− dst[i*dstStep]= src[i*srcStep];
106− }
107−}
108−
109−static void hBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int radius, int power){
110− int y;
111−
112− if(radius==0 && dst==src) return;
113−
114− for(y=0; y<h; y++){
115− blur2(dst + y*dstStride, src + y*srcStride, w, radius, power, 1, 1);
116− }
117−}
118−
119−//FIXME optimize (x before y !!!)
120−static void vBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int radius, int power){
121− int x;
122−
123− if(radius==0 && dst==src) return;
124−
125− for(x=0; x<w; x++){
126− blur2(dst + x, src + x, h, radius, power, dstStride, srcStride);
127− }
128−}
129−
130−static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
131− int cw= mpi->w >> mpi->chroma_x_shift;
132− int ch= mpi->h >> mpi->chroma_y_shift;
133−
134− mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt,
135− MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_READABLE,
136− mpi->w,mpi->h);
137−
138− assert(mpi->flags&MP_IMGFLAG_PLANAR);
139−
140− hBlur(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h,
141− dmpi->stride[0], mpi->stride[0], vf->priv->lumaParam.radius, vf->priv->lumaParam.power);
142− hBlur(dmpi->planes[1], mpi->planes[1], cw,ch,
143− dmpi->stride[1], mpi->stride[1], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
144− hBlur(dmpi->planes[2], mpi->planes[2], cw,ch,
145− dmpi->stride[2], mpi->stride[2], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
146−
147− vBlur(dmpi->planes[0], dmpi->planes[0], mpi->w,mpi->h,
148− dmpi->stride[0], dmpi->stride[0], vf->priv->lumaParam.radius, vf->priv->lumaParam.power);
149− vBlur(dmpi->planes[1], dmpi->planes[1], cw,ch,
150− dmpi->stride[1], dmpi->stride[1], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
151− vBlur(dmpi->planes[2], dmpi->planes[2], cw,ch,
152− dmpi->stride[2], dmpi->stride[2], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
153−
154− return vf_next_put_image(vf,dmpi, pts);
155−}
156−
157−//===========================================================================//
158−
159−static int query_format(struct vf_instance *vf, unsigned int fmt){
160− switch(fmt)
161− {
162− case IMGFMT_YV12:
163− case IMGFMT_I420:
164− case IMGFMT_IYUV:
165− case IMGFMT_YVU9:
166− case IMGFMT_444P:
167− case IMGFMT_422P:
168− case IMGFMT_411P:
169− return vf_next_query_format(vf, fmt);
170− }
171− return 0;
172−}
173−
174−static int vf_open(vf_instance_t *vf, char *args){
175− int e;
176−
177− vf->config=config;
178− vf->put_image=put_image;
179−// vf->get_image=get_image;
180− vf->query_format=query_format;
181− vf->priv=malloc(sizeof(struct vf_priv_s));
182− memset(vf->priv, 0, sizeof(struct vf_priv_s));
183−
184− if(args==NULL) return 0;
185−
186− e=sscanf(args, "%d:%d:%d:%d",
187− &vf->priv->lumaParam.radius,
188− &vf->priv->lumaParam.power,
189− &vf->priv->chromaParam.radius,
190− &vf->priv->chromaParam.power
191− );
192−
193− if(e==2){
194− vf->priv->chromaParam.radius= vf->priv->lumaParam.radius;
195− vf->priv->chromaParam.power = vf->priv->lumaParam.power;
196− }else if(e!=4)
197− return 0;
198−
199− if(vf->priv->lumaParam.radius < 0) return 0;
200− if(vf->priv->chromaParam.radius < 0) return 0;
201−
202− return 1;
203−}
204−
205−const vf_info_t vf_info_boxblur = {
206− "box blur",
207− "boxblur",
208− "Michael Niedermayer",
209− "",
210− vf_open,
211− NULL
212−};
213−
214−//===========================================================================//
libavfilter/vf_mp.c+0−2
@@ -152,7 +152,6 @@ extern const vf_info_t vf_info_unsharp; · 151 unmodified lines
152152 extern const vf_info_t vf_info_swapuv;
153153 extern const vf_info_t vf_info_il;
154154 extern const vf_info_t vf_info_fil;
155−extern const vf_info_t vf_info_boxblur;
156155 extern const vf_info_t vf_info_sab;
157156 extern const vf_info_t vf_info_smartblur;
158157 extern const vf_info_t vf_info_perspective;
@@ -202,7 +201,6 @@ extern const vf_info_t vf_info_stereo3d; · 43 unmodified lines
202201 static const vf_info_t* const filters[]={
203202 &vf_info_2xsai,
204203 &vf_info_blackframe,
205− &vf_info_boxblur,
206204 &vf_info_cropdetect,
207205 &vf_info_decimate,
208206 &vf_info_delogo,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t