Mercurial > mplayer.hg
annotate libmpcodecs/vf_pp.c @ 31666:796b778e2411
Enable robust resync for mpg123 decoder.
This prevents the decoder from giving up give after long pieces of invalid
data, for example during transmission errors with DVB-T and similar.
patch by Thomas Orgis, thomas-forum orgis org
author | diego |
---|---|
date | Tue, 13 Jul 2010 15:11:34 +0000 |
parents | 8a96d56b01f0 |
children | ed8a577b9a20 |
rev | line source |
---|---|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
1 /* |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
2 * This file is part of MPlayer. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
3 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
7 * (at your option) any later version. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
8 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
12 * GNU General Public License for more details. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
13 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
17 */ |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
29263
diff
changeset
|
18 |
5512 | 19 #include <stdio.h> |
20 #include <stdlib.h> | |
21 #include <string.h> | |
7946 | 22 #include <inttypes.h> |
7963 | 23 #include <errno.h> |
5512 | 24 |
17012 | 25 #include "config.h" |
26 #include "mp_msg.h" | |
27 #include "cpudetect.h" | |
5512 | 28 |
28594
df67d03dde3b
Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
diego
parents:
28327
diff
changeset
|
29 #if HAVE_MALLOC_H |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8040
diff
changeset
|
30 #include <malloc.h> |
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8040
diff
changeset
|
31 #endif |
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8040
diff
changeset
|
32 |
5607 | 33 #include "img_format.h" |
34 #include "mp_image.h" | |
5512 | 35 #include "vf.h" |
28327
c39a1fd7d45c
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
27341
diff
changeset
|
36 #include "libavutil/internal.h" |
18557
b7746166426c
libpostproc is not a subdirectory of libavcodec anymore.
diego
parents:
17906
diff
changeset
|
37 #include "libpostproc/postprocess.h" |
26068 | 38 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26069
diff
changeset
|
39 #ifdef CONFIG_LIBPOSTPROC_A |
26069
1318e956c092
FFmpeg now uses different (unified) #include paths.
diego
parents:
26068
diff
changeset
|
40 #define EMU_OLD |
26068 | 41 #include "libpostproc/postprocess_internal.h" |
42 #endif | |
8038 | 43 |
28327
c39a1fd7d45c
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
27341
diff
changeset
|
44 #undef malloc |
c39a1fd7d45c
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
27341
diff
changeset
|
45 |
5512 | 46 struct vf_priv_s { |
7946 | 47 int pp; |
8040 | 48 pp_mode_t *ppMode[PP_QUALITY_MAX+1]; |
7946 | 49 void *context; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
50 unsigned int outfmt; |
5512 | 51 }; |
52 | |
53 //===========================================================================// | |
54 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
55 static int config(struct vf_instance *vf, |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
56 int width, int height, int d_width, int d_height, |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
57 unsigned int voflags, unsigned int outfmt){ |
8805 | 58 int flags= |
7985 | 59 (gCpuCaps.hasMMX ? PP_CPU_CAPS_MMX : 0) |
60 | (gCpuCaps.hasMMX2 ? PP_CPU_CAPS_MMX2 : 0) | |
8805 | 61 | (gCpuCaps.has3DNow ? PP_CPU_CAPS_3DNOW : 0); |
62 | |
63 switch(outfmt){ | |
64 case IMGFMT_444P: flags|= PP_FORMAT_444; break; | |
65 case IMGFMT_422P: flags|= PP_FORMAT_422; break; | |
66 case IMGFMT_411P: flags|= PP_FORMAT_411; break; | |
67 default: flags|= PP_FORMAT_420; break; | |
68 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
69 |
8805 | 70 if(vf->priv->context) pp_free_context(vf->priv->context); |
71 vf->priv->context= pp_get_context(width, height, flags); | |
7946 | 72 |
9528 | 73 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
|
74 } |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
75 |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
76 static void uninit(struct vf_instance *vf){ |
8038 | 77 int i; |
8040 | 78 for(i=0; i<=PP_QUALITY_MAX; i++){ |
8038 | 79 if(vf->priv->ppMode[i]) |
80 pp_free_mode(vf->priv->ppMode[i]); | |
81 } | |
7961 | 82 if(vf->priv->context) pp_free_context(vf->priv->context); |
7949 | 83 } |
84 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
85 static int query_format(struct vf_instance *vf, unsigned int fmt){ |
5518 | 86 switch(fmt){ |
87 case IMGFMT_YV12: | |
88 case IMGFMT_I420: | |
89 case IMGFMT_IYUV: | |
8805 | 90 case IMGFMT_444P: |
91 case IMGFMT_422P: | |
92 case IMGFMT_411P: | |
93 return vf_next_query_format(vf,fmt); | |
5518 | 94 } |
95 return 0; | |
96 } | |
97 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
98 static int control(struct vf_instance *vf, int request, void* data){ |
5519 | 99 switch(request){ |
100 case VFCTRL_QUERY_MAX_PP_LEVEL: | |
8040 | 101 return PP_QUALITY_MAX; |
5519 | 102 case VFCTRL_SET_PP_LEVEL: |
7946 | 103 vf->priv->pp= *((unsigned int*)data); |
5519 | 104 return CONTROL_TRUE; |
105 } | |
106 return vf_next_control(vf,request,data); | |
107 } | |
108 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
109 static void get_image(struct vf_instance *vf, mp_image_t *mpi){ |
5512 | 110 if(vf->priv->pp&0xFFFF) return; // non-local filters enabled |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
111 if((mpi->type==MP_IMGTYPE_IPB || vf->priv->pp) && |
5513 | 112 mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
113 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
|
114 return; // colorspace differ |
5512 | 115 // ok, we can do pp in-place (or pp disabled): |
10141
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
116 vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, |
16018
bdf1b4ecb906
use stored dimensions instead of visible one when (vf_)get_image is called
iive
parents:
15965
diff
changeset
|
117 mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); |
10141
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
118 mpi->planes[0]=vf->dmpi->planes[0]; |
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
119 mpi->stride[0]=vf->dmpi->stride[0]; |
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
120 mpi->width=vf->dmpi->width; |
5512 | 121 if(mpi->flags&MP_IMGFLAG_PLANAR){ |
10141
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
122 mpi->planes[1]=vf->dmpi->planes[1]; |
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
123 mpi->planes[2]=vf->dmpi->planes[2]; |
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
124 mpi->stride[1]=vf->dmpi->stride[1]; |
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
125 mpi->stride[2]=vf->dmpi->stride[2]; |
5512 | 126 } |
127 mpi->flags|=MP_IMGFLAG_DIRECT; | |
128 } | |
129 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
130 static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ |
5512 | 131 if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ |
132 // no DR, so get a new image! hope we'll get DR buffer: | |
10141
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
133 vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, |
16471
9f516ed86916
pp_postprocess reads from target image, so request a readable one.
reimar
parents:
16018
diff
changeset
|
134 MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | |
9f516ed86916
pp_postprocess reads from target image, so request a readable one.
reimar
parents:
16018
diff
changeset
|
135 MP_IMGFLAG_PREFER_ALIGNED_STRIDE | MP_IMGFLAG_READABLE, |
6875 | 136 // MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, |
137 // mpi->w,mpi->h); | |
16018
bdf1b4ecb906
use stored dimensions instead of visible one when (vf_)get_image is called
iive
parents:
15965
diff
changeset
|
138 (mpi->width+7)&(~7),(mpi->height+7)&(~7)); |
10141
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
139 vf->dmpi->w=mpi->w; vf->dmpi->h=mpi->h; // display w;h |
5512 | 140 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
141 |
5512 | 142 if(vf->priv->pp || !(mpi->flags&MP_IMGFLAG_DIRECT)){ |
143 // do the postprocessing! (or copy if no DR) | |
7961 | 144 pp_postprocess(mpi->planes ,mpi->stride, |
10141
7d6a854a5fe5
cleanup, use vf->dmpi rather than vf->priv->dmpi for consistency
rfelker
parents:
9931
diff
changeset
|
145 vf->dmpi->planes,vf->dmpi->stride, |
6875 | 146 (mpi->w+7)&(~7),mpi->h, |
5512 | 147 mpi->qscale, mpi->qstride, |
8038 | 148 vf->priv->ppMode[ vf->priv->pp ], vf->priv->context, |
9931 | 149 #ifdef PP_PICT_TYPE_QP2 |
9925
420640a0f6d0
passing qscale_type around so the pp code can fix the mpeg2 <<1 thing
michael
parents:
9593
diff
changeset
|
150 mpi->pict_type | (mpi->qscale_type ? PP_PICT_TYPE_QP2 : 0)); |
9931 | 151 #else |
152 mpi->pict_type); | |
153 #endif | |
5512 | 154 } |
17906
20aca9baf5d8
passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents:
17463
diff
changeset
|
155 return vf_next_put_image(vf,vf->dmpi, pts); |
5512 | 156 } |
157 | |
158 //===========================================================================// | |
159 | |
160 extern int divx_quality; | |
161 | |
30708 | 162 static const unsigned int fmt_list[]={ |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
163 IMGFMT_YV12, |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
164 IMGFMT_I420, |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
165 IMGFMT_IYUV, |
8805 | 166 IMGFMT_444P, |
167 IMGFMT_422P, | |
168 IMGFMT_411P, | |
7127 | 169 0 |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
170 }; |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
171 |
30638
a7b908875c14
Rename open() vf initialization function to vf_open().
diego
parents:
30633
diff
changeset
|
172 static int vf_open(vf_instance_t *vf, char *args){ |
7946 | 173 char *endptr, *name; |
174 int i; | |
175 int hex_mode=0; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
176 |
5518 | 177 vf->query_format=query_format; |
5519 | 178 vf->control=control; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
179 vf->config=config; |
5512 | 180 vf->get_image=get_image; |
181 vf->put_image=put_image; | |
7949 | 182 vf->uninit=uninit; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
183 vf->default_caps=VFCAP_ACCEPT_STRIDE|VFCAP_POSTPROC; |
5512 | 184 vf->priv=malloc(sizeof(struct vf_priv_s)); |
7949 | 185 vf->priv->context=NULL; |
5565
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
186 |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
187 // check csp: |
0b301fec999a
capabilities support -> automatic insertion of scale, expand, pp
arpi
parents:
5519
diff
changeset
|
188 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
|
189 if(!vf->priv->outfmt) return 0; // no csp match :( |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
190 |
5514 | 191 if(args){ |
7946 | 192 hex_mode= strtol(args, &endptr, 0); |
193 if(*endptr){ | |
194 name= args; | |
195 }else | |
196 name= NULL; | |
197 }else{ | |
198 name="de"; | |
5514 | 199 } |
7972 | 200 |
8038 | 201 #ifdef EMU_OLD |
7946 | 202 if(name){ |
8038 | 203 #endif |
8040 | 204 for(i=0; i<=PP_QUALITY_MAX; i++){ |
7961 | 205 vf->priv->ppMode[i]= pp_get_mode_by_name_and_quality(name, i); |
8038 | 206 if(vf->priv->ppMode[i]==NULL) return -1; |
7946 | 207 } |
8038 | 208 #ifdef EMU_OLD |
7946 | 209 }else{ |
210 /* hex mode for compatibility */ | |
8040 | 211 for(i=0; i<=PP_QUALITY_MAX; i++){ |
8038 | 212 PPMode *ppMode; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
213 |
8038 | 214 ppMode= (PPMode*)memalign(8, sizeof(PPMode)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
215 |
8038 | 216 ppMode->lumMode= hex_mode; |
217 ppMode->chromMode= ((hex_mode&0xFF)>>4) | (hex_mode&0xFFFFFF00); | |
218 ppMode->maxTmpNoise[0]= 700; | |
219 ppMode->maxTmpNoise[1]= 1500; | |
220 ppMode->maxTmpNoise[2]= 3000; | |
221 ppMode->maxAllowedY= 234; | |
222 ppMode->minAllowedY= 16; | |
223 ppMode->baseDcDiff= 256/4; | |
224 ppMode->flatnessThreshold=40; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
225 |
7946 | 226 vf->priv->ppMode[i]= ppMode; |
227 } | |
228 } | |
8038 | 229 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28594
diff
changeset
|
230 |
10756 | 231 vf->priv->pp=PP_QUALITY_MAX; |
5512 | 232 return 1; |
233 } | |
234 | |
25221 | 235 const vf_info_t vf_info_pp = { |
5512 | 236 "postprocessing", |
237 "pp", | |
238 "A'rpi", | |
239 "", | |
30638
a7b908875c14
Rename open() vf initialization function to vf_open().
diego
parents:
30633
diff
changeset
|
240 vf_open, |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9528
diff
changeset
|
241 NULL |
5512 | 242 }; |
243 | |
244 //===========================================================================// |