annotate motion_est.c @ 1668:30746f429df6 libavcodec

move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>) cleanups & fixes by me
author michael
date Tue, 09 Dec 2003 01:49:56 +0000
parents 7653a103b53c
children dea5b2946999
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * Motion estimation
429
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
3 * Copyright (c) 2000,2001 Fabrice Bellard.
1011
michaelni
parents: 1007
diff changeset
4 * Copyright (c) 2002-2003 Michael Niedermayer
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5 *
986e461dc072 Initial revision
glantau
parents:
diff changeset
6 *
429
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
7 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
9 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
10 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 *
429
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
12 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
15 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
16 *
429
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
18 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 376
diff changeset
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
20 *
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
21 * new Motion Estimation (X1/EPZS) by Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
22 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1086
diff changeset
23
1e39f273ecd6 per file doxy
michaelni
parents: 1086
diff changeset
24 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1086
diff changeset
25 * @file motion_est.c
1e39f273ecd6 per file doxy
michaelni
parents: 1086
diff changeset
26 * Motion estimation.
1e39f273ecd6 per file doxy
michaelni
parents: 1086
diff changeset
27 */
1e39f273ecd6 per file doxy
michaelni
parents: 1086
diff changeset
28
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 #include <stdlib.h>
986e461dc072 Initial revision
glantau
parents:
diff changeset
30 #include <stdio.h>
1426
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
31 #include <limits.h>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
32 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
33 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 #include "mpegvideo.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
35
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
36 //#undef NDEBUG
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
37 //#include <assert.h>
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
38
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
39 #define SQ(a) ((a)*(a))
284
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
40
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
41 #define P_LEFT P[1]
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
42 #define P_TOP P[2]
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
43 #define P_TOPRIGHT P[3]
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
44 #define P_MEDIAN P[4]
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
45 #define P_MV1 P[9]
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
46
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
47 static inline int sad_hpel_motion_search(MpegEncContext * s,
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
48 int *mx_ptr, int *my_ptr, int dmin,
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
49 int xmin, int ymin, int xmax, int ymax,
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
50 int pred_x, int pred_y, Picture *picture,
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1106
diff changeset
51 int n, int size, uint8_t * const mv_penalty);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
52
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
53 static inline int update_map_generation(MpegEncContext * s)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
54 {
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
55 s->me.map_generation+= 1<<(ME_MAP_MV_BITS*2);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
56 if(s->me.map_generation==0){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
57 s->me.map_generation= 1<<(ME_MAP_MV_BITS*2);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
58 memset(s->me.map, 0, sizeof(uint32_t)*ME_MAP_SIZE);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
59 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
60 return s->me.map_generation;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
61 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
62
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
63 /* shape adaptive search stuff */
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
64 typedef struct Minima{
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
65 int height;
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
66 int x, y;
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
67 int checked;
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
68 }Minima;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
69
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
70 static int minima_cmp(const void *a, const void *b){
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
71 const Minima *da = (const Minima *) a;
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
72 const Minima *db = (const Minima *) b;
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
73
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
74 return da->height - db->height;
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
75 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
76
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
77 /* SIMPLE */
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
78 #define RENAME(a) simple_ ## a
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
79
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
80 #define CMP(d, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
81 d = cmp(s, src_y, (ref_y) + (x) + (y)*(stride), stride);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
82
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
83 #define CMP_HPEL(d, dx, dy, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
84 {\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
85 const int dxy= (dx) + 2*(dy);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
86 hpel_put[0][dxy](s->me.scratchpad, (ref_y) + (x) + (y)*(stride), stride, (16>>size));\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
87 d = cmp_sub(s, s->me.scratchpad, src_y, stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
88 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
89
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
90 #define CMP_QPEL(d, dx, dy, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
91 {\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
92 const int dxy= (dx) + 4*(dy);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
93 qpel_put[0][dxy](s->me.scratchpad, (ref_y) + (x) + (y)*(stride), stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
94 d = cmp_sub(s, s->me.scratchpad, src_y, stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
95 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
96
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
97 #include "motion_est_template.c"
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
98 #undef RENAME
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
99 #undef CMP
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
100 #undef CMP_HPEL
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
101 #undef CMP_QPEL
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
102 #undef INIT
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
103
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
104 /* SIMPLE CHROMA */
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
105 #define RENAME(a) simple_chroma_ ## a
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
106
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
107 #define CMP(d, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
108 d = cmp(s, src_y, (ref_y) + (x) + (y)*(stride), stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
109 if(chroma_cmp){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
110 int dxy= ((x)&1) + 2*((y)&1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
111 int c= ((x)>>1) + ((y)>>1)*uvstride;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
112 \
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
113 chroma_hpel_put[0][dxy](s->me.scratchpad, ref_u + c, uvstride, 8);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
114 d += chroma_cmp(s, s->me.scratchpad, src_u, uvstride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
115 chroma_hpel_put[0][dxy](s->me.scratchpad, ref_v + c, uvstride, 8);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
116 d += chroma_cmp(s, s->me.scratchpad, src_v, uvstride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
117 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
118
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
119 #define CMP_HPEL(d, dx, dy, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
120 {\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
121 const int dxy= (dx) + 2*(dy);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
122 hpel_put[0][dxy](s->me.scratchpad, (ref_y) + (x) + (y)*(stride), stride, (16>>size));\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
123 d = cmp_sub(s, s->me.scratchpad, src_y, stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
124 if(chroma_cmp_sub){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
125 int cxy= (dxy) | ((x)&1) | (2*((y)&1));\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
126 int c= ((x)>>1) + ((y)>>1)*uvstride;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
127 chroma_hpel_put[0][cxy](s->me.scratchpad, ref_u + c, uvstride, 8);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
128 d += chroma_cmp_sub(s, s->me.scratchpad, src_u, uvstride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
129 chroma_hpel_put[0][cxy](s->me.scratchpad, ref_v + c, uvstride, 8);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
130 d += chroma_cmp_sub(s, s->me.scratchpad, src_v, uvstride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
131 }\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
132 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
133
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
134 #define CMP_QPEL(d, dx, dy, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
135 {\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
136 const int dxy= (dx) + 4*(dy);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
137 qpel_put[0][dxy](s->me.scratchpad, (ref_y) + (x) + (y)*(stride), stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
138 d = cmp_sub(s, s->me.scratchpad, src_y, stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
139 if(chroma_cmp_sub){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
140 int cxy, c;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
141 int cx= (4*(x) + (dx))/2;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
142 int cy= (4*(y) + (dy))/2;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
143 cx= (cx>>1)|(cx&1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
144 cy= (cy>>1)|(cy&1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
145 cxy= (cx&1) + 2*(cy&1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
146 c= ((cx)>>1) + ((cy)>>1)*uvstride;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
147 chroma_hpel_put[0][cxy](s->me.scratchpad, ref_u + c, uvstride, 8);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
148 d += chroma_cmp_sub(s, s->me.scratchpad, src_u, uvstride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
149 chroma_hpel_put[0][cxy](s->me.scratchpad, ref_v + c, uvstride, 8);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
150 d += chroma_cmp_sub(s, s->me.scratchpad, src_v, uvstride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
151 }\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
152 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
153
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
154 #include "motion_est_template.c"
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
155 #undef RENAME
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
156 #undef CMP
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
157 #undef CMP_HPEL
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
158 #undef CMP_QPEL
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
159 #undef INIT
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
160
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
161 /* SIMPLE DIRECT HPEL */
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
162 #define RENAME(a) simple_direct_hpel_ ## a
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
163 //FIXME precalc divisions stuff
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
164
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
165 #define CMP_DIRECT(d, dx, dy, x, y, size, cmp_func)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
166 if((x) >= xmin && 2*(x) + (dx) <= 2*xmax && (y) >= ymin && 2*(y) + (dy) <= 2*ymax){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
167 const int hx= 2*(x) + (dx);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
168 const int hy= 2*(y) + (dy);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
169 if(s->mv_type==MV_TYPE_8X8){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
170 int i;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
171 for(i=0; i<4; i++){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
172 int fx = s->me.direct_basis_mv[i][0] + hx;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
173 int fy = s->me.direct_basis_mv[i][1] + hy;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
174 int bx = hx ? fx - s->me.co_located_mv[i][0] : s->me.co_located_mv[i][0]*(time_pb - time_pp)/time_pp + (i &1)*16;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
175 int by = hy ? fy - s->me.co_located_mv[i][1] : s->me.co_located_mv[i][1]*(time_pb - time_pp)/time_pp + (i>>1)*16;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
176 int fxy= (fx&1) + 2*(fy&1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
177 int bxy= (bx&1) + 2*(by&1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
178 \
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
179 uint8_t *dst= s->me.scratchpad + 8*(i&1) + 8*stride*(i>>1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
180 hpel_put[1][fxy](dst, (ref_y ) + (fx>>1) + (fy>>1)*(stride), stride, 8);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
181 hpel_avg[1][bxy](dst, (ref2_y) + (bx>>1) + (by>>1)*(stride), stride, 8);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
182 }\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
183 }else{\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
184 int fx = s->me.direct_basis_mv[0][0] + hx;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
185 int fy = s->me.direct_basis_mv[0][1] + hy;\
1050
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
186 int bx = hx ? fx - s->me.co_located_mv[0][0] : (s->me.co_located_mv[0][0]*(time_pb - time_pp)/time_pp);\
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
187 int by = hy ? fy - s->me.co_located_mv[0][1] : (s->me.co_located_mv[0][1]*(time_pb - time_pp)/time_pp);\
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
188 int fxy= (fx&1) + 2*(fy&1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
189 int bxy= (bx&1) + 2*(by&1);\
1050
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
190 \
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
191 assert((fx>>1) + 16*s->mb_x >= -16);\
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
192 assert((fy>>1) + 16*s->mb_y >= -16);\
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
193 assert((fx>>1) + 16*s->mb_x <= s->width);\
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
194 assert((fy>>1) + 16*s->mb_y <= s->height);\
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
195 assert((bx>>1) + 16*s->mb_x >= -16);\
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
196 assert((by>>1) + 16*s->mb_y >= -16);\
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
197 assert((bx>>1) + 16*s->mb_x <= s->width);\
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
198 assert((by>>1) + 16*s->mb_y <= s->height);\
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
199 \
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
200 hpel_put[0][fxy](s->me.scratchpad, (ref_y ) + (fx>>1) + (fy>>1)*(stride), stride, 16);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
201 hpel_avg[0][bxy](s->me.scratchpad, (ref2_y) + (bx>>1) + (by>>1)*(stride), stride, 16);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
202 }\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
203 d = cmp_func(s, s->me.scratchpad, src_y, stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
204 }else\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
205 d= 256*256*256*32;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
206
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
207
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
208 #define CMP_HPEL(d, dx, dy, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
209 CMP_DIRECT(d, dx, dy, x, y, size, cmp_sub)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
210
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
211 #define CMP(d, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
212 CMP_DIRECT(d, 0, 0, x, y, size, cmp)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
213
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
214 #include "motion_est_template.c"
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
215 #undef RENAME
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
216 #undef CMP
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
217 #undef CMP_HPEL
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
218 #undef CMP_QPEL
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
219 #undef INIT
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
220 #undef CMP_DIRECT
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
221
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
222 /* SIMPLE DIRECT QPEL */
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
223 #define RENAME(a) simple_direct_qpel_ ## a
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
224
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
225 #define CMP_DIRECT(d, dx, dy, x, y, size, cmp_func)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
226 if((x) >= xmin && 4*(x) + (dx) <= 4*xmax && (y) >= ymin && 4*(y) + (dy) <= 4*ymax){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
227 const int qx= 4*(x) + (dx);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
228 const int qy= 4*(y) + (dy);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
229 if(s->mv_type==MV_TYPE_8X8){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
230 int i;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
231 for(i=0; i<4; i++){\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
232 int fx = s->me.direct_basis_mv[i][0] + qx;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
233 int fy = s->me.direct_basis_mv[i][1] + qy;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
234 int bx = qx ? fx - s->me.co_located_mv[i][0] : s->me.co_located_mv[i][0]*(time_pb - time_pp)/time_pp + (i &1)*16;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
235 int by = qy ? fy - s->me.co_located_mv[i][1] : s->me.co_located_mv[i][1]*(time_pb - time_pp)/time_pp + (i>>1)*16;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
236 int fxy= (fx&3) + 4*(fy&3);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
237 int bxy= (bx&3) + 4*(by&3);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
238 \
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
239 uint8_t *dst= s->me.scratchpad + 8*(i&1) + 8*stride*(i>>1);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
240 qpel_put[1][fxy](dst, (ref_y ) + (fx>>2) + (fy>>2)*(stride), stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
241 qpel_avg[1][bxy](dst, (ref2_y) + (bx>>2) + (by>>2)*(stride), stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
242 }\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
243 }else{\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
244 int fx = s->me.direct_basis_mv[0][0] + qx;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
245 int fy = s->me.direct_basis_mv[0][1] + qy;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
246 int bx = qx ? fx - s->me.co_located_mv[0][0] : s->me.co_located_mv[0][0]*(time_pb - time_pp)/time_pp;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
247 int by = qy ? fy - s->me.co_located_mv[0][1] : s->me.co_located_mv[0][1]*(time_pb - time_pp)/time_pp;\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
248 int fxy= (fx&3) + 4*(fy&3);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
249 int bxy= (bx&3) + 4*(by&3);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
250 \
1053
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1051
diff changeset
251 qpel_put[1][fxy](s->me.scratchpad , (ref_y ) + (fx>>2) + (fy>>2)*(stride) , stride);\
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1051
diff changeset
252 qpel_put[1][fxy](s->me.scratchpad + 8 , (ref_y ) + (fx>>2) + (fy>>2)*(stride) + 8 , stride);\
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1051
diff changeset
253 qpel_put[1][fxy](s->me.scratchpad + 8*stride, (ref_y ) + (fx>>2) + (fy>>2)*(stride) + 8*stride, stride);\
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1051
diff changeset
254 qpel_put[1][fxy](s->me.scratchpad + 8 + 8*stride, (ref_y ) + (fx>>2) + (fy>>2)*(stride) + 8 + 8*stride, stride);\
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1051
diff changeset
255 qpel_avg[1][bxy](s->me.scratchpad , (ref2_y) + (bx>>2) + (by>>2)*(stride) , stride);\
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1051
diff changeset
256 qpel_avg[1][bxy](s->me.scratchpad + 8 , (ref2_y) + (bx>>2) + (by>>2)*(stride) + 8 , stride);\
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1051
diff changeset
257 qpel_avg[1][bxy](s->me.scratchpad + 8*stride, (ref2_y) + (bx>>2) + (by>>2)*(stride) + 8*stride, stride);\
f07fd48c23d4 direct blocksize in bframes fix (might fix qpel+bframe bug)
michaelni
parents: 1051
diff changeset
258 qpel_avg[1][bxy](s->me.scratchpad + 8 + 8*stride, (ref2_y) + (bx>>2) + (by>>2)*(stride) + 8 + 8*stride, stride);\
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
259 }\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
260 d = cmp_func(s, s->me.scratchpad, src_y, stride);\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
261 }else\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
262 d= 256*256*256*32;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
263
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
264
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
265 #define CMP_QPEL(d, dx, dy, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
266 CMP_DIRECT(d, dx, dy, x, y, size, cmp_sub)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
267
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
268 #define CMP(d, x, y, size)\
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
269 CMP_DIRECT(d, 0, 0, x, y, size, cmp)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
270
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
271 #include "motion_est_template.c"
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
272 #undef RENAME
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
273 #undef CMP
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
274 #undef CMP_HPEL
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
275 #undef CMP_QPEL
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
276 #undef INIT
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
277 #undef CMP__DIRECT
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
278
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
279
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
280 static int zero_cmp(void *s, uint8_t *a, uint8_t *b, int stride){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
281 return 0;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
282 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
283
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
284 static void set_cmp(MpegEncContext *s, me_cmp_func *cmp, int type){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
285 DSPContext* c= &s->dsp;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
286 int i;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
287
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
288 memset(cmp, 0, sizeof(void*)*11);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
289
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
290 switch(type&0xFF){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
291 case FF_CMP_SAD:
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
292 cmp[0]= c->sad[0];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
293 cmp[1]= c->sad[1];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
294 break;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
295 case FF_CMP_SATD:
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
296 cmp[0]= c->hadamard8_diff[0];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
297 cmp[1]= c->hadamard8_diff[1];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
298 break;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
299 case FF_CMP_SSE:
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
300 cmp[0]= c->sse[0];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
301 cmp[1]= c->sse[1];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
302 break;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
303 case FF_CMP_DCT:
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
304 cmp[0]= c->dct_sad[0];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
305 cmp[1]= c->dct_sad[1];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
306 break;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
307 case FF_CMP_PSNR:
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
308 cmp[0]= c->quant_psnr[0];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
309 cmp[1]= c->quant_psnr[1];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
310 break;
1007
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
311 case FF_CMP_BIT:
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
312 cmp[0]= c->bit[0];
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
313 cmp[1]= c->bit[1];
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
314 break;
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
315 case FF_CMP_RD:
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
316 cmp[0]= c->rd[0];
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
317 cmp[1]= c->rd[1];
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
318 break;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
319 case FF_CMP_ZERO:
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
320 for(i=0; i<7; i++){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
321 cmp[i]= zero_cmp;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
322 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
323 break;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
324 default:
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1494
diff changeset
325 av_log(s->avctx, AV_LOG_ERROR,"internal error in cmp function selection\n");
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
326 }
1014
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M¸«©ns Rullg¸«©rd))
michaelni
parents: 1013
diff changeset
327 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
328
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
329 static inline int get_penalty_factor(MpegEncContext *s, int type){
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
330 switch(type&0xFF){
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
331 default:
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
332 case FF_CMP_SAD:
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
333 return s->qscale*2;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
334 case FF_CMP_DCT:
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
335 return s->qscale*3;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
336 case FF_CMP_SATD:
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
337 return s->qscale*6;
1007
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
338 case FF_CMP_SSE:
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
339 return s->qscale*s->qscale*2;
1007
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
340 case FF_CMP_BIT:
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
341 return 1;
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 960
diff changeset
342 case FF_CMP_RD:
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
343 case FF_CMP_PSNR:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
344 return (s->qscale*s->qscale*185 + 64)>>7;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
345 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
346 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
347
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
348 void ff_init_me(MpegEncContext *s){
954
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
349 set_cmp(s, s->dsp.me_pre_cmp, s->avctx->me_pre_cmp);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
350 set_cmp(s, s->dsp.me_cmp, s->avctx->me_cmp);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
351 set_cmp(s, s->dsp.me_sub_cmp, s->avctx->me_sub_cmp);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
352 set_cmp(s, s->dsp.mb_cmp, s->avctx->mb_cmp);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
353
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
354 if(s->flags&CODEC_FLAG_QPEL){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
355 if(s->avctx->me_sub_cmp&FF_CMP_CHROMA)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
356 s->me.sub_motion_search= simple_chroma_qpel_motion_search;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
357 else
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
358 s->me.sub_motion_search= simple_qpel_motion_search;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
359 }else{
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
360 if(s->avctx->me_sub_cmp&FF_CMP_CHROMA)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
361 s->me.sub_motion_search= simple_chroma_hpel_motion_search;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
362 else if( s->avctx->me_sub_cmp == FF_CMP_SAD
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
363 && s->avctx-> me_cmp == FF_CMP_SAD
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
364 && s->avctx-> mb_cmp == FF_CMP_SAD)
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
365 s->me.sub_motion_search= sad_hpel_motion_search;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
366 else
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
367 s->me.sub_motion_search= simple_hpel_motion_search;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
368 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
369
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
370 if(s->avctx->me_cmp&FF_CMP_CHROMA){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
371 s->me.motion_search[0]= simple_chroma_epzs_motion_search;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
372 s->me.motion_search[1]= simple_chroma_epzs_motion_search4;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
373 }else{
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
374 s->me.motion_search[0]= simple_epzs_motion_search;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
375 s->me.motion_search[1]= simple_epzs_motion_search4;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
376 }
954
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
377
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
378 if(s->avctx->me_pre_cmp&FF_CMP_CHROMA){
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
379 s->me.pre_motion_search= simple_chroma_epzs_motion_search;
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
380 }else{
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
381 s->me.pre_motion_search= simple_epzs_motion_search;
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
382 }
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
383
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
384 if(s->flags&CODEC_FLAG_QPEL){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
385 if(s->avctx->mb_cmp&FF_CMP_CHROMA)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
386 s->me.get_mb_score= simple_chroma_qpel_get_mb_score;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
387 else
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
388 s->me.get_mb_score= simple_qpel_get_mb_score;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
389 }else{
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
390 if(s->avctx->mb_cmp&FF_CMP_CHROMA)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
391 s->me.get_mb_score= simple_chroma_hpel_get_mb_score;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
392 else
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
393 s->me.get_mb_score= simple_hpel_get_mb_score;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
394 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
395 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
396
1419
a7a9df478e46 removed unused variable
bellard
parents: 1389
diff changeset
397 #if 0
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
398 static int pix_dev(uint8_t * pix, int line_size, int mean)
284
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
399 {
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
400 int s, i, j;
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
401
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
402 s = 0;
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
403 for (i = 0; i < 16; i++) {
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
404 for (j = 0; j < 16; j += 8) {
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
405 s += ABS(pix[0]-mean);
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
406 s += ABS(pix[1]-mean);
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
407 s += ABS(pix[2]-mean);
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
408 s += ABS(pix[3]-mean);
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
409 s += ABS(pix[4]-mean);
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
410 s += ABS(pix[5]-mean);
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
411 s += ABS(pix[6]-mean);
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
412 s += ABS(pix[7]-mean);
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
413 pix += 8;
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
414 }
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
415 pix += line_size - 16;
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
416 }
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
417 return s;
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
418 }
1419
a7a9df478e46 removed unused variable
bellard
parents: 1389
diff changeset
419 #endif
284
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
420
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
421 static inline void no_motion_search(MpegEncContext * s,
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
422 int *mx_ptr, int *my_ptr)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
424 *mx_ptr = 16 * s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
425 *my_ptr = 16 * s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
426 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
427
986e461dc072 Initial revision
glantau
parents:
diff changeset
428 static int full_motion_search(MpegEncContext * s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
429 int *mx_ptr, int *my_ptr, int range,
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
430 int xmin, int ymin, int xmax, int ymax, uint8_t *ref_picture)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
431 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
432 int x1, y1, x2, y2, xx, yy, x, y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
433 int mx, my, dmin, d;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
434 uint8_t *pix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
435
986e461dc072 Initial revision
glantau
parents:
diff changeset
436 xx = 16 * s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
437 yy = 16 * s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 x1 = xx - range + 1; /* we loose one pixel to avoid boundary pb with half pixel pred */
986e461dc072 Initial revision
glantau
parents:
diff changeset
439 if (x1 < xmin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
440 x1 = xmin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
441 x2 = xx + range - 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
442 if (x2 > xmax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
443 x2 = xmax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
444 y1 = yy - range + 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
445 if (y1 < ymin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
446 y1 = ymin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
447 y2 = yy + range - 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
448 if (y2 > ymax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
449 y2 = ymax;
903
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
450 pix = s->new_picture.data[0] + (yy * s->linesize) + xx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
451 dmin = 0x7fffffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
452 mx = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
453 my = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
454 for (y = y1; y <= y2; y++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
455 for (x = x1; x <= x2; x++) {
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
456 d = s->dsp.pix_abs16x16(pix, ref_picture + (y * s->linesize) + x,
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
457 s->linesize);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
458 if (d < dmin ||
986e461dc072 Initial revision
glantau
parents:
diff changeset
459 (d == dmin &&
986e461dc072 Initial revision
glantau
parents:
diff changeset
460 (abs(x - xx) + abs(y - yy)) <
986e461dc072 Initial revision
glantau
parents:
diff changeset
461 (abs(mx - xx) + abs(my - yy)))) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
462 dmin = d;
986e461dc072 Initial revision
glantau
parents:
diff changeset
463 mx = x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
464 my = y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
465 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
466 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
467 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
468
986e461dc072 Initial revision
glantau
parents:
diff changeset
469 *mx_ptr = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
470 *my_ptr = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
471
986e461dc072 Initial revision
glantau
parents:
diff changeset
472 #if 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
473 if (*mx_ptr < -(2 * range) || *mx_ptr >= (2 * range) ||
986e461dc072 Initial revision
glantau
parents:
diff changeset
474 *my_ptr < -(2 * range) || *my_ptr >= (2 * range)) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
475 fprintf(stderr, "error %d %d\n", *mx_ptr, *my_ptr);
986e461dc072 Initial revision
glantau
parents:
diff changeset
476 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
477 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
478 return dmin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
479 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
480
986e461dc072 Initial revision
glantau
parents:
diff changeset
481
986e461dc072 Initial revision
glantau
parents:
diff changeset
482 static int log_motion_search(MpegEncContext * s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
483 int *mx_ptr, int *my_ptr, int range,
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
484 int xmin, int ymin, int xmax, int ymax, uint8_t *ref_picture)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
485 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
486 int x1, y1, x2, y2, xx, yy, x, y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
487 int mx, my, dmin, d;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
488 uint8_t *pix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
489
986e461dc072 Initial revision
glantau
parents:
diff changeset
490 xx = s->mb_x << 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
491 yy = s->mb_y << 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
492
986e461dc072 Initial revision
glantau
parents:
diff changeset
493 /* Left limit */
986e461dc072 Initial revision
glantau
parents:
diff changeset
494 x1 = xx - range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
495 if (x1 < xmin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
496 x1 = xmin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
497
986e461dc072 Initial revision
glantau
parents:
diff changeset
498 /* Right limit */
986e461dc072 Initial revision
glantau
parents:
diff changeset
499 x2 = xx + range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
500 if (x2 > xmax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
501 x2 = xmax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
502
986e461dc072 Initial revision
glantau
parents:
diff changeset
503 /* Upper limit */
986e461dc072 Initial revision
glantau
parents:
diff changeset
504 y1 = yy - range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
505 if (y1 < ymin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
506 y1 = ymin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
507
986e461dc072 Initial revision
glantau
parents:
diff changeset
508 /* Lower limit */
986e461dc072 Initial revision
glantau
parents:
diff changeset
509 y2 = yy + range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
510 if (y2 > ymax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
511 y2 = ymax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
512
903
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
513 pix = s->new_picture.data[0] + (yy * s->linesize) + xx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
514 dmin = 0x7fffffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
515 mx = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
516 my = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
517
986e461dc072 Initial revision
glantau
parents:
diff changeset
518 do {
986e461dc072 Initial revision
glantau
parents:
diff changeset
519 for (y = y1; y <= y2; y += range) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
520 for (x = x1; x <= x2; x += range) {
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
521 d = s->dsp.pix_abs16x16(pix, ref_picture + (y * s->linesize) + x, s->linesize);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
522 if (d < dmin || (d == dmin && (abs(x - xx) + abs(y - yy)) < (abs(mx - xx) + abs(my - yy)))) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
523 dmin = d;
986e461dc072 Initial revision
glantau
parents:
diff changeset
524 mx = x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
525 my = y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
526 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
527 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
528 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
529
986e461dc072 Initial revision
glantau
parents:
diff changeset
530 range = range >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
531
986e461dc072 Initial revision
glantau
parents:
diff changeset
532 x1 = mx - range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
533 if (x1 < xmin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
534 x1 = xmin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
535
986e461dc072 Initial revision
glantau
parents:
diff changeset
536 x2 = mx + range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
537 if (x2 > xmax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
538 x2 = xmax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
539
986e461dc072 Initial revision
glantau
parents:
diff changeset
540 y1 = my - range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
541 if (y1 < ymin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
542 y1 = ymin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
543
986e461dc072 Initial revision
glantau
parents:
diff changeset
544 y2 = my + range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
545 if (y2 > ymax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
546 y2 = ymax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
547
986e461dc072 Initial revision
glantau
parents:
diff changeset
548 } while (range >= 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
549
986e461dc072 Initial revision
glantau
parents:
diff changeset
550 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
551 fprintf(stderr, "log - MX: %d\tMY: %d\n", mx, my);
986e461dc072 Initial revision
glantau
parents:
diff changeset
552 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
553 *mx_ptr = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
554 *my_ptr = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
555 return dmin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
556 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
557
986e461dc072 Initial revision
glantau
parents:
diff changeset
558 static int phods_motion_search(MpegEncContext * s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
559 int *mx_ptr, int *my_ptr, int range,
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
560 int xmin, int ymin, int xmax, int ymax, uint8_t *ref_picture)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
561 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
562 int x1, y1, x2, y2, xx, yy, x, y, lastx, d;
986e461dc072 Initial revision
glantau
parents:
diff changeset
563 int mx, my, dminx, dminy;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
564 uint8_t *pix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
565
986e461dc072 Initial revision
glantau
parents:
diff changeset
566 xx = s->mb_x << 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
567 yy = s->mb_y << 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
568
986e461dc072 Initial revision
glantau
parents:
diff changeset
569 /* Left limit */
986e461dc072 Initial revision
glantau
parents:
diff changeset
570 x1 = xx - range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
571 if (x1 < xmin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
572 x1 = xmin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
573
986e461dc072 Initial revision
glantau
parents:
diff changeset
574 /* Right limit */
986e461dc072 Initial revision
glantau
parents:
diff changeset
575 x2 = xx + range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
576 if (x2 > xmax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
577 x2 = xmax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
578
986e461dc072 Initial revision
glantau
parents:
diff changeset
579 /* Upper limit */
986e461dc072 Initial revision
glantau
parents:
diff changeset
580 y1 = yy - range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
581 if (y1 < ymin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
582 y1 = ymin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
583
986e461dc072 Initial revision
glantau
parents:
diff changeset
584 /* Lower limit */
986e461dc072 Initial revision
glantau
parents:
diff changeset
585 y2 = yy + range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
586 if (y2 > ymax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
587 y2 = ymax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
588
903
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
589 pix = s->new_picture.data[0] + (yy * s->linesize) + xx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
590 mx = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
591 my = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
592
986e461dc072 Initial revision
glantau
parents:
diff changeset
593 x = xx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
594 y = yy;
986e461dc072 Initial revision
glantau
parents:
diff changeset
595 do {
986e461dc072 Initial revision
glantau
parents:
diff changeset
596 dminx = 0x7fffffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
597 dminy = 0x7fffffff;
986e461dc072 Initial revision
glantau
parents:
diff changeset
598
986e461dc072 Initial revision
glantau
parents:
diff changeset
599 lastx = x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
600 for (x = x1; x <= x2; x += range) {
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
601 d = s->dsp.pix_abs16x16(pix, ref_picture + (y * s->linesize) + x, s->linesize);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
602 if (d < dminx || (d == dminx && (abs(x - xx) + abs(y - yy)) < (abs(mx - xx) + abs(my - yy)))) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
603 dminx = d;
986e461dc072 Initial revision
glantau
parents:
diff changeset
604 mx = x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
605 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
606 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
607
986e461dc072 Initial revision
glantau
parents:
diff changeset
608 x = lastx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
609 for (y = y1; y <= y2; y += range) {
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
610 d = s->dsp.pix_abs16x16(pix, ref_picture + (y * s->linesize) + x, s->linesize);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
611 if (d < dminy || (d == dminy && (abs(x - xx) + abs(y - yy)) < (abs(mx - xx) + abs(my - yy)))) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
612 dminy = d;
986e461dc072 Initial revision
glantau
parents:
diff changeset
613 my = y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
614 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
615 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
616
986e461dc072 Initial revision
glantau
parents:
diff changeset
617 range = range >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
618
986e461dc072 Initial revision
glantau
parents:
diff changeset
619 x = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
620 y = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
621 x1 = mx - range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
622 if (x1 < xmin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
623 x1 = xmin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
624
986e461dc072 Initial revision
glantau
parents:
diff changeset
625 x2 = mx + range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
626 if (x2 > xmax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
627 x2 = xmax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
628
986e461dc072 Initial revision
glantau
parents:
diff changeset
629 y1 = my - range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
630 if (y1 < ymin)
986e461dc072 Initial revision
glantau
parents:
diff changeset
631 y1 = ymin;
986e461dc072 Initial revision
glantau
parents:
diff changeset
632
986e461dc072 Initial revision
glantau
parents:
diff changeset
633 y2 = my + range;
986e461dc072 Initial revision
glantau
parents:
diff changeset
634 if (y2 > ymax)
986e461dc072 Initial revision
glantau
parents:
diff changeset
635 y2 = ymax;
986e461dc072 Initial revision
glantau
parents:
diff changeset
636
986e461dc072 Initial revision
glantau
parents:
diff changeset
637 } while (range >= 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
638
986e461dc072 Initial revision
glantau
parents:
diff changeset
639 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
640 fprintf(stderr, "phods - MX: %d\tMY: %d\n", mx, my);
986e461dc072 Initial revision
glantau
parents:
diff changeset
641 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
642
986e461dc072 Initial revision
glantau
parents:
diff changeset
643 /* half pixel search */
986e461dc072 Initial revision
glantau
parents:
diff changeset
644 *mx_ptr = mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
645 *my_ptr = my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
646 return dminy;
986e461dc072 Initial revision
glantau
parents:
diff changeset
647 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
648
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
649
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
650 #define Z_THRESHOLD 256
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
651
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
652 #define CHECK_SAD_HALF_MV(suffix, x, y) \
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
653 {\
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
654 d= pix_abs_ ## suffix(pix, ptr+((x)>>1), s->linesize);\
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
655 d += (mv_penalty[pen_x + x] + mv_penalty[pen_y + y])*penalty_factor;\
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
656 COPY3_IF_LT(dminh, d, dx, x, dy, y)\
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
657 }
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
658
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
659 static inline int sad_hpel_motion_search(MpegEncContext * s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
660 int *mx_ptr, int *my_ptr, int dmin,
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
661 int xmin, int ymin, int xmax, int ymax,
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
662 int pred_x, int pred_y, Picture *picture,
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1106
diff changeset
663 int n, int size, uint8_t * const mv_penalty)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
664 {
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
665 uint8_t *ref_picture= picture->data[0];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
666 uint32_t *score_map= s->me.score_map;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
667 const int penalty_factor= s->me.sub_penalty_factor;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
668 int mx, my, xx, yy, dminh;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
669 uint8_t *pix, *ptr;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
670 op_pixels_abs_func pix_abs_x2;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
671 op_pixels_abs_func pix_abs_y2;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
672 op_pixels_abs_func pix_abs_xy2;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
673
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
674 if(size==0){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
675 pix_abs_x2 = s->dsp.pix_abs16x16_x2;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
676 pix_abs_y2 = s->dsp.pix_abs16x16_y2;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
677 pix_abs_xy2= s->dsp.pix_abs16x16_xy2;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
678 }else{
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
679 pix_abs_x2 = s->dsp.pix_abs8x8_x2;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
680 pix_abs_y2 = s->dsp.pix_abs8x8_y2;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
681 pix_abs_xy2= s->dsp.pix_abs8x8_xy2;
863
4ba00af12589 1l found by kabi
michaelni
parents: 853
diff changeset
682 }
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
683
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
684 if(s->me.skip){
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
685 // printf("S");
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
686 *mx_ptr = 0;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
687 *my_ptr = 0;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
688 return dmin;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
689 }
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
690 // printf("N");
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
691
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
692 xx = 16 * s->mb_x + 8*(n&1);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
693 yy = 16 * s->mb_y + 8*(n>>1);
903
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
694 pix = s->new_picture.data[0] + (yy * s->linesize) + xx;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
695
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
696 mx = *mx_ptr;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
697 my = *my_ptr;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
698 ptr = ref_picture + ((yy + my) * s->linesize) + (xx + mx);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
699
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
700 dminh = dmin;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
701
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
702 if (mx > xmin && mx < xmax &&
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
703 my > ymin && my < ymax) {
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
704 int dx=0, dy=0;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
705 int d, pen_x, pen_y;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
706 const int index= (my<<ME_MAP_SHIFT) + mx;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
707 const int t= score_map[(index-(1<<ME_MAP_SHIFT))&(ME_MAP_SIZE-1)];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
708 const int l= score_map[(index- 1 )&(ME_MAP_SIZE-1)];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
709 const int r= score_map[(index+ 1 )&(ME_MAP_SIZE-1)];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
710 const int b= score_map[(index+(1<<ME_MAP_SHIFT))&(ME_MAP_SIZE-1)];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
711 mx<<=1;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
712 my<<=1;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
713
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
714
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
715 pen_x= pred_x + mx;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
716 pen_y= pred_y + my;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
717
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
718 ptr-= s->linesize;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
719 if(t<=b){
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
720 CHECK_SAD_HALF_MV(y2 , 0, -1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
721 if(l<=r){
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
722 CHECK_SAD_HALF_MV(xy2, -1, -1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
723 if(t+r<=b+l){
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
724 CHECK_SAD_HALF_MV(xy2, +1, -1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
725 ptr+= s->linesize;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
726 }else{
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
727 ptr+= s->linesize;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
728 CHECK_SAD_HALF_MV(xy2, -1, +1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
729 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
730 CHECK_SAD_HALF_MV(x2 , -1, 0)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
731 }else{
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
732 CHECK_SAD_HALF_MV(xy2, +1, -1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
733 if(t+l<=b+r){
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
734 CHECK_SAD_HALF_MV(xy2, -1, -1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
735 ptr+= s->linesize;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
736 }else{
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
737 ptr+= s->linesize;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
738 CHECK_SAD_HALF_MV(xy2, +1, +1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
739 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
740 CHECK_SAD_HALF_MV(x2 , +1, 0)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
741 }
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
742 }else{
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
743 if(l<=r){
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
744 if(t+l<=b+r){
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
745 CHECK_SAD_HALF_MV(xy2, -1, -1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
746 ptr+= s->linesize;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
747 }else{
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
748 ptr+= s->linesize;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
749 CHECK_SAD_HALF_MV(xy2, +1, +1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
750 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
751 CHECK_SAD_HALF_MV(x2 , -1, 0)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
752 CHECK_SAD_HALF_MV(xy2, -1, +1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
753 }else{
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
754 if(t+r<=b+l){
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
755 CHECK_SAD_HALF_MV(xy2, +1, -1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
756 ptr+= s->linesize;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
757 }else{
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
758 ptr+= s->linesize;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
759 CHECK_SAD_HALF_MV(xy2, -1, +1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
760 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
761 CHECK_SAD_HALF_MV(x2 , +1, 0)
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
762 CHECK_SAD_HALF_MV(xy2, +1, +1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
763 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
764 CHECK_SAD_HALF_MV(y2 , 0, +1)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
765 }
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
766 mx+=dx;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
767 my+=dy;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
768
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
769 }else{
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
770 mx<<=1;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
771 my<<=1;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
772 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
773
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
774 *mx_ptr = mx;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
775 *my_ptr = my;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
776 return dminh;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
777 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
778
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
779 static inline void set_p_mv_tables(MpegEncContext * s, int mx, int my, int mv4)
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
780 {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
781 const int xy= s->mb_x + s->mb_y*s->mb_stride;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
782
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
783 s->p_mv_table[xy][0] = mx;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
784 s->p_mv_table[xy][1] = my;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
785
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
786 /* has allready been set to the 4 MV if 4MV is done */
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
787 if(mv4){
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
788 int mot_xy= s->block_index[0];
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
789
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
790 s->current_picture.motion_val[0][mot_xy ][0]= mx;
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
791 s->current_picture.motion_val[0][mot_xy ][1]= my;
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
792 s->current_picture.motion_val[0][mot_xy+1][0]= mx;
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
793 s->current_picture.motion_val[0][mot_xy+1][1]= my;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
794
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
795 mot_xy += s->block_wrap[0];
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
796 s->current_picture.motion_val[0][mot_xy ][0]= mx;
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
797 s->current_picture.motion_val[0][mot_xy ][1]= my;
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
798 s->current_picture.motion_val[0][mot_xy+1][0]= mx;
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
799 s->current_picture.motion_val[0][mot_xy+1][1]= my;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
800 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
801 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
802
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
803 /**
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
804 * get fullpel ME search limits.
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
805 * @param range the approximate search range for the old ME code, unused for EPZS and newer
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
806 */
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
807 static inline void get_limits(MpegEncContext *s, int *range, int *xmin, int *ymin, int *xmax, int *ymax)
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
808 {
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
809 if(s->avctx->me_range) *range= s->avctx->me_range >> 1;
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
810 else *range= 16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
811
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
812 if (s->unrestricted_mv) {
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
813 *xmin = -16;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
814 *ymin = -16;
1367
b33c63b53cef edge fix
michaelni
parents: 1177
diff changeset
815 *xmax = s->mb_width*16;
b33c63b53cef edge fix
michaelni
parents: 1177
diff changeset
816 *ymax = s->mb_height*16;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
817 } else {
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
818 *xmin = 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
819 *ymin = 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
820 *xmax = s->mb_width*16 - 16;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
821 *ymax = s->mb_height*16 - 16;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
822 }
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
823
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
824 //FIXME try to limit x/y min/max if me_range is set
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
825 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
826
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
827 static inline int h263_mv4_search(MpegEncContext *s, int xmin, int ymin, int xmax, int ymax, int mx, int my, int shift)
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
828 {
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
829 int block;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
830 int P[10][2];
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
831 int dmin_sum=0, mx4_sum=0, my4_sum=0;
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1106
diff changeset
832 uint8_t * const mv_penalty= s->me.mv_penalty[s->f_code] + MAX_MV;
1494
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
833 int same=1;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
834
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
835 for(block=0; block<4; block++){
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
836 int mx4, my4;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
837 int pred_x4, pred_y4;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
838 int dmin4;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
839 static const int off[4]= {2, 1, 1, -1};
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
840 const int mot_stride = s->block_wrap[0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
841 const int mot_xy = s->block_index[block];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
842 // const int block_x= (block&1);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
843 // const int block_y= (block>>1);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
844 #if 1 // this saves us a bit of cliping work and shouldnt affect compression in a negative way
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
845 const int rel_xmin4= xmin;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
846 const int rel_xmax4= xmax;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
847 const int rel_ymin4= ymin;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
848 const int rel_ymax4= ymax;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
849 #else
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
850 const int rel_xmin4= xmin - block_x*8;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
851 const int rel_xmax4= xmax - block_x*8 + 8;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
852 const int rel_ymin4= ymin - block_y*8;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
853 const int rel_ymax4= ymax - block_y*8 + 8;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
854 #endif
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
855 P_LEFT[0] = s->current_picture.motion_val[0][mot_xy - 1][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
856 P_LEFT[1] = s->current_picture.motion_val[0][mot_xy - 1][1];
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
857
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
858 if(P_LEFT[0] > (rel_xmax4<<shift)) P_LEFT[0] = (rel_xmax4<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
859
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
860 /* special case for first line */
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
861 if (s->mb_y == 0 && block<2) {
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
862 pred_x4= P_LEFT[0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
863 pred_y4= P_LEFT[1];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
864 } else {
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
865 P_TOP[0] = s->current_picture.motion_val[0][mot_xy - mot_stride ][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
866 P_TOP[1] = s->current_picture.motion_val[0][mot_xy - mot_stride ][1];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
867 P_TOPRIGHT[0] = s->current_picture.motion_val[0][mot_xy - mot_stride + off[block]][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
868 P_TOPRIGHT[1] = s->current_picture.motion_val[0][mot_xy - mot_stride + off[block]][1];
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
869 if(P_TOP[1] > (rel_ymax4<<shift)) P_TOP[1] = (rel_ymax4<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
870 if(P_TOPRIGHT[0] < (rel_xmin4<<shift)) P_TOPRIGHT[0]= (rel_xmin4<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
871 if(P_TOPRIGHT[0] > (rel_xmax4<<shift)) P_TOPRIGHT[0]= (rel_xmax4<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
872 if(P_TOPRIGHT[1] > (rel_ymax4<<shift)) P_TOPRIGHT[1]= (rel_ymax4<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
873
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
874 P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
875 P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
876
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
877 // if(s->out_format == FMT_H263){
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
878 pred_x4 = P_MEDIAN[0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
879 pred_y4 = P_MEDIAN[1];
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
880 #if 0
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
881 }else { /* mpeg1 at least */
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
882 pred_x4= P_LEFT[0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
883 pred_y4= P_LEFT[1];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
884 }
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
885 #endif
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
886 }
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
887 P_MV1[0]= mx;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
888 P_MV1[1]= my;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
889
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
890 dmin4 = s->me.motion_search[1](s, block, &mx4, &my4, P, pred_x4, pred_y4, rel_xmin4, rel_ymin4, rel_xmax4, rel_ymax4,
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
891 &s->last_picture, s->p_mv_table, (1<<16)>>shift, mv_penalty);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
892
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
893 dmin4= s->me.sub_motion_search(s, &mx4, &my4, dmin4, rel_xmin4, rel_ymin4, rel_xmax4, rel_ymax4,
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
894 pred_x4, pred_y4, &s->last_picture, block, 1, mv_penalty);
1038
2e4521b485a1 10l / 4mv segfault fix
michaelni
parents: 1014
diff changeset
895
2e4521b485a1 10l / 4mv segfault fix
michaelni
parents: 1014
diff changeset
896 if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0]){
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
897 int dxy;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
898 const int offset= ((block&1) + (block>>1)*s->linesize)*8;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
899 uint8_t *dest_y = s->me.scratchpad + offset;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
900
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
901 if(s->quarter_sample){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
902 uint8_t *ref= s->last_picture.data[0] + (s->mb_x*16 + (mx4>>2)) + (s->mb_y*16 + (my4>>2))*s->linesize + offset;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
903 dxy = ((my4 & 3) << 2) | (mx4 & 3);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
904
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
905 if(s->no_rounding)
1038
2e4521b485a1 10l / 4mv segfault fix
michaelni
parents: 1014
diff changeset
906 s->dsp.put_no_rnd_qpel_pixels_tab[1][dxy](dest_y , ref , s->linesize);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
907 else
1038
2e4521b485a1 10l / 4mv segfault fix
michaelni
parents: 1014
diff changeset
908 s->dsp.put_qpel_pixels_tab [1][dxy](dest_y , ref , s->linesize);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
909 }else{
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
910 uint8_t *ref= s->last_picture.data[0] + (s->mb_x*16 + (mx4>>1)) + (s->mb_y*16 + (my4>>1))*s->linesize + offset;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
911 dxy = ((my4 & 1) << 1) | (mx4 & 1);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
912
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
913 if(s->no_rounding)
1038
2e4521b485a1 10l / 4mv segfault fix
michaelni
parents: 1014
diff changeset
914 s->dsp.put_no_rnd_pixels_tab[1][dxy](dest_y , ref , s->linesize, 8);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
915 else
1038
2e4521b485a1 10l / 4mv segfault fix
michaelni
parents: 1014
diff changeset
916 s->dsp.put_pixels_tab [1][dxy](dest_y , ref , s->linesize, 8);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
917 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
918 dmin_sum+= (mv_penalty[mx4-pred_x4] + mv_penalty[my4-pred_y4])*s->me.mb_penalty_factor;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
919 }else
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
920 dmin_sum+= dmin4;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
921
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
922 if(s->quarter_sample){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
923 mx4_sum+= mx4/2;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
924 my4_sum+= my4/2;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
925 }else{
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
926 mx4_sum+= mx4;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
927 my4_sum+= my4;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
928 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
929
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
930 s->current_picture.motion_val[0][ s->block_index[block] ][0]= mx4;
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
931 s->current_picture.motion_val[0][ s->block_index[block] ][1]= my4;
1494
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
932
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
933 if(mx4 != mx || my4 != my) same=0;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
934 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
935
1494
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
936 if(same)
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
937 return INT_MAX;
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
938
1038
2e4521b485a1 10l / 4mv segfault fix
michaelni
parents: 1014
diff changeset
939 if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0]){
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
940 dmin_sum += s->dsp.mb_cmp[0](s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*16*s->linesize, s->me.scratchpad, s->linesize);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
941 }
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
942
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
943 if(s->avctx->mb_cmp&FF_CMP_CHROMA){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
944 int dxy;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
945 int mx, my;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
946 int offset;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
947
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
948 mx= ff_h263_round_chroma(mx4_sum);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
949 my= ff_h263_round_chroma(my4_sum);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
950 dxy = ((my & 1) << 1) | (mx & 1);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
951
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
952 offset= (s->mb_x*8 + (mx>>1)) + (s->mb_y*8 + (my>>1))*s->uvlinesize;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
953
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
954 if(s->no_rounding){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
955 s->dsp.put_no_rnd_pixels_tab[1][dxy](s->me.scratchpad , s->last_picture.data[1] + offset, s->uvlinesize, 8);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
956 s->dsp.put_no_rnd_pixels_tab[1][dxy](s->me.scratchpad+8 , s->last_picture.data[2] + offset, s->uvlinesize, 8);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
957 }else{
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
958 s->dsp.put_pixels_tab [1][dxy](s->me.scratchpad , s->last_picture.data[1] + offset, s->uvlinesize, 8);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
959 s->dsp.put_pixels_tab [1][dxy](s->me.scratchpad+8 , s->last_picture.data[2] + offset, s->uvlinesize, 8);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
960 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
961
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
962 dmin_sum += s->dsp.mb_cmp[1](s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*8*s->uvlinesize, s->me.scratchpad , s->uvlinesize);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
963 dmin_sum += s->dsp.mb_cmp[1](s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*8*s->uvlinesize, s->me.scratchpad+8, s->uvlinesize);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
964 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
965
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
966 switch(s->avctx->mb_cmp&0xFF){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
967 /*case FF_CMP_SSE:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
968 return dmin_sum+ 32*s->qscale*s->qscale;*/
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
969 case FF_CMP_RD:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
970 return dmin_sum;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
971 default:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
972 return dmin_sum+ 11*s->me.mb_penalty_factor;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
973 }
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
974 }
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
975
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
976 void ff_estimate_p_frame_motion(MpegEncContext * s,
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
977 int mb_x, int mb_y)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
978 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
979 uint8_t *pix, *ppix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
980 int sum, varc, vard, mx, my, range, dmin, xx, yy;
986e461dc072 Initial revision
glantau
parents:
diff changeset
981 int xmin, ymin, xmax, ymax;
280
3dc1ca4ba717 fixing epzs & mpeg1 (hopefully now really ...)
michaelni
parents: 277
diff changeset
982 int rel_xmin, rel_ymin, rel_xmax, rel_ymax;
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
983 int pred_x=0, pred_y=0;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
984 int P[10][2];
280
3dc1ca4ba717 fixing epzs & mpeg1 (hopefully now really ...)
michaelni
parents: 277
diff changeset
985 const int shift= 1+s->quarter_sample;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
986 int mb_type=0;
903
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
987 uint8_t *ref_picture= s->last_picture.data[0];
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
988 Picture * const pic= &s->current_picture;
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1106
diff changeset
989 uint8_t * const mv_penalty= s->me.mv_penalty[s->f_code] + MAX_MV;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
990
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
991 assert(s->quarter_sample==0 || s->quarter_sample==1);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
992
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
993 s->me.penalty_factor = get_penalty_factor(s, s->avctx->me_cmp);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
994 s->me.sub_penalty_factor= get_penalty_factor(s, s->avctx->me_sub_cmp);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
995 s->me.mb_penalty_factor = get_penalty_factor(s, s->avctx->mb_cmp);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
996
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
997 get_limits(s, &range, &xmin, &ymin, &xmax, &ymax);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
998 rel_xmin= xmin - mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
999 rel_xmax= xmax - mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1000 rel_ymin= ymin - mb_y*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1001 rel_ymax= ymax - mb_y*16;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1002 s->me.skip=0;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1003
320
cda7d0857baf - ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents: 304
diff changeset
1004 switch(s->me_method) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1005 case ME_ZERO:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1006 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1007 no_motion_search(s, &mx, &my);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1008 mx-= mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1009 my-= mb_y*16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1010 dmin = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1011 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1012 case ME_FULL:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1013 dmin = full_motion_search(s, &mx, &my, range, xmin, ymin, xmax, ymax, ref_picture);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1014 mx-= mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1015 my-= mb_y*16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1016 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1017 case ME_LOG:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1018 dmin = log_motion_search(s, &mx, &my, range / 2, xmin, ymin, xmax, ymax, ref_picture);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1019 mx-= mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1020 my-= mb_y*16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1021 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1022 case ME_PHODS:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1023 dmin = phods_motion_search(s, &mx, &my, range / 2, xmin, ymin, xmax, ymax, ref_picture);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1024 mx-= mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1025 my-= mb_y*16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1026 break;
288
f82cce6cb182 10l (motion_val was uninitilized)
michaelni
parents: 284
diff changeset
1027 case ME_X1:
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
1028 case ME_EPZS:
288
f82cce6cb182 10l (motion_val was uninitilized)
michaelni
parents: 284
diff changeset
1029 {
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1030 const int mot_stride = s->block_wrap[0];
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1031 const int mot_xy = s->block_index[0];
288
f82cce6cb182 10l (motion_val was uninitilized)
michaelni
parents: 284
diff changeset
1032
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1033 P_LEFT[0] = s->current_picture.motion_val[0][mot_xy - 1][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1034 P_LEFT[1] = s->current_picture.motion_val[0][mot_xy - 1][1];
288
f82cce6cb182 10l (motion_val was uninitilized)
michaelni
parents: 284
diff changeset
1035
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1036 if(P_LEFT[0] > (rel_xmax<<shift)) P_LEFT[0] = (rel_xmax<<shift);
280
3dc1ca4ba717 fixing epzs & mpeg1 (hopefully now really ...)
michaelni
parents: 277
diff changeset
1037
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1038 if(mb_y) {
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1039 P_TOP[0] = s->current_picture.motion_val[0][mot_xy - mot_stride ][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1040 P_TOP[1] = s->current_picture.motion_val[0][mot_xy - mot_stride ][1];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1041 P_TOPRIGHT[0] = s->current_picture.motion_val[0][mot_xy - mot_stride + 2][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1042 P_TOPRIGHT[1] = s->current_picture.motion_val[0][mot_xy - mot_stride + 2][1];
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1043 if(P_TOP[1] > (rel_ymax<<shift)) P_TOP[1] = (rel_ymax<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1044 if(P_TOPRIGHT[0] < (rel_xmin<<shift)) P_TOPRIGHT[0]= (rel_xmin<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1045 if(P_TOPRIGHT[1] > (rel_ymax<<shift)) P_TOPRIGHT[1]= (rel_ymax<<shift);
280
3dc1ca4ba717 fixing epzs & mpeg1 (hopefully now really ...)
michaelni
parents: 277
diff changeset
1046
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1047 P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1048 P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1049
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1050 if(s->out_format == FMT_H263){
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1051 pred_x = P_MEDIAN[0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1052 pred_y = P_MEDIAN[1];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1053 }else { /* mpeg1 at least */
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1054 pred_x= P_LEFT[0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1055 pred_y= P_LEFT[1];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1056 }
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1057 }else{
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1058 pred_x= P_LEFT[0];
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1059 pred_y= P_LEFT[1];
288
f82cce6cb182 10l (motion_val was uninitilized)
michaelni
parents: 284
diff changeset
1060 }
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1061
280
3dc1ca4ba717 fixing epzs & mpeg1 (hopefully now really ...)
michaelni
parents: 277
diff changeset
1062 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1063 dmin = s->me.motion_search[0](s, 0, &mx, &my, P, pred_x, pred_y, rel_xmin, rel_ymin, rel_xmax, rel_ymax,
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1064 &s->last_picture, s->p_mv_table, (1<<16)>>shift, mv_penalty);
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 280
diff changeset
1065
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 275
diff changeset
1066 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1067 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1068
986e461dc072 Initial revision
glantau
parents:
diff changeset
1069 /* intra / predictive decision */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1070 xx = mb_x * 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1071 yy = mb_y * 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1072
903
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
1073 pix = s->new_picture.data[0] + (yy * s->linesize) + xx;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1074 /* At this point (mx,my) are full-pell and the relative displacement */
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1075 ppix = ref_picture + ((yy+my) * s->linesize) + (xx+mx);
289
648e9245546d seems the old intra/inter decission is slightly better with a threshold, than the new one
michaelni
parents: 288
diff changeset
1076
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1077 sum = s->dsp.pix_sum(pix, s->linesize);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1078
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1079 varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1080 vard = (s->dsp.sse[0](NULL, pix, ppix, s->linesize)+128)>>8;
608
98e39397636b better scene change detection
michaelni
parents: 587
diff changeset
1081
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1082 //printf("%d %d %d %X %X %X\n", s->mb_width, mb_x, mb_y,(int)s, (int)s->mb_var, (int)s->mc_mb_var); fflush(stdout);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1083 pic->mb_var [s->mb_stride * mb_y + mb_x] = varc;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1084 pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = vard;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1085 pic->mb_mean [s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1086 // pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin;
903
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
1087 pic->mb_var_sum += varc;
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
1088 pic->mc_mb_var_sum += vard;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1089 //printf("E%d %d %d %X %X %X\n", s->mb_width, mb_x, mb_y,(int)s, (int)s->mb_var, (int)s->mc_mb_var); fflush(stdout);
320
cda7d0857baf - ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents: 304
diff changeset
1090
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1091 #if 0
233
3f5b72726118 - More work on preliminary bit rate control, just to be able to get an
pulento
parents: 232
diff changeset
1092 printf("varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n",
3f5b72726118 - More work on preliminary bit rate control, just to be able to get an
pulento
parents: 232
diff changeset
1093 varc, s->avg_mb_var, sum, vard, mx - xx, my - yy);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1094 #endif
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1095 if(s->avctx->mb_decision > FF_MB_DECISION_SIMPLE){
608
98e39397636b better scene change detection
michaelni
parents: 587
diff changeset
1096 if (vard <= 64 || vard < varc)
98e39397636b better scene change detection
michaelni
parents: 587
diff changeset
1097 s->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
98e39397636b better scene change detection
michaelni
parents: 587
diff changeset
1098 else
913
51f3b644ae30 better? scene change detection
michaelni
parents: 903
diff changeset
1099 s->scene_change_score+= s->qscale;
608
98e39397636b better scene change detection
michaelni
parents: 587
diff changeset
1100
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1101 if (vard*2 + 200 > varc)
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1102 mb_type|= MB_TYPE_INTRA;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1103 if (varc*2 + 200 > vard){
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1104 mb_type|= MB_TYPE_INTER;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1105 s->me.sub_motion_search(s, &mx, &my, dmin, rel_xmin, rel_ymin, rel_xmax, rel_ymax,
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1106 pred_x, pred_y, &s->last_picture, 0, 0, mv_penalty);
1494
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
1107 if(s->flags&CODEC_FLAG_MV0)
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
1108 if(mx || my)
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
1109 mb_type |= MB_TYPE_SKIPED; //FIXME check difference
304
5753d57e7e6b fixing MVs in hq mode
michaelni
parents: 295
diff changeset
1110 }else{
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1111 mx <<=shift;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1112 my <<=shift;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1113 }
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1114 if((s->flags&CODEC_FLAG_4MV)
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1115 && !s->me.skip && varc>50 && vard>10){
1494
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
1116 if(h263_mv4_search(s, rel_xmin, rel_ymin, rel_xmax, rel_ymax, mx, my, shift) < INT_MAX)
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1426
diff changeset
1117 mb_type|=MB_TYPE_INTER4V;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1118
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1119 set_p_mv_tables(s, mx, my, 0);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1120 }else
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1121 set_p_mv_tables(s, mx, my, 1);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1122 }else{
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1123 int intra_score, i;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1124 mb_type= MB_TYPE_INTER;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1125
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1126 dmin= s->me.sub_motion_search(s, &mx, &my, dmin, rel_xmin, rel_ymin, rel_xmax, rel_ymax,
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1127 pred_x, pred_y, &s->last_picture, 0, 0, mv_penalty);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1128
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1129 if(s->avctx->me_sub_cmp != s->avctx->mb_cmp && !s->me.skip)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1130 dmin= s->me.get_mb_score(s, mx, my, pred_x, pred_y, &s->last_picture, mv_penalty);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1131
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1132 if((s->flags&CODEC_FLAG_4MV)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1133 && !s->me.skip && varc>50 && vard>10){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1134 int dmin4= h263_mv4_search(s, rel_xmin, rel_ymin, rel_xmax, rel_ymax, mx, my, shift);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1135 if(dmin4 < dmin){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1136 mb_type= MB_TYPE_INTER4V;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1137 dmin=dmin4;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1138 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1139 }
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1140
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1141 // pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1142 set_p_mv_tables(s, mx, my, mb_type!=MB_TYPE_INTER4V);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1143
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1144 /* get intra luma score */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1145 if((s->avctx->mb_cmp&0xFF)==FF_CMP_SSE){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1146 intra_score= (varc<<8) - 500; //FIXME dont scale it down so we dont have to fix it
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1147 }else{
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1148 int mean= (sum+128)>>8;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1149 mean*= 0x01010101;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1150
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1151 for(i=0; i<16; i++){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1152 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 0]) = mean;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1153 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 4]) = mean;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1154 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 8]) = mean;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1155 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+12]) = mean;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1156 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1157
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1158 intra_score= s->dsp.mb_cmp[0](s, s->me.scratchpad, pix, s->linesize);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1159 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1160 #if 0 //FIXME
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1161 /* get chroma score */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1162 if(s->avctx->mb_cmp&FF_CMP_CHROMA){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1163 for(i=1; i<3; i++){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1164 uint8_t *dest_c;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1165 int mean;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1166
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1167 if(s->out_format == FMT_H263){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1168 mean= (s->dc_val[i][mb_x + (mb_y+1)*(s->mb_width+2)] + 4)>>3; //FIXME not exact but simple ;)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1169 }else{
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1170 mean= (s->last_dc[i] + 4)>>3;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1171 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1172 dest_c = s->new_picture.data[i] + (mb_y * 8 * (s->uvlinesize)) + mb_x * 8;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1173
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1174 mean*= 0x01010101;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1175 for(i=0; i<8; i++){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1176 *(uint32_t*)(&s->me.scratchpad[i*s->uvlinesize+ 0]) = mean;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1177 *(uint32_t*)(&s->me.scratchpad[i*s->uvlinesize+ 4]) = mean;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1178 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1179
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1180 intra_score+= s->dsp.mb_cmp[1](s, s->me.scratchpad, dest_c, s->uvlinesize);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1181 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1182 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1183 #endif
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1184 intra_score += s->me.mb_penalty_factor*16;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1185
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1186 if(intra_score < dmin){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1187 mb_type= MB_TYPE_INTRA;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1188 s->current_picture.mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_INTRA; //FIXME cleanup
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1189 }else
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1190 s->current_picture.mb_type[mb_y*s->mb_stride + mb_x]= 0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1191
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1192 if (vard <= 64 || vard < varc) { //FIXME
608
98e39397636b better scene change detection
michaelni
parents: 587
diff changeset
1193 s->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1194 }else{
1011
michaelni
parents: 1007
diff changeset
1195 s->scene_change_score+= s->qscale;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1196 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 289
diff changeset
1197 }
284
0778d4e1d584 better inter/intra decission algo (same as xvid)
michaelni
parents: 281
diff changeset
1198
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1199 s->mb_type[mb_y*s->mb_stride + mb_x]= mb_type;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1200 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1201
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1202 int ff_pre_estimate_p_frame_motion(MpegEncContext * s,
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1203 int mb_x, int mb_y)
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1204 {
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1205 int mx, my, range, dmin;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1206 int xmin, ymin, xmax, ymax;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1207 int rel_xmin, rel_ymin, rel_xmax, rel_ymax;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1208 int pred_x=0, pred_y=0;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1209 int P[10][2];
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1210 const int shift= 1+s->quarter_sample;
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1106
diff changeset
1211 uint8_t * const mv_penalty= s->me.mv_penalty[s->f_code] + MAX_MV;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1212 const int xy= mb_x + mb_y*s->mb_stride;
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1213
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1214 assert(s->quarter_sample==0 || s->quarter_sample==1);
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1215
954
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
1216 s->me.pre_penalty_factor = get_penalty_factor(s, s->avctx->me_pre_cmp);
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1217
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1218 get_limits(s, &range, &xmin, &ymin, &xmax, &ymax);
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1219 rel_xmin= xmin - mb_x*16;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1220 rel_xmax= xmax - mb_x*16;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1221 rel_ymin= ymin - mb_y*16;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1222 rel_ymax= ymax - mb_y*16;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1223 s->me.skip=0;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1224
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1225 P_LEFT[0] = s->p_mv_table[xy + 1][0];
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1226 P_LEFT[1] = s->p_mv_table[xy + 1][1];
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1227
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1228 if(P_LEFT[0] < (rel_xmin<<shift)) P_LEFT[0] = (rel_xmin<<shift);
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1229
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1230 /* special case for first line */
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1231 if (mb_y == s->mb_height-1) {
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1232 pred_x= P_LEFT[0];
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1233 pred_y= P_LEFT[1];
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1234 P_TOP[0]= P_TOPRIGHT[0]= P_MEDIAN[0]=
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1235 P_TOP[1]= P_TOPRIGHT[1]= P_MEDIAN[1]= 0; //FIXME
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1236 } else {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1237 P_TOP[0] = s->p_mv_table[xy + s->mb_stride ][0];
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1238 P_TOP[1] = s->p_mv_table[xy + s->mb_stride ][1];
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1239 P_TOPRIGHT[0] = s->p_mv_table[xy + s->mb_stride - 1][0];
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1240 P_TOPRIGHT[1] = s->p_mv_table[xy + s->mb_stride - 1][1];
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1241 if(P_TOP[1] < (rel_ymin<<shift)) P_TOP[1] = (rel_ymin<<shift);
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1242 if(P_TOPRIGHT[0] > (rel_xmax<<shift)) P_TOPRIGHT[0]= (rel_xmax<<shift);
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1243 if(P_TOPRIGHT[1] < (rel_ymin<<shift)) P_TOPRIGHT[1]= (rel_ymin<<shift);
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1244
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1245 P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1246 P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1247
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1248 pred_x = P_MEDIAN[0];
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1249 pred_y = P_MEDIAN[1];
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1250 }
954
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
1251 dmin = s->me.pre_motion_search(s, 0, &mx, &my, P, pred_x, pred_y, rel_xmin, rel_ymin, rel_xmax, rel_ymax,
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
1252 &s->last_picture, s->p_mv_table, (1<<16)>>shift, mv_penalty);
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1253
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1254 s->p_mv_table[xy][0] = mx<<shift;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1255 s->p_mv_table[xy][1] = my<<shift;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1256
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1257 return dmin;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1258 }
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 950
diff changeset
1259
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1053
diff changeset
1260 static int ff_estimate_motion_b(MpegEncContext * s,
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1261 int mb_x, int mb_y, int16_t (*mv_table)[2], Picture *picture, int f_code)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1262 {
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1263 int mx, my, range, dmin;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1264 int xmin, ymin, xmax, ymax;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1265 int rel_xmin, rel_ymin, rel_xmax, rel_ymax;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1266 int pred_x=0, pred_y=0;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1267 int P[10][2];
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1268 const int shift= 1+s->quarter_sample;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1269 const int mot_stride = s->mb_stride;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1270 const int mot_xy = mb_y*mot_stride + mb_x;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1271 uint8_t * const ref_picture= picture->data[0];
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1106
diff changeset
1272 uint8_t * const mv_penalty= s->me.mv_penalty[f_code] + MAX_MV;
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1273 int mv_scale;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1274
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1275 s->me.penalty_factor = get_penalty_factor(s, s->avctx->me_cmp);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1276 s->me.sub_penalty_factor= get_penalty_factor(s, s->avctx->me_sub_cmp);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1277 s->me.mb_penalty_factor = get_penalty_factor(s, s->avctx->mb_cmp);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1278
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1279 get_limits(s, &range, &xmin, &ymin, &xmax, &ymax);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1280 rel_xmin= xmin - mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1281 rel_xmax= xmax - mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1282 rel_ymin= ymin - mb_y*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1283 rel_ymax= ymax - mb_y*16;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1284
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1285 switch(s->me_method) {
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1286 case ME_ZERO:
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1287 default:
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1288 no_motion_search(s, &mx, &my);
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1289 dmin = 0;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1290 mx-= mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1291 my-= mb_y*16;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1292 break;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1293 case ME_FULL:
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1294 dmin = full_motion_search(s, &mx, &my, range, xmin, ymin, xmax, ymax, ref_picture);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1295 mx-= mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1296 my-= mb_y*16;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1297 break;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1298 case ME_LOG:
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1299 dmin = log_motion_search(s, &mx, &my, range / 2, xmin, ymin, xmax, ymax, ref_picture);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1300 mx-= mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1301 my-= mb_y*16;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1302 break;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1303 case ME_PHODS:
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1304 dmin = phods_motion_search(s, &mx, &my, range / 2, xmin, ymin, xmax, ymax, ref_picture);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1305 mx-= mb_x*16;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1306 my-= mb_y*16;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1307 break;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1308 case ME_X1:
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1309 case ME_EPZS:
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1310 {
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1311 P_LEFT[0] = mv_table[mot_xy - 1][0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1312 P_LEFT[1] = mv_table[mot_xy - 1][1];
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1313
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1314 if(P_LEFT[0] > (rel_xmax<<shift)) P_LEFT[0] = (rel_xmax<<shift);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1315
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1316 /* special case for first line */
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1317 if (mb_y) {
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1318 P_TOP[0] = mv_table[mot_xy - mot_stride ][0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1319 P_TOP[1] = mv_table[mot_xy - mot_stride ][1];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1320 P_TOPRIGHT[0] = mv_table[mot_xy - mot_stride + 1 ][0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1321 P_TOPRIGHT[1] = mv_table[mot_xy - mot_stride + 1 ][1];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1322 if(P_TOP[1] > (rel_ymax<<shift)) P_TOP[1]= (rel_ymax<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1323 if(P_TOPRIGHT[0] < (rel_xmin<<shift)) P_TOPRIGHT[0]= (rel_xmin<<shift);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1324 if(P_TOPRIGHT[1] > (rel_ymax<<shift)) P_TOPRIGHT[1]= (rel_ymax<<shift);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1325
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1326 P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1327 P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1328 }
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1329 pred_x= P_LEFT[0];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1330 pred_y= P_LEFT[1];
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1331 }
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1332
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1333 if(mv_table == s->b_forw_mv_table){
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1334 mv_scale= (s->pb_time<<16) / (s->pp_time<<shift);
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1335 }else{
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1336 mv_scale= ((s->pb_time - s->pp_time)<<16) / (s->pp_time<<shift);
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1337 }
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1338
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1339 dmin = s->me.motion_search[0](s, 0, &mx, &my, P, pred_x, pred_y, rel_xmin, rel_ymin, rel_xmax, rel_ymax,
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1340 picture, s->p_mv_table, mv_scale, mv_penalty);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1341
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1342 break;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1343 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1344
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1345 dmin= s->me.sub_motion_search(s, &mx, &my, dmin, rel_xmin, rel_ymin, rel_xmax, rel_ymax,
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1346 pred_x, pred_y, picture, 0, 0, mv_penalty);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1347
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1348 if(s->avctx->me_sub_cmp != s->avctx->mb_cmp && !s->me.skip)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1349 dmin= s->me.get_mb_score(s, mx, my, pred_x, pred_y, picture, mv_penalty);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1350
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1351 //printf("%d %d %d %d//", s->mb_x, s->mb_y, mx, my);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1352 // s->mb_type[mb_y*s->mb_width + mb_x]= mb_type;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1353 mv_table[mot_xy][0]= mx;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1354 mv_table[mot_xy][1]= my;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1355
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1356 return dmin;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1357 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1358
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1359 static inline int check_bidir_mv(MpegEncContext * s,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1360 int mb_x, int mb_y,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1361 int motion_fx, int motion_fy,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1362 int motion_bx, int motion_by,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1363 int pred_fx, int pred_fy,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1364 int pred_bx, int pred_by)
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1365 {
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1366 //FIXME optimize?
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1367 //FIXME move into template?
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1368 //FIXME better f_code prediction (max mv & distance)
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1106
diff changeset
1369 uint8_t * const mv_penalty= s->me.mv_penalty[s->f_code] + MAX_MV; // f_code of the prev frame
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1370 uint8_t *dest_y = s->me.scratchpad;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1371 uint8_t *ptr;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1372 int dxy;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1373 int src_x, src_y;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1374 int fbmin;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1375
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1376 if(s->quarter_sample){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1377 dxy = ((motion_fy & 3) << 2) | (motion_fx & 3);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1378 src_x = mb_x * 16 + (motion_fx >> 2);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1379 src_y = mb_y * 16 + (motion_fy >> 2);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1380 assert(src_x >=-16 && src_x<=s->h_edge_pos);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1381 assert(src_y >=-16 && src_y<=s->v_edge_pos);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1382
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1383 ptr = s->last_picture.data[0] + (src_y * s->linesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1384 s->dsp.put_qpel_pixels_tab[0][dxy](dest_y , ptr , s->linesize);
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1385
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1386 dxy = ((motion_by & 3) << 2) | (motion_bx & 3);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1387 src_x = mb_x * 16 + (motion_bx >> 2);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1388 src_y = mb_y * 16 + (motion_by >> 2);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1389 assert(src_x >=-16 && src_x<=s->h_edge_pos);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1390 assert(src_y >=-16 && src_y<=s->v_edge_pos);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1391
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1392 ptr = s->next_picture.data[0] + (src_y * s->linesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1393 s->dsp.avg_qpel_pixels_tab[0][dxy](dest_y , ptr , s->linesize);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1394 }else{
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1395 dxy = ((motion_fy & 1) << 1) | (motion_fx & 1);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1396 src_x = mb_x * 16 + (motion_fx >> 1);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1397 src_y = mb_y * 16 + (motion_fy >> 1);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1398 assert(src_x >=-16 && src_x<=s->h_edge_pos);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1399 assert(src_y >=-16 && src_y<=s->v_edge_pos);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1400
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1401 ptr = s->last_picture.data[0] + (src_y * s->linesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1402 s->dsp.put_pixels_tab[0][dxy](dest_y , ptr , s->linesize, 16);
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1403
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1404 dxy = ((motion_by & 1) << 1) | (motion_bx & 1);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1405 src_x = mb_x * 16 + (motion_bx >> 1);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1406 src_y = mb_y * 16 + (motion_by >> 1);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1407 assert(src_x >=-16 && src_x<=s->h_edge_pos);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1408 assert(src_y >=-16 && src_y<=s->v_edge_pos);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1409
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1410 ptr = s->next_picture.data[0] + (src_y * s->linesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1411 s->dsp.avg_pixels_tab[0][dxy](dest_y , ptr , s->linesize, 16);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1412 }
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1413
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1414 fbmin = (mv_penalty[motion_fx-pred_fx] + mv_penalty[motion_fy-pred_fy])*s->me.mb_penalty_factor
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1415 +(mv_penalty[motion_bx-pred_bx] + mv_penalty[motion_by-pred_by])*s->me.mb_penalty_factor
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1416 + s->dsp.mb_cmp[0](s, s->new_picture.data[0] + mb_x*16 + mb_y*16*s->linesize, dest_y, s->linesize);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1417
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1418 if(s->avctx->mb_cmp&FF_CMP_CHROMA){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1419 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1420 //FIXME CHROMA !!!
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1421
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1422 return fbmin;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1423 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1424
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1425 /* refine the bidir vectors in hq mode and return the score in both lq & hq mode*/
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1426 static inline int bidir_refine(MpegEncContext * s,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1427 int mb_x, int mb_y)
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1428 {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1429 const int mot_stride = s->mb_stride;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1430 const int xy = mb_y *mot_stride + mb_x;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1431 int fbmin;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1432 int pred_fx= s->b_bidir_forw_mv_table[xy-1][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1433 int pred_fy= s->b_bidir_forw_mv_table[xy-1][1];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1434 int pred_bx= s->b_bidir_back_mv_table[xy-1][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1435 int pred_by= s->b_bidir_back_mv_table[xy-1][1];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1436 int motion_fx= s->b_bidir_forw_mv_table[xy][0]= s->b_forw_mv_table[xy][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1437 int motion_fy= s->b_bidir_forw_mv_table[xy][1]= s->b_forw_mv_table[xy][1];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1438 int motion_bx= s->b_bidir_back_mv_table[xy][0]= s->b_back_mv_table[xy][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1439 int motion_by= s->b_bidir_back_mv_table[xy][1]= s->b_back_mv_table[xy][1];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1440
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1441 //FIXME do refinement and add flag
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1442
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1443 fbmin= check_bidir_mv(s, mb_x, mb_y,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1444 motion_fx, motion_fy,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1445 motion_bx, motion_by,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1446 pred_fx, pred_fy,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1447 pred_bx, pred_by);
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1448
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1449 return fbmin;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1450 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1451
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1452 static inline int direct_search(MpegEncContext * s,
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1453 int mb_x, int mb_y)
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1454 {
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1455 int P[10][2];
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1456 const int mot_stride = s->mb_stride;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1457 const int mot_xy = mb_y*mot_stride + mb_x;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1458 const int shift= 1+s->quarter_sample;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1459 int dmin, i;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1460 const int time_pp= s->pp_time;
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 651
diff changeset
1461 const int time_pb= s->pb_time;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1462 int mx, my, xmin, xmax, ymin, ymax;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1463 int16_t (*mv_table)[2]= s->b_direct_mv_table;
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1106
diff changeset
1464 uint8_t * const mv_penalty= s->me.mv_penalty[1] + MAX_MV;
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1465
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1466 ymin= xmin=(-32)>>shift;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1467 ymax= xmax= 31>>shift;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1468
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1469 if(IS_8X8(s->next_picture.mb_type[mot_xy])){
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1470 s->mv_type= MV_TYPE_8X8;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1471 }else{
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1472 s->mv_type= MV_TYPE_16X16;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1473 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1474
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1475 for(i=0; i<4; i++){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1476 int index= s->block_index[i];
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1477 int min, max;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1478
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1479 s->me.co_located_mv[i][0]= s->next_picture.motion_val[0][index][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1480 s->me.co_located_mv[i][1]= s->next_picture.motion_val[0][index][1];
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1481 s->me.direct_basis_mv[i][0]= s->me.co_located_mv[i][0]*time_pb/time_pp + ((i& 1)<<(shift+3));
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1482 s->me.direct_basis_mv[i][1]= s->me.co_located_mv[i][1]*time_pb/time_pp + ((i>>1)<<(shift+3));
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1483 // s->me.direct_basis_mv[1][i][0]= s->me.co_located_mv[i][0]*(time_pb - time_pp)/time_pp + ((i &1)<<(shift+3);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1484 // s->me.direct_basis_mv[1][i][1]= s->me.co_located_mv[i][1]*(time_pb - time_pp)/time_pp + ((i>>1)<<(shift+3);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1485
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1486 max= FFMAX(s->me.direct_basis_mv[i][0], s->me.direct_basis_mv[i][0] - s->me.co_located_mv[i][0])>>shift;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1487 min= FFMIN(s->me.direct_basis_mv[i][0], s->me.direct_basis_mv[i][0] - s->me.co_located_mv[i][0])>>shift;
1050
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
1488 max+= (2*mb_x + (i& 1))*8 + 1; // +-1 is for the simpler rounding
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
1489 min+= (2*mb_x + (i& 1))*8 - 1;
960
dd421045b4ce b frame segfault fix
michaelni
parents: 954
diff changeset
1490 xmax= FFMIN(xmax, s->width - max);
dd421045b4ce b frame segfault fix
michaelni
parents: 954
diff changeset
1491 xmin= FFMAX(xmin, - 16 - min);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1492
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1493 max= FFMAX(s->me.direct_basis_mv[i][1], s->me.direct_basis_mv[i][1] - s->me.co_located_mv[i][1])>>shift;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1494 min= FFMIN(s->me.direct_basis_mv[i][1], s->me.direct_basis_mv[i][1] - s->me.co_located_mv[i][1])>>shift;
1050
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
1495 max+= (2*mb_y + (i>>1))*8 + 1; // +-1 is for the simpler rounding
8d686fbb6a8c b frame segfault fix (+-1 bug)
michaelni
parents: 1038
diff changeset
1496 min+= (2*mb_y + (i>>1))*8 - 1;
960
dd421045b4ce b frame segfault fix
michaelni
parents: 954
diff changeset
1497 ymax= FFMIN(ymax, s->height - max);
dd421045b4ce b frame segfault fix
michaelni
parents: 954
diff changeset
1498 ymin= FFMAX(ymin, - 16 - min);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1499
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1500 if(s->mv_type == MV_TYPE_16X16) break;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1501 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1502
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1503 assert(xmax <= 15 && ymax <= 15 && xmin >= -16 && ymin >= -16);
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1504
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1505 if(xmax < 0 || xmin >0 || ymax < 0 || ymin > 0){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1506 s->b_direct_mv_table[mot_xy][0]= 0;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1507 s->b_direct_mv_table[mot_xy][1]= 0;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1508
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1509 return 256*256*256*64;
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1510 }
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1511
950
michaelni
parents: 948
diff changeset
1512 P_LEFT[0] = clip(mv_table[mot_xy - 1][0], xmin<<shift, xmax<<shift);
michaelni
parents: 948
diff changeset
1513 P_LEFT[1] = clip(mv_table[mot_xy - 1][1], ymin<<shift, ymax<<shift);
michaelni
parents: 948
diff changeset
1514
michaelni
parents: 948
diff changeset
1515 /* special case for first line */
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
1516 if (mb_y) {
950
michaelni
parents: 948
diff changeset
1517 P_TOP[0] = clip(mv_table[mot_xy - mot_stride ][0], xmin<<shift, xmax<<shift);
michaelni
parents: 948
diff changeset
1518 P_TOP[1] = clip(mv_table[mot_xy - mot_stride ][1], ymin<<shift, ymax<<shift);
michaelni
parents: 948
diff changeset
1519 P_TOPRIGHT[0] = clip(mv_table[mot_xy - mot_stride + 1 ][0], xmin<<shift, xmax<<shift);
michaelni
parents: 948
diff changeset
1520 P_TOPRIGHT[1] = clip(mv_table[mot_xy - mot_stride + 1 ][1], ymin<<shift, ymax<<shift);
michaelni
parents: 948
diff changeset
1521
michaelni
parents: 948
diff changeset
1522 P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);
michaelni
parents: 948
diff changeset
1523 P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);
michaelni
parents: 948
diff changeset
1524 }
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1525
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1526 //FIXME direct_search ptr in context!!! (needed for chroma anyway or this will get messy)
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1527 if(s->flags&CODEC_FLAG_QPEL){
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1528 dmin = simple_direct_qpel_epzs_motion_search(s, 0, &mx, &my, P, 0, 0, xmin, ymin, xmax, ymax,
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1529 &s->last_picture, mv_table, 1<<14, mv_penalty);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1530 dmin = simple_direct_qpel_qpel_motion_search(s, &mx, &my, dmin, xmin, ymin, xmax, ymax,
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1531 0, 0, &s->last_picture, 0, 0, mv_penalty);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1532
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1533 if(s->avctx->me_sub_cmp != s->avctx->mb_cmp && !s->me.skip)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1534 dmin= simple_direct_qpel_qpel_get_mb_score(s, mx, my, 0, 0, &s->last_picture, mv_penalty);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1535 }else{
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1536 dmin = simple_direct_hpel_epzs_motion_search(s, 0, &mx, &my, P, 0, 0, xmin, ymin, xmax, ymax,
948
371bc36a9c5c shape adaptive diamonds for EPZS
michaelni
parents: 936
diff changeset
1537 &s->last_picture, mv_table, 1<<15, mv_penalty);
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1538 dmin = simple_direct_hpel_hpel_motion_search(s, &mx, &my, dmin, xmin, ymin, xmax, ymax,
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1539 0, 0, &s->last_picture, 0, 0, mv_penalty);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1540
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1541 if(s->avctx->me_sub_cmp != s->avctx->mb_cmp && !s->me.skip)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1542 dmin= simple_direct_hpel_hpel_get_mb_score(s, mx, my, 0, 0, &s->last_picture, mv_penalty);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1543 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1544
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1545 s->b_direct_mv_table[mot_xy][0]= mx;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1546 s->b_direct_mv_table[mot_xy][1]= my;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1547 return dmin;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1548 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1549
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1550 void ff_estimate_b_frame_motion(MpegEncContext * s,
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1551 int mb_x, int mb_y)
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1552 {
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1553 const int penalty_factor= s->me.mb_penalty_factor;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1554 int fmin, bmin, dmin, fbmin;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1555 int type=0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1556
1426
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1557 s->me.skip=0;
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1558 if (s->codec_id == CODEC_ID_MPEG4)
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1559 dmin= direct_search(s, mb_x, mb_y);
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1560 else
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1561 dmin= INT_MAX;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1562
1426
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1563 s->me.skip=0;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1564 fmin= ff_estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, &s->last_picture, s->f_code) + 3*penalty_factor;
1426
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1565
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1566 s->me.skip=0;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1567 bmin= ff_estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, &s->next_picture, s->b_code) + 2*penalty_factor;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1568 //printf(" %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1569
1426
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1570 s->me.skip=0;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1571 fbmin= bidir_refine(s, mb_x, mb_y) + penalty_factor;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1572 //printf("%d %d %d %d\n", dmin, fmin, bmin, fbmin);
612
c0005de2be59 new ratecontrol code
michaelni
parents: 608
diff changeset
1573 {
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1050
diff changeset
1574 int score= fmin;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1050
diff changeset
1575 type = MB_TYPE_FORWARD;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1576
1426
b0f89a7855aa 100l (forget to reset me.skip for b frames)
michaelni
parents: 1422
diff changeset
1577 if (dmin <= score){
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1050
diff changeset
1578 score = dmin;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1050
diff changeset
1579 type = MB_TYPE_DIRECT;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1580 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1581 if(bmin<score){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1582 score=bmin;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1583 type= MB_TYPE_BACKWARD;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1584 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1585 if(fbmin<score){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1586 score=fbmin;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1587 type= MB_TYPE_BIDIR;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1588 }
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
1589
807
0e1d375c537f fixing q>0.0 assert failure caused by overflow of variance for b frames
michaelni
parents: 765
diff changeset
1590 score= ((unsigned)(score*score + 128*256))>>16;
903
22ee74da2cd3 cleanup
michaelni
parents: 884
diff changeset
1591 s->current_picture.mc_mb_var_sum += score;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1592 s->current_picture.mc_mb_var[mb_y*s->mb_stride + mb_x] = score; //FIXME use SSE
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1593 }
612
c0005de2be59 new ratecontrol code
michaelni
parents: 608
diff changeset
1594
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1367
diff changeset
1595 if(s->avctx->mb_decision > FF_MB_DECISION_SIMPLE){
612
c0005de2be59 new ratecontrol code
michaelni
parents: 608
diff changeset
1596 type= MB_TYPE_FORWARD | MB_TYPE_BACKWARD | MB_TYPE_BIDIR | MB_TYPE_DIRECT; //FIXME something smarter
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1597 if(dmin>256*256*16) type&= ~MB_TYPE_DIRECT; //dont try direct mode if its invalid for this MB
612
c0005de2be59 new ratecontrol code
michaelni
parents: 608
diff changeset
1598 }
c0005de2be59 new ratecontrol code
michaelni
parents: 608
diff changeset
1599
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1600 s->mb_type[mb_y*s->mb_stride + mb_x]= type;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1601 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1602
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1603 /* find best f_code for ME which do unlimited searches */
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1604 int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type)
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1605 {
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1606 if(s->me_method>=ME_EPZS){
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1607 int score[8];
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1608 int i, y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1609 uint8_t * fcode_tab= s->fcode_tab;
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1610 int best_fcode=-1;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1611 int best_score=-10000000;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1612
936
caa77cd960c0 qpel encoding
michaelni
parents: 913
diff changeset
1613 for(i=0; i<8; i++) score[i]= s->mb_num*(8-i);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1614
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1615 for(y=0; y<s->mb_height; y++){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1616 int x;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1617 int xy= y*s->mb_stride;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1618 for(x=0; x<s->mb_width; x++){
1634
7653a103b53c cleanup
michael
parents: 1633
diff changeset
1619 if(s->mb_type[xy] & type){
847
f3c369b8ddca reversing header game
michaelni
parents: 809
diff changeset
1620 int fcode= FFMAX(fcode_tab[mv_table[xy][0] + MAX_MV],
f3c369b8ddca reversing header game
michaelni
parents: 809
diff changeset
1621 fcode_tab[mv_table[xy][1] + MAX_MV]);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1622 int j;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1623
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1624 for(j=0; j<fcode && j<8; j++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1625 if(s->pict_type==B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy])
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1626 score[j]-= 170;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1627 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1628 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1629 xy++;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1630 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1631 }
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1632
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1633 for(i=1; i<8; i++){
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1634 if(score[i] > best_score){
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1635 best_score= score[i];
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1636 best_fcode= i;
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1637 }
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1638 // printf("%d %d\n", i, score[i]);
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1639 }
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 324
diff changeset
1640
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1641 // printf("fcode: %d type: %d\n", i, s->pict_type);
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1642 return best_fcode;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1643 /* for(i=0; i<=MAX_FCODE; i++){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1644 printf("%d ", mv_num[i]);
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1645 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1646 printf("\n");*/
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1647 }else{
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1648 return 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1649 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1650 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1651
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1652 void ff_fix_long_p_mvs(MpegEncContext * s)
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1653 {
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1654 const int f_code= s->f_code;
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1655 int y, range;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1419
diff changeset
1656 assert(s->pict_type==P_TYPE);
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1657
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1419
diff changeset
1658 range = (((s->out_format == FMT_MPEG1) ? 8 : 16) << f_code);
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1659
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1660 if(s->msmpeg4_version) range= 16;
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1661
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1662 if(s->avctx->me_range && range > s->avctx->me_range) range= s->avctx->me_range;
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1663
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1664 /* clip / convert to intra 16x16 type MVs */
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1665 for(y=0; y<s->mb_height; y++){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1666 int x;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1667 int xy= y*s->mb_stride;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1668 for(x=0; x<s->mb_width; x++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1669 if(s->mb_type[xy]&MB_TYPE_INTER){
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1670 if( s->p_mv_table[xy][0] >=range || s->p_mv_table[xy][0] <-range
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1671 || s->p_mv_table[xy][1] >=range || s->p_mv_table[xy][1] <-range){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1672 s->mb_type[xy] &= ~MB_TYPE_INTER;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1673 s->mb_type[xy] |= MB_TYPE_INTRA;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1674 s->current_picture.mb_type[xy]= MB_TYPE_INTRA;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1675 s->p_mv_table[xy][0] = 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1676 s->p_mv_table[xy][1] = 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1677 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1678 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1679 xy++;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1680 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1681 }
455
7f2d2be2aee9 dont double check vectors
michaelni
parents: 429
diff changeset
1682 //printf("%d no:%d %d//\n", clip, noclip, f_code);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1683 if(s->flags&CODEC_FLAG_4MV){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1684 const int wrap= 2+ s->mb_width*2;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1685
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1686 /* clip / convert to intra 8x8 type MVs */
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1687 for(y=0; y<s->mb_height; y++){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1688 int xy= (y*2 + 1)*wrap + 1;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1689 int i= y*s->mb_stride;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1690 int x;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1691
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1692 for(x=0; x<s->mb_width; x++){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1693 if(s->mb_type[i]&MB_TYPE_INTER4V){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1694 int block;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1695 for(block=0; block<4; block++){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1696 int off= (block& 1) + (block>>1)*wrap;
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1697 int mx= s->current_picture.motion_val[0][ xy + off ][0];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1634
diff changeset
1698 int my= s->current_picture.motion_val[0][ xy + off ][1];
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1699
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1700 if( mx >=range || mx <-range
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1701 || my >=range || my <-range){
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1702 s->mb_type[i] &= ~MB_TYPE_INTER4V;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1703 s->mb_type[i] |= MB_TYPE_INTRA;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1598
diff changeset
1704 s->current_picture.mb_type[i]= MB_TYPE_INTRA;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1705 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1706 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1707 }
502
f74798aca30e 4mv bugfix
michaelni
parents: 455
diff changeset
1708 xy+=2;
f74798aca30e 4mv bugfix
michaelni
parents: 455
diff changeset
1709 i++;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1710 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1711 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1712 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1713 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1714
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1715 void ff_fix_long_b_mvs(MpegEncContext * s, int16_t (*mv_table)[2], int f_code, int type)
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1716 {
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1717 int y;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1718
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1050
diff changeset
1719 // RAL: 8 in MPEG-1, 16 in MPEG-4
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1419
diff changeset
1720 int range = (((s->out_format == FMT_MPEG1) ? 8 : 16) << f_code);
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1721
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1722 if(s->avctx->me_range && range > s->avctx->me_range) range= s->avctx->me_range;
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1050
diff changeset
1723
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1724 /* clip / convert to intra 16x16 type MVs */
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1725 for(y=0; y<s->mb_height; y++){
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1726 int x;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1727 int xy= y*s->mb_stride;
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1728 for(x=0; x<s->mb_width; x++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1162
diff changeset
1729 if (s->mb_type[xy] & type){ // RAL: "type" test added...
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1730 if( mv_table[xy][0] >=range || mv_table[xy][0] <-range
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1731 || mv_table[xy][1] >=range || mv_table[xy][1] <-range){
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1732
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1733 if(s->codec_id == CODEC_ID_MPEG1VIDEO && 0){
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1734 }else{
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1735 if (mv_table[xy][0] > range-1) mv_table[xy][0]= range-1;
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1736 else if(mv_table[xy][0] < -range ) mv_table[xy][0]= -range;
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1737 if (mv_table[xy][1] > range-1) mv_table[xy][1]= range-1;
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1738 else if(mv_table[xy][1] < -range ) mv_table[xy][1]= -range;
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha¸«³l LEGRAND) with some modifications by me
michaelni
parents: 1050
diff changeset
1739 }
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1064
diff changeset
1740 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1741 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1742 xy++;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1743 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1744 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 320
diff changeset
1745 }