Mercurial > mplayer.hg
annotate libmpcodecs/vf_mcdeint.c @ 34757:da38eb1e2069
subassconvert: handle "\r\n" line ends
Previously the code converting text subtitles to ASS format converted newline
characters, and only those, to ASS "new line" markup. If the subtitles
contained "\r\n", the "\r" was thus left in the text. In previous libass
versions the "\r" was not visible, but in the current one it produces an empty
box. Improve the conversion to remove the "\r" in that case. Also treat a lone
"\r" as a newline.
Picked from mplayer2/3e0a2705
author | cboesch |
---|---|
date | Sat, 07 Apr 2012 11:17:09 +0000 |
parents | 8ef6e54892fa |
children | d206960484fe |
rev | line source |
---|---|
18590 | 1 /* |
26727 | 2 * Copyright (C) 2006 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 */ | |
18590 | 20 |
18592 | 21 |
22 /* | |
23 Known Issues: | |
24 * The motion estimation is somewhat at the mercy of the input, if the input | |
25 frames are created purely based on spatial interpolation then for example | |
26 a thin black line or another random and not interpolateable pattern | |
27 will cause problems | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
28 Note: completly ignoring the "unavailable" lines during motion estimation |
18592 | 29 didnt look any better, so the most obvious solution would be to improve |
30 tfields or penalize problematic motion vectors ... | |
31 | |
32 * If non iterative ME is used then snow currently ignores the OBMC window | |
33 and as a result sometimes creates artifacts | |
34 | |
35 * only past frames are used, we should ideally use future frames too, something | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29087
diff
changeset
|
36 like filtering the whole movie in forward and then backward direction seems |
18592 | 37 like a interresting idea but the current filter framework is FAR from |
38 supporting such things | |
39 | |
40 * combining the motion compensated image with the input image also isnt | |
41 as trivial as it seems, simple blindly taking even lines from one and | |
42 odd ones from the other doesnt work at all as ME/MC sometimes simple | |
43 has nothing in the previous frames which matches the current, the current | |
44 algo has been found by trial and error and almost certainly can be | |
45 improved ... | |
46 */ | |
47 | |
18590 | 48 #include <stdio.h> |
49 #include <stdlib.h> | |
50 #include <string.h> | |
51 #include <inttypes.h> | |
52 #include <math.h> | |
53 | |
54 #include "mp_msg.h" | |
55 #include "cpudetect.h" | |
56 | |
28329
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
26727
diff
changeset
|
57 #include "libavutil/internal.h" |
24977 | 58 #include "libavutil/intreadwrite.h" |
18590 | 59 #include "libavcodec/avcodec.h" |
60 #include "libavcodec/dsputil.h" | |
61 | |
28329
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
26727
diff
changeset
|
62 #undef fprintf |
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
26727
diff
changeset
|
63 #undef free |
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
26727
diff
changeset
|
64 #undef malloc |
ed42e982e79f
Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents:
26727
diff
changeset
|
65 |
18590 | 66 #include "img_format.h" |
67 #include "mp_image.h" | |
68 #include "vf.h" | |
33871
30f5e5cd3676
Move code for setting up libav* logging callbacks from vd_ffmpeg to a
reimar
parents:
33343
diff
changeset
|
69 #include "av_helpers.h" |
18590 | 70 |
71 #define MIN(a,b) ((a) > (b) ? (b) : (a)) | |
72 #define MAX(a,b) ((a) < (b) ? (b) : (a)) | |
73 #define ABS(a) ((a) > 0 ? (a) : (-(a))) | |
74 | |
75 //===========================================================================// | |
76 | |
77 struct vf_priv_s { | |
78 int mode; | |
79 int qp; | |
80 int parity; | |
81 #if 0 | |
82 int temp_stride[3]; | |
83 uint8_t *src[3]; | |
84 int16_t *temp[3]; | |
85 #endif | |
86 int outbuf_size; | |
87 uint8_t *outbuf; | |
88 AVCodecContext *avctx_enc; | |
89 AVFrame *frame; | |
90 AVFrame *frame_dec; | |
91 }; | |
92 | |
93 static void filter(struct vf_priv_s *p, uint8_t *dst[3], uint8_t *src[3], int dst_stride[3], int src_stride[3], int width, int height){ | |
18657 | 94 int x, y, i; |
18590 | 95 |
96 for(i=0; i<3; i++){ | |
97 p->frame->data[i]= src[i]; | |
98 p->frame->linesize[i]= src_stride[i]; | |
99 } | |
100 | |
101 p->avctx_enc->me_cmp= | |
102 p->avctx_enc->me_sub_cmp= FF_CMP_SAD /*| (p->parity ? FF_CMP_ODD : FF_CMP_EVEN)*/; | |
103 p->frame->quality= p->qp*FF_QP2LAMBDA; | |
33343 | 104 avcodec_encode_video(p->avctx_enc, p->outbuf, p->outbuf_size, p->frame); |
18590 | 105 p->frame_dec = p->avctx_enc->coded_frame; |
106 | |
107 for(i=0; i<3; i++){ | |
108 int is_chroma= !!i; | |
109 int w= width >>is_chroma; | |
110 int h= height>>is_chroma; | |
111 int fils= p->frame_dec->linesize[i]; | |
112 int srcs= src_stride[i]; | |
113 | |
114 for(y=0; y<h; y++){ | |
115 if((y ^ p->parity) & 1){ | |
116 for(x=0; x<w; x++){ | |
18648
7cc939d4a9e2
filter left & right edges too (yeah the code is lame i know...)
michael
parents:
18647
diff
changeset
|
117 if((x-2)+(y-1)*w>=0 && (x+2)+(y+1)*w<w*h){ //FIXME either alloc larger images or optimize this |
18590 | 118 uint8_t *filp= &p->frame_dec->data[i][x + y*fils]; |
119 uint8_t *srcp= &src[i][x + y*srcs]; | |
18647 | 120 int diff0= filp[-fils] - srcp[-srcs]; |
121 int diff1= filp[+fils] - srcp[+srcs]; | |
18657 | 122 int spatial_score= ABS(srcp[-srcs-1] - srcp[+srcs-1]) |
123 +ABS(srcp[-srcs ] - srcp[+srcs ]) | |
124 +ABS(srcp[-srcs+1] - srcp[+srcs+1]) - 1; | |
18590 | 125 int temp= filp[0]; |
18647 | 126 |
18657 | 127 #define CHECK(j)\ |
128 { int score= ABS(srcp[-srcs-1+j] - srcp[+srcs-1-j])\ | |
129 + ABS(srcp[-srcs +j] - srcp[+srcs -j])\ | |
130 + ABS(srcp[-srcs+1+j] - srcp[+srcs+1-j]);\ | |
131 if(score < spatial_score){\ | |
132 spatial_score= score;\ | |
133 diff0= filp[-fils+j] - srcp[-srcs+j];\ | |
134 diff1= filp[+fils-j] - srcp[+srcs-j]; | |
135 | |
136 CHECK(-1) CHECK(-2) }} }} | |
137 CHECK( 1) CHECK( 2) }} }} | |
18590 | 138 #if 0 |
139 if((diff0 ^ diff1) > 0){ | |
140 int mindiff= ABS(diff0) > ABS(diff1) ? diff1 : diff0; | |
18647 | 141 temp-= mindiff; |
18590 | 142 } |
143 #elif 1 | |
144 if(diff0 + diff1 > 0) | |
18647 | 145 temp-= (diff0 + diff1 - ABS( ABS(diff0) - ABS(diff1) )/2)/2; |
18590 | 146 else |
18647 | 147 temp-= (diff0 + diff1 + ABS( ABS(diff0) - ABS(diff1) )/2)/2; |
18590 | 148 #else |
18647 | 149 temp-= (diff0 + diff1)/2; |
18590 | 150 #endif |
151 #if 1 | |
152 filp[0]= | |
153 dst[i][x + y*dst_stride[i]]= temp > 255U ? ~(temp>>31) : temp; | |
154 #else | |
155 dst[i][x + y*dst_stride[i]]= filp[0]; | |
156 filp[0]= temp > 255U ? ~(temp>>31) : temp; | |
157 #endif | |
158 }else | |
159 dst[i][x + y*dst_stride[i]]= p->frame_dec->data[i][x + y*fils]; | |
160 } | |
161 } | |
162 } | |
163 for(y=0; y<h; y++){ | |
164 if(!((y ^ p->parity) & 1)){ | |
165 for(x=0; x<w; x++){ | |
166 #if 1 | |
167 p->frame_dec->data[i][x + y*fils]= | |
168 dst[i][x + y*dst_stride[i]]= src[i][x + y*srcs]; | |
169 #else | |
170 dst[i][x + y*dst_stride[i]]= p->frame_dec->data[i][x + y*fils]; | |
171 p->frame_dec->data[i][x + y*fils]= src[i][x + y*srcs]; | |
172 #endif | |
173 } | |
174 } | |
175 } | |
176 } | |
177 p->parity ^= 1; | |
178 | |
179 } | |
180 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
181 static int config(struct vf_instance *vf, |
18590 | 182 int width, int height, int d_width, int d_height, |
32702
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
183 unsigned int flags, unsigned int outfmt){ |
18590 | 184 int i; |
185 AVCodec *enc= avcodec_find_encoder(CODEC_ID_SNOW); | |
186 | |
187 for(i=0; i<3; i++){ | |
188 AVCodecContext *avctx_enc; | |
34718 | 189 AVDictionary *opts = NULL; |
18590 | 190 #if 0 |
191 int is_chroma= !!i; | |
192 int w= ((width + 31) & (~31))>>is_chroma; | |
193 int h= ((height + 31) & (~31))>>is_chroma; | |
194 | |
195 vf->priv->temp_stride[i]= w; | |
196 vf->priv->temp[i]= malloc(vf->priv->temp_stride[i]*h*sizeof(int16_t)); | |
197 vf->priv->src [i]= malloc(vf->priv->temp_stride[i]*h*sizeof(uint8_t)); | |
198 #endif | |
199 avctx_enc= | |
34543 | 200 vf->priv->avctx_enc= avcodec_alloc_context3(enc); |
18590 | 201 avctx_enc->width = width; |
202 avctx_enc->height = height; | |
203 avctx_enc->time_base= (AVRational){1,25}; // meaningless | |
204 avctx_enc->gop_size = 300; | |
205 avctx_enc->max_b_frames= 0; | |
206 avctx_enc->pix_fmt = PIX_FMT_YUV420P; | |
207 avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY; | |
208 avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; | |
209 avctx_enc->global_quality= 1; | |
34542 | 210 av_dict_set(&opts, "memc_only", "1", 0); |
18590 | 211 avctx_enc->me_cmp= |
212 avctx_enc->me_sub_cmp= FF_CMP_SAD; //SSE; | |
213 avctx_enc->mb_cmp= FF_CMP_SSE; | |
214 | |
215 switch(vf->priv->mode){ | |
216 case 3: | |
217 avctx_enc->refs= 3; | |
218 case 2: | |
219 avctx_enc->me_method= ME_ITER; | |
220 case 1: | |
221 avctx_enc->flags |= CODEC_FLAG_4MV; | |
222 avctx_enc->dia_size=2; | |
22283
bc9e95184521
cosmetics: Fix some common typos, sepErate --> sepArate, deciSSion --> deciSion.
diego
parents:
18821
diff
changeset
|
223 // avctx_enc->mb_decision = MB_DECISION_RD; |
18590 | 224 case 0: |
225 avctx_enc->flags |= CODEC_FLAG_QPEL; | |
226 } | |
227 | |
34542 | 228 avcodec_open2(avctx_enc, enc, &opts); |
229 av_dict_free(&opts); | |
18590 | 230 |
231 } | |
232 vf->priv->frame= avcodec_alloc_frame(); | |
233 | |
234 vf->priv->outbuf_size= width*height*10; | |
235 vf->priv->outbuf= malloc(vf->priv->outbuf_size); | |
236 | |
32702
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
237 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); |
18590 | 238 } |
239 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
240 static void get_image(struct vf_instance *vf, mp_image_t *mpi){ |
18590 | 241 if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change |
242 return; //caused problems, dunno why | |
243 // ok, we can do pp in-place (or pp disabled): | |
244 vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, | |
245 mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height); | |
246 mpi->planes[0]=vf->dmpi->planes[0]; | |
247 mpi->stride[0]=vf->dmpi->stride[0]; | |
248 mpi->width=vf->dmpi->width; | |
249 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
250 mpi->planes[1]=vf->dmpi->planes[1]; | |
251 mpi->planes[2]=vf->dmpi->planes[2]; | |
32702
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
252 mpi->stride[1]=vf->dmpi->stride[1]; |
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
253 mpi->stride[2]=vf->dmpi->stride[2]; |
18590 | 254 } |
255 mpi->flags|=MP_IMGFLAG_DIRECT; | |
256 } | |
257 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
258 static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ |
18590 | 259 mp_image_t *dmpi; |
260 | |
261 if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ | |
262 // no DR, so get a new image! hope we'll get DR buffer: | |
263 dmpi=vf_get_image(vf->next,mpi->imgfmt, | |
264 MP_IMGTYPE_TEMP, | |
265 MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, | |
266 mpi->width,mpi->height); | |
267 vf_clone_mpi_attributes(dmpi, mpi); | |
268 }else{ | |
269 dmpi=vf->dmpi; | |
270 } | |
271 | |
272 filter(vf->priv, dmpi->planes, mpi->planes, dmpi->stride, mpi->stride, mpi->w, mpi->h); | |
273 | |
274 return vf_next_put_image(vf,dmpi, pts); | |
275 } | |
276 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
277 static void uninit(struct vf_instance *vf){ |
18590 | 278 if(!vf->priv) return; |
279 | |
280 #if 0 | |
281 for(i=0; i<3; i++){ | |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
31959
diff
changeset
|
282 free(vf->priv->temp[i]); |
18590 | 283 vf->priv->temp[i]= NULL; |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
31959
diff
changeset
|
284 free(vf->priv->src[i]); |
18590 | 285 vf->priv->src[i]= NULL; |
286 } | |
287 #endif | |
18821 | 288 if (vf->priv->avctx_enc) { |
18752 | 289 avcodec_close(vf->priv->avctx_enc); |
18590 | 290 av_freep(&vf->priv->avctx_enc); |
18821 | 291 } |
18590 | 292 |
293 free(vf->priv->outbuf); | |
294 free(vf->priv); | |
295 vf->priv=NULL; | |
296 } | |
297 | |
298 //===========================================================================// | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
299 static int query_format(struct vf_instance *vf, unsigned int fmt){ |
18590 | 300 switch(fmt){ |
32702
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
301 case IMGFMT_YV12: |
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
302 case IMGFMT_I420: |
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
303 case IMGFMT_IYUV: |
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
304 case IMGFMT_Y800: |
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
305 case IMGFMT_Y8: |
7af3e6f901fd
Convert some tabs to whitespace to allow using MPlayer filter sourcecode in FFmpeg.
cehoyos
parents:
32537
diff
changeset
|
306 return vf_next_query_format(vf,fmt); |
18590 | 307 } |
308 return 0; | |
309 } | |
310 | |
30638
a7b908875c14
Rename open() vf initialization function to vf_open().
diego
parents:
29263
diff
changeset
|
311 static int vf_open(vf_instance_t *vf, char *args){ |
18590 | 312 |
313 vf->config=config; | |
314 vf->put_image=put_image; | |
315 vf->get_image=get_image; | |
316 vf->query_format=query_format; | |
317 vf->uninit=uninit; | |
318 vf->priv=malloc(sizeof(struct vf_priv_s)); | |
319 memset(vf->priv, 0, sizeof(struct vf_priv_s)); | |
320 | |
31959
f957f330aa6d
Introduce init_avcodec function to avoid duplicated FFmpeg initializations.
diego
parents:
30642
diff
changeset
|
321 init_avcodec(); |
18590 | 322 |
323 vf->priv->mode=0; | |
324 vf->priv->parity= -1; | |
325 vf->priv->qp=1; | |
326 | |
327 if (args) sscanf(args, "%d:%d:%d", &vf->priv->mode, &vf->priv->parity, &vf->priv->qp); | |
328 | |
329 return 1; | |
330 } | |
331 | |
25221 | 332 const vf_info_t vf_info_mcdeint = { |
18590 | 333 "motion compensating deinterlacer", |
334 "mcdeint", | |
335 "Michael Niedermayer", | |
336 "", | |
30638
a7b908875c14
Rename open() vf initialization function to vf_open().
diego
parents:
29263
diff
changeset
|
337 vf_open, |
18590 | 338 NULL |
339 }; |