annotate libmpcodecs/vf_pp.c @ 9707:53e738a54064

Fix a 100L bug wich killed mencoder timing and switch to the new config header
author albeu
date Thu, 27 Mar 2003 20:27:50 +0000
parents e9a2af584986
children 420640a0f6d0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
1 #include <stdio.h>
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
2 #include <stdlib.h>
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
3 #include <string.h>
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
4 #include <inttypes.h>
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
5 #include <errno.h>
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
6
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
7 #include "../config.h"
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
8 #include "../mp_msg.h"
7972
6d1103afba1c cleanly passing the cpuCaps
michael
parents: 7963
diff changeset
9 #include "../cpudetect.h"
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
10
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8040
diff changeset
11 #ifdef HAVE_MALLOC_H
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8040
diff changeset
12 #include <malloc.h>
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8040
diff changeset
13 #endif
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8040
diff changeset
14
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5565
diff changeset
15 #include "img_format.h"
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5565
diff changeset
16 #include "mp_image.h"
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
17 #include "vf.h"
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
18
9426
c9dcb67e9638 moving postprocess code to libavcodec
michael
parents: 8805
diff changeset
19 #ifdef USE_LIBAVCODEC
c9dcb67e9638 moving postprocess code to libavcodec
michael
parents: 8805
diff changeset
20
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
21 #define EMU_OLD
fe30880576dc cleanup
michael
parents: 7985
diff changeset
22
9426
c9dcb67e9638 moving postprocess code to libavcodec
michael
parents: 8805
diff changeset
23 #include "../libavcodec/libpostproc/postprocess.h"
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
24
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
25 #ifdef EMU_OLD
9426
c9dcb67e9638 moving postprocess code to libavcodec
michael
parents: 8805
diff changeset
26 #include "../libavcodec/libpostproc/postprocess_internal.h"
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
27 #endif
fe30880576dc cleanup
michael
parents: 7985
diff changeset
28
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
29 struct vf_priv_s {
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
30 int pp;
8040
5241f95b5ec4 cleanup
michael
parents: 8038
diff changeset
31 pp_mode_t *ppMode[PP_QUALITY_MAX+1];
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
32 void *context;
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
33 mp_image_t *dmpi;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
34 unsigned int outfmt;
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
35 };
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
36
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
37 //===========================================================================//
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
38
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
39 static int config(struct vf_instance_s* vf,
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
40 int width, int height, int d_width, int d_height,
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
41 unsigned int voflags, unsigned int outfmt){
8805
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
42 int flags=
7985
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7972
diff changeset
43 (gCpuCaps.hasMMX ? PP_CPU_CAPS_MMX : 0)
1ab37da5b1da per context cpuCaps (idea by kabi)
michael
parents: 7972
diff changeset
44 | (gCpuCaps.hasMMX2 ? PP_CPU_CAPS_MMX2 : 0)
8805
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
45 | (gCpuCaps.has3DNow ? PP_CPU_CAPS_3DNOW : 0);
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
46
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
47 switch(outfmt){
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
48 case IMGFMT_444P: flags|= PP_FORMAT_444; break;
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
49 case IMGFMT_422P: flags|= PP_FORMAT_422; break;
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
50 case IMGFMT_411P: flags|= PP_FORMAT_411; break;
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
51 default: flags|= PP_FORMAT_420; break;
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
52 }
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
53
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
54 if(vf->priv->context) pp_free_context(vf->priv->context);
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
55 vf->priv->context= pp_get_context(width, height, flags);
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
56
9528
565015128767 10l (pp cant convert formats) fixes segfault
michael
parents: 9426
diff changeset
57 return vf_next_config(vf,width,height,d_width,d_height,voflags,outfmt);
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
58 }
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
59
7949
0aedfdc5d6ef fixing segfault
michael
parents: 7946
diff changeset
60 static void uninit(struct vf_instance_s* vf){
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
61 int i;
8040
5241f95b5ec4 cleanup
michael
parents: 8038
diff changeset
62 for(i=0; i<=PP_QUALITY_MAX; i++){
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
63 if(vf->priv->ppMode[i])
fe30880576dc cleanup
michael
parents: 7985
diff changeset
64 pp_free_mode(vf->priv->ppMode[i]);
fe30880576dc cleanup
michael
parents: 7985
diff changeset
65 }
7961
78e0f2776da7 cosmetics ;)
michael
parents: 7960
diff changeset
66 if(vf->priv->context) pp_free_context(vf->priv->context);
7949
0aedfdc5d6ef fixing segfault
michael
parents: 7946
diff changeset
67 }
0aedfdc5d6ef fixing segfault
michael
parents: 7946
diff changeset
68
5518
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
69 static int query_format(struct vf_instance_s* vf, unsigned int fmt){
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
70 switch(fmt){
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
71 case IMGFMT_YV12:
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
72 case IMGFMT_I420:
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
73 case IMGFMT_IYUV:
8805
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
74 case IMGFMT_444P:
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
75 case IMGFMT_422P:
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
76 case IMGFMT_411P:
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
77 return vf_next_query_format(vf,fmt);
5518
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
78 }
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
79 return 0;
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
80 }
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
81
5519
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
82 static int control(struct vf_instance_s* vf, int request, void* data){
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
83 switch(request){
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
84 case VFCTRL_QUERY_MAX_PP_LEVEL:
8040
5241f95b5ec4 cleanup
michael
parents: 8038
diff changeset
85 return PP_QUALITY_MAX;
5519
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
86 case VFCTRL_SET_PP_LEVEL:
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
87 vf->priv->pp= *((unsigned int*)data);
5519
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
88 return CONTROL_TRUE;
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
89 }
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
90 return vf_next_control(vf,request,data);
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
91 }
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
92
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
93 static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
94 if(vf->priv->pp&0xFFFF) return; // non-local filters enabled
5513
73696051e3ce mpeg+pp0 fixed
arpi
parents: 5512
diff changeset
95 if((mpi->type==MP_IMGTYPE_IPB || vf->priv->pp) &&
73696051e3ce mpeg+pp0 fixed
arpi
parents: 5512
diff changeset
96 mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
97 if(!(mpi->flags&MP_IMGFLAG_ACCEPT_STRIDE) && mpi->imgfmt!=vf->priv->outfmt)
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
98 return; // colorspace differ
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
99 // ok, we can do pp in-place (or pp disabled):
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
100 vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt,
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
101 mpi->type, mpi->flags, mpi->w, mpi->h);
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
102 mpi->planes[0]=vf->priv->dmpi->planes[0];
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
103 mpi->stride[0]=vf->priv->dmpi->stride[0];
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
104 mpi->width=vf->priv->dmpi->width;
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
105 if(mpi->flags&MP_IMGFLAG_PLANAR){
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
106 mpi->planes[1]=vf->priv->dmpi->planes[1];
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
107 mpi->planes[2]=vf->priv->dmpi->planes[2];
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
108 mpi->stride[1]=vf->priv->dmpi->stride[1];
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
109 mpi->stride[2]=vf->priv->dmpi->stride[2];
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
110 }
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
111 mpi->flags|=MP_IMGFLAG_DIRECT;
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
112 }
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
113
7368
a894e99c1e51 changing return type of put_image void->int
arpi
parents: 7127
diff changeset
114 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
115 if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
116 // no DR, so get a new image! hope we'll get DR buffer:
9528
565015128767 10l (pp cant convert formats) fixes segfault
michael
parents: 9426
diff changeset
117 vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt,
6875
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 5607
diff changeset
118 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 5607
diff changeset
119 // MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 5607
diff changeset
120 // mpi->w,mpi->h);
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 5607
diff changeset
121 (mpi->w+7)&(~7),(mpi->h+7)&(~7));
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 5607
diff changeset
122 vf->priv->dmpi->w=mpi->w; vf->priv->dmpi->h=mpi->h; // display w;h
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
123 }
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
124
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
125 if(vf->priv->pp || !(mpi->flags&MP_IMGFLAG_DIRECT)){
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
126 // do the postprocessing! (or copy if no DR)
7961
78e0f2776da7 cosmetics ;)
michael
parents: 7960
diff changeset
127 pp_postprocess(mpi->planes ,mpi->stride,
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
128 vf->priv->dmpi->planes,vf->priv->dmpi->stride,
6875
255b150a75a5 - some reorder/cleanup of mp_image flags
arpi
parents: 5607
diff changeset
129 (mpi->w+7)&(~7),mpi->h,
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
130 mpi->qscale, mpi->qstride,
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
131 vf->priv->ppMode[ vf->priv->pp ], vf->priv->context,
7960
0a4ab841ae29 better deblocking filter
michael
parents: 7949
diff changeset
132 mpi->pict_type);
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
133 }
7368
a894e99c1e51 changing return type of put_image void->int
arpi
parents: 7127
diff changeset
134 return vf_next_put_image(vf,vf->priv->dmpi);
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
135 }
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
136
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
137 //===========================================================================//
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
138
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
139 extern int divx_quality;
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
140
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
141 static unsigned int fmt_list[]={
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
142 IMGFMT_YV12,
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
143 IMGFMT_I420,
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
144 IMGFMT_IYUV,
8805
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
145 IMGFMT_444P,
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
146 IMGFMT_422P,
e547ce712577 YUV 411/422/444 support for pp
michael
parents: 8736
diff changeset
147 IMGFMT_411P,
7127
1e47c2e7aa8e mostly compiler warning fixes, some small bugfix
arpi
parents: 6875
diff changeset
148 0
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
149 };
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
150
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
151 static int open(vf_instance_t *vf, char* args){
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
152 char *endptr, *name;
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
153 int i;
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
154 int hex_mode=0;
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
155
5518
04a40454bdbb accept only 4:2:0 planar yuv formats
arpi
parents: 5514
diff changeset
156 vf->query_format=query_format;
5519
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5518
diff changeset
157 vf->control=control;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
158 vf->config=config;
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
159 vf->get_image=get_image;
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
160 vf->put_image=put_image;
7949
0aedfdc5d6ef fixing segfault
michael
parents: 7946
diff changeset
161 vf->uninit=uninit;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
162 vf->default_caps=VFCAP_ACCEPT_STRIDE|VFCAP_POSTPROC;
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
163 vf->priv=malloc(sizeof(struct vf_priv_s));
7949
0aedfdc5d6ef fixing segfault
michael
parents: 7946
diff changeset
164 vf->priv->context=NULL;
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
165
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
166 // check csp:
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
167 vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
168 if(!vf->priv->outfmt) return 0; // no csp match :(
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5519
diff changeset
169
5514
127f2a84e933 accept -pp value from args
arpi
parents: 5513
diff changeset
170 if(args){
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
171 hex_mode= strtol(args, &endptr, 0);
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
172 if(*endptr){
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
173 name= args;
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
174 }else
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
175 name= NULL;
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
176 }else{
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
177 name="de";
5514
127f2a84e933 accept -pp value from args
arpi
parents: 5513
diff changeset
178 }
7972
6d1103afba1c cleanly passing the cpuCaps
michael
parents: 7963
diff changeset
179
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
180 #ifdef EMU_OLD
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
181 if(name){
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
182 #endif
8040
5241f95b5ec4 cleanup
michael
parents: 8038
diff changeset
183 for(i=0; i<=PP_QUALITY_MAX; i++){
7961
78e0f2776da7 cosmetics ;)
michael
parents: 7960
diff changeset
184 vf->priv->ppMode[i]= pp_get_mode_by_name_and_quality(name, i);
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
185 if(vf->priv->ppMode[i]==NULL) return -1;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
186 }
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
187 #ifdef EMU_OLD
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
188 }else{
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
189 /* hex mode for compatibility */
8040
5241f95b5ec4 cleanup
michael
parents: 8038
diff changeset
190 for(i=0; i<=PP_QUALITY_MAX; i++){
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
191 PPMode *ppMode;
fe30880576dc cleanup
michael
parents: 7985
diff changeset
192
fe30880576dc cleanup
michael
parents: 7985
diff changeset
193 ppMode= (PPMode*)memalign(8, sizeof(PPMode));
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
194
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
195 ppMode->lumMode= hex_mode;
fe30880576dc cleanup
michael
parents: 7985
diff changeset
196 ppMode->chromMode= ((hex_mode&0xFF)>>4) | (hex_mode&0xFFFFFF00);
fe30880576dc cleanup
michael
parents: 7985
diff changeset
197 ppMode->maxTmpNoise[0]= 700;
fe30880576dc cleanup
michael
parents: 7985
diff changeset
198 ppMode->maxTmpNoise[1]= 1500;
fe30880576dc cleanup
michael
parents: 7985
diff changeset
199 ppMode->maxTmpNoise[2]= 3000;
fe30880576dc cleanup
michael
parents: 7985
diff changeset
200 ppMode->maxAllowedY= 234;
fe30880576dc cleanup
michael
parents: 7985
diff changeset
201 ppMode->minAllowedY= 16;
fe30880576dc cleanup
michael
parents: 7985
diff changeset
202 ppMode->baseDcDiff= 256/4;
fe30880576dc cleanup
michael
parents: 7985
diff changeset
203 ppMode->flatnessThreshold=40;
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
204
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
205 vf->priv->ppMode[i]= ppMode;
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
206 }
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
207 }
8038
fe30880576dc cleanup
michael
parents: 7985
diff changeset
208 #endif
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7368
diff changeset
209
8040
5241f95b5ec4 cleanup
michael
parents: 8038
diff changeset
210 vf->priv->pp=PP_QUALITY_MAX; //divx_quality;
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
211 return 1;
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
212 }
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
213
7963
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
214 int readPPOpt(void *conf, char *arg)
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
215 {
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
216 int val;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
217
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
218 if(arg == NULL)
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
219 return -2; // ERR_MISSING_PARAM
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
220 errno = 0;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
221 val = (int)strtol(arg,NULL,0);
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
222 if(errno != 0)
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
223 return -4; // What about include cfgparser.h and use ERR_* defines */
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
224 if(val < 0)
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
225 return -3; // ERR_OUT_OF_RANGE
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
226
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
227 divx_quality = val;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
228
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
229 return 1;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
230 }
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
231
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
232 void revertPPOpt(void *conf, char* opt)
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
233 {
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
234 divx_quality=0;
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
235 }
0a5d69e6f2a2 cleanup
michael
parents: 7961
diff changeset
236
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
237 vf_info_t vf_info_pp = {
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
238 "postprocessing",
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
239 "pp",
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
240 "A'rpi",
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
241 "",
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9528
diff changeset
242 open,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9528
diff changeset
243 NULL
5512
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
244 };
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
245
4ccfa77d8e86 postprocessing filter (fixme: -pp 0)
arpi
parents:
diff changeset
246 //===========================================================================//
9426
c9dcb67e9638 moving postprocess code to libavcodec
michael
parents: 8805
diff changeset
247
c9dcb67e9638 moving postprocess code to libavcodec
michael
parents: 8805
diff changeset
248 #endif // USE_LIBAVCODEC