Mercurial > libavcodec.hg
annotate mpegvideo.c @ 3225:a0d2d5053c9d libavcodec
optimizations by arpi
author | michael |
---|---|
date | Wed, 29 Mar 2006 01:59:24 +0000 |
parents | 4186eb8d29a1 |
children | c2c29be6282e |
rev | line source |
---|---|
0 | 1 /* |
2 * The simplest mpeg encoder (well, it was the simplest!) | |
429 | 3 * Copyright (c) 2000,2001 Fabrice Bellard. |
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1729
diff
changeset
|
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
0 | 5 * |
429 | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Lesser General Public | |
8 * License as published by the Free Software Foundation; either | |
9 * version 2 of the License, or (at your option) any later version. | |
0 | 10 * |
429 | 11 * This library is distributed in the hope that it will be useful, |
0 | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 * Lesser General Public License for more details. | |
0 | 15 * |
429 | 16 * You should have received a copy of the GNU Lesser General Public |
17 * License along with this library; if not, write to the Free Software | |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3011
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
295 | 19 * |
325 | 20 * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at> |
0 | 21 */ |
2967 | 22 |
1106 | 23 /** |
24 * @file mpegvideo.c | |
25 * The simplest mpeg encoder (well, it was the simplest!). | |
2967 | 26 */ |
27 | |
0 | 28 #include "avcodec.h" |
29 #include "dsputil.h" | |
30 #include "mpegvideo.h" | |
1557 | 31 #include "faandct.h" |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
32 #include <limits.h> |
0 | 33 |
17
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
34 #ifdef USE_FASTMEMCPY |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
35 #include "fastmemcpy.h" |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
36 #endif |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
37 |
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
|
38 //#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
|
39 //#include <assert.h> |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
40 |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
41 #ifdef CONFIG_ENCODERS |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
42 static void encode_picture(MpegEncContext *s, int picture_number); |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
43 #endif //CONFIG_ENCODERS |
2967 | 44 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, |
1689 | 45 DCTELEM *block, int n, int qscale); |
2967 | 46 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, |
1689 | 47 DCTELEM *block, int n, int qscale); |
48 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s, | |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
49 DCTELEM *block, int n, int qscale); |
1689 | 50 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, |
325 | 51 DCTELEM *block, int n, int qscale); |
2967 | 52 static void dct_unquantize_h263_intra_c(MpegEncContext *s, |
1689 | 53 DCTELEM *block, int n, int qscale); |
2967 | 54 static void dct_unquantize_h263_inter_c(MpegEncContext *s, |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
55 DCTELEM *block, int n, int qscale); |
1064 | 56 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w); |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
57 #ifdef CONFIG_ENCODERS |
344 | 58 static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); |
945 | 59 static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); |
1777 | 60 static int dct_quantize_refine(MpegEncContext *s, DCTELEM *block, int16_t *weight, DCTELEM *orig, int n, int qscale); |
1389 | 61 static int sse_mb(MpegEncContext *s); |
1719 | 62 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block); |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
63 #endif //CONFIG_ENCODERS |
206 | 64 |
1381 | 65 #ifdef HAVE_XVMC |
66 extern int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx); | |
67 extern void XVMC_field_end(MpegEncContext *s); | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1579
diff
changeset
|
68 extern void XVMC_decode_mb(MpegEncContext *s); |
1381 | 69 #endif |
70 | |
1064 | 71 void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, int w)= draw_edges_c; |
206 | 72 |
0 | 73 |
74 /* enable all paranoid tests for rounding, overflows, etc... */ | |
75 //#define PARANOID | |
76 | |
77 //#define DEBUG | |
78 | |
321 | 79 |
0 | 80 /* for jpeg fast DCT */ |
81 #define CONST_BITS 14 | |
82 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
83 static const uint16_t aanscales[64] = { |
0 | 84 /* precomputed values scaled up by 14 bits */ |
85 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | |
86 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270, | |
87 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906, | |
88 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315, | |
89 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | |
90 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552, | |
936 | 91 8867 , 12299, 11585, 10426, 8867, 6967, 4799, 2446, |
92 4520 , 6270, 5906, 5315, 4520, 3552, 2446, 1247 | |
0 | 93 }; |
94 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
95 static const uint8_t h263_chroma_roundtab[16] = { |
1013 | 96 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
0 | 97 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, |
98 }; | |
99 | |
1644 | 100 static const uint8_t ff_default_chroma_qscale_table[32]={ |
101 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | |
102 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31 | |
103 }; | |
104 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
105 #ifdef CONFIG_ENCODERS |
1162 | 106 static uint8_t (*default_mv_penalty)[MAX_MV*2+1]=NULL; |
1064 | 107 static uint8_t default_fcode_tab[MAX_MV*2+1]; |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
108 |
998 | 109 enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1}; |
110 | |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
111 static void convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64], |
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
112 const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra) |
0 | 113 { |
344 | 114 int qscale; |
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
115 int shift=0; |
0 | 116 |
709
afeff6ccb7f5
convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents:
706
diff
changeset
|
117 for(qscale=qmin; qscale<=qmax; qscale++){ |
344 | 118 int i; |
2967 | 119 if (dsp->fdct == ff_jpeg_fdct_islow |
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
120 #ifdef FAAN_POSTSCALE |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
121 || dsp->fdct == ff_faandct |
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
122 #endif |
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
123 ) { |
625
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
124 for(i=0;i<64;i++) { |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
125 const int j= dsp->idct_permutation[i]; |
625
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
126 /* 16 <= qscale * quant_matrix[i] <= 7905 */ |
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
127 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ |
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
128 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ |
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
129 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */ |
2967 | 130 |
131 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / | |
625
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
132 (qscale * quant_matrix[j])); |
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
133 } |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
134 } else if (dsp->fdct == fdct_ifast |
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
135 #ifndef FAAN_POSTSCALE |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
136 || dsp->fdct == ff_faandct |
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
137 #endif |
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
138 ) { |
344 | 139 for(i=0;i<64;i++) { |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
140 const int j= dsp->idct_permutation[i]; |
344 | 141 /* 16 <= qscale * quant_matrix[i] <= 7905 */ |
142 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ | |
143 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ | |
144 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */ | |
2967 | 145 |
146 qmat[qscale][i] = (int)((uint64_t_C(1) << (QMAT_SHIFT + 14)) / | |
344 | 147 (aanscales[i] * qscale * quant_matrix[j])); |
148 } | |
149 } else { | |
150 for(i=0;i<64;i++) { | |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
151 const int j= dsp->idct_permutation[i]; |
344 | 152 /* We can safely suppose that 16 <= quant_matrix[i] <= 255 |
153 So 16 <= qscale * quant_matrix[i] <= 7905 | |
154 so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 | |
155 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 | |
156 */ | |
1064 | 157 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j])); |
945 | 158 // qmat [qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]); |
1554
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
159 qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]); |
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
160 |
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
161 if(qmat16[qscale][0][i]==0 || qmat16[qscale][0][i]==128*256) qmat16[qscale][0][i]=128*256-1; |
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
162 qmat16[qscale][1][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][0][i]); |
344 | 163 } |
0 | 164 } |
2967 | 165 |
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
166 for(i=intra; i<64; i++){ |
2390 | 167 int64_t max= 8191; |
168 if (dsp->fdct == fdct_ifast | |
169 #ifndef FAAN_POSTSCALE | |
170 || dsp->fdct == ff_faandct | |
171 #endif | |
172 ) { | |
173 max= (8191LL*aanscales[i]) >> 14; | |
174 } | |
2967 | 175 while(((max * qmat[qscale][i]) >> shift) > INT_MAX){ |
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
176 shift++; |
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
177 } |
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
178 } |
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
179 } |
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
180 if(shift){ |
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
181 av_log(NULL, AV_LOG_INFO, "Warning, QMAT_SHIFT is larger then %d, overflows possible\n", QMAT_SHIFT - shift); |
0 | 182 } |
183 } | |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
184 |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
185 static inline void update_qscale(MpegEncContext *s){ |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
186 s->qscale= (s->lambda*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7); |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
187 s->qscale= clip(s->qscale, s->avctx->qmin, s->avctx->qmax); |
2967 | 188 |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
189 s->lambda2= (s->lambda*s->lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT; |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
190 } |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
191 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
192 |
1273 | 193 void ff_init_scantable(uint8_t *permutation, ScanTable *st, const uint8_t *src_scantable){ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
194 int i; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
195 int end; |
2967 | 196 |
764 | 197 st->scantable= src_scantable; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
198 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
199 for(i=0; i<64; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
200 int j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
201 j = src_scantable[i]; |
1273 | 202 st->permutated[i] = permutation[j]; |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
203 #ifdef ARCH_POWERPC |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
204 st->inverse[j] = i; |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
205 #endif |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
206 } |
2967 | 207 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
208 end=-1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
209 for(i=0; i<64; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
210 int j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
211 j = st->permutated[i]; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
212 if(j>end) end=j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
213 st->raster_end[i]= end; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
214 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
215 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
216 |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1523
diff
changeset
|
217 #ifdef CONFIG_ENCODERS |
1411 | 218 void ff_write_quant_matrix(PutBitContext *pb, int16_t *matrix){ |
219 int i; | |
220 | |
221 if(matrix){ | |
222 put_bits(pb, 1, 1); | |
223 for(i=0;i<64;i++) { | |
224 put_bits(pb, 8, matrix[ ff_zigzag_direct[i] ]); | |
225 } | |
226 }else | |
227 put_bits(pb, 1, 0); | |
228 } | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1523
diff
changeset
|
229 #endif //CONFIG_ENCODERS |
1411 | 230 |
3086 | 231 const uint8_t *ff_find_start_code(const uint8_t * restrict p, const uint8_t *end, uint32_t * restrict state){ |
232 int i; | |
233 | |
3092 | 234 assert(p<=end); |
235 if(p>=end) | |
236 return end; | |
237 | |
3086 | 238 for(i=0; i<3; i++){ |
239 uint32_t tmp= *state << 8; | |
240 *state= tmp + *(p++); | |
241 if(tmp == 0x100 || p==end) | |
242 return p; | |
243 } | |
244 | |
245 while(p<end){ | |
3087 | 246 if (p[-1] > 1 ) p+= 3; |
247 else if(p[-2] ) p+= 2; | |
248 else if(p[-3]|(p[-1]-1)) p++; | |
3086 | 249 else{ |
250 p++; | |
251 break; | |
252 } | |
253 } | |
254 | |
3087 | 255 p= FFMIN(p, end)-4; |
3086 | 256 *state= be2me_32(unaligned32(p)); |
257 | |
258 return p+4; | |
259 } | |
260 | |
726
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
261 /* init common dct for both encoder and decoder */ |
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
262 int DCT_common_init(MpegEncContext *s) |
0 | 263 { |
1689 | 264 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; |
265 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c; | |
266 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c; | |
267 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c; | |
268 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c; | |
269 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; | |
1092 | 270 |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
271 #ifdef CONFIG_ENCODERS |
625
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
272 s->dct_quantize= dct_quantize_c; |
1719 | 273 s->denoise_dct= denoise_dct_c; |
2616
ba6530ae8e34
remove superfluous CONFIG_ENCODERS (entire function is already wrapped)
melanson
parents:
2584
diff
changeset
|
274 #endif //CONFIG_ENCODERS |
2967 | 275 |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
276 #ifdef HAVE_MMX |
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
|
277 MPV_common_init_mmx(s); |
8 | 278 #endif |
514
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
279 #ifdef ARCH_ALPHA |
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
280 MPV_common_init_axp(s); |
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
281 #endif |
628
f596db4aa871
sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents:
625
diff
changeset
|
282 #ifdef HAVE_MLIB |
f596db4aa871
sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents:
625
diff
changeset
|
283 MPV_common_init_mlib(s); |
f596db4aa871
sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents:
625
diff
changeset
|
284 #endif |
721
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
285 #ifdef HAVE_MMI |
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
286 MPV_common_init_mmi(s); |
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
287 #endif |
730 | 288 #ifdef ARCH_ARMV4L |
874 | 289 MPV_common_init_armv4l(s); |
730 | 290 #endif |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
291 #ifdef ARCH_POWERPC |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
292 MPV_common_init_ppc(s); |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
293 #endif |
730 | 294 |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
295 #ifdef CONFIG_ENCODERS |
1007 | 296 s->fast_dct_quantize= s->dct_quantize; |
297 | |
945 | 298 if(s->flags&CODEC_FLAG_TRELLIS_QUANT){ |
299 s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_* | |
300 } | |
301 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
302 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
303 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
304 /* load & permutate scantables |
2967 | 305 note: only wmv uses different ones |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
306 */ |
1708 | 307 if(s->alternate_scan){ |
308 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); | |
309 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
310 }else{ | |
311 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); | |
312 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
313 } | |
1273 | 314 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); |
315 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
591 | 316 |
726
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
317 return 0; |
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
318 } |
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
319 |
1539
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
320 static void copy_picture(Picture *dst, Picture *src){ |
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
321 *dst = *src; |
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
322 dst->type= FF_BUFFER_TYPE_COPY; |
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
323 } |
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
324 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
325 static void copy_picture_attributes(MpegEncContext *s, AVFrame *dst, AVFrame *src){ |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
326 int i; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
327 |
1702 | 328 dst->pict_type = src->pict_type; |
329 dst->quality = src->quality; | |
330 dst->coded_picture_number = src->coded_picture_number; | |
331 dst->display_picture_number = src->display_picture_number; | |
332 // dst->reference = src->reference; | |
333 dst->pts = src->pts; | |
334 dst->interlaced_frame = src->interlaced_frame; | |
335 dst->top_field_first = src->top_field_first; | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
336 |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
337 if(s->avctx->me_threshold){ |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
338 if(!src->motion_val[0]) |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
339 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_val not set!\n"); |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
340 if(!src->mb_type) |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
341 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.mb_type not set!\n"); |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
342 if(!src->ref_index[0]) |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
343 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.ref_index not set!\n"); |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
344 if(src->motion_subsample_log2 != dst->motion_subsample_log2) |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
345 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_subsample_log2 doesn't match! (%d!=%d)\n", |
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
346 src->motion_subsample_log2, dst->motion_subsample_log2); |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
347 |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
348 memcpy(dst->mb_type, src->mb_type, s->mb_stride * s->mb_height * sizeof(dst->mb_type[0])); |
2967 | 349 |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
350 for(i=0; i<2; i++){ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
351 int stride= ((16*s->mb_width )>>src->motion_subsample_log2) + 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
352 int height= ((16*s->mb_height)>>src->motion_subsample_log2); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
353 |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
354 if(src->motion_val[i] && src->motion_val[i] != dst->motion_val[i]){ |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
355 memcpy(dst->motion_val[i], src->motion_val[i], 2*stride*height*sizeof(int16_t)); |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
356 } |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
357 if(src->ref_index[i] && src->ref_index[i] != dst->ref_index[i]){ |
1948 | 358 memcpy(dst->ref_index[i], src->ref_index[i], s->b8_stride*2*s->mb_height*sizeof(int8_t)); |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
359 } |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
360 } |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
361 } |
1702 | 362 } |
363 | |
903 | 364 /** |
924 | 365 * allocates a Picture |
366 * The pixels are allocated/set by calling get_buffer() if shared=0 | |
903 | 367 */ |
924 | 368 static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){ |
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:
1173
diff
changeset
|
369 const int big_mb_num= s->mb_stride*(s->mb_height+1) + 1; //the +1 is needed so memset(,,stride*height) doesnt sig11 |
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:
1173
diff
changeset
|
370 const int mb_array_size= s->mb_stride*s->mb_height; |
1655 | 371 const int b8_array_size= s->b8_stride*s->mb_height*2; |
372 const int b4_array_size= s->b4_stride*s->mb_height*4; | |
1168 | 373 int i; |
2967 | 374 |
924 | 375 if(shared){ |
376 assert(pic->data[0]); | |
377 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED); | |
378 pic->type= FF_BUFFER_TYPE_SHARED; | |
379 }else{ | |
380 int r; | |
2967 | 381 |
924 | 382 assert(!pic->data[0]); |
2967 | 383 |
925 | 384 r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic); |
2967 | 385 |
924 | 386 if(r<0 || !pic->age || !pic->type || !pic->data[0]){ |
2979 | 387 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n", r, pic->age, pic->type, pic->data[0]); |
924 | 388 return -1; |
389 } | |
390 | |
391 if(s->linesize && (s->linesize != pic->linesize[0] || s->uvlinesize != pic->linesize[1])){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
392 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (stride changed)\n"); |
924 | 393 return -1; |
394 } | |
395 | |
396 if(pic->linesize[1] != pic->linesize[2]){ | |
2764 | 397 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (uv stride mismatch)\n"); |
924 | 398 return -1; |
399 } | |
400 | |
401 s->linesize = pic->linesize[0]; | |
402 s->uvlinesize= pic->linesize[1]; | |
903 | 403 } |
2967 | 404 |
924 | 405 if(pic->qscale_table==NULL){ |
2967 | 406 if (s->encoding) { |
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:
1173
diff
changeset
|
407 CHECKED_ALLOCZ(pic->mb_var , mb_array_size * sizeof(int16_t)) |
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:
1173
diff
changeset
|
408 CHECKED_ALLOCZ(pic->mc_mb_var, mb_array_size * sizeof(int16_t)) |
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:
1173
diff
changeset
|
409 CHECKED_ALLOCZ(pic->mb_mean , mb_array_size * sizeof(int8_t)) |
924 | 410 } |
411 | |
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:
1173
diff
changeset
|
412 CHECKED_ALLOCZ(pic->mbskip_table , mb_array_size * sizeof(uint8_t)+2) //the +2 is for the slice end check |
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
|
413 CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t)) |
1742 | 414 CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(uint32_t)) |
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:
1173
diff
changeset
|
415 pic->mb_type= pic->mb_type_base + s->mb_stride+1; |
1168 | 416 if(s->out_format == FMT_H264){ |
417 for(i=0; i<2; i++){ | |
2570 | 418 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+4) * sizeof(int16_t)) |
419 pic->motion_val[i]= pic->motion_val_base[i]+4; | |
1948 | 420 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t)) |
1655 | 421 } |
1669 | 422 pic->motion_subsample_log2= 2; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
423 }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){ |
1655 | 424 for(i=0; i<2; i++){ |
2570 | 425 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+4) * sizeof(int16_t)) |
426 pic->motion_val[i]= pic->motion_val_base[i]+4; | |
1948 | 427 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t)) |
1168 | 428 } |
1669 | 429 pic->motion_subsample_log2= 3; |
1168 | 430 } |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
431 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
432 CHECKED_ALLOCZ(pic->dct_coeff, 64 * mb_array_size * sizeof(DCTELEM)*6) |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
433 } |
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:
1173
diff
changeset
|
434 pic->qstride= s->mb_stride; |
1546 | 435 CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan)) |
924 | 436 } |
1168 | 437 |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
438 //it might be nicer if the application would keep track of these but it would require a API change |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
439 memmove(s->prev_pict_types+1, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE-1); |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
440 s->prev_pict_types[0]= s->pict_type; |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
441 if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == B_TYPE) |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
442 pic->age= INT_MAX; // skipped MBs in b frames are quite rare in mpeg1/2 and its a bit tricky to skip them anyway |
2967 | 443 |
903 | 444 return 0; |
445 fail: //for the CHECKED_ALLOCZ macro | |
446 return -1; | |
447 } | |
448 | |
924 | 449 /** |
450 * deallocates a picture | |
451 */ | |
903 | 452 static void free_picture(MpegEncContext *s, Picture *pic){ |
453 int i; | |
924 | 454 |
455 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){ | |
925 | 456 s->avctx->release_buffer(s->avctx, (AVFrame*)pic); |
924 | 457 } |
458 | |
903 | 459 av_freep(&pic->mb_var); |
460 av_freep(&pic->mc_mb_var); | |
461 av_freep(&pic->mb_mean); | |
462 av_freep(&pic->mbskip_table); | |
463 av_freep(&pic->qscale_table); | |
1168 | 464 av_freep(&pic->mb_type_base); |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
465 av_freep(&pic->dct_coeff); |
1546 | 466 av_freep(&pic->pan_scan); |
1168 | 467 pic->mb_type= NULL; |
468 for(i=0; i<2; i++){ | |
1655 | 469 av_freep(&pic->motion_val_base[i]); |
1168 | 470 av_freep(&pic->ref_index[i]); |
471 } | |
2967 | 472 |
1214 | 473 if(pic->type == FF_BUFFER_TYPE_SHARED){ |
924 | 474 for(i=0; i<4; i++){ |
475 pic->base[i]= | |
476 pic->data[i]= NULL; | |
477 } | |
2967 | 478 pic->type= 0; |
903 | 479 } |
480 } | |
481 | |
1799 | 482 static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ |
483 int i; | |
484 | |
2967 | 485 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264) |
1799 | 486 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance |
487 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17; | |
488 | |
489 //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer() | |
2967 | 490 CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t)) |
1799 | 491 s->rd_scratchpad= s->me.scratchpad; |
492 s->b_scratchpad= s->me.scratchpad; | |
493 s->obmc_scratchpad= s->me.scratchpad + 16; | |
494 if (s->encoding) { | |
495 CHECKED_ALLOCZ(s->me.map , ME_MAP_SIZE*sizeof(uint32_t)) | |
496 CHECKED_ALLOCZ(s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t)) | |
497 if(s->avctx->noise_reduction){ | |
498 CHECKED_ALLOCZ(s->dct_error_sum, 2 * 64 * sizeof(int)) | |
499 } | |
2967 | 500 } |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1846
diff
changeset
|
501 CHECKED_ALLOCZ(s->blocks, 64*12*2 * sizeof(DCTELEM)) |
1799 | 502 s->block= s->blocks[0]; |
503 | |
504 for(i=0;i<12;i++){ | |
505 s->pblocks[i] = (short *)(&s->block[i]); | |
506 } | |
507 return 0; | |
508 fail: | |
509 return -1; //free() through MPV_common_end() | |
510 } | |
511 | |
512 static void free_duplicate_context(MpegEncContext *s){ | |
513 if(s==NULL) return; | |
514 | |
515 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL; | |
516 av_freep(&s->me.scratchpad); | |
2967 | 517 s->rd_scratchpad= |
518 s->b_scratchpad= | |
1799 | 519 s->obmc_scratchpad= NULL; |
2967 | 520 |
1799 | 521 av_freep(&s->dct_error_sum); |
522 av_freep(&s->me.map); | |
523 av_freep(&s->me.score_map); | |
524 av_freep(&s->blocks); | |
525 s->block= NULL; | |
526 } | |
527 | |
528 static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){ | |
529 #define COPY(a) bak->a= src->a | |
530 COPY(allocated_edge_emu_buffer); | |
531 COPY(edge_emu_buffer); | |
532 COPY(me.scratchpad); | |
533 COPY(rd_scratchpad); | |
534 COPY(b_scratchpad); | |
535 COPY(obmc_scratchpad); | |
536 COPY(me.map); | |
537 COPY(me.score_map); | |
538 COPY(blocks); | |
539 COPY(block); | |
540 COPY(start_mb_y); | |
541 COPY(end_mb_y); | |
542 COPY(me.map_generation); | |
543 COPY(pb); | |
544 COPY(dct_error_sum); | |
1810 | 545 COPY(dct_count[0]); |
546 COPY(dct_count[1]); | |
1799 | 547 #undef COPY |
548 } | |
549 | |
1827 | 550 void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){ |
1799 | 551 MpegEncContext bak; |
1827 | 552 int i; |
1799 | 553 //FIXME copy only needed parts |
554 //START_TIMER | |
555 backup_duplicate_context(&bak, dst); | |
556 memcpy(dst, src, sizeof(MpegEncContext)); | |
557 backup_duplicate_context(dst, &bak); | |
1827 | 558 for(i=0;i<12;i++){ |
559 dst->pblocks[i] = (short *)(&dst->block[i]); | |
560 } | |
1799 | 561 //STOP_TIMER("update_duplicate_context") //about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads |
562 } | |
563 | |
564 static void update_duplicate_context_after_me(MpegEncContext *dst, MpegEncContext *src){ | |
565 #define COPY(a) dst->a= src->a | |
566 COPY(pict_type); | |
567 COPY(current_picture); | |
568 COPY(f_code); | |
569 COPY(b_code); | |
570 COPY(qscale); | |
571 COPY(lambda); | |
572 COPY(lambda2); | |
573 COPY(picture_in_gop_number); | |
574 COPY(gop_picture_number); | |
2764 | 575 COPY(frame_pred_frame_dct); //FIXME don't set in encode_header |
576 COPY(progressive_frame); //FIXME don't set in encode_header | |
577 COPY(partitioned_frame); //FIXME don't set in encode_header | |
1799 | 578 #undef COPY |
579 } | |
580 | |
1892 | 581 /** |
582 * sets the given MpegEncContext to common defaults (same for encoding and decoding). | |
583 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
584 */ | |
585 static void MPV_common_defaults(MpegEncContext *s){ | |
586 s->y_dc_scale_table= | |
587 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
588 s->chroma_qscale_table= ff_default_chroma_qscale_table; | |
589 s->progressive_frame= 1; | |
590 s->progressive_sequence= 1; | |
591 s->picture_structure= PICT_FRAME; | |
592 | |
593 s->coded_picture_number = 0; | |
594 s->picture_number = 0; | |
595 s->input_picture_number = 0; | |
596 | |
597 s->picture_in_gop_number = 0; | |
1894 | 598 |
599 s->f_code = 1; | |
600 s->b_code = 1; | |
1892 | 601 } |
602 | |
603 /** | |
604 * sets the given MpegEncContext to defaults for decoding. | |
605 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
606 */ | |
607 void MPV_decode_defaults(MpegEncContext *s){ | |
608 MPV_common_defaults(s); | |
609 } | |
610 | |
611 /** | |
612 * sets the given MpegEncContext to defaults for encoding. | |
613 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
614 */ | |
1902
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
615 |
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
616 #ifdef CONFIG_ENCODERS |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
617 static void MPV_encode_defaults(MpegEncContext *s){ |
1892 | 618 static int done=0; |
2967 | 619 |
1892 | 620 MPV_common_defaults(s); |
2967 | 621 |
1892 | 622 if(!done){ |
623 int i; | |
624 done=1; | |
625 | |
626 default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); | |
627 memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1)); | |
628 | |
629 for(i=-16; i<16; i++){ | |
630 default_fcode_tab[i + MAX_MV]= 1; | |
631 } | |
632 } | |
633 s->me.mv_penalty= default_mv_penalty; | |
634 s->fcode_tab= default_fcode_tab; | |
635 } | |
1902
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
636 #endif //CONFIG_ENCODERS |
1892 | 637 |
2967 | 638 /** |
1892 | 639 * init common structure for both encoder and decoder. |
640 * this assumes that some variables like width/height are already set | |
641 */ | |
726
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
642 int MPV_common_init(MpegEncContext *s) |
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
643 { |
1708 | 644 int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y; |
726
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
645 |
3070 | 646 s->mb_height = (s->height + 15) / 16; |
647 | |
648 if(s->avctx->thread_count > MAX_THREADS || (s->avctx->thread_count > s->mb_height && s->mb_height)){ | |
1989 | 649 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n"); |
650 return -1; | |
651 } | |
652 | |
2422 | 653 if((s->width || s->height) && avcodec_check_dimensions(s->avctx, s->width, s->height)) |
654 return -1; | |
655 | |
1092 | 656 dsputil_init(&s->dsp, s->avctx); |
726
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
657 DCT_common_init(s); |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
658 |
754 | 659 s->flags= s->avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
660 s->flags2= s->avctx->flags2; |
726
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
661 |
903 | 662 s->mb_width = (s->width + 15) / 16; |
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:
1173
diff
changeset
|
663 s->mb_stride = s->mb_width + 1; |
1655 | 664 s->b8_stride = s->mb_width*2 + 1; |
665 s->b4_stride = s->mb_width*4 + 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:
1173
diff
changeset
|
666 mb_array_size= s->mb_height * s->mb_stride; |
1708 | 667 mv_table_size= (s->mb_height+2) * s->mb_stride + 1; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
668 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
669 /* set chroma shifts */ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
670 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt,&(s->chroma_x_shift), |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
671 &(s->chroma_y_shift) ); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
672 |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
673 /* set default edge pos, will be overriden in decode_header if needed */ |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
674 s->h_edge_pos= s->mb_width*16; |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
675 s->v_edge_pos= s->mb_height*16; |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
676 |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
677 s->mb_num = s->mb_width * s->mb_height; |
2967 | 678 |
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:
1173
diff
changeset
|
679 s->block_wrap[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:
1173
diff
changeset
|
680 s->block_wrap[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:
1173
diff
changeset
|
681 s->block_wrap[2]= |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
682 s->block_wrap[3]= s->b8_stride; |
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:
1173
diff
changeset
|
683 s->block_wrap[4]= |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
684 s->block_wrap[5]= s->mb_stride; |
2967 | 685 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
686 y_size = s->b8_stride * (2 * s->mb_height + 1); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
687 c_size = s->mb_stride * (s->mb_height + 1); |
756 | 688 yc_size = y_size + 2 * c_size; |
2967 | 689 |
701 | 690 /* convert fourcc to upper case */ |
2967 | 691 s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF) |
1116 | 692 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 ) |
2967 | 693 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16) |
1116 | 694 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24); |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
695 |
2967 | 696 s->avctx->stream_codec_tag= toupper( s->avctx->stream_codec_tag &0xFF) |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
697 + (toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 ) |
2967 | 698 + (toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16) |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
699 + (toupper((s->avctx->stream_codec_tag>>24)&0xFF)<<24); |
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
700 |
925 | 701 s->avctx->coded_frame= (AVFrame*)&s->current_picture; |
903 | 702 |
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:
1173
diff
changeset
|
703 CHECKED_ALLOCZ(s->mb_index2xy, (s->mb_num+1)*sizeof(int)) //error ressilience code looks cleaner with this |
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:
1173
diff
changeset
|
704 for(y=0; y<s->mb_height; y++){ |
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:
1173
diff
changeset
|
705 for(x=0; x<s->mb_width; x++){ |
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:
1173
diff
changeset
|
706 s->mb_index2xy[ x + y*s->mb_width ] = x + y*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:
1173
diff
changeset
|
707 } |
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:
1173
diff
changeset
|
708 } |
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:
1173
diff
changeset
|
709 s->mb_index2xy[ s->mb_height*s->mb_width ] = (s->mb_height-1)*s->mb_stride + s->mb_width; //FIXME really needed? |
2967 | 710 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
711 if (s->encoding) { |
324 | 712 /* Allocate MV tables */ |
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:
1173
diff
changeset
|
713 CHECKED_ALLOCZ(s->p_mv_table_base , mv_table_size * 2 * sizeof(int16_t)) |
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:
1173
diff
changeset
|
714 CHECKED_ALLOCZ(s->b_forw_mv_table_base , mv_table_size * 2 * sizeof(int16_t)) |
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:
1173
diff
changeset
|
715 CHECKED_ALLOCZ(s->b_back_mv_table_base , mv_table_size * 2 * sizeof(int16_t)) |
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:
1173
diff
changeset
|
716 CHECKED_ALLOCZ(s->b_bidir_forw_mv_table_base , mv_table_size * 2 * sizeof(int16_t)) |
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:
1173
diff
changeset
|
717 CHECKED_ALLOCZ(s->b_bidir_back_mv_table_base , mv_table_size * 2 * sizeof(int16_t)) |
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:
1173
diff
changeset
|
718 CHECKED_ALLOCZ(s->b_direct_mv_table_base , mv_table_size * 2 * sizeof(int16_t)) |
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:
1173
diff
changeset
|
719 s->p_mv_table = s->p_mv_table_base + 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:
1173
diff
changeset
|
720 s->b_forw_mv_table = s->b_forw_mv_table_base + 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:
1173
diff
changeset
|
721 s->b_back_mv_table = s->b_back_mv_table_base + 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:
1173
diff
changeset
|
722 s->b_bidir_forw_mv_table= s->b_bidir_forw_mv_table_base + 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:
1173
diff
changeset
|
723 s->b_bidir_back_mv_table= s->b_bidir_back_mv_table_base + 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:
1173
diff
changeset
|
724 s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1; |
324 | 725 |
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
726 if(s->msmpeg4_version){ |
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
727 CHECKED_ALLOCZ(s->ac_stats, 2*2*(MAX_LEVEL+1)*(MAX_RUN+1)*2*sizeof(int)); |
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
728 } |
612 | 729 CHECKED_ALLOCZ(s->avctx->stats_out, 256); |
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:
1173
diff
changeset
|
730 |
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:
1173
diff
changeset
|
731 /* Allocate MB type table */ |
1708 | 732 CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint16_t)) //needed for encoding |
2967 | 733 |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
734 CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int)) |
2967 | 735 |
1553
541681146f83
move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents:
1552
diff
changeset
|
736 CHECKED_ALLOCZ(s->q_intra_matrix, 64*32 * sizeof(int)) |
541681146f83
move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents:
1552
diff
changeset
|
737 CHECKED_ALLOCZ(s->q_inter_matrix, 64*32 * sizeof(int)) |
1554
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
738 CHECKED_ALLOCZ(s->q_intra_matrix16, 64*32*2 * sizeof(uint16_t)) |
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
739 CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t)) |
1556 | 740 CHECKED_ALLOCZ(s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) |
741 CHECKED_ALLOCZ(s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) | |
2967 | 742 |
1597 | 743 if(s->avctx->noise_reduction){ |
744 CHECKED_ALLOCZ(s->dct_offset, 2 * 64 * sizeof(uint16_t)) | |
745 } | |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
746 } |
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
747 CHECKED_ALLOCZ(s->picture, MAX_PICTURE_COUNT * sizeof(Picture)) |
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
748 |
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:
1173
diff
changeset
|
749 CHECKED_ALLOCZ(s->error_status_table, mb_array_size*sizeof(uint8_t)) |
2967 | 750 |
1708 | 751 if(s->codec_id==CODEC_ID_MPEG4 || (s->flags & CODEC_FLAG_INTERLACED_ME)){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
752 /* interlaced direct mode decoding tables */ |
1708 | 753 for(i=0; i<2; i++){ |
754 int j, k; | |
755 for(j=0; j<2; j++){ | |
756 for(k=0; k<2; k++){ | |
757 CHECKED_ALLOCZ(s->b_field_mv_table_base[i][j][k] , mv_table_size * 2 * sizeof(int16_t)) | |
758 s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1; | |
759 } | |
760 CHECKED_ALLOCZ(s->b_field_select_table[i][j] , mb_array_size * 2 * sizeof(uint8_t)) | |
761 CHECKED_ALLOCZ(s->p_field_mv_table_base[i][j] , mv_table_size * 2 * sizeof(int16_t)) | |
762 s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1; | |
763 } | |
764 CHECKED_ALLOCZ(s->p_field_select_table[i] , mb_array_size * 2 * sizeof(uint8_t)) | |
765 } | |
0 | 766 } |
767 | 767 if (s->out_format == FMT_H263) { |
0 | 768 /* ac values */ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
769 CHECKED_ALLOCZ(s->ac_val_base, yc_size * sizeof(int16_t) * 16); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
770 s->ac_val[0] = s->ac_val_base + s->b8_stride + 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
771 s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1; |
0 | 772 s->ac_val[2] = s->ac_val[1] + c_size; |
2967 | 773 |
0 | 774 /* cbp values */ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
775 CHECKED_ALLOCZ(s->coded_block_base, y_size); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
776 s->coded_block= s->coded_block_base + s->b8_stride + 1; |
2967 | 777 |
456 | 778 /* cbp, ac_pred, pred_dir */ |
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:
1173
diff
changeset
|
779 CHECKED_ALLOCZ(s->cbp_table , mb_array_size * sizeof(uint8_t)) |
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:
1173
diff
changeset
|
780 CHECKED_ALLOCZ(s->pred_dir_table, mb_array_size * sizeof(uint8_t)) |
197
21abf1b20016
different fix, s->mbintra_table used only if h263_pred set. - patch by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
196
diff
changeset
|
781 } |
2967 | 782 |
756 | 783 if (s->h263_pred || s->h263_plus || !s->encoding) { |
784 /* dc values */ | |
785 //MN: we need these for error resilience of intra-frames | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
786 CHECKED_ALLOCZ(s->dc_val_base, yc_size * sizeof(int16_t)); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
787 s->dc_val[0] = s->dc_val_base + s->b8_stride + 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
788 s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1; |
756 | 789 s->dc_val[2] = s->dc_val[1] + c_size; |
790 for(i=0;i<yc_size;i++) | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
791 s->dc_val_base[i] = 1024; |
756 | 792 } |
793 | |
611
3214d3f4519e
error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents:
608
diff
changeset
|
794 /* which mb is a intra block */ |
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:
1173
diff
changeset
|
795 CHECKED_ALLOCZ(s->mbintra_table, mb_array_size); |
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:
1173
diff
changeset
|
796 memset(s->mbintra_table, 1, mb_array_size); |
2967 | 797 |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
798 /* init macroblock skip table */ |
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:
1173
diff
changeset
|
799 CHECKED_ALLOCZ(s->mbskip_table, mb_array_size+2); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
800 //Note the +1 is for a quicker mpeg4 slice_end detection |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
801 CHECKED_ALLOCZ(s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE); |
2967 | 802 |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
803 s->parse_context.state= -1; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
804 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
805 s->visualization_buffer[0] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH); |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
806 s->visualization_buffer[1] = av_malloc((s->mb_width*8 + EDGE_WIDTH) * s->mb_height*8 + EDGE_WIDTH); |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
807 s->visualization_buffer[2] = av_malloc((s->mb_width*8 + EDGE_WIDTH) * s->mb_height*8 + EDGE_WIDTH); |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
808 } |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
809 |
0 | 810 s->context_initialized = 1; |
1799 | 811 |
812 s->thread_context[0]= s; | |
813 for(i=1; i<s->avctx->thread_count; i++){ | |
814 s->thread_context[i]= av_malloc(sizeof(MpegEncContext)); | |
815 memcpy(s->thread_context[i], s, sizeof(MpegEncContext)); | |
816 } | |
817 | |
818 for(i=0; i<s->avctx->thread_count; i++){ | |
819 if(init_duplicate_context(s->thread_context[i], s) < 0) | |
820 goto fail; | |
821 s->thread_context[i]->start_mb_y= (s->mb_height*(i ) + s->avctx->thread_count/2) / s->avctx->thread_count; | |
822 s->thread_context[i]->end_mb_y = (s->mb_height*(i+1) + s->avctx->thread_count/2) / s->avctx->thread_count; | |
823 } | |
824 | |
0 | 825 return 0; |
826 fail: | |
244 | 827 MPV_common_end(s); |
828 return -1; | |
829 } | |
830 | |
831 /* init common structure for both encoder and decoder */ | |
832 void MPV_common_end(MpegEncContext *s) | |
833 { | |
1708 | 834 int i, j, k; |
244 | 835 |
1799 | 836 for(i=0; i<s->avctx->thread_count; i++){ |
837 free_duplicate_context(s->thread_context[i]); | |
838 } | |
839 for(i=1; i<s->avctx->thread_count; i++){ | |
840 av_freep(&s->thread_context[i]); | |
841 } | |
842 | |
1344
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
843 av_freep(&s->parse_context.buffer); |
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
844 s->parse_context.buffer_size=0; |
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
845 |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
846 av_freep(&s->mb_type); |
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:
1173
diff
changeset
|
847 av_freep(&s->p_mv_table_base); |
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:
1173
diff
changeset
|
848 av_freep(&s->b_forw_mv_table_base); |
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:
1173
diff
changeset
|
849 av_freep(&s->b_back_mv_table_base); |
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:
1173
diff
changeset
|
850 av_freep(&s->b_bidir_forw_mv_table_base); |
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:
1173
diff
changeset
|
851 av_freep(&s->b_bidir_back_mv_table_base); |
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:
1173
diff
changeset
|
852 av_freep(&s->b_direct_mv_table_base); |
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:
1173
diff
changeset
|
853 s->p_mv_table= NULL; |
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:
1173
diff
changeset
|
854 s->b_forw_mv_table= NULL; |
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:
1173
diff
changeset
|
855 s->b_back_mv_table= NULL; |
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:
1173
diff
changeset
|
856 s->b_bidir_forw_mv_table= NULL; |
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:
1173
diff
changeset
|
857 s->b_bidir_back_mv_table= NULL; |
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:
1173
diff
changeset
|
858 s->b_direct_mv_table= NULL; |
1708 | 859 for(i=0; i<2; i++){ |
860 for(j=0; j<2; j++){ | |
861 for(k=0; k<2; k++){ | |
862 av_freep(&s->b_field_mv_table_base[i][j][k]); | |
863 s->b_field_mv_table[i][j][k]=NULL; | |
864 } | |
865 av_freep(&s->b_field_select_table[i][j]); | |
866 av_freep(&s->p_field_mv_table_base[i][j]); | |
867 s->p_field_mv_table[i][j]=NULL; | |
868 } | |
869 av_freep(&s->p_field_select_table[i]); | |
870 } | |
2967 | 871 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
872 av_freep(&s->dc_val_base); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
873 av_freep(&s->ac_val_base); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
874 av_freep(&s->coded_block_base); |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
875 av_freep(&s->mbintra_table); |
456 | 876 av_freep(&s->cbp_table); |
877 av_freep(&s->pred_dir_table); | |
2967 | 878 |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
879 av_freep(&s->mbskip_table); |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
880 av_freep(&s->prev_pict_types); |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
881 av_freep(&s->bitstream_buffer); |
2422 | 882 s->allocated_bitstream_buffer_size=0; |
883 | |
612 | 884 av_freep(&s->avctx->stats_out); |
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
885 av_freep(&s->ac_stats); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
886 av_freep(&s->error_status_table); |
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:
1173
diff
changeset
|
887 av_freep(&s->mb_index2xy); |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
888 av_freep(&s->lambda_table); |
1553
541681146f83
move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents:
1552
diff
changeset
|
889 av_freep(&s->q_intra_matrix); |
541681146f83
move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents:
1552
diff
changeset
|
890 av_freep(&s->q_inter_matrix); |
1554
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
891 av_freep(&s->q_intra_matrix16); |
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
892 av_freep(&s->q_inter_matrix16); |
1556 | 893 av_freep(&s->input_picture); |
894 av_freep(&s->reordered_input_picture); | |
1597 | 895 av_freep(&s->dct_offset); |
903 | 896 |
1573 | 897 if(s->picture){ |
898 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
899 free_picture(s, &s->picture[i]); | |
900 } | |
0 | 901 } |
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
902 av_freep(&s->picture); |
0 | 903 s->context_initialized = 0; |
1523 | 904 s->last_picture_ptr= |
905 s->next_picture_ptr= | |
906 s->current_picture_ptr= NULL; | |
2231 | 907 s->linesize= s->uvlinesize= 0; |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
908 |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
909 for(i=0; i<3; i++) |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
910 av_freep(&s->visualization_buffer[i]); |
2231 | 911 |
912 avcodec_default_free_buffers(s->avctx); | |
0 | 913 } |
914 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
915 #ifdef CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
916 |
0 | 917 /* init video encoder */ |
918 int MPV_encode_init(AVCodecContext *avctx) | |
919 { | |
920 MpegEncContext *s = avctx->priv_data; | |
2834 | 921 int i; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
922 int chroma_h_shift, chroma_v_shift; |
2967 | 923 |
1892 | 924 MPV_encode_defaults(s); |
315 | 925 |
2442 | 926 if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUV420P){ |
927 av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n"); | |
928 return -1; | |
929 } | |
930 | |
931 if(avctx->codec_id == CODEC_ID_MJPEG || avctx->codec_id == CODEC_ID_LJPEG){ | |
2658
d1609cfeb1d0
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents:
2654
diff
changeset
|
932 if(avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL && avctx->pix_fmt != PIX_FMT_YUVJ420P){ |
2442 | 933 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n"); |
934 return -1; | |
935 } | |
936 }else{ | |
2658
d1609cfeb1d0
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents:
2654
diff
changeset
|
937 if(avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL && avctx->pix_fmt != PIX_FMT_YUV420P){ |
2442 | 938 av_log(avctx, AV_LOG_ERROR, "colorspace not supported\n"); |
939 return -1; | |
940 } | |
941 } | |
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1397
diff
changeset
|
942 |
0 | 943 s->bit_rate = avctx->bit_rate; |
944 s->width = avctx->width; | |
945 s->height = avctx->height; | |
456 | 946 if(avctx->gop_size > 600){ |
2979 | 947 av_log(avctx, AV_LOG_ERROR, "Warning keyframe interval too large! reducing it ...\n"); |
456 | 948 avctx->gop_size=600; |
949 } | |
0 | 950 s->gop_size = avctx->gop_size; |
194
27d1773552c9
mpeg4 encoder fix by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
191
diff
changeset
|
951 s->avctx = avctx; |
294 | 952 s->flags= avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
953 s->flags2= avctx->flags2; |
324 | 954 s->max_b_frames= avctx->max_b_frames; |
344 | 955 s->codec_id= avctx->codec->id; |
456 | 956 s->luma_elim_threshold = avctx->luma_elim_threshold; |
957 s->chroma_elim_threshold= avctx->chroma_elim_threshold; | |
958 s->strict_std_compliance= avctx->strict_std_compliance; | |
959 s->data_partitioning= avctx->flags & CODEC_FLAG_PART; | |
936 | 960 s->quarter_sample= (avctx->flags & CODEC_FLAG_QPEL)!=0; |
599 | 961 s->mpeg_quant= avctx->mpeg_quant; |
1661 | 962 s->rtp_mode= !!avctx->rtp_payload_size; |
1992 | 963 s->intra_dc_precision= avctx->intra_dc_precision; |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
964 s->user_specified_pts = AV_NOPTS_VALUE; |
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
|
965 |
0 | 966 if (s->gop_size <= 1) { |
967 s->intra_only = 1; | |
968 s->gop_size = 12; | |
969 } else { | |
970 s->intra_only = 0; | |
971 } | |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
972 |
936 | 973 s->me_method = avctx->me_method; |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
974 |
320
cda7d0857baf
- ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents:
315
diff
changeset
|
975 /* Fixed QSCALE */ |
1708 | 976 s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE); |
2967 | 977 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
978 s->adaptive_quant= ( s->avctx->lumi_masking |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
979 || s->avctx->dark_masking |
2967 | 980 || s->avctx->temporal_cplx_masking |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
981 || s->avctx->spatial_cplx_masking |
1616 | 982 || s->avctx->p_masking |
2493
258120c61eea
Border processing adaptive quant patch by (Christophe Massiot |cmassiot freebox fr)
michael
parents:
2492
diff
changeset
|
983 || s->avctx->border_masking |
1616 | 984 || (s->flags&CODEC_FLAG_QP_RD)) |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
985 && !s->fixed_qscale; |
2967 | 986 |
1708 | 987 s->obmc= !!(s->flags & CODEC_FLAG_OBMC); |
988 s->loop_filter= !!(s->flags & CODEC_FLAG_LOOP_FILTER); | |
989 s->alternate_scan= !!(s->flags & CODEC_FLAG_ALT_SCAN); | |
1633 | 990 |
1711 | 991 if(avctx->rc_max_rate && !avctx->rc_buffer_size){ |
992 av_log(avctx, AV_LOG_ERROR, "a vbv buffer size is needed, for encoding with a maximum bitrate\n"); | |
993 return -1; | |
2967 | 994 } |
1711 | 995 |
996 if(avctx->rc_min_rate && avctx->rc_max_rate != avctx->rc_min_rate){ | |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
997 av_log(avctx, AV_LOG_INFO, "Warning min_rate > 0 but min_rate != max_rate isn't recommended!\n"); |
1907 | 998 } |
2967 | 999 |
2063 | 1000 if(avctx->rc_min_rate && avctx->rc_min_rate > avctx->bit_rate){ |
1001 av_log(avctx, AV_LOG_INFO, "bitrate below min bitrate\n"); | |
1002 return -1; | |
1003 } | |
2967 | 1004 |
2063 | 1005 if(avctx->rc_max_rate && avctx->rc_max_rate < avctx->bit_rate){ |
1006 av_log(avctx, AV_LOG_INFO, "bitrate above max bitrate\n"); | |
1007 return -1; | |
1008 } | |
2967 | 1009 |
1010 if( s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate | |
1907 | 1011 && (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO) |
1012 && 90000LL * (avctx->rc_buffer_size-1) > s->avctx->rc_max_rate*0xFFFFLL){ | |
2967 | 1013 |
1907 | 1014 av_log(avctx, AV_LOG_INFO, "Warning vbv_delay will be set to 0xFFFF (=VBR) as the specified vbv buffer is too large for the given bitrate!\n"); |
1015 } | |
2967 | 1016 |
1017 if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4 | |
1790 | 1018 && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P && s->codec_id != CODEC_ID_FLV1){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1019 av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n"); |
1188 | 1020 return -1; |
1021 } | |
2967 | 1022 |
1633 | 1023 if(s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE){ |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
1024 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with simple mb decision\n"); |
1633 | 1025 return -1; |
1026 } | |
2967 | 1027 |
1644 | 1028 if(s->obmc && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P){ |
1029 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with H263(+)\n"); | |
1030 return -1; | |
1031 } | |
2967 | 1032 |
1188 | 1033 if(s->quarter_sample && s->codec_id != CODEC_ID_MPEG4){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1034 av_log(avctx, AV_LOG_ERROR, "qpel not supported by codec\n"); |
1188 | 1035 return -1; |
1036 } | |
1037 | |
1038 if(s->data_partitioning && s->codec_id != CODEC_ID_MPEG4){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1039 av_log(avctx, AV_LOG_ERROR, "data partitioning not supported by codec\n"); |
1188 | 1040 return -1; |
1041 } | |
2967 | 1042 |
1421 | 1043 if(s->max_b_frames && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1044 av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n"); |
1188 | 1045 return -1; |
1046 } | |
1958 | 1047 |
2967 | 1048 if((s->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN)) |
1958 | 1049 && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO){ |
1050 av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n"); | |
1051 return -1; | |
1052 } | |
2967 | 1053 |
1188 | 1054 if(s->mpeg_quant && s->codec_id != CODEC_ID_MPEG4){ //FIXME mpeg2 uses that too |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
1055 av_log(avctx, AV_LOG_ERROR, "mpeg2 style quantization not supported by codec\n"); |
1188 | 1056 return -1; |
1057 } | |
2967 | 1058 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1059 if((s->flags & CODEC_FLAG_CBP_RD) && !(s->flags & CODEC_FLAG_TRELLIS_QUANT)){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1060 av_log(avctx, AV_LOG_ERROR, "CBP RD needs trellis quant\n"); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1061 return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1062 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1063 |
1622 | 1064 if((s->flags & CODEC_FLAG_QP_RD) && s->avctx->mb_decision != FF_MB_DECISION_RD){ |
1065 av_log(avctx, AV_LOG_ERROR, "QP RD needs mbd=2\n"); | |
1066 return -1; | |
1067 } | |
2967 | 1068 |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1069 if(s->avctx->scenechange_threshold < 1000000000 && (s->flags & CODEC_FLAG_CLOSED_GOP)){ |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1070 av_log(avctx, AV_LOG_ERROR, "closed gop with scene change detection arent supported yet\n"); |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1071 return -1; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1072 } |
2967 | 1073 |
1074 if(s->avctx->thread_count > 1 && s->codec_id != CODEC_ID_MPEG4 | |
1075 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO | |
1799 | 1076 && (s->codec_id != CODEC_ID_H263P || !(s->flags & CODEC_FLAG_H263P_SLICE_STRUCT))){ |
1077 av_log(avctx, AV_LOG_ERROR, "multi threaded encoding not supported by codec\n"); | |
1078 return -1; | |
1079 } | |
2967 | 1080 |
1799 | 1081 if(s->avctx->thread_count > 1) |
1082 s->rtp_mode= 1; | |
1760 | 1083 |
2637 | 1084 if(!avctx->time_base.den || !avctx->time_base.num){ |
2450 | 1085 av_log(avctx, AV_LOG_ERROR, "framerate not set\n"); |
1086 return -1; | |
1087 } | |
2967 | 1088 |
2576
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1089 i= (INT_MAX/2+128)>>8; |
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1090 if(avctx->me_threshold >= i){ |
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1091 av_log(avctx, AV_LOG_ERROR, "me_threshold too large, max is %d\n", i - 1); |
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1092 return -1; |
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1093 } |
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1094 if(avctx->mb_threshold >= i){ |
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1095 av_log(avctx, AV_LOG_ERROR, "mb_threshold too large, max is %d\n", i - 1); |
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1096 return -1; |
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1097 } |
2967 | 1098 |
2668 | 1099 if(avctx->b_frame_strategy && (avctx->flags&CODEC_FLAG_PASS2)){ |
3069 | 1100 av_log(avctx, AV_LOG_ERROR, "b_frame_strategy must be 0 on the second pass\n"); |
2668 | 1101 return -1; |
1102 } | |
1103 | |
2637 | 1104 i= ff_gcd(avctx->time_base.den, avctx->time_base.num); |
1760 | 1105 if(i > 1){ |
1106 av_log(avctx, AV_LOG_INFO, "removing common factors from framerate\n"); | |
2637 | 1107 avctx->time_base.den /= i; |
1108 avctx->time_base.num /= i; | |
1760 | 1109 // return -1; |
1110 } | |
2967 | 1111 |
1150 | 1112 if(s->codec_id==CODEC_ID_MJPEG){ |
1113 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x | |
1114 s->inter_quant_bias= 0; | |
1421 | 1115 }else if(s->mpeg_quant || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO){ |
1150 | 1116 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x |
1117 s->inter_quant_bias= 0; | |
1118 }else{ | |
1119 s->intra_quant_bias=0; | |
1120 s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x | |
1121 } | |
2967 | 1122 |
1150 | 1123 if(avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) |
1124 s->intra_quant_bias= avctx->intra_quant_bias; | |
1125 if(avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS) | |
1126 s->inter_quant_bias= avctx->inter_quant_bias; | |
2967 | 1127 |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1128 avcodec_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift); |
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1129 |
2653
2515af7d3238
complain about mpeg4 limits only if codec_id == MPEG4
michael
parents:
2639
diff
changeset
|
1130 if(avctx->codec_id == CODEC_ID_MPEG4 && s->avctx->time_base.den > (1<<16)-1){ |
2637 | 1131 av_log(avctx, AV_LOG_ERROR, "timebase not supported by mpeg 4 standard\n"); |
2967 | 1132 return -1; |
2637 | 1133 } |
1134 s->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1; | |
1424 | 1135 |
0 | 1136 switch(avctx->codec->id) { |
1137 case CODEC_ID_MPEG1VIDEO: | |
1138 s->out_format = FMT_MPEG1; | |
1126
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1124
diff
changeset
|
1139 s->low_delay= 0; //s->max_b_frames ? 0 : 1; |
77ccf7fe3bd0
per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents:
1124
diff
changeset
|
1140 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
0 | 1141 break; |
1421 | 1142 case CODEC_ID_MPEG2VIDEO: |
1143 s->out_format = FMT_MPEG1; | |
1144 s->low_delay= 0; //s->max_b_frames ? 0 : 1; | |
1145 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); | |
1661 | 1146 s->rtp_mode= 1; |
1421 | 1147 break; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1148 case CODEC_ID_LJPEG: |
2973 | 1149 case CODEC_ID_JPEGLS: |
0 | 1150 case CODEC_ID_MJPEG: |
1151 s->out_format = FMT_MJPEG; | |
1152 s->intra_only = 1; /* force intra only for jpeg */ | |
2973 | 1153 s->mjpeg_write_tables = avctx->codec->id != CODEC_ID_JPEGLS; |
2979 | 1154 s->mjpeg_data_only_frames = 0; /* write all the needed headers */ |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1155 s->mjpeg_vsample[0] = 1<<chroma_v_shift; |
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1156 s->mjpeg_vsample[1] = 1; |
2967 | 1157 s->mjpeg_vsample[2] = 1; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1158 s->mjpeg_hsample[0] = 1<<chroma_h_shift; |
2967 | 1159 s->mjpeg_hsample[1] = 1; |
1160 s->mjpeg_hsample[2] = 1; | |
0 | 1161 if (mjpeg_init(s) < 0) |
1162 return -1; | |
336 | 1163 avctx->delay=0; |
924 | 1164 s->low_delay=1; |
0 | 1165 break; |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1166 case CODEC_ID_H261: |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1167 s->out_format = FMT_H261; |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1168 avctx->delay=0; |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1169 s->low_delay=1; |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1170 break; |
0 | 1171 case CODEC_ID_H263: |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1172 if (h263_get_picture_format(s->width, s->height) == 7) { |
3011 | 1173 av_log(avctx, AV_LOG_INFO, "The specified picture size of %dx%d is not valid for the H.263 codec.\nValid sizes are 128x96, 176x144, 352x288, 704x576, and 1408x1152. Try H.263+.\n", s->width, s->height); |
0 | 1174 return -1; |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1175 } |
0 | 1176 s->out_format = FMT_H263; |
2979 | 1177 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; |
336 | 1178 avctx->delay=0; |
924 | 1179 s->low_delay=1; |
0 | 1180 break; |
1181 case CODEC_ID_H263P: | |
1182 s->out_format = FMT_H263; | |
1183 s->h263_plus = 1; | |
2979 | 1184 /* Fx */ |
1644 | 1185 s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0; |
2979 | 1186 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0; |
1187 s->modified_quant= s->h263_aic; | |
1188 s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0; | |
1189 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; | |
1190 s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0; | |
1191 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; | |
1661 | 1192 s->h263_slice_structured= (s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) ? 1:0; |
1644 | 1193 |
2979 | 1194 /* /Fx */ |
79
82e579c37bc3
Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents:
78
diff
changeset
|
1195 /* These are just to be sure */ |
336 | 1196 avctx->delay=0; |
924 | 1197 s->low_delay=1; |
0 | 1198 break; |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1199 case CODEC_ID_FLV1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1200 s->out_format = FMT_H263; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1201 s->h263_flv = 2; /* format = 1; 11-bit codes */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1202 s->unrestricted_mv = 1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1203 s->rtp_mode=0; /* don't allow GOB */ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1204 avctx->delay=0; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1205 s->low_delay=1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1206 break; |
0 | 1207 case CODEC_ID_RV10: |
1208 s->out_format = FMT_H263; | |
336 | 1209 avctx->delay=0; |
924 | 1210 s->low_delay=1; |
0 | 1211 break; |
2380 | 1212 case CODEC_ID_RV20: |
1213 s->out_format = FMT_H263; | |
1214 avctx->delay=0; | |
1215 s->low_delay=1; | |
1216 s->modified_quant=1; | |
1217 s->h263_aic=1; | |
1218 s->h263_plus=1; | |
1219 s->loop_filter=1; | |
1220 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; | |
1221 break; | |
71 | 1222 case CODEC_ID_MPEG4: |
0 | 1223 s->out_format = FMT_H263; |
1224 s->h263_pred = 1; | |
1225 s->unrestricted_mv = 1; | |
924 | 1226 s->low_delay= s->max_b_frames ? 0 : 1; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
1227 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
0 | 1228 break; |
307 | 1229 case CODEC_ID_MSMPEG4V1: |
0 | 1230 s->out_format = FMT_H263; |
1231 s->h263_msmpeg4 = 1; | |
1232 s->h263_pred = 1; | |
1233 s->unrestricted_mv = 1; | |
307 | 1234 s->msmpeg4_version= 1; |
336 | 1235 avctx->delay=0; |
924 | 1236 s->low_delay=1; |
307 | 1237 break; |
1238 case CODEC_ID_MSMPEG4V2: | |
1239 s->out_format = FMT_H263; | |
1240 s->h263_msmpeg4 = 1; | |
1241 s->h263_pred = 1; | |
1242 s->unrestricted_mv = 1; | |
1243 s->msmpeg4_version= 2; | |
336 | 1244 avctx->delay=0; |
924 | 1245 s->low_delay=1; |
307 | 1246 break; |
1247 case CODEC_ID_MSMPEG4V3: | |
1248 s->out_format = FMT_H263; | |
1249 s->h263_msmpeg4 = 1; | |
1250 s->h263_pred = 1; | |
1251 s->unrestricted_mv = 1; | |
1252 s->msmpeg4_version= 3; | |
1163 | 1253 s->flipflop_rounding=1; |
336 | 1254 avctx->delay=0; |
924 | 1255 s->low_delay=1; |
0 | 1256 break; |
499 | 1257 case CODEC_ID_WMV1: |
1258 s->out_format = FMT_H263; | |
1259 s->h263_msmpeg4 = 1; | |
1260 s->h263_pred = 1; | |
1261 s->unrestricted_mv = 1; | |
1262 s->msmpeg4_version= 4; | |
1163 | 1263 s->flipflop_rounding=1; |
499 | 1264 avctx->delay=0; |
924 | 1265 s->low_delay=1; |
499 | 1266 break; |
1267 case CODEC_ID_WMV2: | |
1268 s->out_format = FMT_H263; | |
1269 s->h263_msmpeg4 = 1; | |
1270 s->h263_pred = 1; | |
1271 s->unrestricted_mv = 1; | |
1272 s->msmpeg4_version= 5; | |
1163 | 1273 s->flipflop_rounding=1; |
499 | 1274 avctx->delay=0; |
924 | 1275 s->low_delay=1; |
499 | 1276 break; |
0 | 1277 default: |
1278 return -1; | |
1279 } | |
2967 | 1280 |
2042 | 1281 avctx->has_b_frames= !s->low_delay; |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1742
diff
changeset
|
1282 |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1283 s->encoding = 1; |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1284 |
0 | 1285 /* init */ |
1286 if (MPV_common_init(s) < 0) | |
1287 return -1; | |
1678 | 1288 |
1289 if(s->modified_quant) | |
1290 s->chroma_qscale_table= ff_h263_chroma_qscale_table; | |
2967 | 1291 s->progressive_frame= |
1708 | 1292 s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)); |
1799 | 1293 s->quant_precision=5; |
2967 | 1294 |
1729 | 1295 ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp); |
2382 | 1296 ff_set_cmp(&s->dsp, s->dsp.frame_skip_cmp, s->avctx->frame_skip_cmp); |
2967 | 1297 |
2639 | 1298 #ifdef CONFIG_H261_ENCODER |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1299 if (s->out_format == FMT_H261) |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1300 ff_h261_encode_init(s); |
2639 | 1301 #endif |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1302 if (s->out_format == FMT_H263) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1303 h263_encode_init(s); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1304 if(s->msmpeg4_version) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1305 ff_msmpeg4_encode_init(s); |
1042 | 1306 if (s->out_format == FMT_MPEG1) |
1307 ff_mpeg1_encode_init(s); | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1308 |
1892 | 1309 /* init q matrix */ |
60 | 1310 for(i=0;i<64;i++) { |
1092 | 1311 int j= s->dsp.idct_permutation[i]; |
599 | 1312 if(s->codec_id==CODEC_ID_MPEG4 && s->mpeg_quant){ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1313 s->intra_matrix[j] = ff_mpeg4_default_intra_matrix[i]; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1314 s->inter_matrix[j] = ff_mpeg4_default_non_intra_matrix[i]; |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1315 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1316 s->intra_matrix[j] = |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1317 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
1042 | 1318 }else |
1421 | 1319 { /* mpeg1/2 */ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1320 s->intra_matrix[j] = ff_mpeg1_default_intra_matrix[i]; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1321 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
599 | 1322 } |
1411 | 1323 if(s->avctx->intra_matrix) |
1324 s->intra_matrix[j] = s->avctx->intra_matrix[i]; | |
1325 if(s->avctx->inter_matrix) | |
1326 s->inter_matrix[j] = s->avctx->inter_matrix[i]; | |
344 | 1327 } |
1328 | |
1329 /* precompute matrix */ | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
1330 /* for mjpeg, we do include qscale in the matrix */ |
344 | 1331 if (s->out_format != FMT_MJPEG) { |
2967 | 1332 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, |
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
1333 s->intra_matrix, s->intra_quant_bias, avctx->qmin, 31, 1); |
2967 | 1334 convert_matrix(&s->dsp, s->q_inter_matrix, s->q_inter_matrix16, |
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
1335 s->inter_matrix, s->inter_quant_bias, avctx->qmin, 31, 0); |
60 | 1336 } |
1337 | |
329 | 1338 if(ff_rate_control_init(s) < 0) |
1339 return -1; | |
2967 | 1340 |
0 | 1341 return 0; |
1342 } | |
1343 | |
1344 int MPV_encode_end(AVCodecContext *avctx) | |
1345 { | |
1346 MpegEncContext *s = avctx->priv_data; | |
1347 | |
1348 #ifdef STATS | |
1349 print_stats(); | |
1350 #endif | |
329 | 1351 |
1352 ff_rate_control_uninit(s); | |
1353 | |
0 | 1354 MPV_common_end(s); |
1355 if (s->out_format == FMT_MJPEG) | |
1356 mjpeg_close(s); | |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
1357 |
1424 | 1358 av_freep(&avctx->extradata); |
2967 | 1359 |
0 | 1360 return 0; |
1361 } | |
1362 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
1363 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
1364 |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1365 void init_rl(RLTable *rl, int use_static) |
1042 | 1366 { |
1064 | 1367 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1]; |
1368 uint8_t index_run[MAX_RUN+1]; | |
1042 | 1369 int last, run, level, start, end, i; |
1370 | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1371 /* If table is static, we can quit if rl->max_level[0] is not NULL */ |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1372 if(use_static && rl->max_level[0]) |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1373 return; |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1374 |
1042 | 1375 /* compute max_level[], max_run[] and index_run[] */ |
1376 for(last=0;last<2;last++) { | |
1377 if (last == 0) { | |
1378 start = 0; | |
1379 end = rl->last; | |
1380 } else { | |
1381 start = rl->last; | |
1382 end = rl->n; | |
1383 } | |
1384 | |
1385 memset(max_level, 0, MAX_RUN + 1); | |
1386 memset(max_run, 0, MAX_LEVEL + 1); | |
1387 memset(index_run, rl->n, MAX_RUN + 1); | |
1388 for(i=start;i<end;i++) { | |
1389 run = rl->table_run[i]; | |
1390 level = rl->table_level[i]; | |
1391 if (index_run[run] == rl->n) | |
1392 index_run[run] = i; | |
1393 if (level > max_level[run]) | |
1394 max_level[run] = level; | |
1395 if (run > max_run[level]) | |
1396 max_run[level] = run; | |
1397 } | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1398 if(use_static) |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1399 rl->max_level[last] = av_mallocz_static(MAX_RUN + 1); |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1400 else |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1401 rl->max_level[last] = av_malloc(MAX_RUN + 1); |
1042 | 1402 memcpy(rl->max_level[last], max_level, MAX_RUN + 1); |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1403 if(use_static) |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1404 rl->max_run[last] = av_mallocz_static(MAX_LEVEL + 1); |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1405 else |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1406 rl->max_run[last] = av_malloc(MAX_LEVEL + 1); |
1042 | 1407 memcpy(rl->max_run[last], max_run, MAX_LEVEL + 1); |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1408 if(use_static) |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1409 rl->index_run[last] = av_mallocz_static(MAX_RUN + 1); |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1410 else |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1411 rl->index_run[last] = av_malloc(MAX_RUN + 1); |
1042 | 1412 memcpy(rl->index_run[last], index_run, MAX_RUN + 1); |
1413 } | |
1414 } | |
1415 | |
0 | 1416 /* draw the edges of width 'w' of an image of size width, height */ |
619
2be2cc8fd0a1
mpeg4 interlaced decoding support (not completly implemented/tested due to lack of samples)
michaelni
parents:
618
diff
changeset
|
1417 //FIXME check that this is ok for mpeg4 interlaced |
1064 | 1418 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w) |
0 | 1419 { |
1064 | 1420 uint8_t *ptr, *last_line; |
0 | 1421 int i; |
1422 | |
1423 last_line = buf + (height - 1) * wrap; | |
1424 for(i=0;i<w;i++) { | |
1425 /* top and bottom */ | |
1426 memcpy(buf - (i + 1) * wrap, buf, width); | |
1427 memcpy(last_line + (i + 1) * wrap, last_line, width); | |
1428 } | |
1429 /* left and right */ | |
1430 ptr = buf; | |
1431 for(i=0;i<height;i++) { | |
1432 memset(ptr - w, ptr[0], w); | |
1433 memset(ptr + width, ptr[width-1], w); | |
1434 ptr += wrap; | |
1435 } | |
1436 /* corners */ | |
1437 for(i=0;i<w;i++) { | |
1438 memset(buf - (i + 1) * wrap - w, buf[0], w); /* top left */ | |
1439 memset(buf - (i + 1) * wrap + width, buf[width-1], w); /* top right */ | |
1440 memset(last_line + (i + 1) * wrap - w, last_line[0], w); /* top left */ | |
1441 memset(last_line + (i + 1) * wrap + width, last_line[width-1], w); /* top right */ | |
1442 } | |
1443 } | |
1444 | |
1586 | 1445 int ff_find_unused_picture(MpegEncContext *s, int shared){ |
924 | 1446 int i; |
2967 | 1447 |
924 | 1448 if(shared){ |
1449 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1450 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) return i; |
924 | 1451 } |
1452 }else{ | |
1453 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1454 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) return i; //FIXME |
924 | 1455 } |
1456 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1457 if(s->picture[i].data[0]==NULL) return i; |
924 | 1458 } |
1459 } | |
1460 | |
1586 | 1461 assert(0); |
1462 return -1; | |
924 | 1463 } |
1464 | |
1597 | 1465 static void update_noise_reduction(MpegEncContext *s){ |
1466 int intra, i; | |
1467 | |
1468 for(intra=0; intra<2; intra++){ | |
1469 if(s->dct_count[intra] > (1<<16)){ | |
1470 for(i=0; i<64; i++){ | |
1471 s->dct_error_sum[intra][i] >>=1; | |
1472 } | |
1473 s->dct_count[intra] >>= 1; | |
1474 } | |
2967 | 1475 |
1597 | 1476 for(i=0; i<64; i++){ |
1477 s->dct_offset[intra][i]= (s->avctx->noise_reduction * s->dct_count[intra] + s->dct_error_sum[intra][i]/2) / (s->dct_error_sum[intra][i]+1); | |
1478 } | |
1479 } | |
1480 } | |
1481 | |
1586 | 1482 /** |
1483 * generic function for encode/decode called after coding/decoding the header and before a frame is coded/decoded | |
1484 */ | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1485 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) |
0 | 1486 { |
924 | 1487 int i; |
925 | 1488 AVFrame *pic; |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
1489 s->mb_skipped = 0; |
1168 | 1490 |
1234 | 1491 assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3); |
1228 | 1492 |
903 | 1493 /* mark&release old frames */ |
1944 | 1494 if (s->pict_type != B_TYPE && s->last_picture_ptr && s->last_picture_ptr != s->next_picture_ptr && s->last_picture_ptr->data[0]) { |
1138 | 1495 avctx->release_buffer(avctx, (AVFrame*)s->last_picture_ptr); |
903 | 1496 |
1497 /* release forgotten pictures */ | |
1498 /* if(mpeg124/h263) */ | |
1499 if(!s->encoding){ | |
1500 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1138 | 1501 if(s->picture[i].data[0] && &s->picture[i] != s->next_picture_ptr && s->picture[i].reference){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1502 av_log(avctx, AV_LOG_ERROR, "releasing zombie picture\n"); |
2967 | 1503 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); |
903 | 1504 } |
1505 } | |
1506 } | |
1507 } | |
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1508 alloc: |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1509 if(!s->encoding){ |
2764 | 1510 /* release non reference frames */ |
1228 | 1511 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
1512 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
1513 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
1514 } | |
1515 } | |
1516 | |
1586 | 1517 if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL) |
1518 pic= (AVFrame*)s->current_picture_ptr; //we allready have a unused image (maybe it was set before reading the header) | |
1519 else{ | |
1520 i= ff_find_unused_picture(s, 0); | |
1521 pic= (AVFrame*)&s->picture[i]; | |
1522 } | |
1523 | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2534
diff
changeset
|
1524 pic->reference= (s->pict_type != B_TYPE || s->codec_id == CODEC_ID_H264) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2534
diff
changeset
|
1525 && !s->dropable ? 3 : 0; |
1138 | 1526 |
1705 | 1527 pic->coded_picture_number= s->coded_picture_number++; |
2967 | 1528 |
1384 | 1529 if( alloc_picture(s, (Picture*)pic, 0) < 0) |
1530 return -1; | |
903 | 1531 |
1586 | 1532 s->current_picture_ptr= (Picture*)pic; |
1658 | 1533 s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic |
1659 | 1534 s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence; |
903 | 1535 } |
456 | 1536 |
1173 | 1537 s->current_picture_ptr->pict_type= s->pict_type; |
2967 | 1538 // if(s->flags && CODEC_FLAG_QSCALE) |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
1539 // s->current_picture_ptr->quality= s->new_picture_ptr->quality; |
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:
1173
diff
changeset
|
1540 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE; |
1173 | 1541 |
1539
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
1542 copy_picture(&s->current_picture, s->current_picture_ptr); |
2967 | 1543 |
1234 | 1544 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){ |
903 | 1545 if (s->pict_type != B_TYPE) { |
1138 | 1546 s->last_picture_ptr= s->next_picture_ptr; |
1944 | 1547 if(!s->dropable) |
1548 s->next_picture_ptr= s->current_picture_ptr; | |
1549 } | |
1550 /* av_log(s->avctx, AV_LOG_DEBUG, "L%p N%p C%p L%p N%p C%p type:%d drop:%d\n", s->last_picture_ptr, s->next_picture_ptr,s->current_picture_ptr, | |
2967 | 1551 s->last_picture_ptr ? s->last_picture_ptr->data[0] : NULL, |
1552 s->next_picture_ptr ? s->next_picture_ptr->data[0] : NULL, | |
1944 | 1553 s->current_picture_ptr ? s->current_picture_ptr->data[0] : NULL, |
1554 s->pict_type, s->dropable);*/ | |
2967 | 1555 |
1539
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
1556 if(s->last_picture_ptr) copy_picture(&s->last_picture, s->last_picture_ptr); |
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
1557 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); |
2967 | 1558 |
1539
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
1559 if(s->pict_type != I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL)){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1560 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); |
2764 | 1561 assert(s->pict_type != B_TYPE); //these should have been dropped if we don't have a reference |
1393 | 1562 goto alloc; |
1563 } | |
1564 | |
1565 assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0])); | |
1566 | |
1138 | 1567 if(s->picture_structure!=PICT_FRAME){ |
1568 int i; | |
1569 for(i=0; i<4; i++){ | |
1570 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
1571 s->current_picture.data[i] += s->current_picture.linesize[i]; | |
2967 | 1572 } |
1138 | 1573 s->current_picture.linesize[i] *= 2; |
1574 s->last_picture.linesize[i] *=2; | |
1575 s->next_picture.linesize[i] *=2; | |
1576 } | |
553 | 1577 } |
1168 | 1578 } |
2967 | 1579 |
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1580 s->hurry_up= s->avctx->hurry_up; |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1581 s->error_resilience= avctx->error_resilience; |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1582 |
2764 | 1583 /* set dequantizer, we can't do it during init as it might change for mpeg4 |
1584 and we can't do it in the header decode as init isnt called for mpeg4 there yet */ | |
1689 | 1585 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){ |
1586 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; | |
1587 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; | |
2345 | 1588 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ |
1689 | 1589 s->dct_unquantize_intra = s->dct_unquantize_h263_intra; |
1590 s->dct_unquantize_inter = s->dct_unquantize_h263_inter; | |
1591 }else{ | |
1592 s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra; | |
1593 s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter; | |
1594 } | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1595 |
1597 | 1596 if(s->dct_error_sum){ |
1597 assert(s->avctx->noise_reduction && s->encoding); | |
1598 | |
1599 update_noise_reduction(s); | |
1600 } | |
2967 | 1601 |
1381 | 1602 #ifdef HAVE_XVMC |
1603 if(s->avctx->xvmc_acceleration) | |
1604 return XVMC_field_start(s, avctx); | |
1605 #endif | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1606 return 0; |
0 | 1607 } |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
1608 |
0 | 1609 /* generic function for encode/decode called after a frame has been coded/decoded */ |
1610 void MPV_frame_end(MpegEncContext *s) | |
1611 { | |
903 | 1612 int i; |
0 | 1613 /* draw edge for correct motion prediction if outside */ |
1381 | 1614 #ifdef HAVE_XVMC |
1615 //just to make sure that all data is rendered. | |
1616 if(s->avctx->xvmc_acceleration){ | |
1617 XVMC_field_end(s); | |
1618 }else | |
1619 #endif | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2534
diff
changeset
|
1620 if(s->unrestricted_mv && s->current_picture.reference && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) { |
903 | 1621 draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH ); |
1622 draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
1623 draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
0 | 1624 } |
207 | 1625 emms_c(); |
2967 | 1626 |
612 | 1627 s->last_pict_type = s->pict_type; |
2997
188f4ef688f2
second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2990
diff
changeset
|
1628 s->last_lambda_for[s->pict_type]= s->current_picture_ptr->quality; |
329 | 1629 if(s->pict_type!=B_TYPE){ |
1630 s->last_non_b_pict_type= s->pict_type; | |
1631 } | |
1138 | 1632 #if 0 |
1633 /* copy back current_picture variables */ | |
903 | 1634 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
1635 if(s->picture[i].data[0] == s->current_picture.data[0]){ | |
1636 s->picture[i]= s->current_picture; | |
1637 break; | |
2967 | 1638 } |
903 | 1639 } |
1640 assert(i<MAX_PICTURE_COUNT); | |
2967 | 1641 #endif |
903 | 1642 |
1228 | 1643 if(s->encoding){ |
2764 | 1644 /* release non-reference frames */ |
1228 | 1645 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
1646 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
1647 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
1648 } | |
1649 } | |
324 | 1650 } |
1138 | 1651 // clear copies, to avoid confusion |
1652 #if 0 | |
1653 memset(&s->last_picture, 0, sizeof(Picture)); | |
1654 memset(&s->next_picture, 0, sizeof(Picture)); | |
1655 memset(&s->current_picture, 0, sizeof(Picture)); | |
1656 #endif | |
2213 | 1657 s->avctx->coded_frame= (AVFrame*)s->current_picture_ptr; |
903 | 1658 } |
1659 | |
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:
1173
diff
changeset
|
1660 /** |
1285 | 1661 * draws an line from (ex, ey) -> (sx, sy). |
1662 * @param w width of the image | |
1663 * @param h height of the image | |
1664 * @param stride stride/linesize of the image | |
1665 * @param color color of the arrow | |
1666 */ | |
1667 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ | |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1668 int t, x, y, fr, f; |
2967 | 1669 |
1285 | 1670 sx= clip(sx, 0, w-1); |
1671 sy= clip(sy, 0, h-1); | |
1672 ex= clip(ex, 0, w-1); | |
1673 ey= clip(ey, 0, h-1); | |
2967 | 1674 |
1285 | 1675 buf[sy*stride + sx]+= color; |
2967 | 1676 |
1285 | 1677 if(ABS(ex - sx) > ABS(ey - sy)){ |
1678 if(sx > ex){ | |
1679 t=sx; sx=ex; ex=t; | |
1680 t=sy; sy=ey; ey=t; | |
1681 } | |
1682 buf+= sx + sy*stride; | |
1683 ex-= sx; | |
1684 f= ((ey-sy)<<16)/ex; | |
1685 for(x= 0; x <= ex; x++){ | |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1686 y = (x*f)>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1687 fr= (x*f)&0xFFFF; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1688 buf[ y *stride + x]+= (color*(0x10000-fr))>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1689 buf[(y+1)*stride + x]+= (color* fr )>>16; |
1285 | 1690 } |
1691 }else{ | |
1692 if(sy > ey){ | |
1693 t=sx; sx=ex; ex=t; | |
1694 t=sy; sy=ey; ey=t; | |
1695 } | |
1696 buf+= sx + sy*stride; | |
1697 ey-= sy; | |
1698 if(ey) f= ((ex-sx)<<16)/ey; | |
1699 else f= 0; | |
1700 for(y= 0; y <= ey; y++){ | |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1701 x = (y*f)>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1702 fr= (y*f)&0xFFFF; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1703 buf[y*stride + x ]+= (color*(0x10000-fr))>>16;; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1704 buf[y*stride + x+1]+= (color* fr )>>16;; |
1285 | 1705 } |
1706 } | |
1707 } | |
1708 | |
1709 /** | |
1710 * draws an arrow from (ex, ey) -> (sx, sy). | |
1711 * @param w width of the image | |
1712 * @param h height of the image | |
1713 * @param stride stride/linesize of the image | |
1714 * @param color color of the arrow | |
1715 */ | |
2967 | 1716 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ |
1285 | 1717 int dx,dy; |
1718 | |
1719 sx= clip(sx, -100, w+100); | |
1720 sy= clip(sy, -100, h+100); | |
1721 ex= clip(ex, -100, w+100); | |
1722 ey= clip(ey, -100, h+100); | |
2967 | 1723 |
1285 | 1724 dx= ex - sx; |
1725 dy= ey - sy; | |
2967 | 1726 |
1285 | 1727 if(dx*dx + dy*dy > 3*3){ |
1728 int rx= dx + dy; | |
1729 int ry= -dx + dy; | |
1730 int length= ff_sqrt((rx*rx + ry*ry)<<8); | |
2967 | 1731 |
1285 | 1732 //FIXME subpixel accuracy |
1733 rx= ROUNDED_DIV(rx*3<<4, length); | |
1734 ry= ROUNDED_DIV(ry*3<<4, length); | |
2967 | 1735 |
1285 | 1736 draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color); |
1737 draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color); | |
1738 } | |
1739 draw_line(buf, sx, sy, ex, ey, w, h, stride, color); | |
1740 } | |
1741 | |
1742 /** | |
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:
1173
diff
changeset
|
1743 * prints debuging info for the given picture. |
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:
1173
diff
changeset
|
1744 */ |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1745 void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){ |
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:
1173
diff
changeset
|
1746 |
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:
1173
diff
changeset
|
1747 if(!pict || !pict->mb_type) return; |
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:
1173
diff
changeset
|
1748 |
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:
1173
diff
changeset
|
1749 if(s->avctx->debug&(FF_DEBUG_SKIP | FF_DEBUG_QP | FF_DEBUG_MB_TYPE)){ |
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:
1173
diff
changeset
|
1750 int x,y; |
2967 | 1751 |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1752 av_log(s->avctx,AV_LOG_DEBUG,"New frame, type: "); |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1753 switch (pict->pict_type) { |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1754 case FF_I_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"I\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1755 case FF_P_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"P\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1756 case FF_B_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"B\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1757 case FF_S_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"S\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1758 case FF_SI_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SI\n"); break; |
2967 | 1759 case FF_SP_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SP\n"); break; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1760 } |
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:
1173
diff
changeset
|
1761 for(y=0; y<s->mb_height; y++){ |
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:
1173
diff
changeset
|
1762 for(x=0; x<s->mb_width; x++){ |
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:
1173
diff
changeset
|
1763 if(s->avctx->debug&FF_DEBUG_SKIP){ |
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:
1173
diff
changeset
|
1764 int count= s->mbskip_table[x + y*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:
1173
diff
changeset
|
1765 if(count>9) count=9; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1766 av_log(s->avctx, AV_LOG_DEBUG, "%1d", count); |
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:
1173
diff
changeset
|
1767 } |
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:
1173
diff
changeset
|
1768 if(s->avctx->debug&FF_DEBUG_QP){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1769 av_log(s->avctx, AV_LOG_DEBUG, "%2d", pict->qscale_table[x + y*s->mb_stride]); |
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:
1173
diff
changeset
|
1770 } |
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:
1173
diff
changeset
|
1771 if(s->avctx->debug&FF_DEBUG_MB_TYPE){ |
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:
1173
diff
changeset
|
1772 int mb_type= pict->mb_type[x + y*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:
1173
diff
changeset
|
1773 //Type & MV direction |
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:
1173
diff
changeset
|
1774 if(IS_PCM(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1775 av_log(s->avctx, AV_LOG_DEBUG, "P"); |
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:
1173
diff
changeset
|
1776 else if(IS_INTRA(mb_type) && IS_ACPRED(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1777 av_log(s->avctx, AV_LOG_DEBUG, "A"); |
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:
1173
diff
changeset
|
1778 else if(IS_INTRA4x4(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1779 av_log(s->avctx, AV_LOG_DEBUG, "i"); |
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:
1173
diff
changeset
|
1780 else if(IS_INTRA16x16(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1781 av_log(s->avctx, AV_LOG_DEBUG, "I"); |
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:
1173
diff
changeset
|
1782 else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1783 av_log(s->avctx, AV_LOG_DEBUG, "d"); |
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:
1173
diff
changeset
|
1784 else if(IS_DIRECT(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1785 av_log(s->avctx, AV_LOG_DEBUG, "D"); |
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:
1173
diff
changeset
|
1786 else if(IS_GMC(mb_type) && IS_SKIP(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1787 av_log(s->avctx, AV_LOG_DEBUG, "g"); |
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:
1173
diff
changeset
|
1788 else if(IS_GMC(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1789 av_log(s->avctx, AV_LOG_DEBUG, "G"); |
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:
1173
diff
changeset
|
1790 else if(IS_SKIP(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1791 av_log(s->avctx, AV_LOG_DEBUG, "S"); |
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:
1173
diff
changeset
|
1792 else if(!USES_LIST(mb_type, 1)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1793 av_log(s->avctx, AV_LOG_DEBUG, ">"); |
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:
1173
diff
changeset
|
1794 else if(!USES_LIST(mb_type, 0)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1795 av_log(s->avctx, AV_LOG_DEBUG, "<"); |
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:
1173
diff
changeset
|
1796 else{ |
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:
1173
diff
changeset
|
1797 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1798 av_log(s->avctx, AV_LOG_DEBUG, "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:
1173
diff
changeset
|
1799 } |
2967 | 1800 |
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:
1173
diff
changeset
|
1801 //segmentation |
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:
1173
diff
changeset
|
1802 if(IS_8X8(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1803 av_log(s->avctx, AV_LOG_DEBUG, "+"); |
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:
1173
diff
changeset
|
1804 else if(IS_16X8(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1805 av_log(s->avctx, AV_LOG_DEBUG, "-"); |
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:
1173
diff
changeset
|
1806 else if(IS_8X16(mb_type)) |
2677 | 1807 av_log(s->avctx, AV_LOG_DEBUG, "|"); |
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:
1173
diff
changeset
|
1808 else if(IS_INTRA(mb_type) || IS_16X16(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1809 av_log(s->avctx, AV_LOG_DEBUG, " "); |
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:
1173
diff
changeset
|
1810 else |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1811 av_log(s->avctx, AV_LOG_DEBUG, "?"); |
2967 | 1812 |
1813 | |
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:
1173
diff
changeset
|
1814 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1815 av_log(s->avctx, AV_LOG_DEBUG, "="); |
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:
1173
diff
changeset
|
1816 else |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1817 av_log(s->avctx, AV_LOG_DEBUG, " "); |
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:
1173
diff
changeset
|
1818 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1819 // av_log(s->avctx, AV_LOG_DEBUG, " "); |
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:
1173
diff
changeset
|
1820 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1821 av_log(s->avctx, AV_LOG_DEBUG, "\n"); |
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:
1173
diff
changeset
|
1822 } |
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:
1173
diff
changeset
|
1823 } |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
1824 |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1825 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){ |
1285 | 1826 const int shift= 1 + s->quarter_sample; |
1827 int mb_y; | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1828 uint8_t *ptr; |
1707 | 1829 int i; |
1723
033d889d7c2c
non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1722
diff
changeset
|
1830 int h_chroma_shift, v_chroma_shift; |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1831 const int width = s->avctx->width; |
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1832 const int height= s->avctx->height; |
2395 | 1833 const int mv_sample_log2= 4 - pict->motion_subsample_log2; |
1834 const int mv_stride= (s->mb_width << mv_sample_log2) + 1; | |
1285 | 1835 s->low_delay=0; //needed to see the vectors without trashing the buffers |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1836 |
1723
033d889d7c2c
non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1722
diff
changeset
|
1837 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1838 for(i=0; i<3; i++){ |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1839 memcpy(s->visualization_buffer[i], pict->data[i], (i==0) ? pict->linesize[i]*height:pict->linesize[i]*height >> v_chroma_shift); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1840 pict->data[i]= s->visualization_buffer[i]; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1841 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1842 pict->type= FF_BUFFER_TYPE_COPY; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1843 ptr= pict->data[0]; |
1285 | 1844 |
1845 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
1846 int mb_x; | |
1847 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
1848 const int mb_index= mb_x + mb_y*s->mb_stride; | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1849 if((s->avctx->debug_mv) && pict->motion_val){ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1850 int type; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1851 for(type=0; type<3; type++){ |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
1852 int direction = 0; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1853 switch (type) { |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1854 case 0: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_P_FOR)) || (pict->pict_type!=FF_P_TYPE)) |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1855 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1856 direction = 0; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1857 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1858 case 1: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_B_FOR)) || (pict->pict_type!=FF_B_TYPE)) |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1859 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1860 direction = 0; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1861 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1862 case 2: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_B_BACK)) || (pict->pict_type!=FF_B_TYPE)) |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1863 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1864 direction = 1; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1865 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1866 } |
1712 | 1867 if(!USES_LIST(pict->mb_type[mb_index], direction)) |
1868 continue; | |
1869 | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1870 if(IS_8X8(pict->mb_type[mb_index])){ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1871 int i; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1872 for(i=0; i<4; i++){ |
1285 | 1873 int sx= mb_x*16 + 4 + 8*(i&1); |
1874 int sy= mb_y*16 + 4 + 8*(i>>1); | |
2522
e25782262d7d
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
2514
diff
changeset
|
1875 int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << (mv_sample_log2-1); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1876 int mx= (pict->motion_val[direction][xy][0]>>shift) + sx; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1877 int my= (pict->motion_val[direction][xy][1]>>shift) + sy; |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1878 draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1879 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1880 }else if(IS_16X8(pict->mb_type[mb_index])){ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1881 int i; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1882 for(i=0; i<2; i++){ |
1629
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1883 int sx=mb_x*16 + 8; |
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1884 int sy=mb_y*16 + 4 + 8*i; |
2522
e25782262d7d
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
2514
diff
changeset
|
1885 int xy= (mb_x*2 + (mb_y*2 + i)*mv_stride) << (mv_sample_log2-1); |
2395 | 1886 int mx=(pict->motion_val[direction][xy][0]>>shift); |
1887 int my=(pict->motion_val[direction][xy][1]>>shift); | |
2967 | 1888 |
2395 | 1889 if(IS_INTERLACED(pict->mb_type[mb_index])) |
1890 my*=2; | |
2967 | 1891 |
2395 | 1892 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100); |
1893 } | |
1894 }else if(IS_8X16(pict->mb_type[mb_index])){ | |
1895 int i; | |
1896 for(i=0; i<2; i++){ | |
1897 int sx=mb_x*16 + 4 + 8*i; | |
1898 int sy=mb_y*16 + 8; | |
2522
e25782262d7d
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
2514
diff
changeset
|
1899 int xy= (mb_x*2 + i + mb_y*2*mv_stride) << (mv_sample_log2-1); |
1947
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1900 int mx=(pict->motion_val[direction][xy][0]>>shift); |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1901 int my=(pict->motion_val[direction][xy][1]>>shift); |
2967 | 1902 |
1947
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1903 if(IS_INTERLACED(pict->mb_type[mb_index])) |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1904 my*=2; |
2967 | 1905 |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1906 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1907 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1908 }else{ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1909 int sx= mb_x*16 + 8; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1910 int sy= mb_y*16 + 8; |
2395 | 1911 int xy= (mb_x + mb_y*mv_stride) << mv_sample_log2; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1912 int mx= (pict->motion_val[direction][xy][0]>>shift) + sx; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1913 int my= (pict->motion_val[direction][xy][1]>>shift) + sy; |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1914 draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100); |
1629
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1915 } |
2967 | 1916 } |
1685 | 1917 } |
1918 if((s->avctx->debug&FF_DEBUG_VIS_QP) && pict->motion_val){ | |
1919 uint64_t c= (pict->qscale_table[mb_index]*128/31) * 0x0101010101010101ULL; | |
1920 int y; | |
1921 for(y=0; y<8; y++){ | |
1922 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= c; | |
1923 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= c; | |
1924 } | |
1925 } | |
1926 if((s->avctx->debug&FF_DEBUG_VIS_MB_TYPE) && pict->motion_val){ | |
1927 int mb_type= pict->mb_type[mb_index]; | |
1928 uint64_t u,v; | |
1929 int y; | |
1930 #define COLOR(theta, r)\ | |
1931 u= (int)(128 + r*cos(theta*3.141592/180));\ | |
1932 v= (int)(128 + r*sin(theta*3.141592/180)); | |
1933 | |
2967 | 1934 |
1685 | 1935 u=v=128; |
1936 if(IS_PCM(mb_type)){ | |
1937 COLOR(120,48) | |
1938 }else if((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) || IS_INTRA16x16(mb_type)){ | |
1939 COLOR(30,48) | |
1940 }else if(IS_INTRA4x4(mb_type)){ | |
1941 COLOR(90,48) | |
1942 }else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type)){ | |
1943 // COLOR(120,48) | |
1944 }else if(IS_DIRECT(mb_type)){ | |
1945 COLOR(150,48) | |
1946 }else if(IS_GMC(mb_type) && IS_SKIP(mb_type)){ | |
1947 COLOR(170,48) | |
1948 }else if(IS_GMC(mb_type)){ | |
1949 COLOR(190,48) | |
1950 }else if(IS_SKIP(mb_type)){ | |
1951 // COLOR(180,48) | |
1952 }else if(!USES_LIST(mb_type, 1)){ | |
1953 COLOR(240,48) | |
1954 }else if(!USES_LIST(mb_type, 0)){ | |
1955 COLOR(0,48) | |
1956 }else{ | |
1957 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); | |
1958 COLOR(300,48) | |
1959 } | |
1960 | |
1961 u*= 0x0101010101010101ULL; | |
1962 v*= 0x0101010101010101ULL; | |
1963 for(y=0; y<8; y++){ | |
1964 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= u; | |
1965 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= v; | |
1966 } | |
1967 | |
1968 //segmentation | |
1969 if(IS_8X8(mb_type) || IS_16X8(mb_type)){ | |
1970 *(uint64_t*)(pict->data[0] + 16*mb_x + 0 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL; | |
1971 *(uint64_t*)(pict->data[0] + 16*mb_x + 8 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL; | |
1972 } | |
1973 if(IS_8X8(mb_type) || IS_8X16(mb_type)){ | |
1974 for(y=0; y<16; y++) | |
1975 pict->data[0][16*mb_x + 8 + (16*mb_y + y)*pict->linesize[0]]^= 0x80; | |
1976 } | |
2534 | 1977 if(IS_8X8(mb_type) && mv_sample_log2 >= 2){ |
1978 int dm= 1 << (mv_sample_log2-2); | |
1979 for(i=0; i<4; i++){ | |
1980 int sx= mb_x*16 + 8*(i&1); | |
1981 int sy= mb_y*16 + 8*(i>>1); | |
1982 int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << (mv_sample_log2-1); | |
1983 //FIXME bidir | |
1984 int32_t *mv = (int32_t*)&pict->motion_val[0][xy]; | |
1985 if(mv[0] != mv[dm] || mv[dm*mv_stride] != mv[dm*(mv_stride+1)]) | |
1986 for(y=0; y<8; y++) | |
1987 pict->data[0][sx + 4 + (sy + y)*pict->linesize[0]]^= 0x80; | |
1988 if(mv[0] != mv[dm*mv_stride] || mv[dm] != mv[dm*(mv_stride+1)]) | |
1989 *(uint64_t*)(pict->data[0] + sx + (sy + 4)*pict->linesize[0])^= 0x8080808080808080ULL; | |
1990 } | |
1991 } | |
2967 | 1992 |
1685 | 1993 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264){ |
1994 // hmm | |
1995 } | |
1285 | 1996 } |
1997 s->mbskip_table[mb_index]=0; | |
1998 } | |
1999 } | |
2000 } | |
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:
1173
diff
changeset
|
2001 } |
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:
1173
diff
changeset
|
2002 |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
2003 #ifdef CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
2004 |
915 | 2005 static int get_sae(uint8_t *src, int ref, int stride){ |
2006 int x,y; | |
2007 int acc=0; | |
2967 | 2008 |
915 | 2009 for(y=0; y<16; y++){ |
2010 for(x=0; x<16; x++){ | |
2011 acc+= ABS(src[x+y*stride] - ref); | |
2012 } | |
2013 } | |
2967 | 2014 |
915 | 2015 return acc; |
2016 } | |
2017 | |
2018 static int get_intra_count(MpegEncContext *s, uint8_t *src, uint8_t *ref, int stride){ | |
2019 int x, y, w, h; | |
2020 int acc=0; | |
2967 | 2021 |
915 | 2022 w= s->width &~15; |
2023 h= s->height&~15; | |
2967 | 2024 |
915 | 2025 for(y=0; y<h; y+=16){ |
2026 for(x=0; x<w; x+=16){ | |
2027 int offset= x + y*stride; | |
1708 | 2028 int sad = s->dsp.sad[0](NULL, src + offset, ref + offset, stride, 16); |
915 | 2029 int mean= (s->dsp.pix_sum(src + offset, stride) + 128)>>8; |
2030 int sae = get_sae(src + offset, mean, stride); | |
2967 | 2031 |
915 | 2032 acc+= sae + 500 < sad; |
2033 } | |
2034 } | |
2035 return acc; | |
2036 } | |
2037 | |
924 | 2038 |
925 | 2039 static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){ |
1373 | 2040 AVFrame *pic=NULL; |
2427 | 2041 int64_t pts; |
924 | 2042 int i; |
903 | 2043 const int encoding_delay= s->max_b_frames; |
924 | 2044 int direct=1; |
2967 | 2045 |
2419 | 2046 if(pic_arg){ |
2427 | 2047 pts= pic_arg->pts; |
2048 pic_arg->display_picture_number= s->input_picture_number++; | |
2049 | |
2967 | 2050 if(pts != AV_NOPTS_VALUE){ |
2419 | 2051 if(s->user_specified_pts != AV_NOPTS_VALUE){ |
2637 | 2052 int64_t time= pts; |
2053 int64_t last= s->user_specified_pts; | |
2967 | 2054 |
2055 if(time <= last){ | |
2962 | 2056 av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%"PRId64", last=%"PRId64"\n", pts, s->user_specified_pts); |
2419 | 2057 return -1; |
2058 } | |
2059 } | |
2427 | 2060 s->user_specified_pts= pts; |
2419 | 2061 }else{ |
2062 if(s->user_specified_pts != AV_NOPTS_VALUE){ | |
2967 | 2063 s->user_specified_pts= |
2637 | 2064 pts= s->user_specified_pts + 1; |
2962 | 2065 av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%"PRId64")\n", pts); |
2419 | 2066 }else{ |
2637 | 2067 pts= pic_arg->display_picture_number; |
2419 | 2068 } |
2069 } | |
2070 } | |
2071 | |
1373 | 2072 if(pic_arg){ |
924 | 2073 if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0; |
2074 if(pic_arg->linesize[0] != s->linesize) direct=0; | |
2075 if(pic_arg->linesize[1] != s->uvlinesize) direct=0; | |
2076 if(pic_arg->linesize[2] != s->uvlinesize) direct=0; | |
2967 | 2077 |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2078 // av_log(AV_LOG_DEBUG, "%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize); |
2967 | 2079 |
924 | 2080 if(direct){ |
1586 | 2081 i= ff_find_unused_picture(s, 1); |
924 | 2082 |
925 | 2083 pic= (AVFrame*)&s->picture[i]; |
1168 | 2084 pic->reference= 3; |
2967 | 2085 |
924 | 2086 for(i=0; i<4; i++){ |
2087 pic->data[i]= pic_arg->data[i]; | |
2088 pic->linesize[i]= pic_arg->linesize[i]; | |
2089 } | |
2090 alloc_picture(s, (Picture*)pic, 1); | |
2091 }else{ | |
1586 | 2092 i= ff_find_unused_picture(s, 0); |
924 | 2093 |
925 | 2094 pic= (AVFrame*)&s->picture[i]; |
1168 | 2095 pic->reference= 3; |
924 | 2096 |
2097 alloc_picture(s, (Picture*)pic, 0); | |
1539
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
2098 |
3068 | 2099 if( pic->data[0] + INPLACE_OFFSET == pic_arg->data[0] |
2100 && pic->data[1] + INPLACE_OFFSET == pic_arg->data[1] | |
2101 && pic->data[2] + INPLACE_OFFSET == pic_arg->data[2]){ | |
924 | 2102 // empty |
2103 }else{ | |
2104 int h_chroma_shift, v_chroma_shift; | |
2105 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); | |
2967 | 2106 |
924 | 2107 for(i=0; i<3; i++){ |
2108 int src_stride= pic_arg->linesize[i]; | |
2109 int dst_stride= i ? s->uvlinesize : s->linesize; | |
2110 int h_shift= i ? h_chroma_shift : 0; | |
2111 int v_shift= i ? v_chroma_shift : 0; | |
2112 int w= s->width >>h_shift; | |
2113 int h= s->height>>v_shift; | |
2114 uint8_t *src= pic_arg->data[i]; | |
3068 | 2115 uint8_t *dst= pic->data[i] + INPLACE_OFFSET; |
2967 | 2116 |
924 | 2117 if(src_stride==dst_stride) |
2118 memcpy(dst, src, src_stride*h); | |
2119 else{ | |
2120 while(h--){ | |
2121 memcpy(dst, src, w); | |
2122 dst += dst_stride; | |
2123 src += src_stride; | |
2124 } | |
2125 } | |
2126 } | |
2127 } | |
324 | 2128 } |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
2129 copy_picture_attributes(s, pic, pic_arg); |
2427 | 2130 pic->pts= pts; //we set this here to avoid modifiying pic_arg |
1373 | 2131 } |
2967 | 2132 |
903 | 2133 /* shift buffer entries */ |
2134 for(i=1; i<MAX_PICTURE_COUNT /*s->encoding_delay+1*/; i++) | |
2135 s->input_picture[i-1]= s->input_picture[i]; | |
2967 | 2136 |
903 | 2137 s->input_picture[encoding_delay]= (Picture*)pic; |
2138 | |
2139 return 0; | |
2140 } | |
2141 | |
2381 | 2142 static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){ |
2143 int x, y, plane; | |
2144 int score=0; | |
2382 | 2145 int64_t score64=0; |
2381 | 2146 |
2147 for(plane=0; plane<3; plane++){ | |
2148 const int stride= p->linesize[plane]; | |
2149 const int bw= plane ? 1 : 2; | |
2150 for(y=0; y<s->mb_height*bw; y++){ | |
2151 for(x=0; x<s->mb_width*bw; x++){ | |
2931 | 2152 int off= p->type == FF_BUFFER_TYPE_SHARED ? 0: 16; |
2153 int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride)+off, ref->data[plane] + 8*(x + y*stride), stride, 8); | |
2967 | 2154 |
2382 | 2155 switch(s->avctx->frame_skip_exp){ |
2156 case 0: score= FFMAX(score, v); break; | |
2157 case 1: score+= ABS(v);break; | |
2158 case 2: score+= v*v;break; | |
2159 case 3: score64+= ABS(v*v*(int64_t)v);break; | |
2160 case 4: score64+= v*v*(int64_t)(v*v);break; | |
2161 } | |
2381 | 2162 } |
2163 } | |
2164 } | |
2967 | 2165 |
2382 | 2166 if(score) score64= score; |
2167 | |
2168 if(score64 < s->avctx->frame_skip_threshold) | |
2381 | 2169 return 1; |
2382 | 2170 if(score64 < ((s->avctx->frame_skip_factor * (int64_t)s->lambda)>>8)) |
2381 | 2171 return 1; |
2172 return 0; | |
2173 } | |
2174 | |
2988 | 2175 static int estimate_best_b_count(MpegEncContext *s){ |
2176 AVCodec *codec= avcodec_find_encoder(s->avctx->codec_id); | |
2177 AVCodecContext *c= avcodec_alloc_context(); | |
2178 AVFrame input[FF_MAX_B_FRAMES+2]; | |
2990
0300c2647bc3
support downscaling frames for dynamic b frame decission
michael
parents:
2988
diff
changeset
|
2179 const int scale= s->avctx->brd_scale; |
3068 | 2180 int i, j, out_size, p_lambda, b_lambda, lambda2; |
2990
0300c2647bc3
support downscaling frames for dynamic b frame decission
michael
parents:
2988
diff
changeset
|
2181 int outbuf_size= s->width * s->height; //FIXME |
2988 | 2182 uint8_t *outbuf= av_malloc(outbuf_size); |
2183 ImgReSampleContext *resample; | |
2184 int64_t best_rd= INT64_MAX; | |
2185 int best_b_count= -1; | |
3068 | 2186 |
2187 // emms_c(); | |
2188 p_lambda= s->last_lambda_for[P_TYPE]; //s->next_picture_ptr->quality; | |
2189 b_lambda= s->last_lambda_for[B_TYPE]; //p_lambda *ABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset; | |
2190 if(!b_lambda) b_lambda= p_lambda; //FIXME we should do this somewhere else | |
2191 lambda2= (b_lambda*b_lambda + (1<<FF_LAMBDA_SHIFT)/2 ) >> FF_LAMBDA_SHIFT; | |
2988 | 2192 |
2193 c->width = s->width >> scale; | |
2194 c->height= s->height>> scale; | |
2195 c->flags= CODEC_FLAG_QSCALE | CODEC_FLAG_PSNR | CODEC_FLAG_INPUT_PRESERVED /*| CODEC_FLAG_EMU_EDGE*/; | |
2196 c->flags|= s->avctx->flags & CODEC_FLAG_QPEL; | |
2197 c->mb_decision= s->avctx->mb_decision; | |
2198 c->me_cmp= s->avctx->me_cmp; | |
2199 c->mb_cmp= s->avctx->mb_cmp; | |
2200 c->me_sub_cmp= s->avctx->me_sub_cmp; | |
2201 c->pix_fmt = PIX_FMT_YUV420P; | |
2202 c->time_base= s->avctx->time_base; | |
2203 c->max_b_frames= s->max_b_frames; | |
2204 | |
2205 if (avcodec_open(c, codec) < 0) | |
2206 return -1; | |
2207 | |
2208 resample= img_resample_init(c->width, c->height, s->width, s->height); //FIXME use sws | |
2209 | |
2210 for(i=0; i<s->max_b_frames+2; i++){ | |
2211 int ysize= c->width*c->height; | |
2212 int csize= (c->width/2)*(c->height/2); | |
3068 | 2213 Picture pre_input, *pre_input_ptr= i ? s->input_picture[i-1] : s->next_picture_ptr; |
2214 | |
2215 if(pre_input_ptr) | |
2216 pre_input= *pre_input_ptr; | |
2217 | |
2218 if(pre_input.type != FF_BUFFER_TYPE_SHARED && i){ | |
2219 pre_input.data[0]+=INPLACE_OFFSET; | |
2220 pre_input.data[1]+=INPLACE_OFFSET; | |
2221 pre_input.data[2]+=INPLACE_OFFSET; | |
2222 } | |
2988 | 2223 |
2224 avcodec_get_frame_defaults(&input[i]); | |
2225 input[i].data[0]= av_malloc(ysize + 2*csize); | |
2226 input[i].data[1]= input[i].data[0] + ysize; | |
2227 input[i].data[2]= input[i].data[1] + csize; | |
2228 input[i].linesize[0]= c->width; | |
2229 input[i].linesize[1]= | |
2230 input[i].linesize[2]= c->width/2; | |
2231 | |
2232 if(!i || s->input_picture[i-1]) | |
3145 | 2233 img_resample(resample, (AVPicture*)&input[i], |
2234 (AVPicture*)&pre_input); | |
2988 | 2235 } |
2236 | |
2237 for(j=0; j<s->max_b_frames+1; j++){ | |
2238 int64_t rd=0; | |
2239 | |
2240 if(!s->input_picture[j]) | |
2241 break; | |
2242 | |
2243 c->error[0]= c->error[1]= c->error[2]= 0; | |
2244 | |
2245 input[0].pict_type= I_TYPE; | |
3068 | 2246 input[0].quality= 1 * FF_QP2LAMBDA; |
2988 | 2247 out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[0]); |
3068 | 2248 // rd += (out_size * lambda2) >> FF_LAMBDA_SHIFT; |
2988 | 2249 |
2250 for(i=0; i<s->max_b_frames+1; i++){ | |
2251 int is_p= i % (j+1) == j || i==s->max_b_frames; | |
2252 | |
2253 input[i+1].pict_type= is_p ? P_TYPE : B_TYPE; | |
3068 | 2254 input[i+1].quality= is_p ? p_lambda : b_lambda; |
2988 | 2255 out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[i+1]); |
3068 | 2256 rd += (out_size * lambda2) >> (FF_LAMBDA_SHIFT - 3); |
2988 | 2257 } |
2258 | |
2259 /* get the delayed frames */ | |
2260 while(out_size){ | |
2261 out_size = avcodec_encode_video(c, outbuf, outbuf_size, NULL); | |
3068 | 2262 rd += (out_size * lambda2) >> (FF_LAMBDA_SHIFT - 3); |
2988 | 2263 } |
2264 | |
2265 rd += c->error[0] + c->error[1] + c->error[2]; | |
2266 | |
2267 if(rd < best_rd){ | |
2268 best_rd= rd; | |
2269 best_b_count= j; | |
2270 } | |
2271 } | |
2272 | |
2273 av_freep(&outbuf); | |
2274 avcodec_close(c); | |
2275 av_freep(&c); | |
2276 img_resample_close(resample); | |
2277 | |
2278 for(i=0; i<s->max_b_frames+2; i++){ | |
2279 av_freep(&input[i].data[0]); | |
2280 } | |
2281 | |
2282 return best_b_count; | |
2283 } | |
2284 | |
903 | 2285 static void select_input_picture(MpegEncContext *s){ |
2286 int i; | |
924 | 2287 |
903 | 2288 for(i=1; i<MAX_PICTURE_COUNT; i++) |
2289 s->reordered_input_picture[i-1]= s->reordered_input_picture[i]; | |
2290 s->reordered_input_picture[MAX_PICTURE_COUNT-1]= NULL; | |
2291 | |
2764 | 2292 /* set next picture type & ordering */ |
903 | 2293 if(s->reordered_input_picture[0]==NULL && s->input_picture[0]){ |
1138 | 2294 if(/*s->picture_in_gop_number >= s->gop_size ||*/ s->next_picture_ptr==NULL || s->intra_only){ |
915 | 2295 s->reordered_input_picture[0]= s->input_picture[0]; |
2296 s->reordered_input_picture[0]->pict_type= I_TYPE; | |
1705 | 2297 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
915 | 2298 }else{ |
2299 int b_frames; | |
2381 | 2300 |
2301 if(s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor){ | |
2931 | 2302 if(s->picture_in_gop_number < s->gop_size && skip_check(s, s->input_picture[0], s->next_picture_ptr)){ |
2303 //FIXME check that te gop check above is +-1 correct | |
2381 | 2304 //av_log(NULL, AV_LOG_DEBUG, "skip %p %Ld\n", s->input_picture[0]->data[0], s->input_picture[0]->pts); |
2967 | 2305 |
2381 | 2306 if(s->input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ |
2307 for(i=0; i<4; i++) | |
2308 s->input_picture[0]->data[i]= NULL; | |
2967 | 2309 s->input_picture[0]->type= 0; |
2381 | 2310 }else{ |
2967 | 2311 assert( s->input_picture[0]->type==FF_BUFFER_TYPE_USER |
2381 | 2312 || s->input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); |
2967 | 2313 |
2381 | 2314 s->avctx->release_buffer(s->avctx, (AVFrame*)s->input_picture[0]); |
2315 } | |
2967 | 2316 |
2931 | 2317 emms_c(); |
2318 ff_vbv_update(s, 0); | |
2381 | 2319 |
2320 goto no_output_pic; | |
2321 } | |
2322 } | |
2323 | |
915 | 2324 if(s->flags&CODEC_FLAG_PASS2){ |
2325 for(i=0; i<s->max_b_frames+1; i++){ | |
2326 int pict_num= s->input_picture[0]->display_picture_number + i; | |
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2327 |
2967 | 2328 if(pict_num >= s->rc_context.num_entries) |
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2329 break; |
2363
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2330 if(!s->input_picture[i]){ |
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2331 s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE; |
2363
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2332 break; |
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2333 } |
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2334 |
2967 | 2335 s->input_picture[i]->pict_type= |
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2336 s->rc_context.entry[pict_num].new_pict_type; |
915 | 2337 } |
2338 } | |
924 | 2339 |
2297 | 2340 if(s->avctx->b_frame_strategy==0){ |
915 | 2341 b_frames= s->max_b_frames; |
1373 | 2342 while(b_frames && !s->input_picture[b_frames]) b_frames--; |
1687 | 2343 }else if(s->avctx->b_frame_strategy==1){ |
915 | 2344 for(i=1; i<s->max_b_frames+1; i++){ |
1373 | 2345 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){ |
2967 | 2346 s->input_picture[i]->b_frame_score= |
2347 get_intra_count(s, s->input_picture[i ]->data[0], | |
924 | 2348 s->input_picture[i-1]->data[0], s->linesize) + 1; |
915 | 2349 } |
2350 } | |
2728 | 2351 for(i=0; i<s->max_b_frames+1; i++){ |
1373 | 2352 if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/40) break; |
915 | 2353 } |
2967 | 2354 |
915 | 2355 b_frames= FFMAX(0, i-1); |
2967 | 2356 |
915 | 2357 /* reset scores */ |
2358 for(i=0; i<b_frames+1; i++){ | |
2359 s->input_picture[i]->b_frame_score=0; | |
2360 } | |
2988 | 2361 }else if(s->avctx->b_frame_strategy==2){ |
2362 b_frames= estimate_best_b_count(s); | |
915 | 2363 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2364 av_log(s->avctx, AV_LOG_ERROR, "illegal b frame strategy\n"); |
915 | 2365 b_frames=0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2366 } |
915 | 2367 |
2368 emms_c(); | |
2369 //static int b_count=0; | |
2370 //b_count+= b_frames; | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2371 //av_log(s->avctx, AV_LOG_DEBUG, "b_frames: %d\n", b_count); |
2297 | 2372 |
2373 for(i= b_frames - 1; i>=0; i--){ | |
2374 int type= s->input_picture[i]->pict_type; | |
2375 if(type && type != B_TYPE) | |
2376 b_frames= i; | |
2377 } | |
2378 if(s->input_picture[b_frames]->pict_type == B_TYPE && b_frames == s->max_b_frames){ | |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
2379 av_log(s->avctx, AV_LOG_ERROR, "warning, too many b frames in a row\n"); |
2297 | 2380 } |
2381 | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2382 if(s->picture_in_gop_number + b_frames >= s->gop_size){ |
2298 | 2383 if((s->flags2 & CODEC_FLAG2_STRICT_GOP) && s->gop_size > s->picture_in_gop_number){ |
2384 b_frames= s->gop_size - s->picture_in_gop_number - 1; | |
2385 }else{ | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2386 if(s->flags & CODEC_FLAG_CLOSED_GOP) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2387 b_frames=0; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2388 s->input_picture[b_frames]->pict_type= I_TYPE; |
2298 | 2389 } |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2390 } |
2967 | 2391 |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2392 if( (s->flags & CODEC_FLAG_CLOSED_GOP) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2393 && b_frames |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2394 && s->input_picture[b_frames]->pict_type== I_TYPE) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2395 b_frames--; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2396 |
915 | 2397 s->reordered_input_picture[0]= s->input_picture[b_frames]; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2398 if(s->reordered_input_picture[0]->pict_type != I_TYPE) |
915 | 2399 s->reordered_input_picture[0]->pict_type= P_TYPE; |
1705 | 2400 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
915 | 2401 for(i=0; i<b_frames; i++){ |
2402 s->reordered_input_picture[i+1]= s->input_picture[i]; | |
2403 s->reordered_input_picture[i+1]->pict_type= B_TYPE; | |
1705 | 2404 s->reordered_input_picture[i+1]->coded_picture_number= s->coded_picture_number++; |
903 | 2405 } |
324 | 2406 } |
2407 } | |
2381 | 2408 no_output_pic: |
903 | 2409 if(s->reordered_input_picture[0]){ |
1168 | 2410 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=B_TYPE ? 3 : 0; |
1138 | 2411 |
1539
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
2412 copy_picture(&s->new_picture, s->reordered_input_picture[0]); |
924 | 2413 |
2414 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ | |
2764 | 2415 // input is a shared pix, so we can't modifiy it -> alloc a new one & ensure that the shared one is reuseable |
2967 | 2416 |
1586 | 2417 int i= ff_find_unused_picture(s, 0); |
924 | 2418 Picture *pic= &s->picture[i]; |
2419 | |
2420 /* mark us unused / free shared pic */ | |
2421 for(i=0; i<4; i++) | |
2422 s->reordered_input_picture[0]->data[i]= NULL; | |
2423 s->reordered_input_picture[0]->type= 0; | |
2967 | 2424 |
1702 | 2425 pic->reference = s->reordered_input_picture[0]->reference; |
2967 | 2426 |
924 | 2427 alloc_picture(s, pic, 0); |
2428 | |
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
2429 copy_picture_attributes(s, (AVFrame*)pic, (AVFrame*)s->reordered_input_picture[0]); |
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
2430 |
1138 | 2431 s->current_picture_ptr= pic; |
924 | 2432 }else{ |
1138 | 2433 // input is not a shared pix -> reuse buffer for current_pix |
2434 | |
2967 | 2435 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER |
924 | 2436 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); |
2967 | 2437 |
1138 | 2438 s->current_picture_ptr= s->reordered_input_picture[0]; |
924 | 2439 for(i=0; i<4; i++){ |
3068 | 2440 s->new_picture.data[i]+= INPLACE_OFFSET; |
924 | 2441 } |
903 | 2442 } |
1539
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
2443 copy_picture(&s->current_picture, s->current_picture_ptr); |
2967 | 2444 |
903 | 2445 s->picture_number= s->new_picture.display_picture_number; |
2446 //printf("dpn:%d\n", s->picture_number); | |
2447 }else{ | |
2448 memset(&s->new_picture, 0, sizeof(Picture)); | |
324 | 2449 } |
2450 } | |
2451 | |
0 | 2452 int MPV_encode_picture(AVCodecContext *avctx, |
2453 unsigned char *buf, int buf_size, void *data) | |
2454 { | |
2455 MpegEncContext *s = avctx->priv_data; | |
925 | 2456 AVFrame *pic_arg = data; |
1684 | 2457 int i, stuffing_count; |
0 | 2458 |
2442 | 2459 if(avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUVJ420P){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2460 av_log(avctx, AV_LOG_ERROR, "this codec supports only YUV420P\n"); |
1397 | 2461 return -1; |
2462 } | |
2967 | 2463 |
1799 | 2464 for(i=0; i<avctx->thread_count; i++){ |
1838 | 2465 int start_y= s->thread_context[i]->start_mb_y; |
2466 int end_y= s->thread_context[i]-> end_mb_y; | |
1799 | 2467 int h= s->mb_height; |
2807
3137aae854c9
Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de)
michael
parents:
2792
diff
changeset
|
2468 uint8_t *start= buf + (size_t)(((int64_t) buf_size)*start_y/h); |
3137aae854c9
Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de)
michael
parents:
2792
diff
changeset
|
2469 uint8_t *end = buf + (size_t)(((int64_t) buf_size)* end_y/h); |
1799 | 2470 |
2471 init_put_bits(&s->thread_context[i]->pb, start, end - start); | |
2472 } | |
0 | 2473 |
903 | 2474 s->picture_in_gop_number++; |
2475 | |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2476 if(load_input_picture(s, pic_arg) < 0) |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2477 return -1; |
2967 | 2478 |
903 | 2479 select_input_picture(s); |
2967 | 2480 |
324 | 2481 /* output? */ |
903 | 2482 if(s->new_picture.data[0]){ |
2483 s->pict_type= s->new_picture.pict_type; | |
2484 //emms_c(); | |
2485 //printf("qs:%f %f %d\n", s->new_picture.quality, s->current_picture.quality, s->qscale); | |
553 | 2486 MPV_frame_start(s, avctx); |
286 | 2487 |
324 | 2488 encode_picture(s, s->picture_number); |
2967 | 2489 |
376 | 2490 avctx->real_pict_num = s->picture_number; |
324 | 2491 avctx->header_bits = s->header_bits; |
2492 avctx->mv_bits = s->mv_bits; | |
2493 avctx->misc_bits = s->misc_bits; | |
2494 avctx->i_tex_bits = s->i_tex_bits; | |
2495 avctx->p_tex_bits = s->p_tex_bits; | |
2496 avctx->i_count = s->i_count; | |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
2497 avctx->p_count = s->mb_num - s->i_count - s->skip_count; //FIXME f/b_count in avctx |
324 | 2498 avctx->skip_count = s->skip_count; |
0 | 2499 |
324 | 2500 MPV_frame_end(s); |
2501 | |
2502 if (s->out_format == FMT_MJPEG) | |
2503 mjpeg_picture_trailer(s); | |
2967 | 2504 |
329 | 2505 if(s->flags&CODEC_FLAG_PASS1) |
2506 ff_write_pass1_stats(s); | |
1138 | 2507 |
2508 for(i=0; i<4; i++){ | |
2955 | 2509 s->current_picture_ptr->error[i]= s->current_picture.error[i]; |
1138 | 2510 avctx->error[i] += s->current_picture_ptr->error[i]; |
2511 } | |
1766 | 2512 |
2428
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
2513 if(s->flags&CODEC_FLAG_PASS1) |
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
2514 assert(avctx->header_bits + avctx->mv_bits + avctx->misc_bits + avctx->i_tex_bits + avctx->p_tex_bits == put_bits_count(&s->pb)); |
1684 | 2515 flush_put_bits(&s->pb); |
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
2516 s->frame_bits = put_bits_count(&s->pb); |
1766 | 2517 |
2518 stuffing_count= ff_vbv_update(s, s->frame_bits); | |
2519 if(stuffing_count){ | |
2422 | 2520 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < stuffing_count + 50){ |
2521 av_log(s->avctx, AV_LOG_ERROR, "stuffing too large\n"); | |
2522 return -1; | |
2523 } | |
2524 | |
1766 | 2525 switch(s->codec_id){ |
2526 case CODEC_ID_MPEG1VIDEO: | |
2527 case CODEC_ID_MPEG2VIDEO: | |
2528 while(stuffing_count--){ | |
2529 put_bits(&s->pb, 8, 0); | |
2530 } | |
2531 break; | |
2532 case CODEC_ID_MPEG4: | |
2533 put_bits(&s->pb, 16, 0); | |
2534 put_bits(&s->pb, 16, 0x1C3); | |
2535 stuffing_count -= 4; | |
2536 while(stuffing_count--){ | |
2537 put_bits(&s->pb, 8, 0xFF); | |
2538 } | |
2539 break; | |
2540 default: | |
2541 av_log(s->avctx, AV_LOG_ERROR, "vbv buffer overflow\n"); | |
2542 } | |
2543 flush_put_bits(&s->pb); | |
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
2544 s->frame_bits = put_bits_count(&s->pb); |
1766 | 2545 } |
2546 | |
2967 | 2547 /* update mpeg1/2 vbv_delay for CBR */ |
1907 | 2548 if(s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate && s->out_format == FMT_MPEG1 |
2549 && 90000LL * (avctx->rc_buffer_size-1) <= s->avctx->rc_max_rate*0xFFFFLL){ | |
1766 | 2550 int vbv_delay; |
2551 | |
2552 assert(s->repeat_first_field==0); | |
2967 | 2553 |
1766 | 2554 vbv_delay= lrintf(90000 * s->rc_context.buffer_index / s->avctx->rc_max_rate); |
2555 assert(vbv_delay < 0xFFFF); | |
2556 | |
2557 s->vbv_delay_ptr[0] &= 0xF8; | |
2558 s->vbv_delay_ptr[0] |= vbv_delay>>13; | |
2559 s->vbv_delay_ptr[1] = vbv_delay>>5; | |
2560 s->vbv_delay_ptr[2] &= 0x07; | |
2561 s->vbv_delay_ptr[2] |= vbv_delay<<3; | |
2562 } | |
2563 s->total_bits += s->frame_bits; | |
2564 avctx->frame_bits = s->frame_bits; | |
2565 }else{ | |
2566 assert((pbBufPtr(&s->pb) == s->pb.buf)); | |
2567 s->frame_bits=0; | |
1684 | 2568 } |
1766 | 2569 assert((s->frame_bits&7)==0); |
2967 | 2570 |
1684 | 2571 return s->frame_bits/8; |
0 | 2572 } |
2573 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
2574 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
2575 |
255 | 2576 static inline void gmc1_motion(MpegEncContext *s, |
1064 | 2577 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2578 uint8_t **ref_picture) |
255 | 2579 { |
1064 | 2580 uint8_t *ptr; |
556 | 2581 int offset, src_x, src_y, linesize, uvlinesize; |
255 | 2582 int motion_x, motion_y; |
566 | 2583 int emu=0; |
255 | 2584 |
2585 motion_x= s->sprite_offset[0][0]; | |
2586 motion_y= s->sprite_offset[0][1]; | |
2587 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
2588 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
2589 motion_x<<=(3-s->sprite_warping_accuracy); | |
2590 motion_y<<=(3-s->sprite_warping_accuracy); | |
2591 src_x = clip(src_x, -16, s->width); | |
2592 if (src_x == s->width) | |
2593 motion_x =0; | |
2594 src_y = clip(src_y, -16, s->height); | |
2595 if (src_y == s->height) | |
2596 motion_y =0; | |
753 | 2597 |
255 | 2598 linesize = s->linesize; |
556 | 2599 uvlinesize = s->uvlinesize; |
2967 | 2600 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2601 ptr = ref_picture[0] + (src_y * linesize) + src_x; |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2602 |
566 | 2603 if(s->flags&CODEC_FLAG_EMU_EDGE){ |
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
2604 if( (unsigned)src_x >= s->h_edge_pos - 17 |
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
2605 || (unsigned)src_y >= s->v_edge_pos - 17){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2606 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, linesize, 17, 17, src_x, src_y, s->h_edge_pos, s->v_edge_pos); |
566 | 2607 ptr= s->edge_emu_buffer; |
2608 } | |
2609 } | |
2967 | 2610 |
753 | 2611 if((motion_x|motion_y)&7){ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2612 s->dsp.gmc1(dest_y , ptr , linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2613 s->dsp.gmc1(dest_y+8, ptr+8, linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding); |
753 | 2614 }else{ |
2615 int dxy; | |
2967 | 2616 |
753 | 2617 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2); |
2618 if (s->no_rounding){ | |
2979 | 2619 s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16); |
753 | 2620 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2621 s->dsp.put_pixels_tab [0][dxy](dest_y, ptr, linesize, 16); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2622 } |
753 | 2623 } |
2967 | 2624 |
753 | 2625 if(s->flags&CODEC_FLAG_GRAY) return; |
255 | 2626 |
2627 motion_x= s->sprite_offset[1][0]; | |
2628 motion_y= s->sprite_offset[1][1]; | |
2629 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
2630 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
2631 motion_x<<=(3-s->sprite_warping_accuracy); | |
2632 motion_y<<=(3-s->sprite_warping_accuracy); | |
2633 src_x = clip(src_x, -8, s->width>>1); | |
2634 if (src_x == s->width>>1) | |
2635 motion_x =0; | |
2636 src_y = clip(src_y, -8, s->height>>1); | |
2637 if (src_y == s->height>>1) | |
2638 motion_y =0; | |
2639 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2640 offset = (src_y * uvlinesize) + src_x; |
255 | 2641 ptr = ref_picture[1] + offset; |
1002 | 2642 if(s->flags&CODEC_FLAG_EMU_EDGE){ |
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
2643 if( (unsigned)src_x >= (s->h_edge_pos>>1) - 9 |
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
2644 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2645 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); |
1002 | 2646 ptr= s->edge_emu_buffer; |
2647 emu=1; | |
2648 } | |
566 | 2649 } |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2650 s->dsp.gmc1(dest_cb, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
2967 | 2651 |
255 | 2652 ptr = ref_picture[2] + offset; |
566 | 2653 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2654 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); |
566 | 2655 ptr= s->edge_emu_buffer; |
2656 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2657 s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
2967 | 2658 |
255 | 2659 return; |
2660 } | |
2661 | |
753 | 2662 static inline void gmc_motion(MpegEncContext *s, |
1064 | 2663 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2664 uint8_t **ref_picture) |
753 | 2665 { |
1064 | 2666 uint8_t *ptr; |
753 | 2667 int linesize, uvlinesize; |
2668 const int a= s->sprite_warping_accuracy; | |
2669 int ox, oy; | |
2670 | |
2671 linesize = s->linesize; | |
2672 uvlinesize = s->uvlinesize; | |
2673 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2674 ptr = ref_picture[0]; |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2675 |
753 | 2676 ox= s->sprite_offset[0][0] + s->sprite_delta[0][0]*s->mb_x*16 + s->sprite_delta[0][1]*s->mb_y*16; |
2677 oy= s->sprite_offset[0][1] + s->sprite_delta[1][0]*s->mb_x*16 + s->sprite_delta[1][1]*s->mb_y*16; | |
2678 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2679 s->dsp.gmc(dest_y, ptr, linesize, 16, |
2967 | 2680 ox, |
2681 oy, | |
753 | 2682 s->sprite_delta[0][0], s->sprite_delta[0][1], |
2967 | 2683 s->sprite_delta[1][0], s->sprite_delta[1][1], |
753 | 2684 a+1, (1<<(2*a+1)) - s->no_rounding, |
2685 s->h_edge_pos, s->v_edge_pos); | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2686 s->dsp.gmc(dest_y+8, ptr, linesize, 16, |
2967 | 2687 ox + s->sprite_delta[0][0]*8, |
2688 oy + s->sprite_delta[1][0]*8, | |
753 | 2689 s->sprite_delta[0][0], s->sprite_delta[0][1], |
2967 | 2690 s->sprite_delta[1][0], s->sprite_delta[1][1], |
753 | 2691 a+1, (1<<(2*a+1)) - s->no_rounding, |
2692 s->h_edge_pos, s->v_edge_pos); | |
2693 | |
2694 if(s->flags&CODEC_FLAG_GRAY) return; | |
2695 | |
2696 ox= s->sprite_offset[1][0] + s->sprite_delta[0][0]*s->mb_x*8 + s->sprite_delta[0][1]*s->mb_y*8; | |
2697 oy= s->sprite_offset[1][1] + s->sprite_delta[1][0]*s->mb_x*8 + s->sprite_delta[1][1]*s->mb_y*8; | |
2698 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2699 ptr = ref_picture[1]; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2700 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8, |
2967 | 2701 ox, |
2702 oy, | |
753 | 2703 s->sprite_delta[0][0], s->sprite_delta[0][1], |
2967 | 2704 s->sprite_delta[1][0], s->sprite_delta[1][1], |
753 | 2705 a+1, (1<<(2*a+1)) - s->no_rounding, |
2706 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2967 | 2707 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2708 ptr = ref_picture[2]; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2709 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8, |
2967 | 2710 ox, |
2711 oy, | |
753 | 2712 s->sprite_delta[0][0], s->sprite_delta[0][1], |
2967 | 2713 s->sprite_delta[1][0], s->sprite_delta[1][1], |
753 | 2714 a+1, (1<<(2*a+1)) - s->no_rounding, |
2715 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2716 } | |
2717 | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2718 /** |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2719 * Copies a rectangular area of samples to a temporary buffer and replicates the boarder samples. |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2720 * @param buf destination buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2721 * @param src source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2722 * @param linesize number of bytes between 2 vertically adjacent samples in both the source and destination buffers |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2723 * @param block_w width of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2724 * @param block_h height of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2725 * @param src_x x coordinate of the top left sample of the block in the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2726 * @param src_y y coordinate of the top left sample of the block in the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2727 * @param w width of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2728 * @param h height of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2729 */ |
2967 | 2730 void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h, |
553 | 2731 int src_x, int src_y, int w, int h){ |
2732 int x, y; | |
2733 int start_y, start_x, end_y, end_x; | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2734 |
553 | 2735 if(src_y>= h){ |
2736 src+= (h-1-src_y)*linesize; | |
2737 src_y=h-1; | |
554 | 2738 }else if(src_y<=-block_h){ |
2739 src+= (1-block_h-src_y)*linesize; | |
2740 src_y=1-block_h; | |
553 | 2741 } |
2742 if(src_x>= w){ | |
2743 src+= (w-1-src_x); | |
2744 src_x=w-1; | |
554 | 2745 }else if(src_x<=-block_w){ |
2746 src+= (1-block_w-src_x); | |
2747 src_x=1-block_w; | |
553 | 2748 } |
2749 | |
847 | 2750 start_y= FFMAX(0, -src_y); |
2751 start_x= FFMAX(0, -src_x); | |
2752 end_y= FFMIN(block_h, h-src_y); | |
2753 end_x= FFMIN(block_w, w-src_x); | |
566 | 2754 |
553 | 2755 // copy existing part |
2756 for(y=start_y; y<end_y; y++){ | |
2757 for(x=start_x; x<end_x; x++){ | |
2758 buf[x + y*linesize]= src[x + y*linesize]; | |
2759 } | |
2760 } | |
2761 | |
2762 //top | |
2763 for(y=0; y<start_y; y++){ | |
2764 for(x=start_x; x<end_x; x++){ | |
2765 buf[x + y*linesize]= buf[x + start_y*linesize]; | |
2766 } | |
2767 } | |
2768 | |
2769 //bottom | |
2770 for(y=end_y; y<block_h; y++){ | |
2771 for(x=start_x; x<end_x; x++){ | |
2772 buf[x + y*linesize]= buf[x + (end_y-1)*linesize]; | |
2773 } | |
2774 } | |
2967 | 2775 |
553 | 2776 for(y=0; y<block_h; y++){ |
2777 //left | |
2778 for(x=0; x<start_x; x++){ | |
2779 buf[x + y*linesize]= buf[start_x + y*linesize]; | |
2780 } | |
2967 | 2781 |
553 | 2782 //right |
2783 for(x=end_x; x<block_w; x++){ | |
2784 buf[x + y*linesize]= buf[end_x - 1 + y*linesize]; | |
2785 } | |
2786 } | |
2787 } | |
2788 | |
2967 | 2789 static inline int hpel_motion(MpegEncContext *s, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2790 uint8_t *dest, uint8_t *src, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2791 int field_based, int field_select, |
1633 | 2792 int src_x, int src_y, |
2793 int width, int height, int stride, | |
2794 int h_edge_pos, int v_edge_pos, | |
2795 int w, int h, op_pixels_func *pix_op, | |
2796 int motion_x, int motion_y) | |
2797 { | |
2798 int dxy; | |
2799 int emu=0; | |
2800 | |
2801 dxy = ((motion_y & 1) << 1) | (motion_x & 1); | |
2802 src_x += motion_x >> 1; | |
2803 src_y += motion_y >> 1; | |
2967 | 2804 |
1633 | 2805 /* WARNING: do no forget half pels */ |
2806 src_x = clip(src_x, -16, width); //FIXME unneeded for emu? | |
2807 if (src_x == width) | |
2808 dxy &= ~1; | |
2809 src_y = clip(src_y, -16, height); | |
2810 if (src_y == height) | |
2811 dxy &= ~2; | |
2812 src += src_y * stride + src_x; | |
2813 | |
2814 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){ | |
2815 if( (unsigned)src_x > h_edge_pos - (motion_x&1) - w | |
2816 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2817 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2818 src_x, src_y<<field_based, h_edge_pos, s->v_edge_pos); |
1633 | 2819 src= s->edge_emu_buffer; |
2820 emu=1; | |
2821 } | |
2822 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2823 if(field_select) |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2824 src += s->linesize; |
1633 | 2825 pix_op[dxy](dest, src, stride, h); |
2826 return emu; | |
2827 } | |
553 | 2828 |
2967 | 2829 static inline int hpel_motion_lowres(MpegEncContext *s, |
2292 | 2830 uint8_t *dest, uint8_t *src, |
2831 int field_based, int field_select, | |
2832 int src_x, int src_y, | |
2833 int width, int height, int stride, | |
2834 int h_edge_pos, int v_edge_pos, | |
2835 int w, int h, h264_chroma_mc_func *pix_op, | |
2836 int motion_x, int motion_y) | |
2837 { | |
2838 const int lowres= s->avctx->lowres; | |
2839 const int s_mask= (2<<lowres)-1; | |
2840 int emu=0; | |
2841 int sx, sy; | |
2842 | |
2843 if(s->quarter_sample){ | |
2844 motion_x/=2; | |
2845 motion_y/=2; | |
2846 } | |
2847 | |
2848 sx= motion_x & s_mask; | |
2849 sy= motion_y & s_mask; | |
2850 src_x += motion_x >> (lowres+1); | |
2851 src_y += motion_y >> (lowres+1); | |
2967 | 2852 |
2292 | 2853 src += src_y * stride + src_x; |
2854 | |
2855 if( (unsigned)src_x > h_edge_pos - (!!sx) - w | |
2856 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
2857 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based, | |
2858 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
2859 src= s->edge_emu_buffer; | |
2860 emu=1; | |
2861 } | |
2862 | |
2863 sx <<= 2 - lowres; | |
2864 sy <<= 2 - lowres; | |
2865 if(field_select) | |
2866 src += s->linesize; | |
2867 pix_op[lowres](dest, src, stride, h, sx, sy); | |
2868 return emu; | |
2869 } | |
2870 | |
0 | 2871 /* apply one mpeg motion vector to the three components */ |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2872 static always_inline void mpeg_motion(MpegEncContext *s, |
1064 | 2873 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2874 int field_based, int bottom_field, int field_select, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2875 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
0 | 2876 int motion_x, int motion_y, int h) |
2877 { | |
1846 | 2878 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
2879 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize; | |
2967 | 2880 |
2881 #if 0 | |
255 | 2882 if(s->quarter_sample) |
2883 { | |
2884 motion_x>>=1; | |
2885 motion_y>>=1; | |
2886 } | |
651 | 2887 #endif |
1633 | 2888 |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
2889 v_edge_pos = s->v_edge_pos >> field_based; |
1846 | 2890 linesize = s->current_picture.linesize[0] << field_based; |
1138 | 2891 uvlinesize = s->current_picture.linesize[1] << field_based; |
1633 | 2892 |
1846 | 2893 dxy = ((motion_y & 1) << 1) | (motion_x & 1); |
2894 src_x = s->mb_x* 16 + (motion_x >> 1); | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2895 src_y =(s->mb_y<<(4-field_based)) + (motion_y >> 1); |
485 | 2896 |
0 | 2897 if (s->out_format == FMT_H263) { |
1916 | 2898 if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){ |
2899 mx = (motion_x>>1)|(motion_x&1); | |
2900 my = motion_y >>1; | |
2901 uvdxy = ((my & 1) << 1) | (mx & 1); | |
2902 uvsrc_x = s->mb_x* 8 + (mx >> 1); | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2903 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1); |
1916 | 2904 }else{ |
2905 uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1); | |
2906 uvsrc_x = src_x>>1; | |
2907 uvsrc_y = src_y>>1; | |
2908 } | |
2044
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2909 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261 |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2910 mx = motion_x / 4; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2911 my = motion_y / 4; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2912 uvdxy = 0; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2913 uvsrc_x = s->mb_x*8 + mx; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2914 uvsrc_y = s->mb_y*8 + my; |
0 | 2915 } else { |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2916 if(s->chroma_y_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2917 mx = motion_x / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2918 my = motion_y / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2919 uvdxy = ((my & 1) << 1) | (mx & 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2920 uvsrc_x = s->mb_x* 8 + (mx >> 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2921 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2922 } else { |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2923 if(s->chroma_x_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2924 //Chroma422 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2925 mx = motion_x / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2926 uvdxy = ((motion_y & 1) << 1) | (mx & 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2927 uvsrc_x = s->mb_x* 8 + (mx >> 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2928 uvsrc_y = src_y; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2929 } else { |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2930 //Chroma444 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2931 uvdxy = dxy; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2932 uvsrc_x = src_x; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2933 uvsrc_y = src_y; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2934 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2935 } |
1846 | 2936 } |
2937 | |
2938 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2939 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2940 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2941 | |
2942 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16 | |
2943 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2944 if(s->codec_id == CODEC_ID_MPEG2VIDEO || |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2945 s->codec_id == CODEC_ID_MPEG1VIDEO){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2946 av_log(s->avctx,AV_LOG_DEBUG,"MPEG motion vector out of boundary\n"); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2947 return ; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2948 } |
1846 | 2949 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, |
2950 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); | |
2951 ptr_y = s->edge_emu_buffer; | |
2952 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1874 | 2953 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; |
2967 | 2954 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, |
1846 | 2955 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
2967 | 2956 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, |
1846 | 2957 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
2958 ptr_cb= uvbuf; | |
2959 ptr_cr= uvbuf+16; | |
2960 } | |
2961 } | |
2962 | |
2963 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data | |
2964 dest_y += s->linesize; | |
2965 dest_cb+= s->uvlinesize; | |
2966 dest_cr+= s->uvlinesize; | |
2967 } | |
2968 | |
2969 if(field_select){ | |
2970 ptr_y += s->linesize; | |
2971 ptr_cb+= s->uvlinesize; | |
2972 ptr_cr+= s->uvlinesize; | |
2973 } | |
2974 | |
2975 pix_op[0][dxy](dest_y, ptr_y, linesize, h); | |
2967 | 2976 |
1846 | 2977 if(!(s->flags&CODEC_FLAG_GRAY)){ |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2978 pix_op[s->chroma_x_shift][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2979 pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift); |
1846 | 2980 } |
2639 | 2981 #if defined(CONFIG_H261_ENCODER) || defined(CONFIG_H261_DECODER) |
2291 | 2982 if(s->out_format == FMT_H261){ |
2983 ff_h261_loop_filter(s); | |
2984 } | |
2639 | 2985 #endif |
0 | 2986 } |
2256 | 2987 |
2988 /* apply one mpeg motion vector to the three components */ | |
2989 static always_inline void mpeg_motion_lowres(MpegEncContext *s, | |
2990 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2991 int field_based, int bottom_field, int field_select, | |
2992 uint8_t **ref_picture, h264_chroma_mc_func *pix_op, | |
2993 int motion_x, int motion_y, int h) | |
2994 { | |
2995 uint8_t *ptr_y, *ptr_cb, *ptr_cr; | |
2996 int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, uvlinesize, linesize, sx, sy, uvsx, uvsy; | |
2997 const int lowres= s->avctx->lowres; | |
2998 const int block_s= 8>>lowres; | |
2999 const int s_mask= (2<<lowres)-1; | |
3000 const int h_edge_pos = s->h_edge_pos >> lowres; | |
3001 const int v_edge_pos = s->v_edge_pos >> lowres; | |
3002 linesize = s->current_picture.linesize[0] << field_based; | |
3003 uvlinesize = s->current_picture.linesize[1] << field_based; | |
3004 | |
2260 | 3005 if(s->quarter_sample){ //FIXME obviously not perfect but qpel wont work in lowres anyway |
3006 motion_x/=2; | |
3007 motion_y/=2; | |
3008 } | |
2967 | 3009 |
2260 | 3010 if(field_based){ |
3011 motion_y += (bottom_field - field_select)*((1<<lowres)-1); | |
3012 } | |
3013 | |
2256 | 3014 sx= motion_x & s_mask; |
3015 sy= motion_y & s_mask; | |
3016 src_x = s->mb_x*2*block_s + (motion_x >> (lowres+1)); | |
2260 | 3017 src_y =(s->mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1)); |
2967 | 3018 |
2256 | 3019 if (s->out_format == FMT_H263) { |
2265 | 3020 uvsx = ((motion_x>>1) & s_mask) | (sx&1); |
3021 uvsy = ((motion_y>>1) & s_mask) | (sy&1); | |
2256 | 3022 uvsrc_x = src_x>>1; |
3023 uvsrc_y = src_y>>1; | |
3024 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261 | |
3025 mx = motion_x / 4; | |
3026 my = motion_y / 4; | |
3027 uvsx = (2*mx) & s_mask; | |
3028 uvsy = (2*my) & s_mask; | |
3029 uvsrc_x = s->mb_x*block_s + (mx >> lowres); | |
3030 uvsrc_y = s->mb_y*block_s + (my >> lowres); | |
3031 } else { | |
3032 mx = motion_x / 2; | |
3033 my = motion_y / 2; | |
3034 uvsx = mx & s_mask; | |
3035 uvsy = my & s_mask; | |
3036 uvsrc_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
2260 | 3037 uvsrc_y =(s->mb_y*block_s>>field_based) + (my >> (lowres+1)); |
2256 | 3038 } |
3039 | |
3040 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
3041 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
3042 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
3043 | |
3044 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s | |
3045 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
3046 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, | |
3047 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
3048 ptr_y = s->edge_emu_buffer; | |
3049 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
3050 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; | |
2967 | 3051 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, |
2256 | 3052 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); |
2967 | 3053 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, |
2256 | 3054 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); |
3055 ptr_cb= uvbuf; | |
3056 ptr_cr= uvbuf+16; | |
3057 } | |
3058 } | |
3059 | |
2260 | 3060 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data |
3061 dest_y += s->linesize; | |
3062 dest_cb+= s->uvlinesize; | |
3063 dest_cr+= s->uvlinesize; | |
3064 } | |
3065 | |
3066 if(field_select){ | |
3067 ptr_y += s->linesize; | |
3068 ptr_cb+= s->uvlinesize; | |
3069 ptr_cr+= s->uvlinesize; | |
3070 } | |
3071 | |
2256 | 3072 sx <<= 2 - lowres; |
3073 sy <<= 2 - lowres; | |
3074 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy); | |
2967 | 3075 |
2256 | 3076 if(!(s->flags&CODEC_FLAG_GRAY)){ |
3077 uvsx <<= 2 - lowres; | |
3078 uvsy <<= 2 - lowres; | |
3079 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
3080 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
3081 } | |
2291 | 3082 //FIXME h261 lowres loop filter |
2256 | 3083 } |
3084 | |
1633 | 3085 //FIXME move to dsputil, avg variant, 16x16 version |
3086 static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride){ | |
3087 int x; | |
3088 uint8_t * const top = src[1]; | |
3089 uint8_t * const left = src[2]; | |
3090 uint8_t * const mid = src[0]; | |
3091 uint8_t * const right = src[3]; | |
3092 uint8_t * const bottom= src[4]; | |
3093 #define OBMC_FILTER(x, t, l, m, r, b)\ | |
3094 dst[x]= (t*top[x] + l*left[x] + m*mid[x] + r*right[x] + b*bottom[x] + 4)>>3 | |
3095 #define OBMC_FILTER4(x, t, l, m, r, b)\ | |
3096 OBMC_FILTER(x , t, l, m, r, b);\ | |
3097 OBMC_FILTER(x+1 , t, l, m, r, b);\ | |
3098 OBMC_FILTER(x +stride, t, l, m, r, b);\ | |
3099 OBMC_FILTER(x+1+stride, t, l, m, r, b); | |
2967 | 3100 |
1633 | 3101 x=0; |
3102 OBMC_FILTER (x , 2, 2, 4, 0, 0); | |
3103 OBMC_FILTER (x+1, 2, 1, 5, 0, 0); | |
3104 OBMC_FILTER4(x+2, 2, 1, 5, 0, 0); | |
3105 OBMC_FILTER4(x+4, 2, 0, 5, 1, 0); | |
3106 OBMC_FILTER (x+6, 2, 0, 5, 1, 0); | |
3107 OBMC_FILTER (x+7, 2, 0, 4, 2, 0); | |
3108 x+= stride; | |
3109 OBMC_FILTER (x , 1, 2, 5, 0, 0); | |
3110 OBMC_FILTER (x+1, 1, 2, 5, 0, 0); | |
3111 OBMC_FILTER (x+6, 1, 0, 5, 2, 0); | |
3112 OBMC_FILTER (x+7, 1, 0, 5, 2, 0); | |
3113 x+= stride; | |
3114 OBMC_FILTER4(x , 1, 2, 5, 0, 0); | |
3115 OBMC_FILTER4(x+2, 1, 1, 6, 0, 0); | |
3116 OBMC_FILTER4(x+4, 1, 0, 6, 1, 0); | |
3117 OBMC_FILTER4(x+6, 1, 0, 5, 2, 0); | |
3118 x+= 2*stride; | |
3119 OBMC_FILTER4(x , 0, 2, 5, 0, 1); | |
3120 OBMC_FILTER4(x+2, 0, 1, 6, 0, 1); | |
3121 OBMC_FILTER4(x+4, 0, 0, 6, 1, 1); | |
3122 OBMC_FILTER4(x+6, 0, 0, 5, 2, 1); | |
3123 x+= 2*stride; | |
3124 OBMC_FILTER (x , 0, 2, 5, 0, 1); | |
3125 OBMC_FILTER (x+1, 0, 2, 5, 0, 1); | |
3126 OBMC_FILTER4(x+2, 0, 1, 5, 0, 2); | |
3127 OBMC_FILTER4(x+4, 0, 0, 5, 1, 2); | |
3128 OBMC_FILTER (x+6, 0, 0, 5, 2, 1); | |
3129 OBMC_FILTER (x+7, 0, 0, 5, 2, 1); | |
3130 x+= stride; | |
3131 OBMC_FILTER (x , 0, 2, 4, 0, 2); | |
3132 OBMC_FILTER (x+1, 0, 1, 5, 0, 2); | |
3133 OBMC_FILTER (x+6, 0, 0, 5, 1, 2); | |
3134 OBMC_FILTER (x+7, 0, 0, 4, 2, 2); | |
3135 } | |
3136 | |
3137 /* obmc for 1 8x8 luma block */ | |
3138 static inline void obmc_motion(MpegEncContext *s, | |
3139 uint8_t *dest, uint8_t *src, | |
3140 int src_x, int src_y, | |
3141 op_pixels_func *pix_op, | |
3142 int16_t mv[5][2]/* mid top left right bottom*/) | |
3143 #define MID 0 | |
3144 { | |
3145 int i; | |
3146 uint8_t *ptr[5]; | |
2967 | 3147 |
1633 | 3148 assert(s->quarter_sample==0); |
2967 | 3149 |
1633 | 3150 for(i=0; i<5; i++){ |
3151 if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){ | |
3152 ptr[i]= ptr[MID]; | |
3153 }else{ | |
1799 | 3154 ptr[i]= s->obmc_scratchpad + 8*(i&1) + s->linesize*8*(i>>1); |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3155 hpel_motion(s, ptr[i], src, 0, 0, |
1633 | 3156 src_x, src_y, |
3157 s->width, s->height, s->linesize, | |
3158 s->h_edge_pos, s->v_edge_pos, | |
3159 8, 8, pix_op, | |
3160 mv[i][0], mv[i][1]); | |
3161 } | |
3162 } | |
3163 | |
2967 | 3164 put_obmc(dest, ptr, s->linesize); |
1633 | 3165 } |
0 | 3166 |
255 | 3167 static inline void qpel_motion(MpegEncContext *s, |
1064 | 3168 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3169 int field_based, int bottom_field, int field_select, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3170 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
651 | 3171 qpel_mc_func (*qpix_op)[16], |
255 | 3172 int motion_x, int motion_y, int h) |
3173 { | |
1846 | 3174 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
3175 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, linesize, uvlinesize; | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3176 |
255 | 3177 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
1846 | 3178 src_x = s->mb_x * 16 + (motion_x >> 2); |
255 | 3179 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2); |
3180 | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
3181 v_edge_pos = s->v_edge_pos >> field_based; |
255 | 3182 linesize = s->linesize << field_based; |
671 | 3183 uvlinesize = s->uvlinesize << field_based; |
2967 | 3184 |
671 | 3185 if(field_based){ |
3186 mx= motion_x/2; | |
3187 my= motion_y>>1; | |
1048 | 3188 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){ |
3189 static const int rtab[8]= {0,0,1,1,0,0,0,1}; | |
3190 mx= (motion_x>>1) + rtab[motion_x&7]; | |
3191 my= (motion_y>>1) + rtab[motion_y&7]; | |
760 | 3192 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){ |
671 | 3193 mx= (motion_x>>1)|(motion_x&1); |
3194 my= (motion_y>>1)|(motion_y&1); | |
3195 }else{ | |
3196 mx= motion_x/2; | |
3197 my= motion_y/2; | |
3198 } | |
3199 mx= (mx>>1)|(mx&1); | |
3200 my= (my>>1)|(my&1); | |
1048 | 3201 |
1846 | 3202 uvdxy= (mx&1) | ((my&1)<<1); |
671 | 3203 mx>>=1; |
3204 my>>=1; | |
255 | 3205 |
1846 | 3206 uvsrc_x = s->mb_x * 8 + mx; |
3207 uvsrc_y = s->mb_y * (8 >> field_based) + my; | |
3208 | |
3209 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
3210 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
3211 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
3212 | |
2967 | 3213 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16 |
1846 | 3214 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){ |
2967 | 3215 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, |
1846 | 3216 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); |
3217 ptr_y= s->edge_emu_buffer; | |
3218 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1874 | 3219 uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize; |
2967 | 3220 ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based, |
1846 | 3221 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
2967 | 3222 ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based, |
1846 | 3223 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
3224 ptr_cb= uvbuf; | |
3225 ptr_cr= uvbuf + 16; | |
3226 } | |
3227 } | |
3228 | |
3229 if(!field_based) | |
3230 qpix_op[0][dxy](dest_y, ptr_y, linesize); | |
3231 else{ | |
3232 if(bottom_field){ | |
3233 dest_y += s->linesize; | |
3234 dest_cb+= s->uvlinesize; | |
3235 dest_cr+= s->uvlinesize; | |
3236 } | |
3237 | |
3238 if(field_select){ | |
3239 ptr_y += s->linesize; | |
3240 ptr_cb += s->uvlinesize; | |
3241 ptr_cr += s->uvlinesize; | |
3242 } | |
3243 //damn interlaced mode | |
3244 //FIXME boundary mirroring is not exactly correct here | |
3245 qpix_op[1][dxy](dest_y , ptr_y , linesize); | |
3246 qpix_op[1][dxy](dest_y+8, ptr_y+8, linesize); | |
3247 } | |
3248 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
3249 pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1); | |
3250 pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1); | |
3251 } | |
255 | 3252 } |
3253 | |
1013 | 3254 inline int ff_h263_round_chroma(int x){ |
3255 if (x >= 0) | |
3256 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
3257 else { | |
3258 x = -x; | |
3259 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
3260 } | |
3261 } | |
255 | 3262 |
1225 | 3263 /** |
1633 | 3264 * h263 chorma 4mv motion compensation. |
3265 */ | |
3266 static inline void chroma_4mv_motion(MpegEncContext *s, | |
3267 uint8_t *dest_cb, uint8_t *dest_cr, | |
3268 uint8_t **ref_picture, | |
3269 op_pixels_func *pix_op, | |
3270 int mx, int my){ | |
3271 int dxy, emu=0, src_x, src_y, offset; | |
3272 uint8_t *ptr; | |
2967 | 3273 |
1633 | 3274 /* In case of 8X8, we construct a single chroma motion vector |
3275 with a special rounding */ | |
3276 mx= ff_h263_round_chroma(mx); | |
3277 my= ff_h263_round_chroma(my); | |
2967 | 3278 |
1633 | 3279 dxy = ((my & 1) << 1) | (mx & 1); |
3280 mx >>= 1; | |
3281 my >>= 1; | |
3282 | |
3283 src_x = s->mb_x * 8 + mx; | |
3284 src_y = s->mb_y * 8 + my; | |
3285 src_x = clip(src_x, -8, s->width/2); | |
3286 if (src_x == s->width/2) | |
3287 dxy &= ~1; | |
3288 src_y = clip(src_y, -8, s->height/2); | |
3289 if (src_y == s->height/2) | |
3290 dxy &= ~2; | |
2967 | 3291 |
1633 | 3292 offset = (src_y * (s->uvlinesize)) + src_x; |
3293 ptr = ref_picture[1] + offset; | |
3294 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
3295 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8 | |
3296 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){ | |
3297 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
3298 ptr= s->edge_emu_buffer; | |
3299 emu=1; | |
3300 } | |
3301 } | |
3302 pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8); | |
3303 | |
3304 ptr = ref_picture[2] + offset; | |
3305 if(emu){ | |
3306 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
3307 ptr= s->edge_emu_buffer; | |
3308 } | |
3309 pix_op[dxy](dest_cr, ptr, s->uvlinesize, 8); | |
3310 } | |
3311 | |
2292 | 3312 static inline void chroma_4mv_motion_lowres(MpegEncContext *s, |
3313 uint8_t *dest_cb, uint8_t *dest_cr, | |
3314 uint8_t **ref_picture, | |
3315 h264_chroma_mc_func *pix_op, | |
3316 int mx, int my){ | |
3317 const int lowres= s->avctx->lowres; | |
3318 const int block_s= 8>>lowres; | |
3319 const int s_mask= (2<<lowres)-1; | |
3320 const int h_edge_pos = s->h_edge_pos >> (lowres+1); | |
3321 const int v_edge_pos = s->v_edge_pos >> (lowres+1); | |
3322 int emu=0, src_x, src_y, offset, sx, sy; | |
3323 uint8_t *ptr; | |
2967 | 3324 |
2292 | 3325 if(s->quarter_sample){ |
3326 mx/=2; | |
3327 my/=2; | |
3328 } | |
3329 | |
3330 /* In case of 8X8, we construct a single chroma motion vector | |
3331 with a special rounding */ | |
3332 mx= ff_h263_round_chroma(mx); | |
3333 my= ff_h263_round_chroma(my); | |
2967 | 3334 |
2292 | 3335 sx= mx & s_mask; |
3336 sy= my & s_mask; | |
3337 src_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
3338 src_y = s->mb_y*block_s + (my >> (lowres+1)); | |
2967 | 3339 |
2292 | 3340 offset = src_y * s->uvlinesize + src_x; |
3341 ptr = ref_picture[1] + offset; | |
3342 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
3343 if( (unsigned)src_x > h_edge_pos - (!!sx) - block_s | |
3344 || (unsigned)src_y > v_edge_pos - (!!sy) - block_s){ | |
3345 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
3346 ptr= s->edge_emu_buffer; | |
3347 emu=1; | |
3348 } | |
2967 | 3349 } |
2292 | 3350 sx <<= 2 - lowres; |
3351 sy <<= 2 - lowres; | |
3352 pix_op[lowres](dest_cb, ptr, s->uvlinesize, block_s, sx, sy); | |
2967 | 3353 |
2292 | 3354 ptr = ref_picture[2] + offset; |
3355 if(emu){ | |
3356 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
3357 ptr= s->edge_emu_buffer; | |
3358 } | |
3359 pix_op[lowres](dest_cr, ptr, s->uvlinesize, block_s, sx, sy); | |
3360 } | |
3361 | |
3216
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3362 static inline void prefetch_motion(MpegEncContext *s, uint8_t **pix, int dir){ |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3363 /* fetch pixels for estimated mv 4 macroblocks ahead |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3364 * optimized for 64byte cache lines */ |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3365 const int shift = s->quarter_sample ? 2 : 1; |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3366 const int mx= (s->mv[dir][0][0]>>shift) + 16*s->mb_x + 8; |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3367 const int my= (s->mv[dir][0][1]>>shift) + 16*s->mb_y; |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3368 int off= mx + (my + (s->mb_x&3)*4)*s->linesize + 64; |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3369 s->dsp.prefetch(pix[0]+off, s->linesize, 4); |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3370 off= (mx>>1) + ((my>>1) + (s->mb_x&7))*s->uvlinesize + 64; |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3371 s->dsp.prefetch(pix[1]+off, pix[2]-pix[1], 2); |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3372 } |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3373 |
1633 | 3374 /** |
2764 | 3375 * motion compensation of a single macroblock |
1225 | 3376 * @param s context |
3377 * @param dest_y luma destination pointer | |
3378 * @param dest_cb chroma cb/u destination pointer | |
3379 * @param dest_cr chroma cr/v destination pointer | |
3380 * @param dir direction (0->forward, 1->backward) | |
3381 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
3382 * @param pic_op halfpel motion compensation function (average or put normally) | |
3383 * @param pic_op qpel motion compensation function (average or put normally) | |
3384 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
3385 */ | |
2967 | 3386 static inline void MPV_motion(MpegEncContext *s, |
1064 | 3387 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
2967 | 3388 int dir, uint8_t **ref_picture, |
651 | 3389 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]) |
0 | 3390 { |
1633 | 3391 int dxy, mx, my, src_x, src_y, motion_x, motion_y; |
0 | 3392 int mb_x, mb_y, i; |
1064 | 3393 uint8_t *ptr, *dest; |
0 | 3394 |
3395 mb_x = s->mb_x; | |
3396 mb_y = s->mb_y; | |
3397 | |
3216
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3398 prefetch_motion(s, ref_picture, dir); |
4186eb8d29a1
prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp).
lorenm
parents:
3145
diff
changeset
|
3399 |
1655 | 3400 if(s->obmc && s->pict_type != B_TYPE){ |
1633 | 3401 int16_t mv_cache[4][4][2]; |
3402 const int xy= s->mb_x + s->mb_y*s->mb_stride; | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3403 const int mot_stride= s->b8_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3404 const int mot_xy= mb_x*2 + mb_y*2*mot_stride; |
1633 | 3405 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
3406 assert(!s->mb_skipped); |
2967 | 3407 |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3408 memcpy(mv_cache[1][1], s->current_picture.motion_val[0][mot_xy ], sizeof(int16_t)*4); |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3409 memcpy(mv_cache[2][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4); |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3410 memcpy(mv_cache[3][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4); |
1633 | 3411 |
3412 if(mb_y==0 || IS_INTRA(s->current_picture.mb_type[xy-s->mb_stride])){ | |
3413 memcpy(mv_cache[0][1], mv_cache[1][1], sizeof(int16_t)*4); | |
3414 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3415 memcpy(mv_cache[0][1], s->current_picture.motion_val[0][mot_xy-mot_stride], sizeof(int16_t)*4); |
1633 | 3416 } |
3417 | |
3418 if(mb_x==0 || IS_INTRA(s->current_picture.mb_type[xy-1])){ | |
3419 *(int32_t*)mv_cache[1][0]= *(int32_t*)mv_cache[1][1]; | |
3420 *(int32_t*)mv_cache[2][0]= *(int32_t*)mv_cache[2][1]; | |
3421 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3422 *(int32_t*)mv_cache[1][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3423 *(int32_t*)mv_cache[2][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1+mot_stride]; |
1633 | 3424 } |
3425 | |
3426 if(mb_x+1>=s->mb_width || IS_INTRA(s->current_picture.mb_type[xy+1])){ | |
3427 *(int32_t*)mv_cache[1][3]= *(int32_t*)mv_cache[1][2]; | |
3428 *(int32_t*)mv_cache[2][3]= *(int32_t*)mv_cache[2][2]; | |
3429 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3430 *(int32_t*)mv_cache[1][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3431 *(int32_t*)mv_cache[2][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2+mot_stride]; |
1633 | 3432 } |
2967 | 3433 |
1633 | 3434 mx = 0; |
3435 my = 0; | |
3436 for(i=0;i<4;i++) { | |
3437 const int x= (i&1)+1; | |
3438 const int y= (i>>1)+1; | |
3439 int16_t mv[5][2]= { | |
3440 {mv_cache[y][x ][0], mv_cache[y][x ][1]}, | |
3441 {mv_cache[y-1][x][0], mv_cache[y-1][x][1]}, | |
3442 {mv_cache[y][x-1][0], mv_cache[y][x-1][1]}, | |
3443 {mv_cache[y][x+1][0], mv_cache[y][x+1][1]}, | |
3444 {mv_cache[y+1][x][0], mv_cache[y+1][x][1]}}; | |
3445 //FIXME cleanup | |
3446 obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize, | |
3447 ref_picture[0], | |
3448 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, | |
3449 pix_op[1], | |
3450 mv); | |
3451 | |
3452 mx += mv[0][0]; | |
3453 my += mv[0][1]; | |
3454 } | |
3455 if(!(s->flags&CODEC_FLAG_GRAY)) | |
3456 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
3457 | |
3458 return; | |
3459 } | |
2967 | 3460 |
0 | 3461 switch(s->mv_type) { |
3462 case MV_TYPE_16X16: | |
255 | 3463 if(s->mcsel){ |
753 | 3464 if(s->real_sprite_warping_points==1){ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3465 gmc1_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3466 ref_picture); |
753 | 3467 }else{ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3468 gmc_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3469 ref_picture); |
753 | 3470 } |
651 | 3471 }else if(s->quarter_sample){ |
2967 | 3472 qpel_motion(s, dest_y, dest_cb, dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3473 0, 0, 0, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3474 ref_picture, pix_op, qpix_op, |
255 | 3475 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
936 | 3476 }else if(s->mspel){ |
3477 ff_mspel_motion(s, dest_y, dest_cb, dest_cr, | |
3478 ref_picture, pix_op, | |
3479 s->mv[dir][0][0], s->mv[dir][0][1], 16); | |
1042 | 3480 }else |
3481 { | |
2967 | 3482 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3483 0, 0, 0, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3484 ref_picture, pix_op, |
255 | 3485 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
2967 | 3486 } |
0 | 3487 break; |
3488 case MV_TYPE_8X8: | |
673 | 3489 mx = 0; |
3490 my = 0; | |
3491 if(s->quarter_sample){ | |
3492 for(i=0;i<4;i++) { | |
3493 motion_x = s->mv[dir][i][0]; | |
3494 motion_y = s->mv[dir][i][1]; | |
0 | 3495 |
673 | 3496 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
3497 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8; | |
3498 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8; | |
2967 | 3499 |
673 | 3500 /* WARNING: do no forget half pels */ |
3501 src_x = clip(src_x, -16, s->width); | |
3502 if (src_x == s->width) | |
3503 dxy &= ~3; | |
3504 src_y = clip(src_y, -16, s->height); | |
3505 if (src_y == s->height) | |
3506 dxy &= ~12; | |
2967 | 3507 |
673 | 3508 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x); |
3509 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
2967 | 3510 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 8 |
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
3511 || (unsigned)src_y > s->v_edge_pos - (motion_y&3) - 8 ){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
3512 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->linesize, 9, 9, src_x, src_y, s->h_edge_pos, s->v_edge_pos); |
673 | 3513 ptr= s->edge_emu_buffer; |
3514 } | |
3515 } | |
3516 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize; | |
3517 qpix_op[1][dxy](dest, ptr, s->linesize); | |
3518 | |
3519 mx += s->mv[dir][i][0]/2; | |
3520 my += s->mv[dir][i][1]/2; | |
3521 } | |
3522 }else{ | |
3523 for(i=0;i<4;i++) { | |
1633 | 3524 hpel_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3525 ref_picture[0], 0, 0, |
1633 | 3526 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, |
3527 s->width, s->height, s->linesize, | |
3528 s->h_edge_pos, s->v_edge_pos, | |
3529 8, 8, pix_op[1], | |
3530 s->mv[dir][i][0], s->mv[dir][i][1]); | |
673 | 3531 |
3532 mx += s->mv[dir][i][0]; | |
3533 my += s->mv[dir][i][1]; | |
554 | 3534 } |
0 | 3535 } |
673 | 3536 |
1633 | 3537 if(!(s->flags&CODEC_FLAG_GRAY)) |
3538 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
0 | 3539 break; |
3540 case MV_TYPE_FIELD: | |
3541 if (s->picture_structure == PICT_FRAME) { | |
671 | 3542 if(s->quarter_sample){ |
1843 | 3543 for(i=0; i<2; i++){ |
3544 qpel_motion(s, dest_y, dest_cb, dest_cr, | |
3545 1, i, s->field_select[dir][i], | |
3546 ref_picture, pix_op, qpix_op, | |
3547 s->mv[dir][i][0], s->mv[dir][i][1], 8); | |
3548 } | |
671 | 3549 }else{ |
2967 | 3550 /* top field */ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3551 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3552 1, 0, s->field_select[dir][0], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3553 ref_picture, pix_op, |
671 | 3554 s->mv[dir][0][0], s->mv[dir][0][1], 8); |
3555 /* bottom field */ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3556 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3557 1, 1, s->field_select[dir][1], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3558 ref_picture, pix_op, |
671 | 3559 s->mv[dir][1][0], s->mv[dir][1][1], 8); |
3560 } | |
0 | 3561 } else { |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3562 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3563 ref_picture= s->current_picture_ptr->data; |
2967 | 3564 } |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
3565 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3566 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3567 0, 0, s->field_select[dir][0], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3568 ref_picture, pix_op, |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
3569 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
0 | 3570 } |
3571 break; | |
1843 | 3572 case MV_TYPE_16X8: |
3573 for(i=0; i<2; i++){ | |
3574 uint8_t ** ref2picture; | |
3575 | |
3576 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ | |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3577 ref2picture= ref_picture; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3578 }else{ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3579 ref2picture= s->current_picture_ptr->data; |
2967 | 3580 } |
3581 | |
3582 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
1843 | 3583 0, 0, s->field_select[dir][i], |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3584 ref2picture, pix_op, |
1843 | 3585 s->mv[dir][i][0], s->mv[dir][i][1] + 16*i, 8); |
2967 | 3586 |
1843 | 3587 dest_y += 16*s->linesize; |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3588 dest_cb+= (16>>s->chroma_y_shift)*s->uvlinesize; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3589 dest_cr+= (16>>s->chroma_y_shift)*s->uvlinesize; |
2967 | 3590 } |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3591 break; |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3592 case MV_TYPE_DMV: |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3593 if(s->picture_structure == PICT_FRAME){ |
1843 | 3594 for(i=0; i<2; i++){ |
3595 int j; | |
3596 for(j=0; j<2; j++){ | |
3597 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
3598 1, j, j^i, | |
3599 ref_picture, pix_op, | |
3600 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], 8); | |
3601 } | |
2967 | 3602 pix_op = s->dsp.avg_pixels_tab; |
1843 | 3603 } |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3604 }else{ |
1843 | 3605 for(i=0; i<2; i++){ |
2967 | 3606 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
1843 | 3607 0, 0, s->picture_structure != i+1, |
3608 ref_picture, pix_op, | |
3609 s->mv[dir][2*i][0],s->mv[dir][2*i][1],16); | |
3610 | |
3611 // after put we make avg of the same block | |
2967 | 3612 pix_op=s->dsp.avg_pixels_tab; |
1843 | 3613 |
3614 //opposite parity is always in the same frame if this is second field | |
3615 if(!s->first_field){ | |
2967 | 3616 ref_picture = s->current_picture_ptr->data; |
1843 | 3617 } |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3618 } |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3619 } |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3620 break; |
1633 | 3621 default: assert(0); |
0 | 3622 } |
3623 } | |
3624 | |
2256 | 3625 /** |
2764 | 3626 * motion compensation of a single macroblock |
2256 | 3627 * @param s context |
3628 * @param dest_y luma destination pointer | |
3629 * @param dest_cb chroma cb/u destination pointer | |
3630 * @param dest_cr chroma cr/v destination pointer | |
3631 * @param dir direction (0->forward, 1->backward) | |
3632 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
3633 * @param pic_op halfpel motion compensation function (average or put normally) | |
3634 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
3635 */ | |
2967 | 3636 static inline void MPV_motion_lowres(MpegEncContext *s, |
2256 | 3637 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
2967 | 3638 int dir, uint8_t **ref_picture, |
2256 | 3639 h264_chroma_mc_func *pix_op) |
3640 { | |
2292 | 3641 int mx, my; |
2260 | 3642 int mb_x, mb_y, i; |
3643 const int lowres= s->avctx->lowres; | |
2967 | 3644 const int block_s= 8>>lowres; |
2260 | 3645 |
3646 mb_x = s->mb_x; | |
3647 mb_y = s->mb_y; | |
3648 | |
3649 switch(s->mv_type) { | |
3650 case MV_TYPE_16X16: | |
2967 | 3651 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, |
2260 | 3652 0, 0, 0, |
3653 ref_picture, pix_op, | |
3654 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
3655 break; | |
2292 | 3656 case MV_TYPE_8X8: |
2260 | 3657 mx = 0; |
3658 my = 0; | |
3659 for(i=0;i<4;i++) { | |
2292 | 3660 hpel_motion_lowres(s, dest_y + ((i & 1) + (i >> 1) * s->linesize)*block_s, |
2260 | 3661 ref_picture[0], 0, 0, |
2292 | 3662 (2*mb_x + (i & 1))*block_s, (2*mb_y + (i >>1))*block_s, |
2260 | 3663 s->width, s->height, s->linesize, |
2292 | 3664 s->h_edge_pos >> lowres, s->v_edge_pos >> lowres, |
3665 block_s, block_s, pix_op, | |
2260 | 3666 s->mv[dir][i][0], s->mv[dir][i][1]); |
3667 | |
3668 mx += s->mv[dir][i][0]; | |
3669 my += s->mv[dir][i][1]; | |
3670 } | |
3671 | |
3672 if(!(s->flags&CODEC_FLAG_GRAY)) | |
2292 | 3673 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my); |
3674 break; | |
2260 | 3675 case MV_TYPE_FIELD: |
3676 if (s->picture_structure == PICT_FRAME) { | |
2967 | 3677 /* top field */ |
2260 | 3678 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, |
3679 1, 0, s->field_select[dir][0], | |
3680 ref_picture, pix_op, | |
3681 s->mv[dir][0][0], s->mv[dir][0][1], block_s); | |
3682 /* bottom field */ | |
3683 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3684 1, 1, s->field_select[dir][1], | |
3685 ref_picture, pix_op, | |
3686 s->mv[dir][1][0], s->mv[dir][1][1], block_s); | |
3687 } else { | |
3688 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ | |
3689 ref_picture= s->current_picture_ptr->data; | |
2967 | 3690 } |
2260 | 3691 |
3692 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3693 0, 0, s->field_select[dir][0], | |
3694 ref_picture, pix_op, | |
3695 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
3696 } | |
3697 break; | |
3698 case MV_TYPE_16X8: | |
3699 for(i=0; i<2; i++){ | |
3700 uint8_t ** ref2picture; | |
3701 | |
3702 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ | |
3703 ref2picture= ref_picture; | |
3704 }else{ | |
3705 ref2picture= s->current_picture_ptr->data; | |
2967 | 3706 } |
3707 | |
3708 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
2260 | 3709 0, 0, s->field_select[dir][i], |
3710 ref2picture, pix_op, | |
3711 s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s); | |
2967 | 3712 |
2260 | 3713 dest_y += 2*block_s*s->linesize; |
3714 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
3715 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
2967 | 3716 } |
2260 | 3717 break; |
3718 case MV_TYPE_DMV: | |
3719 if(s->picture_structure == PICT_FRAME){ | |
3720 for(i=0; i<2; i++){ | |
3721 int j; | |
3722 for(j=0; j<2; j++){ | |
3723 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3724 1, j, j^i, | |
3725 ref_picture, pix_op, | |
3726 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s); | |
3727 } | |
3728 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
3729 } | |
3730 }else{ | |
3731 for(i=0; i<2; i++){ | |
2967 | 3732 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, |
2260 | 3733 0, 0, s->picture_structure != i+1, |
3734 ref_picture, pix_op, | |
3735 s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s); | |
3736 | |
3737 // after put we make avg of the same block | |
3738 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
3739 | |
3740 //opposite parity is always in the same frame if this is second field | |
3741 if(!s->first_field){ | |
2967 | 3742 ref_picture = s->current_picture_ptr->data; |
2260 | 3743 } |
3744 } | |
3745 } | |
3746 break; | |
3747 default: assert(0); | |
3748 } | |
2256 | 3749 } |
0 | 3750 |
3751 /* put block[] to dest[] */ | |
2967 | 3752 static inline void put_dct(MpegEncContext *s, |
1651 | 3753 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
0 | 3754 { |
1689 | 3755 s->dct_unquantize_intra(s, block, i, qscale); |
1092 | 3756 s->dsp.idct_put (dest, line_size, block); |
0 | 3757 } |
3758 | |
3759 /* add block[] to dest[] */ | |
2967 | 3760 static inline void add_dct(MpegEncContext *s, |
1064 | 3761 DCTELEM *block, int i, uint8_t *dest, int line_size) |
0 | 3762 { |
3763 if (s->block_last_index[i] >= 0) { | |
1092 | 3764 s->dsp.idct_add (dest, line_size, block); |
481 | 3765 } |
3766 } | |
3767 | |
2967 | 3768 static inline void add_dequant_dct(MpegEncContext *s, |
1644 | 3769 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
481 | 3770 { |
3771 if (s->block_last_index[i] >= 0) { | |
1689 | 3772 s->dct_unquantize_inter(s, block, i, qscale); |
324 | 3773 |
1092 | 3774 s->dsp.idct_add (dest, line_size, block); |
0 | 3775 } |
3776 } | |
3777 | |
456 | 3778 /** |
3779 * cleans dc, ac, coded_block for the current non intra MB | |
3780 */ | |
3781 void ff_clean_intra_table_entries(MpegEncContext *s) | |
3782 { | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3783 int wrap = s->b8_stride; |
456 | 3784 int xy = s->block_index[0]; |
2967 | 3785 |
3786 s->dc_val[0][xy ] = | |
3787 s->dc_val[0][xy + 1 ] = | |
456 | 3788 s->dc_val[0][xy + wrap] = |
3789 s->dc_val[0][xy + 1 + wrap] = 1024; | |
3790 /* ac pred */ | |
1064 | 3791 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); |
3792 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); | |
456 | 3793 if (s->msmpeg4_version>=3) { |
3794 s->coded_block[xy ] = | |
3795 s->coded_block[xy + 1 ] = | |
3796 s->coded_block[xy + wrap] = | |
3797 s->coded_block[xy + 1 + wrap] = 0; | |
3798 } | |
3799 /* chroma */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3800 wrap = s->mb_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3801 xy = s->mb_x + s->mb_y * wrap; |
456 | 3802 s->dc_val[1][xy] = |
3803 s->dc_val[2][xy] = 1024; | |
3804 /* ac pred */ | |
1064 | 3805 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t)); |
3806 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t)); | |
2967 | 3807 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3808 s->mbintra_table[xy]= 0; |
456 | 3809 } |
3810 | |
0 | 3811 /* generic function called after a macroblock has been parsed by the |
3812 decoder or after it has been encoded by the encoder. | |
3813 | |
3814 Important variables used: | |
3815 s->mb_intra : true if intra macroblock | |
3816 s->mv_dir : motion vector direction | |
3817 s->mv_type : motion vector type | |
3818 s->mv : motion vector | |
3819 s->interlaced_dct : true if interlaced dct used (mpeg2) | |
3820 */ | |
2256 | 3821 static always_inline void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], int lowres_flag) |
0 | 3822 { |
244 | 3823 int mb_x, mb_y; |
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:
1173
diff
changeset
|
3824 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; |
1381 | 3825 #ifdef HAVE_XVMC |
3826 if(s->avctx->xvmc_acceleration){ | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1579
diff
changeset
|
3827 XVMC_decode_mb(s);//xvmc uses pblocks |
1381 | 3828 return; |
3829 } | |
3830 #endif | |
0 | 3831 |
3832 mb_x = s->mb_x; | |
3833 mb_y = s->mb_y; | |
3834 | |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3835 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3836 /* save DCT coefficients */ |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3837 int i,j; |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3838 DCTELEM *dct = &s->current_picture.dct_coeff[mb_xy*64*6]; |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3839 for(i=0; i<6; i++) |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3840 for(j=0; j<64; j++) |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3841 *dct++ = block[i][s->dsp.idct_permutation[j]]; |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3842 } |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3843 |
903 | 3844 s->current_picture.qscale_table[mb_xy]= s->qscale; |
108
1e4a4af694d1
exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents:
79
diff
changeset
|
3845 |
0 | 3846 /* update DC predictors for P macroblocks */ |
3847 if (!s->mb_intra) { | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3848 if (s->h263_pred || s->h263_aic) { |
481 | 3849 if(s->mbintra_table[mb_xy]) |
456 | 3850 ff_clean_intra_table_entries(s); |
0 | 3851 } else { |
456 | 3852 s->last_dc[0] = |
3853 s->last_dc[1] = | |
0 | 3854 s->last_dc[2] = 128 << s->intra_dc_precision; |
3855 } | |
3856 } | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3857 else if (s->h263_pred || s->h263_aic) |
481 | 3858 s->mbintra_table[mb_xy]=1; |
191
883f184537e6
AC table reset (memset) optimization - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents:
189
diff
changeset
|
3859 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3860 if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { //FIXME precalc |
1064 | 3861 uint8_t *dest_y, *dest_cb, *dest_cr; |
481 | 3862 int dct_linesize, dct_offset; |
651 | 3863 op_pixels_func (*op_pix)[4]; |
3864 qpel_mc_func (*op_qpix)[16]; | |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
3865 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this would be wrong for field pics |
1138 | 3866 const int uvlinesize= s->current_picture.linesize[1]; |
2256 | 3867 const int readable= s->pict_type != B_TYPE || s->encoding || s->avctx->draw_horiz_band || lowres_flag; |
3868 const int block_size= lowres_flag ? 8>>s->avctx->lowres : 8; | |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3869 |
903 | 3870 /* avoid copy if macroblock skipped in last frame too */ |
3871 /* skip only during decoding as we might trash the buffers during encoding a bit */ | |
3872 if(!s->encoding){ | |
1064 | 3873 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy]; |
903 | 3874 const int age= s->current_picture.age; |
3875 | |
3876 assert(age); | |
3877 | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
3878 if (s->mb_skipped) { |
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
3879 s->mb_skipped= 0; |
903 | 3880 assert(s->pict_type!=I_TYPE); |
2967 | 3881 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
3882 (*mbskip_ptr) ++; /* indicate that this time we skipped it */ |
556 | 3883 if(*mbskip_ptr >99) *mbskip_ptr= 99; |
3884 | |
903 | 3885 /* if previous was skipped too, then nothing to do ! */ |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3886 if (*mbskip_ptr >= age && s->current_picture.reference){ |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3887 return; |
903 | 3888 } |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3889 } else if(!s->current_picture.reference){ |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3890 (*mbskip_ptr) ++; /* increase counter so the age can be compared cleanly */ |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3891 if(*mbskip_ptr >99) *mbskip_ptr= 99; |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3892 } else{ |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3893 *mbskip_ptr = 0; /* not skipped */ |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3894 } |
717 | 3895 } |
2967 | 3896 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3897 dct_linesize = linesize << s->interlaced_dct; |
2256 | 3898 dct_offset =(s->interlaced_dct)? linesize : linesize*block_size; |
2967 | 3899 |
1632 | 3900 if(readable){ |
3901 dest_y= s->dest[0]; | |
3902 dest_cb= s->dest[1]; | |
3903 dest_cr= s->dest[2]; | |
3904 }else{ | |
1799 | 3905 dest_y = s->b_scratchpad; |
1834 | 3906 dest_cb= s->b_scratchpad+16*linesize; |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3907 dest_cr= s->b_scratchpad+32*linesize; |
1632 | 3908 } |
2256 | 3909 |
0 | 3910 if (!s->mb_intra) { |
3911 /* motion handling */ | |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
3912 /* decoding or more than one mb_type (MC was already done otherwise) */ |
1389 | 3913 if(!s->encoding){ |
2256 | 3914 if(lowres_flag){ |
3915 h264_chroma_mc_func *op_pix = s->dsp.put_h264_chroma_pixels_tab; | |
3916 | |
3917 if (s->mv_dir & MV_DIR_FORWARD) { | |
3918 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix); | |
3919 op_pix = s->dsp.avg_h264_chroma_pixels_tab; | |
3920 } | |
3921 if (s->mv_dir & MV_DIR_BACKWARD) { | |
3922 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix); | |
3923 } | |
324 | 3924 }else{ |
2967 | 3925 if ((!s->no_rounding) || s->pict_type==B_TYPE){ |
2256 | 3926 op_pix = s->dsp.put_pixels_tab; |
3927 op_qpix= s->dsp.put_qpel_pixels_tab; | |
3928 }else{ | |
3929 op_pix = s->dsp.put_no_rnd_pixels_tab; | |
3930 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; | |
3931 } | |
3932 if (s->mv_dir & MV_DIR_FORWARD) { | |
3933 MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix); | |
3934 op_pix = s->dsp.avg_pixels_tab; | |
3935 op_qpix= s->dsp.avg_qpel_pixels_tab; | |
3936 } | |
3937 if (s->mv_dir & MV_DIR_BACKWARD) { | |
3938 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); | |
3939 } | |
324 | 3940 } |
0 | 3941 } |
3942 | |
481 | 3943 /* skip dequant / idct if we are really late ;) */ |
2792 | 3944 if(s->hurry_up>1) goto skip_idct; |
3945 if(s->avctx->skip_idct){ | |
3946 if( (s->avctx->skip_idct >= AVDISCARD_NONREF && s->pict_type == B_TYPE) | |
3947 ||(s->avctx->skip_idct >= AVDISCARD_NONKEY && s->pict_type != I_TYPE) | |
3948 || s->avctx->skip_idct >= AVDISCARD_ALL) | |
3949 goto skip_idct; | |
3950 } | |
481 | 3951 |
0 | 3952 /* add dct residue */ |
1421 | 3953 if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO |
711 | 3954 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){ |
2256 | 3955 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
3956 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
3957 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
3958 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
0 | 3959 |
485 | 3960 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1644 | 3961 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
3962 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
485 | 3963 } |
936 | 3964 } else if(s->codec_id != CODEC_ID_WMV2){ |
2256 | 3965 add_dct(s, block[0], 0, dest_y , dct_linesize); |
3966 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize); | |
3967 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize); | |
3968 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize); | |
481 | 3969 |
485 | 3970 if(!(s->flags&CODEC_FLAG_GRAY)){ |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3971 if(s->chroma_y_shift){//Chroma420 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3972 add_dct(s, block[4], 4, dest_cb, uvlinesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3973 add_dct(s, block[5], 5, dest_cr, uvlinesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3974 }else{ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3975 //chroma422 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3976 dct_linesize = uvlinesize << s->interlaced_dct; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3977 dct_offset =(s->interlaced_dct)? uvlinesize : uvlinesize*8; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3978 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3979 add_dct(s, block[4], 4, dest_cb, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3980 add_dct(s, block[5], 5, dest_cr, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3981 add_dct(s, block[6], 6, dest_cb+dct_offset, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3982 add_dct(s, block[7], 7, dest_cr+dct_offset, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3983 if(!s->chroma_x_shift){//Chroma444 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3984 add_dct(s, block[8], 8, dest_cb+8, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3985 add_dct(s, block[9], 9, dest_cr+8, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3986 add_dct(s, block[10], 10, dest_cb+8+dct_offset, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3987 add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3988 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3989 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3990 }//fi gray |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3991 } |
1042 | 3992 else{ |
936 | 3993 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); |
481 | 3994 } |
0 | 3995 } else { |
3996 /* dct only in intra block */ | |
1421 | 3997 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ |
2256 | 3998 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
3999 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
4000 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
4001 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
0 | 4002 |
711 | 4003 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1651 | 4004 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
4005 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
711 | 4006 } |
4007 }else{ | |
2256 | 4008 s->dsp.idct_put(dest_y , dct_linesize, block[0]); |
4009 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]); | |
4010 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]); | |
4011 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]); | |
711 | 4012 |
4013 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4014 if(s->chroma_y_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4015 s->dsp.idct_put(dest_cb, uvlinesize, block[4]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4016 s->dsp.idct_put(dest_cr, uvlinesize, block[5]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4017 }else{ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4018 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4019 dct_linesize = uvlinesize << s->interlaced_dct; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4020 dct_offset =(s->interlaced_dct)? uvlinesize : uvlinesize*8; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4021 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4022 s->dsp.idct_put(dest_cb, dct_linesize, block[4]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4023 s->dsp.idct_put(dest_cr, dct_linesize, block[5]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4024 s->dsp.idct_put(dest_cb + dct_offset, dct_linesize, block[6]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4025 s->dsp.idct_put(dest_cr + dct_offset, dct_linesize, block[7]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4026 if(!s->chroma_x_shift){//Chroma444 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4027 s->dsp.idct_put(dest_cb + 8, dct_linesize, block[8]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4028 s->dsp.idct_put(dest_cr + 8, dct_linesize, block[9]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4029 s->dsp.idct_put(dest_cb + 8 + dct_offset, dct_linesize, block[10]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4030 s->dsp.idct_put(dest_cr + 8 + dct_offset, dct_linesize, block[11]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4031 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4032 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4033 }//gray |
485 | 4034 } |
0 | 4035 } |
2792 | 4036 skip_idct: |
1632 | 4037 if(!readable){ |
4038 s->dsp.put_pixels_tab[0][0](s->dest[0], dest_y , linesize,16); | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4039 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4040 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift); |
1632 | 4041 } |
0 | 4042 } |
294 | 4043 } |
4044 | |
2256 | 4045 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){ |
4046 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1); | |
4047 else MPV_decode_mb_internal(s, block, 0); | |
4048 } | |
4049 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4050 #ifdef CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4051 |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4052 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold) |
456 | 4053 { |
4054 static const char tab[64]= | |
4055 {3,2,2,1,1,1,1,1, | |
4056 1,1,1,1,1,1,1,1, | |
4057 1,1,1,1,1,1,1,1, | |
4058 0,0,0,0,0,0,0,0, | |
4059 0,0,0,0,0,0,0,0, | |
4060 0,0,0,0,0,0,0,0, | |
4061 0,0,0,0,0,0,0,0, | |
4062 0,0,0,0,0,0,0,0}; | |
4063 int score=0; | |
4064 int run=0; | |
4065 int i; | |
4066 DCTELEM *block= s->block[n]; | |
4067 const int last_index= s->block_last_index[n]; | |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4068 int skip_dc; |
456 | 4069 |
604
4344cc8033bd
skip blocks with small chroma dc too (if the user wants it) needed to avoid IDCT(input coeffs !=0) == 0 problems which cause catastrophic error accumulation at qp=1
michaelni
parents:
599
diff
changeset
|
4070 if(threshold<0){ |
4344cc8033bd
skip blocks with small chroma dc too (if the user wants it) needed to avoid IDCT(input coeffs !=0) == 0 problems which cause catastrophic error accumulation at qp=1
michaelni
parents:
599
diff
changeset
|
4071 skip_dc=0; |
4344cc8033bd
skip blocks with small chroma dc too (if the user wants it) needed to avoid IDCT(input coeffs !=0) == 0 problems which cause catastrophic error accumulation at qp=1
michaelni
parents:
599
diff
changeset
|
4072 threshold= -threshold; |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4073 }else |
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4074 skip_dc=1; |
604
4344cc8033bd
skip blocks with small chroma dc too (if the user wants it) needed to avoid IDCT(input coeffs !=0) == 0 problems which cause catastrophic error accumulation at qp=1
michaelni
parents:
599
diff
changeset
|
4075 |
456 | 4076 /* are all which we could set to zero are allready zero? */ |
4077 if(last_index<=skip_dc - 1) return; | |
4078 | |
4079 for(i=0; i<=last_index; i++){ | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4080 const int j = s->intra_scantable.permutated[i]; |
456 | 4081 const int level = ABS(block[j]); |
4082 if(level==1){ | |
4083 if(skip_dc && i==0) continue; | |
4084 score+= tab[run]; | |
4085 run=0; | |
4086 }else if(level>1){ | |
4087 return; | |
4088 }else{ | |
4089 run++; | |
4090 } | |
4091 } | |
4092 if(score >= threshold) return; | |
4093 for(i=skip_dc; i<=last_index; i++){ | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4094 const int j = s->intra_scantable.permutated[i]; |
456 | 4095 block[j]=0; |
4096 } | |
4097 if(block[0]) s->block_last_index[n]= 0; | |
4098 else s->block_last_index[n]= -1; | |
4099 } | |
4100 | |
344 | 4101 static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index) |
4102 { | |
4103 int i; | |
4104 const int maxlevel= s->max_qcoeff; | |
4105 const int minlevel= s->min_qcoeff; | |
1722
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4106 int overflow=0; |
2967 | 4107 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4108 if(s->mb_intra){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4109 i=1; //skip clipping of intra dc |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4110 }else |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4111 i=0; |
2967 | 4112 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4113 for(;i<=last_index; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4114 const int j= s->intra_scantable.permutated[i]; |
344 | 4115 int level = block[j]; |
2967 | 4116 |
1722
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4117 if (level>maxlevel){ |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4118 level=maxlevel; |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4119 overflow++; |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4120 }else if(level<minlevel){ |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4121 level=minlevel; |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4122 overflow++; |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4123 } |
2967 | 4124 |
344 | 4125 block[j]= level; |
4126 } | |
2967 | 4127 |
1722
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
4128 if(overflow && s->avctx->mb_decision == FF_MB_DECISION_SIMPLE) |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
4129 av_log(s->avctx, AV_LOG_INFO, "warning, clipping %d dct coefficients to %d..%d\n", overflow, minlevel, maxlevel); |
344 | 4130 } |
324 | 4131 |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4132 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4133 |
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4134 /** |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4135 * |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4136 * @param h is the normal height, this will be reduced automatically if needed for the last row |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4137 */ |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4138 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){ |
1368 | 4139 if (s->avctx->draw_horiz_band) { |
1370 | 4140 AVFrame *src; |
1368 | 4141 int offset[4]; |
2967 | 4142 |
1370 | 4143 if(s->picture_structure != PICT_FRAME){ |
4144 h <<= 1; | |
4145 y <<= 1; | |
4146 if(s->first_field && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return; | |
4147 } | |
4148 | |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
4149 h= FFMIN(h, s->avctx->height - y); |
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4150 |
2967 | 4151 if(s->pict_type==B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER)) |
1370 | 4152 src= (AVFrame*)s->current_picture_ptr; |
4153 else if(s->last_picture_ptr) | |
4154 src= (AVFrame*)s->last_picture_ptr; | |
4155 else | |
4156 return; | |
2967 | 4157 |
1369 | 4158 if(s->pict_type==B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){ |
1368 | 4159 offset[0]= |
4160 offset[1]= | |
4161 offset[2]= | |
4162 offset[3]= 0; | |
4163 }else{ | |
4164 offset[0]= y * s->linesize;; | |
2967 | 4165 offset[1]= |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4166 offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize; |
1368 | 4167 offset[3]= 0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4168 } |
1368 | 4169 |
813 | 4170 emms_c(); |
4171 | |
1370 | 4172 s->avctx->draw_horiz_band(s->avctx, src, offset, |
4173 y, s->picture_structure, h); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4174 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4175 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4176 |
1389 | 4177 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename |
2764 | 4178 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this would be wrong for field pics |
1389 | 4179 const int uvlinesize= s->current_picture.linesize[1]; |
2256 | 4180 const int mb_size= 4 - s->avctx->lowres; |
2967 | 4181 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4182 s->block_index[0]= s->b8_stride*(s->mb_y*2 ) - 2 + s->mb_x*2; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4183 s->block_index[1]= s->b8_stride*(s->mb_y*2 ) - 1 + s->mb_x*2; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4184 s->block_index[2]= s->b8_stride*(s->mb_y*2 + 1) - 2 + s->mb_x*2; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4185 s->block_index[3]= s->b8_stride*(s->mb_y*2 + 1) - 1 + s->mb_x*2; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4186 s->block_index[4]= s->mb_stride*(s->mb_y + 1) + s->b8_stride*s->mb_height*2 + s->mb_x - 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4187 s->block_index[5]= s->mb_stride*(s->mb_y + s->mb_height + 2) + s->b8_stride*s->mb_height*2 + s->mb_x - 1; |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4188 //block_index is not used by mpeg2, so it is not affected by chroma_format |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4189 |
2256 | 4190 s->dest[0] = s->current_picture.data[0] + ((s->mb_x - 1) << mb_size); |
4191 s->dest[1] = s->current_picture.data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
4192 s->dest[2] = s->current_picture.data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
2168 | 4193 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4194 if(!(s->pict_type==B_TYPE && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME)) |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4195 { |
2256 | 4196 s->dest[0] += s->mb_y * linesize << mb_size; |
4197 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift); | |
4198 s->dest[2] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift); | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4199 } |
1389 | 4200 } |
4201 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4202 #ifdef CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4203 |
1777 | 4204 static void get_vissual_weight(int16_t *weight, uint8_t *ptr, int stride){ |
4205 int x, y; | |
4206 //FIXME optimize | |
4207 for(y=0; y<8; y++){ | |
4208 for(x=0; x<8; x++){ | |
4209 int x2, y2; | |
4210 int sum=0; | |
4211 int sqr=0; | |
4212 int count=0; | |
4213 | |
4214 for(y2= FFMAX(y-1, 0); y2 < FFMIN(8, y+2); y2++){ | |
4215 for(x2= FFMAX(x-1, 0); x2 < FFMIN(8, x+2); x2++){ | |
4216 int v= ptr[x2 + y2*stride]; | |
4217 sum += v; | |
4218 sqr += v*v; | |
4219 count++; | |
4220 } | |
4221 } | |
4222 weight[x + 8*y]= (36*ff_sqrt(count*sqr - sum*sum)) / count; | |
4223 } | |
4224 } | |
4225 } | |
4226 | |
324 | 4227 static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) |
294 | 4228 { |
1777 | 4229 int16_t weight[6][64]; |
4230 DCTELEM orig[6][64]; | |
294 | 4231 const int mb_x= s->mb_x; |
4232 const int mb_y= s->mb_y; | |
4233 int i; | |
456 | 4234 int skip_dct[6]; |
697 | 4235 int dct_offset = s->linesize*8; //default for progressive frames |
1778 | 4236 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
4237 int wrap_y, wrap_c; | |
2967 | 4238 |
456 | 4239 for(i=0; i<6; i++) skip_dct[i]=0; |
2967 | 4240 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4241 if(s->adaptive_quant){ |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
4242 const int last_qp= s->qscale; |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
4243 const int mb_xy= mb_x + mb_y*s->mb_stride; |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
4244 |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
4245 s->lambda= s->lambda_table[mb_xy]; |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
4246 update_qscale(s); |
2967 | 4247 |
1616 | 4248 if(!(s->flags&CODEC_FLAG_QP_RD)){ |
4249 s->dquant= s->qscale - last_qp; | |
4250 | |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4251 if(s->out_format==FMT_H263){ |
1616 | 4252 s->dquant= clip(s->dquant, -2, 2); //FIXME RD |
2967 | 4253 |
4254 if(s->codec_id==CODEC_ID_MPEG4){ | |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4255 if(!s->mb_intra){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4256 if(s->pict_type == B_TYPE){ |
2967 | 4257 if(s->dquant&1) |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4258 s->dquant= (s->dquant/2)*2; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4259 if(s->mv_dir&MV_DIRECT) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4260 s->dquant= 0; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4261 } |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4262 if(s->mv_type==MV_TYPE_8X8) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4263 s->dquant=0; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4264 } |
1616 | 4265 } |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4266 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4267 } |
1652 | 4268 ff_set_qscale(s, last_qp + s->dquant); |
2054 | 4269 }else if(s->flags&CODEC_FLAG_QP_RD) |
4270 ff_set_qscale(s, s->qscale + s->dquant); | |
294 | 4271 |
1778 | 4272 wrap_y = s->linesize; |
4273 wrap_c = s->uvlinesize; | |
4274 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16; | |
4275 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
4276 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
4277 | |
4278 if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){ | |
2165
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4279 uint8_t *ebuf= s->edge_emu_buffer + 32; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4280 ff_emulated_edge_mc(ebuf , ptr_y , wrap_y,16,16,mb_x*16,mb_y*16, s->width , s->height); |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4281 ptr_y= ebuf; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4282 ff_emulated_edge_mc(ebuf+18*wrap_y , ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4283 ptr_cb= ebuf+18*wrap_y; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4284 ff_emulated_edge_mc(ebuf+18*wrap_y+8, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4285 ptr_cr= ebuf+18*wrap_y+8; |
1778 | 4286 } |
4287 | |
324 | 4288 if (s->mb_intra) { |
697 | 4289 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
4290 int progressive_score, interlaced_score; | |
1708 | 4291 |
1729 | 4292 s->interlaced_dct=0; |
2967 | 4293 progressive_score= s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y, 8) |
1777 | 4294 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y*8, NULL, wrap_y, 8) - 400; |
1729 | 4295 |
4296 if(progressive_score > 0){ | |
2967 | 4297 interlaced_score = s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y*2, 8) |
1777 | 4298 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y , NULL, wrap_y*2, 8); |
1729 | 4299 if(progressive_score > interlaced_score){ |
4300 s->interlaced_dct=1; | |
2967 | 4301 |
1729 | 4302 dct_offset= wrap_y; |
4303 wrap_y<<=1; | |
4304 } | |
4305 } | |
697 | 4306 } |
2967 | 4307 |
2979 | 4308 s->dsp.get_pixels(s->block[0], ptr_y , wrap_y); |
1777 | 4309 s->dsp.get_pixels(s->block[1], ptr_y + 8, wrap_y); |
4310 s->dsp.get_pixels(s->block[2], ptr_y + dct_offset , wrap_y); | |
4311 s->dsp.get_pixels(s->block[3], ptr_y + dct_offset + 8, wrap_y); | |
294 | 4312 |
487 | 4313 if(s->flags&CODEC_FLAG_GRAY){ |
4314 skip_dct[4]= 1; | |
4315 skip_dct[5]= 1; | |
4316 }else{ | |
2979 | 4317 s->dsp.get_pixels(s->block[4], ptr_cb, wrap_c); |
1777 | 4318 s->dsp.get_pixels(s->block[5], ptr_cr, wrap_c); |
4319 } | |
324 | 4320 }else{ |
651 | 4321 op_pixels_func (*op_pix)[4]; |
4322 qpel_mc_func (*op_qpix)[16]; | |
1064 | 4323 uint8_t *dest_y, *dest_cb, *dest_cr; |
294 | 4324 |
1389 | 4325 dest_y = s->dest[0]; |
4326 dest_cb = s->dest[1]; | |
4327 dest_cr = s->dest[2]; | |
324 | 4328 |
327 | 4329 if ((!s->no_rounding) || s->pict_type==B_TYPE){ |
2979 | 4330 op_pix = s->dsp.put_pixels_tab; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4331 op_qpix= s->dsp.put_qpel_pixels_tab; |
295 | 4332 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4333 op_pix = s->dsp.put_no_rnd_pixels_tab; |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4334 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; |
324 | 4335 } |
295 | 4336 |
324 | 4337 if (s->mv_dir & MV_DIR_FORWARD) { |
903 | 4338 MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix); |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4339 op_pix = s->dsp.avg_pixels_tab; |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4340 op_qpix= s->dsp.avg_qpel_pixels_tab; |
324 | 4341 } |
4342 if (s->mv_dir & MV_DIR_BACKWARD) { | |
903 | 4343 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); |
324 | 4344 } |
295 | 4345 |
697 | 4346 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
4347 int progressive_score, interlaced_score; | |
1729 | 4348 |
4349 s->interlaced_dct=0; | |
2967 | 4350 progressive_score= s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y, 8) |
1729 | 4351 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y*8, ptr_y + wrap_y*8, wrap_y, 8) - 400; |
2967 | 4352 |
1729 | 4353 if(s->avctx->ildct_cmp == FF_CMP_VSSE) progressive_score -= 400; |
4354 | |
4355 if(progressive_score>0){ | |
2967 | 4356 interlaced_score = s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y*2, 8) |
1729 | 4357 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y , ptr_y + wrap_y , wrap_y*2, 8); |
2967 | 4358 |
1729 | 4359 if(progressive_score > interlaced_score){ |
4360 s->interlaced_dct=1; | |
2967 | 4361 |
1729 | 4362 dct_offset= wrap_y; |
4363 wrap_y<<=1; | |
4364 } | |
4365 } | |
697 | 4366 } |
2967 | 4367 |
2979 | 4368 s->dsp.diff_pixels(s->block[0], ptr_y , dest_y , wrap_y); |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4369 s->dsp.diff_pixels(s->block[1], ptr_y + 8, dest_y + 8, wrap_y); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4370 s->dsp.diff_pixels(s->block[2], ptr_y + dct_offset , dest_y + dct_offset , wrap_y); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4371 s->dsp.diff_pixels(s->block[3], ptr_y + dct_offset + 8, dest_y + dct_offset + 8, wrap_y); |
2967 | 4372 |
487 | 4373 if(s->flags&CODEC_FLAG_GRAY){ |
4374 skip_dct[4]= 1; | |
4375 skip_dct[5]= 1; | |
4376 }else{ | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4377 s->dsp.diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4378 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c); |
487 | 4379 } |
2967 | 4380 /* pre quantization */ |
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:
1173
diff
changeset
|
4381 if(s->current_picture.mc_mb_var[s->mb_stride*mb_y+ mb_x]<2*s->qscale*s->qscale){ |
697 | 4382 //FIXME optimize |
2979 | 4383 if(s->dsp.sad[1](NULL, ptr_y , dest_y , wrap_y, 8) < 20*s->qscale) skip_dct[0]= 1; |
1708 | 4384 if(s->dsp.sad[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20*s->qscale) skip_dct[1]= 1; |
4385 if(s->dsp.sad[1](NULL, ptr_y +dct_offset , dest_y +dct_offset , wrap_y, 8) < 20*s->qscale) skip_dct[2]= 1; | |
4386 if(s->dsp.sad[1](NULL, ptr_y +dct_offset+ 8, dest_y +dct_offset+ 8, wrap_y, 8) < 20*s->qscale) skip_dct[3]= 1; | |
4387 if(s->dsp.sad[1](NULL, ptr_cb , dest_cb , wrap_c, 8) < 20*s->qscale) skip_dct[4]= 1; | |
4388 if(s->dsp.sad[1](NULL, ptr_cr , dest_cr , wrap_c, 8) < 20*s->qscale) skip_dct[5]= 1; | |
456 | 4389 } |
1778 | 4390 } |
4391 | |
4392 if(s->avctx->quantizer_noise_shaping){ | |
4393 if(!skip_dct[0]) get_vissual_weight(weight[0], ptr_y , wrap_y); | |
4394 if(!skip_dct[1]) get_vissual_weight(weight[1], ptr_y + 8, wrap_y); | |
4395 if(!skip_dct[2]) get_vissual_weight(weight[2], ptr_y + dct_offset , wrap_y); | |
4396 if(!skip_dct[3]) get_vissual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y); | |
4397 if(!skip_dct[4]) get_vissual_weight(weight[4], ptr_cb , wrap_c); | |
4398 if(!skip_dct[5]) get_vissual_weight(weight[5], ptr_cr , wrap_c); | |
4399 memcpy(orig[0], s->block[0], sizeof(DCTELEM)*64*6); | |
294 | 4400 } |
2967 | 4401 |
294 | 4402 /* DCT & quantize */ |
1778 | 4403 assert(s->out_format!=FMT_MJPEG || s->qscale==8); |
4404 { | |
344 | 4405 for(i=0;i<6;i++) { |
456 | 4406 if(!skip_dct[i]){ |
4407 int overflow; | |
625
bb6a69f9d409
slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents:
619
diff
changeset
|
4408 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, s->qscale, &overflow); |
344 | 4409 // FIXME we could decide to change to quantizer instead of clipping |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4410 // JS: I don't think that would be a good idea it could lower quality instead |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4411 // of improve it. Just INTRADC clipping deserves changes in quantizer |
456 | 4412 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); |
4413 }else | |
4414 s->block_last_index[i]= -1; | |
344 | 4415 } |
1777 | 4416 if(s->avctx->quantizer_noise_shaping){ |
4417 for(i=0;i<6;i++) { | |
4418 if(!skip_dct[i]){ | |
4419 s->block_last_index[i] = dct_quantize_refine(s, s->block[i], weight[i], orig[i], i, s->qscale); | |
4420 } | |
4421 } | |
4422 } | |
2967 | 4423 |
456 | 4424 if(s->luma_elim_threshold && !s->mb_intra) |
4425 for(i=0; i<4; i++) | |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4426 dct_single_coeff_elimination(s, i, s->luma_elim_threshold); |
456 | 4427 if(s->chroma_elim_threshold && !s->mb_intra) |
4428 for(i=4; i<6; i++) | |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4429 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold); |
1497 | 4430 |
4431 if(s->flags & CODEC_FLAG_CBP_RD){ | |
4432 for(i=0;i<6;i++) { | |
4433 if(s->block_last_index[i] == -1) | |
4434 s->coded_score[i]= INT_MAX/256; | |
4435 } | |
4436 } | |
294 | 4437 } |
4438 | |
487 | 4439 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ |
4440 s->block_last_index[4]= | |
4441 s->block_last_index[5]= 0; | |
4442 s->block[4][0]= | |
1011 | 4443 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale; |
487 | 4444 } |
4445 | |
1708 | 4446 //non c quantize code returns incorrect block_last_index FIXME |
4447 if(s->alternate_scan && s->dct_quantize != dct_quantize_c){ | |
4448 for(i=0; i<6; i++){ | |
4449 int j; | |
4450 if(s->block_last_index[i]>0){ | |
4451 for(j=63; j>0; j--){ | |
4452 if(s->block[i][ s->intra_scantable.permutated[j] ]) break; | |
4453 } | |
4454 s->block_last_index[i]= j; | |
4455 } | |
4456 } | |
4457 } | |
4458 | |
294 | 4459 /* huffman encode */ |
936 | 4460 switch(s->codec_id){ //FIXME funct ptr could be slightly faster |
4461 case CODEC_ID_MPEG1VIDEO: | |
1421 | 4462 case CODEC_ID_MPEG2VIDEO: |
936 | 4463 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; |
4464 case CODEC_ID_MPEG4: | |
4465 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
4466 case CODEC_ID_MSMPEG4V2: | |
4467 case CODEC_ID_MSMPEG4V3: | |
4468 case CODEC_ID_WMV1: | |
4469 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
4470 case CODEC_ID_WMV2: | |
4471 ff_wmv2_encode_mb(s, s->block, motion_x, motion_y); break; | |
2639 | 4472 #ifdef CONFIG_H261_ENCODER |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4473 case CODEC_ID_H261: |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4474 ff_h261_encode_mb(s, s->block, motion_x, motion_y); break; |
2639 | 4475 #endif |
936 | 4476 case CODEC_ID_H263: |
4477 case CODEC_ID_H263P: | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4478 case CODEC_ID_FLV1: |
936 | 4479 case CODEC_ID_RV10: |
2380 | 4480 case CODEC_ID_RV20: |
936 | 4481 h263_encode_mb(s, s->block, motion_x, motion_y); break; |
1042 | 4482 case CODEC_ID_MJPEG: |
4483 mjpeg_encode_mb(s, s->block); break; | |
936 | 4484 default: |
4485 assert(0); | |
294 | 4486 } |
4487 } | |
4488 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4489 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4490 |
1368 | 4491 void ff_mpeg_flush(AVCodecContext *avctx){ |
4492 int i; | |
4493 MpegEncContext *s = avctx->priv_data; | |
2967 | 4494 |
4495 if(s==NULL || s->picture==NULL) | |
1751 | 4496 return; |
2967 | 4497 |
1368 | 4498 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
4499 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL | |
4500 || s->picture[i].type == FF_BUFFER_TYPE_USER)) | |
4501 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); | |
4502 } | |
1601 | 4503 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL; |
2967 | 4504 |
2380 | 4505 s->mb_x= s->mb_y= 0; |
2967 | 4506 |
1395 | 4507 s->parse_context.state= -1; |
4508 s->parse_context.frame_start_found= 0; | |
4509 s->parse_context.overread= 0; | |
4510 s->parse_context.overread_index= 0; | |
4511 s->parse_context.index= 0; | |
4512 s->parse_context.last_index= 0; | |
1851 | 4513 s->bitstream_buffer_size=0; |
1368 | 4514 } |
4515 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
4516 #ifdef CONFIG_ENCODERS |
1064 | 4517 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) |
294 | 4518 { |
1810 | 4519 const uint16_t *srcw= (uint16_t*)src; |
1799 | 4520 int words= length>>4; |
326 | 4521 int bits= length&15; |
4522 int i; | |
4523 | |
456 | 4524 if(length==0) return; |
2967 | 4525 |
1803 | 4526 if(words < 16){ |
4527 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); | |
4528 }else if(put_bits_count(pb)&7){ | |
4529 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); | |
1802
e91dbb5b1a8d
activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
michael
parents:
1801
diff
changeset
|
4530 }else{ |
1803 | 4531 for(i=0; put_bits_count(pb)&31; i++) |
4532 put_bits(pb, 8, src[i]); | |
1799 | 4533 flush_put_bits(pb); |
1803 | 4534 memcpy(pbBufPtr(pb), src+i, 2*words-i); |
4535 skip_put_bytes(pb, 2*words-i); | |
1802
e91dbb5b1a8d
activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
michael
parents:
1801
diff
changeset
|
4536 } |
2967 | 4537 |
1803 | 4538 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits)); |
0 | 4539 } |
4540 | |
456 | 4541 static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 4542 int i; |
4543 | |
4544 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
4545 | |
4546 /* mpeg1 */ | |
1160 | 4547 d->mb_skip_run= s->mb_skip_run; |
326 | 4548 for(i=0; i<3; i++) |
4549 d->last_dc[i]= s->last_dc[i]; | |
2967 | 4550 |
326 | 4551 /* statistics */ |
4552 d->mv_bits= s->mv_bits; | |
4553 d->i_tex_bits= s->i_tex_bits; | |
4554 d->p_tex_bits= s->p_tex_bits; | |
4555 d->i_count= s->i_count; | |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4556 d->f_count= s->f_count; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4557 d->b_count= s->b_count; |
326 | 4558 d->skip_count= s->skip_count; |
4559 d->misc_bits= s->misc_bits; | |
329 | 4560 d->last_bits= 0; |
327 | 4561 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
4562 d->mb_skipped= 0; |
912 | 4563 d->qscale= s->qscale; |
1616 | 4564 d->dquant= s->dquant; |
326 | 4565 } |
4566 | |
456 | 4567 static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 4568 int i; |
4569 | |
2967 | 4570 memcpy(d->mv, s->mv, 2*4*2*sizeof(int)); |
326 | 4571 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? |
2967 | 4572 |
326 | 4573 /* mpeg1 */ |
1160 | 4574 d->mb_skip_run= s->mb_skip_run; |
326 | 4575 for(i=0; i<3; i++) |
4576 d->last_dc[i]= s->last_dc[i]; | |
2967 | 4577 |
326 | 4578 /* statistics */ |
4579 d->mv_bits= s->mv_bits; | |
4580 d->i_tex_bits= s->i_tex_bits; | |
4581 d->p_tex_bits= s->p_tex_bits; | |
4582 d->i_count= s->i_count; | |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4583 d->f_count= s->f_count; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4584 d->b_count= s->b_count; |
326 | 4585 d->skip_count= s->skip_count; |
4586 d->misc_bits= s->misc_bits; | |
4587 | |
4588 d->mb_intra= s->mb_intra; | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
4589 d->mb_skipped= s->mb_skipped; |
326 | 4590 d->mv_type= s->mv_type; |
4591 d->mv_dir= s->mv_dir; | |
4592 d->pb= s->pb; | |
456 | 4593 if(s->data_partitioning){ |
4594 d->pb2= s->pb2; | |
4595 d->tex_pb= s->tex_pb; | |
4596 } | |
326 | 4597 d->block= s->block; |
4598 for(i=0; i<6; i++) | |
4599 d->block_last_index[i]= s->block_last_index[i]; | |
755 | 4600 d->interlaced_dct= s->interlaced_dct; |
912 | 4601 d->qscale= s->qscale; |
326 | 4602 } |
4603 | |
2967 | 4604 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type, |
456 | 4605 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2], |
4606 int *dmin, int *next_block, int motion_x, int motion_y) | |
4607 { | |
1389 | 4608 int score; |
4609 uint8_t *dest_backup[3]; | |
2967 | 4610 |
456 | 4611 copy_context_before_encode(s, backup, type); |
4612 | |
4613 s->block= s->blocks[*next_block]; | |
4614 s->pb= pb[*next_block]; | |
4615 if(s->data_partitioning){ | |
4616 s->pb2 = pb2 [*next_block]; | |
4617 s->tex_pb= tex_pb[*next_block]; | |
4618 } | |
2967 | 4619 |
1389 | 4620 if(*next_block){ |
4621 memcpy(dest_backup, s->dest, sizeof(s->dest)); | |
1799 | 4622 s->dest[0] = s->rd_scratchpad; |
4623 s->dest[1] = s->rd_scratchpad + 16*s->linesize; | |
4624 s->dest[2] = s->rd_scratchpad + 16*s->linesize + 8; | |
4625 assert(s->linesize >= 32); //FIXME | |
1389 | 4626 } |
456 | 4627 |
4628 encode_mb(s, motion_x, motion_y); | |
2967 | 4629 |
1786 | 4630 score= put_bits_count(&s->pb); |
456 | 4631 if(s->data_partitioning){ |
1786 | 4632 score+= put_bits_count(&s->pb2); |
4633 score+= put_bits_count(&s->tex_pb); | |
456 | 4634 } |
2967 | 4635 |
1389 | 4636 if(s->avctx->mb_decision == FF_MB_DECISION_RD){ |
4637 MPV_decode_mb(s, s->block); | |
4638 | |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
4639 score *= s->lambda2; |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
4640 score += sse_mb(s) << FF_LAMBDA_SHIFT; |
1389 | 4641 } |
2967 | 4642 |
1389 | 4643 if(*next_block){ |
4644 memcpy(s->dest, dest_backup, sizeof(s->dest)); | |
4645 } | |
4646 | |
4647 if(score<*dmin){ | |
4648 *dmin= score; | |
456 | 4649 *next_block^=1; |
4650 | |
4651 copy_context_after_encode(best, s, type); | |
4652 } | |
4653 } | |
2967 | 4654 |
1389 | 4655 static int sse(MpegEncContext *s, uint8_t *src1, uint8_t *src2, int w, int h, int stride){ |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4656 uint32_t *sq = squareTbl + 256; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4657 int acc=0; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4658 int x,y; |
2967 | 4659 |
4660 if(w==16 && h==16) | |
1708 | 4661 return s->dsp.sse[0](NULL, src1, src2, stride, 16); |
936 | 4662 else if(w==8 && h==8) |
1708 | 4663 return s->dsp.sse[1](NULL, src1, src2, stride, 8); |
2967 | 4664 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4665 for(y=0; y<h; y++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4666 for(x=0; x<w; x++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4667 acc+= sq[src1[x + y*stride] - src2[x + y*stride]]; |
2967 | 4668 } |
4669 } | |
4670 | |
936 | 4671 assert(acc>=0); |
2967 | 4672 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4673 return acc; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4674 } |
326 | 4675 |
1389 | 4676 static int sse_mb(MpegEncContext *s){ |
4677 int w= 16; | |
4678 int h= 16; | |
4679 | |
4680 if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; | |
4681 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; | |
4682 | |
4683 if(w==16 && h==16) | |
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4684 if(s->avctx->mb_cmp == FF_CMP_NSSE){ |
2066 | 4685 return s->dsp.nsse[0](s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], s->linesize, 16) |
4686 +s->dsp.nsse[1](s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], s->uvlinesize, 8) | |
4687 +s->dsp.nsse[1](s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], s->uvlinesize, 8); | |
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4688 }else{ |
1708 | 4689 return s->dsp.sse[0](NULL, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], s->linesize, 16) |
4690 +s->dsp.sse[1](NULL, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], s->uvlinesize, 8) | |
4691 +s->dsp.sse[1](NULL, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], s->uvlinesize, 8); | |
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4692 } |
1389 | 4693 else |
4694 return sse(s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], w, h, s->linesize) | |
4695 +sse(s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], w>>1, h>>1, s->uvlinesize) | |
4696 +sse(s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], w>>1, h>>1, s->uvlinesize); | |
4697 } | |
4698 | |
1799 | 4699 static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){ |
4700 MpegEncContext *s= arg; | |
4701 | |
2967 | 4702 |
1799 | 4703 s->me.pre_pass=1; |
4704 s->me.dia_size= s->avctx->pre_dia_size; | |
4705 s->first_slice_line=1; | |
4706 for(s->mb_y= s->end_mb_y-1; s->mb_y >= s->start_mb_y; s->mb_y--) { | |
4707 for(s->mb_x=s->mb_width-1; s->mb_x >=0 ;s->mb_x--) { | |
4708 ff_pre_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
4709 } | |
4710 s->first_slice_line=0; | |
4711 } | |
2967 | 4712 |
1799 | 4713 s->me.pre_pass=0; |
2967 | 4714 |
1799 | 4715 return 0; |
4716 } | |
4717 | |
4718 static int estimate_motion_thread(AVCodecContext *c, void *arg){ | |
4719 MpegEncContext *s= arg; | |
4720 | |
4721 s->me.dia_size= s->avctx->dia_size; | |
4722 s->first_slice_line=1; | |
4723 for(s->mb_y= s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) { | |
4724 s->mb_x=0; //for block init below | |
4725 ff_init_block_index(s); | |
4726 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { | |
4727 s->block_index[0]+=2; | |
4728 s->block_index[1]+=2; | |
4729 s->block_index[2]+=2; | |
4730 s->block_index[3]+=2; | |
2967 | 4731 |
1799 | 4732 /* compute motion vector & mb_type and store in context */ |
4733 if(s->pict_type==B_TYPE) | |
4734 ff_estimate_b_frame_motion(s, s->mb_x, s->mb_y); | |
4735 else | |
4736 ff_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
4737 } | |
4738 s->first_slice_line=0; | |
4739 } | |
4740 return 0; | |
4741 } | |
4742 | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4743 static int mb_var_thread(AVCodecContext *c, void *arg){ |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4744 MpegEncContext *s= arg; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4745 int mb_x, mb_y; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4746 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4747 for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4748 for(mb_x=0; mb_x < s->mb_width; mb_x++) { |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4749 int xx = mb_x * 16; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4750 int yy = mb_y * 16; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4751 uint8_t *pix = s->new_picture.data[0] + (yy * s->linesize) + xx; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4752 int varc; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4753 int sum = s->dsp.pix_sum(pix, s->linesize); |
2967 | 4754 |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4755 varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4756 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4757 s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4758 s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
4759 s->me.mb_var_sum_temp += varc; |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4760 } |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4761 } |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4762 return 0; |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4763 } |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4764 |
1799 | 4765 static void write_slice_end(MpegEncContext *s){ |
4766 if(s->codec_id==CODEC_ID_MPEG4){ | |
4767 if(s->partitioned_frame){ | |
4768 ff_mpeg4_merge_partitions(s); | |
4769 } | |
2967 | 4770 |
1799 | 4771 ff_mpeg4_stuffing(&s->pb); |
4772 }else if(s->out_format == FMT_MJPEG){ | |
4773 ff_mjpeg_stuffing(&s->pb); | |
4774 } | |
4775 | |
4776 align_put_bits(&s->pb); | |
4777 flush_put_bits(&s->pb); | |
2967 | 4778 |
2428
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
4779 if((s->flags&CODEC_FLAG_PASS1) && !s->partitioned_frame) |
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
4780 s->misc_bits+= get_bits_diff(s); |
1799 | 4781 } |
4782 | |
4783 static int encode_thread(AVCodecContext *c, void *arg){ | |
4784 MpegEncContext *s= arg; | |
766 | 4785 int mb_x, mb_y, pdif = 0; |
1708 | 4786 int i, j; |
326 | 4787 MpegEncContext best_s, backup_s; |
2422 | 4788 uint8_t bit_buf[2][MAX_MB_BYTES]; |
4789 uint8_t bit_buf2[2][MAX_MB_BYTES]; | |
4790 uint8_t bit_buf_tex[2][MAX_MB_BYTES]; | |
456 | 4791 PutBitContext pb[2], pb2[2], tex_pb[2]; |
1799 | 4792 //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y); |
456 | 4793 |
4794 for(i=0; i<2; i++){ | |
2422 | 4795 init_put_bits(&pb [i], bit_buf [i], MAX_MB_BYTES); |
4796 init_put_bits(&pb2 [i], bit_buf2 [i], MAX_MB_BYTES); | |
4797 init_put_bits(&tex_pb[i], bit_buf_tex[i], MAX_MB_BYTES); | |
456 | 4798 } |
0 | 4799 |
1786 | 4800 s->last_bits= put_bits_count(&s->pb); |
286 | 4801 s->mv_bits=0; |
4802 s->misc_bits=0; | |
4803 s->i_tex_bits=0; | |
4804 s->p_tex_bits=0; | |
4805 s->i_count=0; | |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4806 s->f_count=0; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4807 s->b_count=0; |
286 | 4808 s->skip_count=0; |
4809 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4810 for(i=0; i<3; i++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4811 /* init last dc values */ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4812 /* note: quant matrix value (8) is implied here */ |
1992 | 4813 s->last_dc[i] = 128 << s->intra_dc_precision; |
2967 | 4814 |
2955 | 4815 s->current_picture.error[i] = 0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4816 } |
1160 | 4817 s->mb_skip_run = 0; |
1708 | 4818 memset(s->last_mv, 0, sizeof(s->last_mv)); |
2967 | 4819 |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4820 s->last_mv_dir = 0; |
0 | 4821 |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4822 switch(s->codec_id){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4823 case CODEC_ID_H263: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4824 case CODEC_ID_H263P: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4825 case CODEC_ID_FLV1: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4826 s->gob_index = ff_h263_get_gob_height(s); |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4827 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4828 case CODEC_ID_MPEG4: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4829 if(s->partitioned_frame) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4830 ff_mpeg4_init_partitions(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4831 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4832 } |
456 | 4833 |
4834 s->resync_mb_x=0; | |
2967 | 4835 s->resync_mb_y=0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4836 s->first_slice_line = 1; |
766 | 4837 s->ptr_lastgob = s->pb.buf; |
1799 | 4838 for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { |
4839 // printf("row %d at %X\n", s->mb_y, (int)s); | |
1389 | 4840 s->mb_x=0; |
4841 s->mb_y= mb_y; | |
4842 | |
1652 | 4843 ff_set_qscale(s, s->qscale); |
1389 | 4844 ff_init_block_index(s); |
2967 | 4845 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4846 for(mb_x=0; mb_x < s->mb_width; mb_x++) { |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4847 int xy= mb_y*s->mb_stride + mb_x; // removed const, H261 needs to adjust this |
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:
1173
diff
changeset
|
4848 int mb_type= s->mb_type[xy]; |
456 | 4849 // int d; |
1389 | 4850 int dmin= INT_MAX; |
1708 | 4851 int dir; |
0 | 4852 |
2422 | 4853 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < MAX_MB_BYTES){ |
4854 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
4855 return -1; | |
4856 } | |
4857 if(s->data_partitioning){ | |
4858 if( s->pb2 .buf_end - s->pb2 .buf - (put_bits_count(&s-> pb2)>>3) < MAX_MB_BYTES | |
4859 || s->tex_pb.buf_end - s->tex_pb.buf - (put_bits_count(&s->tex_pb )>>3) < MAX_MB_BYTES){ | |
4860 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
4861 return -1; | |
4862 } | |
4863 } | |
4864 | |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4865 s->mb_x = mb_x; |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4866 s->mb_y = mb_y; // moved into loop, can get changed by H.261 |
1389 | 4867 ff_update_block_index(s); |
456 | 4868 |
2639 | 4869 #ifdef CONFIG_H261_ENCODER |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4870 if(s->codec_id == CODEC_ID_H261){ |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4871 ff_h261_reorder_mb_index(s); |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4872 xy= s->mb_y*s->mb_stride + s->mb_x; |
2345 | 4873 mb_type= s->mb_type[xy]; |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4874 } |
2639 | 4875 #endif |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4876 |
766 | 4877 /* write gob / video packet header */ |
1661 | 4878 if(s->rtp_mode){ |
766 | 4879 int current_packet_size, is_gob_start; |
2967 | 4880 |
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
4881 current_packet_size= ((put_bits_count(&s->pb)+7)>>3) - (s->ptr_lastgob - s->pb.buf); |
2967 | 4882 |
4883 is_gob_start= s->avctx->rtp_payload_size && current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x>0; | |
4884 | |
1799 | 4885 if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0) is_gob_start=1; |
2967 | 4886 |
1661 | 4887 switch(s->codec_id){ |
4888 case CODEC_ID_H263: | |
4889 case CODEC_ID_H263P: | |
4890 if(!s->h263_slice_structured) | |
4891 if(s->mb_x || s->mb_y%s->gob_index) is_gob_start=0; | |
4892 break; | |
4893 case CODEC_ID_MPEG2VIDEO: | |
4894 if(s->mb_x==0 && s->mb_y!=0) is_gob_start=1; | |
4895 case CODEC_ID_MPEG1VIDEO: | |
4896 if(s->mb_skip_run) is_gob_start=0; | |
4897 break; | |
4898 } | |
1799 | 4899 |
1661 | 4900 if(is_gob_start){ |
1799 | 4901 if(s->start_mb_y != mb_y || mb_x!=0){ |
4902 write_slice_end(s); | |
4903 | |
4904 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame){ | |
4905 ff_mpeg4_init_partitions(s); | |
4906 } | |
1661 | 4907 } |
2967 | 4908 |
1786 | 4909 assert((put_bits_count(&s->pb)&7) == 0); |
1661 | 4910 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob; |
2967 | 4911 |
1688 | 4912 if(s->avctx->error_rate && s->resync_mb_x + s->resync_mb_y > 0){ |
2371 | 4913 int r= put_bits_count(&s->pb)/8 + s->picture_number + 16 + s->mb_x + s->mb_y; |
1688 | 4914 int d= 100 / s->avctx->error_rate; |
4915 if(r % d == 0){ | |
4916 current_packet_size=0; | |
4917 #ifndef ALT_BITSTREAM_WRITER | |
4918 s->pb.buf_ptr= s->ptr_lastgob; | |
4919 #endif | |
4920 assert(pbBufPtr(&s->pb) == s->ptr_lastgob); | |
4921 } | |
4922 } | |
2492
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4923 |
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4924 if (s->avctx->rtp_callback){ |
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4925 int number_mb = (mb_y - s->resync_mb_y)*s->mb_width + mb_x - s->resync_mb_x; |
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4926 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, number_mb); |
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4927 } |
2967 | 4928 |
1661 | 4929 switch(s->codec_id){ |
4930 case CODEC_ID_MPEG4: | |
456 | 4931 ff_mpeg4_encode_video_packet_header(s); |
4932 ff_mpeg4_clean_buffers(s); | |
1661 | 4933 break; |
4934 case CODEC_ID_MPEG1VIDEO: | |
4935 case CODEC_ID_MPEG2VIDEO: | |
1421 | 4936 ff_mpeg1_encode_slice_header(s); |
4937 ff_mpeg1_clean_buffers(s); | |
1661 | 4938 break; |
4939 case CODEC_ID_H263: | |
4940 case CODEC_ID_H263P: | |
2967 | 4941 h263_encode_gob_header(s, mb_y); |
1661 | 4942 break; |
1160 | 4943 } |
1661 | 4944 |
4945 if(s->flags&CODEC_FLAG_PASS1){ | |
1786 | 4946 int bits= put_bits_count(&s->pb); |
1661 | 4947 s->misc_bits+= bits - s->last_bits; |
4948 s->last_bits= bits; | |
766 | 4949 } |
2967 | 4950 |
1662 | 4951 s->ptr_lastgob += current_packet_size; |
456 | 4952 s->first_slice_line=1; |
4953 s->resync_mb_x=mb_x; | |
4954 s->resync_mb_y=mb_y; | |
4955 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4956 } |
456 | 4957 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4958 if( (s->resync_mb_x == s->mb_x) |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4959 && s->resync_mb_y+1 == s->mb_y){ |
2967 | 4960 s->first_slice_line=0; |
456 | 4961 } |
4962 | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
4963 s->mb_skipped=0; |
1616 | 4964 s->dquant=0; //only for QP_RD |
4965 | |
2230 | 4966 if(mb_type & (mb_type-1) || (s->flags & CODEC_FLAG_QP_RD)){ // more than 1 MB type possible or CODEC_FLAG_QP_RD |
327 | 4967 int next_block=0; |
456 | 4968 int pb_bits_count, pb2_bits_count, tex_pb_bits_count; |
326 | 4969 |
4970 copy_context_before_encode(&backup_s, s, -1); | |
456 | 4971 backup_s.pb= s->pb; |
4972 best_s.data_partitioning= s->data_partitioning; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4973 best_s.partitioned_frame= s->partitioned_frame; |
456 | 4974 if(s->data_partitioning){ |
4975 backup_s.pb2= s->pb2; | |
4976 backup_s.tex_pb= s->tex_pb; | |
4977 } | |
326 | 4978 |
1708 | 4979 if(mb_type&CANDIDATE_MB_TYPE_INTER){ |
327 | 4980 s->mv_dir = MV_DIR_FORWARD; |
295 | 4981 s->mv_type = MV_TYPE_16X16; |
294 | 4982 s->mb_intra= 0; |
324 | 4983 s->mv[0][0][0] = s->p_mv_table[xy][0]; |
4984 s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
2967 | 4985 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb, |
456 | 4986 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
0 | 4987 } |
2967 | 4988 if(mb_type&CANDIDATE_MB_TYPE_INTER_I){ |
1708 | 4989 s->mv_dir = MV_DIR_FORWARD; |
4990 s->mv_type = MV_TYPE_FIELD; | |
4991 s->mb_intra= 0; | |
4992 for(i=0; i<2; i++){ | |
4993 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
4994 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
4995 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
4996 } | |
2967 | 4997 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb, |
1708 | 4998 &dmin, &next_block, 0, 0); |
4999 } | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
5000 if(mb_type&CANDIDATE_MB_TYPE_SKIPPED){ |
1494
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
5001 s->mv_dir = MV_DIR_FORWARD; |
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
5002 s->mv_type = MV_TYPE_16X16; |
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
5003 s->mb_intra= 0; |
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
5004 s->mv[0][0][0] = 0; |
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
5005 s->mv[0][0][1] = 0; |
2967 | 5006 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_SKIPPED, pb, pb2, tex_pb, |
1494
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
5007 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
5008 } |
2967 | 5009 if(mb_type&CANDIDATE_MB_TYPE_INTER4V){ |
327 | 5010 s->mv_dir = MV_DIR_FORWARD; |
295 | 5011 s->mv_type = MV_TYPE_8X8; |
5012 s->mb_intra= 0; | |
5013 for(i=0; i<4; i++){ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
5014 s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
5015 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
295 | 5016 } |
2967 | 5017 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb, |
456 | 5018 &dmin, &next_block, 0, 0); |
327 | 5019 } |
1708 | 5020 if(mb_type&CANDIDATE_MB_TYPE_FORWARD){ |
327 | 5021 s->mv_dir = MV_DIR_FORWARD; |
5022 s->mv_type = MV_TYPE_16X16; | |
5023 s->mb_intra= 0; | |
5024 s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
5025 s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
2967 | 5026 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb, |
456 | 5027 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
327 | 5028 } |
1708 | 5029 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD){ |
327 | 5030 s->mv_dir = MV_DIR_BACKWARD; |
5031 s->mv_type = MV_TYPE_16X16; | |
5032 s->mb_intra= 0; | |
5033 s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
5034 s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
2967 | 5035 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb, |
456 | 5036 &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]); |
327 | 5037 } |
1708 | 5038 if(mb_type&CANDIDATE_MB_TYPE_BIDIR){ |
327 | 5039 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
5040 s->mv_type = MV_TYPE_16X16; | |
5041 s->mb_intra= 0; | |
5042 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
5043 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
5044 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
5045 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
2967 | 5046 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb, |
456 | 5047 &dmin, &next_block, 0, 0); |
327 | 5048 } |
1708 | 5049 if(mb_type&CANDIDATE_MB_TYPE_DIRECT){ |
936 | 5050 int mx= s->b_direct_mv_table[xy][0]; |
5051 int my= s->b_direct_mv_table[xy][1]; | |
2967 | 5052 |
327 | 5053 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
5054 s->mb_intra= 0; | |
936 | 5055 ff_mpeg4_set_direct_mv(s, mx, my); |
2967 | 5056 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb, |
936 | 5057 &dmin, &next_block, mx, my); |
295 | 5058 } |
2967 | 5059 if(mb_type&CANDIDATE_MB_TYPE_FORWARD_I){ |
1708 | 5060 s->mv_dir = MV_DIR_FORWARD; |
5061 s->mv_type = MV_TYPE_FIELD; | |
5062 s->mb_intra= 0; | |
5063 for(i=0; i<2; i++){ | |
5064 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
5065 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
5066 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
5067 } | |
2967 | 5068 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb, |
1708 | 5069 &dmin, &next_block, 0, 0); |
5070 } | |
2967 | 5071 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD_I){ |
1708 | 5072 s->mv_dir = MV_DIR_BACKWARD; |
5073 s->mv_type = MV_TYPE_FIELD; | |
5074 s->mb_intra= 0; | |
5075 for(i=0; i<2; i++){ | |
5076 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
5077 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
5078 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
5079 } | |
2967 | 5080 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb, |
1708 | 5081 &dmin, &next_block, 0, 0); |
5082 } | |
2967 | 5083 if(mb_type&CANDIDATE_MB_TYPE_BIDIR_I){ |
1708 | 5084 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
5085 s->mv_type = MV_TYPE_FIELD; | |
5086 s->mb_intra= 0; | |
5087 for(dir=0; dir<2; dir++){ | |
5088 for(i=0; i<2; i++){ | |
5089 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
5090 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
5091 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
5092 } | |
5093 } | |
2967 | 5094 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb, |
1708 | 5095 &dmin, &next_block, 0, 0); |
5096 } | |
5097 if(mb_type&CANDIDATE_MB_TYPE_INTRA){ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5098 s->mv_dir = 0; |
295 | 5099 s->mv_type = MV_TYPE_16X16; |
294 | 5100 s->mb_intra= 1; |
5101 s->mv[0][0][0] = 0; | |
5102 s->mv[0][0][1] = 0; | |
2967 | 5103 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb, |
456 | 5104 &dmin, &next_block, 0, 0); |
1389 | 5105 if(s->h263_pred || s->h263_aic){ |
5106 if(best_s.mb_intra) | |
5107 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1; | |
5108 else | |
5109 ff_clean_intra_table_entries(s); //old mode? | |
5110 } | |
295 | 5111 } |
1616 | 5112 |
5113 if(s->flags & CODEC_FLAG_QP_RD){ | |
5114 if(best_s.mv_type==MV_TYPE_16X16 && !(best_s.mv_dir&MV_DIRECT)){ | |
5115 const int last_qp= backup_s.qscale; | |
5116 int dquant, dir, qp, dc[6]; | |
1617 | 5117 DCTELEM ac[6][16]; |
1623 | 5118 const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0; |
2967 | 5119 |
1616 | 5120 assert(backup_s.dquant == 0); |
5121 | |
5122 //FIXME intra | |
5123 s->mv_dir= best_s.mv_dir; | |
5124 s->mv_type = MV_TYPE_16X16; | |
5125 s->mb_intra= best_s.mb_intra; | |
5126 s->mv[0][0][0] = best_s.mv[0][0][0]; | |
5127 s->mv[0][0][1] = best_s.mv[0][0][1]; | |
5128 s->mv[1][0][0] = best_s.mv[1][0][0]; | |
5129 s->mv[1][0][1] = best_s.mv[1][0][1]; | |
2967 | 5130 |
1616 | 5131 dir= s->pict_type == B_TYPE ? 2 : 1; |
1623 | 5132 if(last_qp + dir > s->avctx->qmax) dir= -dir; |
1616 | 5133 for(dquant= dir; dquant<=2 && dquant>=-2; dquant += dir){ |
5134 qp= last_qp + dquant; | |
5135 if(qp < s->avctx->qmin || qp > s->avctx->qmax) | |
5136 break; | |
5137 backup_s.dquant= dquant; | |
2229 | 5138 if(s->mb_intra && s->dc_val[0]){ |
1617 | 5139 for(i=0; i<6; i++){ |
5140 dc[i]= s->dc_val[0][ s->block_index[i] ]; | |
5141 memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(DCTELEM)*16); | |
5142 } | |
1616 | 5143 } |
1617 | 5144 |
2967 | 5145 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb, |
1623 | 5146 &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]); |
1616 | 5147 if(best_s.qscale != qp){ |
2229 | 5148 if(s->mb_intra && s->dc_val[0]){ |
1617 | 5149 for(i=0; i<6; i++){ |
5150 s->dc_val[0][ s->block_index[i] ]= dc[i]; | |
5151 memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM)*16); | |
5152 } | |
1616 | 5153 } |
5154 if(dir > 0 && dquant==dir){ | |
5155 dquant= 0; | |
5156 dir= -dir; | |
5157 }else | |
5158 break; | |
5159 } | |
5160 } | |
5161 qp= best_s.qscale; | |
5162 s->current_picture.qscale_table[xy]= qp; | |
5163 } | |
5164 } | |
5165 | |
326 | 5166 copy_context_after_encode(s, &best_s, -1); |
2967 | 5167 |
1786 | 5168 pb_bits_count= put_bits_count(&s->pb); |
456 | 5169 flush_put_bits(&s->pb); |
5170 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count); | |
5171 s->pb= backup_s.pb; | |
2967 | 5172 |
456 | 5173 if(s->data_partitioning){ |
1786 | 5174 pb2_bits_count= put_bits_count(&s->pb2); |
456 | 5175 flush_put_bits(&s->pb2); |
5176 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count); | |
5177 s->pb2= backup_s.pb2; | |
2967 | 5178 |
1786 | 5179 tex_pb_bits_count= put_bits_count(&s->tex_pb); |
456 | 5180 flush_put_bits(&s->tex_pb); |
5181 ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count); | |
5182 s->tex_pb= backup_s.tex_pb; | |
5183 } | |
1786 | 5184 s->last_bits= put_bits_count(&s->pb); |
2967 | 5185 |
1389 | 5186 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
5187 ff_h263_update_motion_val(s); | |
2967 | 5188 |
1799 | 5189 if(next_block==0){ //FIXME 16 vs linesize16 |
5190 s->dsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16); | |
5191 s->dsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8); | |
5192 s->dsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8); | |
1389 | 5193 } |
5194 | |
5195 if(s->avctx->mb_decision == FF_MB_DECISION_BITS) | |
5196 MPV_decode_mb(s, s->block); | |
294 | 5197 } else { |
324 | 5198 int motion_x, motion_y; |
5199 s->mv_type=MV_TYPE_16X16; | |
294 | 5200 // only one MB-Type possible |
2967 | 5201 |
327 | 5202 switch(mb_type){ |
1708 | 5203 case CANDIDATE_MB_TYPE_INTRA: |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5204 s->mv_dir = 0; |
294 | 5205 s->mb_intra= 1; |
324 | 5206 motion_x= s->mv[0][0][0] = 0; |
5207 motion_y= s->mv[0][0][1] = 0; | |
327 | 5208 break; |
1708 | 5209 case CANDIDATE_MB_TYPE_INTER: |
324 | 5210 s->mv_dir = MV_DIR_FORWARD; |
5211 s->mb_intra= 0; | |
5212 motion_x= s->mv[0][0][0] = s->p_mv_table[xy][0]; | |
5213 motion_y= s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
327 | 5214 break; |
1708 | 5215 case CANDIDATE_MB_TYPE_INTER_I: |
5216 s->mv_dir = MV_DIR_FORWARD; | |
5217 s->mv_type = MV_TYPE_FIELD; | |
5218 s->mb_intra= 0; | |
5219 for(i=0; i<2; i++){ | |
5220 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
5221 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
5222 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
5223 } | |
5224 motion_x = motion_y = 0; | |
5225 break; | |
5226 case CANDIDATE_MB_TYPE_INTER4V: | |
456 | 5227 s->mv_dir = MV_DIR_FORWARD; |
5228 s->mv_type = MV_TYPE_8X8; | |
5229 s->mb_intra= 0; | |
5230 for(i=0; i<4; i++){ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
5231 s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
5232 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
456 | 5233 } |
5234 motion_x= motion_y= 0; | |
5235 break; | |
1708 | 5236 case CANDIDATE_MB_TYPE_DIRECT: |
324 | 5237 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
5238 s->mb_intra= 0; | |
327 | 5239 motion_x=s->b_direct_mv_table[xy][0]; |
5240 motion_y=s->b_direct_mv_table[xy][1]; | |
936 | 5241 ff_mpeg4_set_direct_mv(s, motion_x, motion_y); |
327 | 5242 break; |
1708 | 5243 case CANDIDATE_MB_TYPE_BIDIR: |
324 | 5244 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
294 | 5245 s->mb_intra= 0; |
324 | 5246 motion_x=0; |
5247 motion_y=0; | |
5248 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
5249 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
5250 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
5251 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
327 | 5252 break; |
1708 | 5253 case CANDIDATE_MB_TYPE_BACKWARD: |
324 | 5254 s->mv_dir = MV_DIR_BACKWARD; |
5255 s->mb_intra= 0; | |
5256 motion_x= s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
5257 motion_y= s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
327 | 5258 break; |
1708 | 5259 case CANDIDATE_MB_TYPE_FORWARD: |
324 | 5260 s->mv_dir = MV_DIR_FORWARD; |
5261 s->mb_intra= 0; | |
5262 motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
5263 motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
5264 // printf(" %d %d ", motion_x, motion_y); | |
327 | 5265 break; |
1708 | 5266 case CANDIDATE_MB_TYPE_FORWARD_I: |
5267 s->mv_dir = MV_DIR_FORWARD; | |
5268 s->mv_type = MV_TYPE_FIELD; | |
5269 s->mb_intra= 0; | |
5270 for(i=0; i<2; i++){ | |
5271 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
5272 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
5273 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
5274 } | |
5275 motion_x=motion_y=0; | |
5276 break; | |
5277 case CANDIDATE_MB_TYPE_BACKWARD_I: | |
5278 s->mv_dir = MV_DIR_BACKWARD; | |
5279 s->mv_type = MV_TYPE_FIELD; | |
5280 s->mb_intra= 0; | |
5281 for(i=0; i<2; i++){ | |
5282 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
5283 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
5284 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
5285 } | |
5286 motion_x=motion_y=0; | |
5287 break; | |
5288 case CANDIDATE_MB_TYPE_BIDIR_I: | |
5289 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
5290 s->mv_type = MV_TYPE_FIELD; | |
5291 s->mb_intra= 0; | |
5292 for(dir=0; dir<2; dir++){ | |
5293 for(i=0; i<2; i++){ | |
5294 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
5295 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
5296 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
5297 } | |
5298 } | |
5299 motion_x=motion_y=0; | |
5300 break; | |
327 | 5301 default: |
324 | 5302 motion_x=motion_y=0; //gcc warning fix |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
5303 av_log(s->avctx, AV_LOG_ERROR, "illegal MB type\n"); |
294 | 5304 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5305 |
324 | 5306 encode_mb(s, motion_x, motion_y); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5307 |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5308 // RAL: Update last macroblock type |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5309 s->last_mv_dir = s->mv_dir; |
2967 | 5310 |
1389 | 5311 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
5312 ff_h263_update_motion_val(s); | |
2967 | 5313 |
1389 | 5314 MPV_decode_mb(s, s->block); |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
244
diff
changeset
|
5315 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5316 |
327 | 5317 /* clean the MV table in IPS frames for direct mode in B frames */ |
5318 if(s->mb_intra /* && I,P,S_TYPE */){ | |
5319 s->p_mv_table[xy][0]=0; | |
5320 s->p_mv_table[xy][1]=0; | |
5321 } | |
2967 | 5322 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5323 if(s->flags&CODEC_FLAG_PSNR){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5324 int w= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5325 int h= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5326 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5327 if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5328 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; |
936 | 5329 |
2955 | 5330 s->current_picture.error[0] += sse( |
1389 | 5331 s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, |
5332 s->dest[0], w, h, s->linesize); | |
2955 | 5333 s->current_picture.error[1] += sse( |
1389 | 5334 s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
5335 s->dest[1], w>>1, h>>1, s->uvlinesize); | |
2955 | 5336 s->current_picture.error[2] += sse( |
1389 | 5337 s, s->new_picture .data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
5338 s->dest[2], w>>1, h>>1, s->uvlinesize); | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5339 } |
2345 | 5340 if(s->loop_filter){ |
5341 if(s->out_format == FMT_H263) | |
5342 ff_h263_loop_filter(s); | |
5343 } | |
1786 | 5344 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb)); |
0 | 5345 } |
5346 } | |
286 | 5347 |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5348 //not beautiful here but we must write it before flushing so it has to be here |
456 | 5349 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE) |
208 | 5350 msmpeg4_encode_ext_header(s); |
456 | 5351 |
1799 | 5352 write_slice_end(s); |
5353 | |
2967 | 5354 /* Send the last GOB if RTP */ |
1661 | 5355 if (s->avctx->rtp_callback) { |
2492
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
5356 int number_mb = (mb_y - s->resync_mb_y)*s->mb_width - s->resync_mb_x; |
234
5fc0c3af3fe4
alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents:
233
diff
changeset
|
5357 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob; |
231 | 5358 /* Call the RTP callback to send the last GOB */ |
1799 | 5359 emms_c(); |
2492
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
5360 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb); |
231 | 5361 } |
1799 | 5362 |
5363 return 0; | |
5364 } | |
5365 | |
5366 #define MERGE(field) dst->field += src->field; src->field=0 | |
5367 static void merge_context_after_me(MpegEncContext *dst, MpegEncContext *src){ | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5368 MERGE(me.scene_change_score); |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5369 MERGE(me.mc_mb_var_sum_temp); |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5370 MERGE(me.mb_var_sum_temp); |
1799 | 5371 } |
5372 | |
5373 static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src){ | |
5374 int i; | |
5375 | |
5376 MERGE(dct_count[0]); //note, the other dct vars are not part of the context | |
5377 MERGE(dct_count[1]); | |
5378 MERGE(mv_bits); | |
5379 MERGE(i_tex_bits); | |
5380 MERGE(p_tex_bits); | |
5381 MERGE(i_count); | |
5382 MERGE(f_count); | |
5383 MERGE(b_count); | |
5384 MERGE(skip_count); | |
5385 MERGE(misc_bits); | |
5386 MERGE(error_count); | |
5387 MERGE(padding_bug_score); | |
2955 | 5388 MERGE(current_picture.error[0]); |
5389 MERGE(current_picture.error[1]); | |
5390 MERGE(current_picture.error[2]); | |
1799 | 5391 |
5392 if(dst->avctx->noise_reduction){ | |
5393 for(i=0; i<64; i++){ | |
5394 MERGE(dct_error_sum[0][i]); | |
5395 MERGE(dct_error_sum[1][i]); | |
5396 } | |
5397 } | |
2967 | 5398 |
1799 | 5399 assert(put_bits_count(&src->pb) % 8 ==0); |
5400 assert(put_bits_count(&dst->pb) % 8 ==0); | |
5401 ff_copy_bits(&dst->pb, src->pb.buf, put_bits_count(&src->pb)); | |
5402 flush_put_bits(&dst->pb); | |
5403 } | |
5404 | |
2974 | 5405 static void estimate_qp(MpegEncContext *s, int dry_run){ |
5406 if (!s->fixed_qscale) | |
5407 s->current_picture_ptr->quality= | |
5408 s->current_picture.quality = ff_rate_estimate_qscale(s, dry_run); | |
5409 | |
5410 if(s->adaptive_quant){ | |
5411 switch(s->codec_id){ | |
5412 case CODEC_ID_MPEG4: | |
5413 ff_clean_mpeg4_qscales(s); | |
5414 break; | |
5415 case CODEC_ID_H263: | |
5416 case CODEC_ID_H263P: | |
5417 case CODEC_ID_FLV1: | |
5418 ff_clean_h263_qscales(s); | |
5419 break; | |
5420 } | |
5421 | |
5422 s->lambda= s->lambda_table[0]; | |
5423 //FIXME broken | |
5424 }else | |
5425 s->lambda= s->current_picture.quality; | |
5426 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); | |
5427 update_qscale(s); | |
5428 } | |
5429 | |
1799 | 5430 static void encode_picture(MpegEncContext *s, int picture_number) |
5431 { | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5432 int i; |
1799 | 5433 int bits; |
5434 | |
5435 s->picture_number = picture_number; | |
2967 | 5436 |
1799 | 5437 /* Reset the average MB variance */ |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5438 s->me.mb_var_sum_temp = |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5439 s->me.mc_mb_var_sum_temp = 0; |
1799 | 5440 |
5441 /* we need to initialize some time vars before we can encode b-frames */ | |
5442 // RAL: Condition added for MPEG1VIDEO | |
5443 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4)) | |
1834 | 5444 ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar |
2967 | 5445 |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5446 s->me.scene_change_score=0; |
2967 | 5447 |
2053 | 5448 // s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration |
2967 | 5449 |
1799 | 5450 if(s->pict_type==I_TYPE){ |
5451 if(s->msmpeg4_version >= 3) s->no_rounding=1; | |
5452 else s->no_rounding=0; | |
5453 }else if(s->pict_type!=B_TYPE){ | |
5454 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4) | |
2967 | 5455 s->no_rounding ^= 1; |
5456 } | |
5457 | |
2981 | 5458 if(s->flags & CODEC_FLAG_PASS2){ |
2974 | 5459 estimate_qp(s, 1); |
2981 | 5460 ff_get_2pass_fcode(s); |
5461 }else if(!(s->flags & CODEC_FLAG_QSCALE)){ | |
2980
529163f99474
improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2979
diff
changeset
|
5462 if(s->pict_type==B_TYPE) |
2997
188f4ef688f2
second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2990
diff
changeset
|
5463 s->lambda= s->last_lambda_for[s->pict_type]; |
2980
529163f99474
improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2979
diff
changeset
|
5464 else |
2997
188f4ef688f2
second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2990
diff
changeset
|
5465 s->lambda= s->last_lambda_for[s->last_non_b_pict_type]; |
2980
529163f99474
improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2979
diff
changeset
|
5466 update_qscale(s); |
529163f99474
improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2979
diff
changeset
|
5467 } |
2974 | 5468 |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5469 s->mb_intra=0; //for the rate distortion & bit compare functions |
1799 | 5470 for(i=1; i<s->avctx->thread_count; i++){ |
1827 | 5471 ff_update_duplicate_context(s->thread_context[i], s); |
1799 | 5472 } |
1962 | 5473 |
5474 ff_init_me(s); | |
5475 | |
1799 | 5476 /* Estimate motion for every MB */ |
5477 if(s->pict_type != I_TYPE){ | |
2584 | 5478 s->lambda = (s->lambda * s->avctx->me_penalty_compensation + 128)>>8; |
5479 s->lambda2= (s->lambda2* s->avctx->me_penalty_compensation + 128)>>8; | |
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
5480 if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){ |
1799 | 5481 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ |
5482 s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5483 } | |
5484 } | |
5485 | |
5486 s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5487 }else /* if(s->pict_type == I_TYPE) */{ | |
5488 /* I-Frame */ | |
5489 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
5490 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
2967 | 5491 |
1799 | 5492 if(!s->fixed_qscale){ |
5493 /* finding spatial complexity for I-frame rate control */ | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5494 s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); |
1799 | 5495 } |
5496 } | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5497 for(i=1; i<s->avctx->thread_count; i++){ |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5498 merge_context_after_me(s, s->thread_context[i]); |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5499 } |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5500 s->current_picture.mc_mb_var_sum= s->current_picture_ptr->mc_mb_var_sum= s->me.mc_mb_var_sum_temp; |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5501 s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp; |
1799 | 5502 emms_c(); |
5503 | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5504 if(s->me.scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){ |
1799 | 5505 s->pict_type= I_TYPE; |
5506 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
5507 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
5508 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); | |
5509 } | |
5510 | |
5511 if(!s->umvplus){ | |
5512 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { | |
5513 s->f_code= ff_get_best_fcode(s, s->p_mv_table, CANDIDATE_MB_TYPE_INTER); | |
5514 | |
5515 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
5516 int a,b; | |
5517 a= ff_get_best_fcode(s, s->p_field_mv_table[0][0], CANDIDATE_MB_TYPE_INTER_I); //FIXME field_select | |
5518 b= ff_get_best_fcode(s, s->p_field_mv_table[1][1], CANDIDATE_MB_TYPE_INTER_I); | |
5519 s->f_code= FFMAX(s->f_code, FFMAX(a,b)); | |
5520 } | |
2967 | 5521 |
1799 | 5522 ff_fix_long_p_mvs(s); |
5523 ff_fix_long_mvs(s, NULL, 0, s->p_mv_table, s->f_code, CANDIDATE_MB_TYPE_INTER, 0); | |
5524 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5525 int j; |
1799 | 5526 for(i=0; i<2; i++){ |
5527 for(j=0; j<2; j++) | |
2967 | 5528 ff_fix_long_mvs(s, s->p_field_select_table[i], j, |
1799 | 5529 s->p_field_mv_table[i][j], s->f_code, CANDIDATE_MB_TYPE_INTER_I, 0); |
5530 } | |
5531 } | |
5532 } | |
5533 | |
5534 if(s->pict_type==B_TYPE){ | |
5535 int a, b; | |
5536 | |
5537 a = ff_get_best_fcode(s, s->b_forw_mv_table, CANDIDATE_MB_TYPE_FORWARD); | |
5538 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
5539 s->f_code = FFMAX(a, b); | |
5540 | |
5541 a = ff_get_best_fcode(s, s->b_back_mv_table, CANDIDATE_MB_TYPE_BACKWARD); | |
5542 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
5543 s->b_code = FFMAX(a, b); | |
5544 | |
5545 ff_fix_long_mvs(s, NULL, 0, s->b_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_FORWARD, 1); | |
5546 ff_fix_long_mvs(s, NULL, 0, s->b_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BACKWARD, 1); | |
5547 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
5548 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
5549 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5550 int dir, j; |
1799 | 5551 for(dir=0; dir<2; dir++){ |
5552 for(i=0; i<2; i++){ | |
5553 for(j=0; j<2; j++){ | |
2967 | 5554 int type= dir ? (CANDIDATE_MB_TYPE_BACKWARD_I|CANDIDATE_MB_TYPE_BIDIR_I) |
1799 | 5555 : (CANDIDATE_MB_TYPE_FORWARD_I |CANDIDATE_MB_TYPE_BIDIR_I); |
2967 | 5556 ff_fix_long_mvs(s, s->b_field_select_table[dir][i], j, |
1799 | 5557 s->b_field_mv_table[dir][i][j], dir ? s->b_code : s->f_code, type, 1); |
5558 } | |
5559 } | |
5560 } | |
5561 } | |
5562 } | |
5563 } | |
5564 | |
2974 | 5565 estimate_qp(s, 0); |
2967 | 5566 |
5567 if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(s->flags & CODEC_FLAG_QSCALE)) | |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5568 s->qscale= 3; //reduce clipping problems |
2967 | 5569 |
1799 | 5570 if (s->out_format == FMT_MJPEG) { |
5571 /* for mjpeg, we do include qscale in the matrix */ | |
5572 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; | |
5573 for(i=1;i<64;i++){ | |
5574 int j= s->dsp.idct_permutation[i]; | |
5575 | |
2654 | 5576 s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3) & 0xFF; |
1799 | 5577 } |
2967 | 5578 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, |
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
5579 s->intra_matrix, s->intra_quant_bias, 8, 8, 1); |
1799 | 5580 s->qscale= 8; |
5581 } | |
2967 | 5582 |
1799 | 5583 //FIXME var duplication |
2235
0c04463f79d8
10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2231
diff
changeset
|
5584 s->current_picture_ptr->key_frame= |
1799 | 5585 s->current_picture.key_frame= s->pict_type == I_TYPE; //FIXME pic_ptr |
2235
0c04463f79d8
10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2231
diff
changeset
|
5586 s->current_picture_ptr->pict_type= |
1799 | 5587 s->current_picture.pict_type= s->pict_type; |
5588 | |
5589 if(s->current_picture.key_frame) | |
5590 s->picture_in_gop_number=0; | |
5591 | |
5592 s->last_bits= put_bits_count(&s->pb); | |
5593 switch(s->out_format) { | |
5594 case FMT_MJPEG: | |
5595 mjpeg_picture_header(s); | |
5596 break; | |
2639 | 5597 #ifdef CONFIG_H261_ENCODER |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5598 case FMT_H261: |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5599 ff_h261_encode_picture_header(s, picture_number); |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5600 break; |
2639 | 5601 #endif |
1799 | 5602 case FMT_H263: |
2967 | 5603 if (s->codec_id == CODEC_ID_WMV2) |
1799 | 5604 ff_wmv2_encode_picture_header(s, picture_number); |
2967 | 5605 else if (s->h263_msmpeg4) |
1799 | 5606 msmpeg4_encode_picture_header(s, picture_number); |
5607 else if (s->h263_pred) | |
5608 mpeg4_encode_picture_header(s, picture_number); | |
2639 | 5609 #ifdef CONFIG_RV10_ENCODER |
2967 | 5610 else if (s->codec_id == CODEC_ID_RV10) |
1799 | 5611 rv10_encode_picture_header(s, picture_number); |
2639 | 5612 #endif |
5613 #ifdef CONFIG_RV20_ENCODER | |
2967 | 5614 else if (s->codec_id == CODEC_ID_RV20) |
2380 | 5615 rv20_encode_picture_header(s, picture_number); |
2639 | 5616 #endif |
1799 | 5617 else if (s->codec_id == CODEC_ID_FLV1) |
5618 ff_flv_encode_picture_header(s, picture_number); | |
5619 else | |
5620 h263_encode_picture_header(s, picture_number); | |
5621 break; | |
5622 case FMT_MPEG1: | |
5623 mpeg1_encode_picture_header(s, picture_number); | |
5624 break; | |
5625 case FMT_H264: | |
5626 break; | |
5627 default: | |
5628 assert(0); | |
5629 } | |
5630 bits= put_bits_count(&s->pb); | |
5631 s->header_bits= bits - s->last_bits; | |
2967 | 5632 |
1799 | 5633 for(i=1; i<s->avctx->thread_count; i++){ |
5634 update_duplicate_context_after_me(s->thread_context[i], s); | |
5635 } | |
5636 s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5637 for(i=1; i<s->avctx->thread_count; i++){ | |
5638 merge_context_after_encode(s, s->thread_context[i]); | |
5639 } | |
5640 emms_c(); | |
0 | 5641 } |
5642 | |
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5643 #endif //CONFIG_ENCODERS |
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5644 |
1719 | 5645 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block){ |
1597 | 5646 const int intra= s->mb_intra; |
5647 int i; | |
5648 | |
1599 | 5649 s->dct_count[intra]++; |
5650 | |
1597 | 5651 for(i=0; i<64; i++){ |
5652 int level= block[i]; | |
5653 | |
5654 if(level){ | |
5655 if(level>0){ | |
5656 s->dct_error_sum[intra][i] += level; | |
5657 level -= s->dct_offset[intra][i]; | |
5658 if(level<0) level=0; | |
5659 }else{ | |
5660 s->dct_error_sum[intra][i] -= level; | |
5661 level += s->dct_offset[intra][i]; | |
5662 if(level>0) level=0; | |
5663 } | |
5664 block[i]= level; | |
5665 } | |
5666 } | |
5667 } | |
5668 | |
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5669 #ifdef CONFIG_ENCODERS |
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5670 |
2967 | 5671 static int dct_quantize_trellis_c(MpegEncContext *s, |
945 | 5672 DCTELEM *block, int n, |
5673 int qscale, int *overflow){ | |
5674 const int *qmat; | |
1064 | 5675 const uint8_t *scantable= s->intra_scantable.scantable; |
1718 | 5676 const uint8_t *perm_scantable= s->intra_scantable.permutated; |
945 | 5677 int max=0; |
5678 unsigned int threshold1, threshold2; | |
5679 int bias=0; | |
5680 int run_tab[65]; | |
5681 int level_tab[65]; | |
5682 int score_tab[65]; | |
1718 | 5683 int survivor[65]; |
5684 int survivor_count; | |
946 | 5685 int last_run=0; |
5686 int last_level=0; | |
5687 int last_score= 0; | |
1718 | 5688 int last_i; |
1715 | 5689 int coeff[2][64]; |
945 | 5690 int coeff_count[64]; |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
5691 int qmul, qadd, start_i, last_non_zero, i, dc; |
945 | 5692 const int esc_length= s->ac_esc_length; |
5693 uint8_t * length; | |
5694 uint8_t * last_length; | |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
5695 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
2967 | 5696 |
1092 | 5697 s->dsp.fdct (block); |
2967 | 5698 |
1597 | 5699 if(s->dct_error_sum) |
1719 | 5700 s->denoise_dct(s, block); |
945 | 5701 qmul= qscale*16; |
5702 qadd= ((qscale-1)|1)*8; | |
946 | 5703 |
945 | 5704 if (s->mb_intra) { |
5705 int q; | |
5706 if (!s->h263_aic) { | |
5707 if (n < 4) | |
5708 q = s->y_dc_scale; | |
5709 else | |
5710 q = s->c_dc_scale; | |
5711 q = q << 3; | |
5712 } else{ | |
5713 /* For AIC we skip quant/dequant of INTRADC */ | |
5714 q = 1 << 3; | |
5715 qadd=0; | |
5716 } | |
2967 | 5717 |
945 | 5718 /* note: block[0] is assumed to be positive */ |
5719 block[0] = (block[0] + (q >> 1)) / q; | |
5720 start_i = 1; | |
5721 last_non_zero = 0; | |
5722 qmat = s->q_intra_matrix[qscale]; | |
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
|
5723 if(s->mpeg_quant || s->out_format == FMT_MPEG1) |
945 | 5724 bias= 1<<(QMAT_SHIFT-1); |
5725 length = s->intra_ac_vlc_length; | |
5726 last_length= s->intra_ac_vlc_last_length; | |
5727 } else { | |
5728 start_i = 0; | |
5729 last_non_zero = -1; | |
5730 qmat = s->q_inter_matrix[qscale]; | |
5731 length = s->inter_ac_vlc_length; | |
5732 last_length= s->inter_ac_vlc_last_length; | |
5733 } | |
1718 | 5734 last_i= start_i; |
945 | 5735 |
5736 threshold1= (1<<QMAT_SHIFT) - bias - 1; | |
5737 threshold2= (threshold1<<1); | |
946 | 5738 |
1715 | 5739 for(i=63; i>=start_i; i--) { |
5740 const int j = scantable[i]; | |
5741 int level = block[j] * qmat[j]; | |
5742 | |
5743 if(((unsigned)(level+threshold1))>threshold2){ | |
5744 last_non_zero = i; | |
5745 break; | |
5746 } | |
5747 } | |
5748 | |
5749 for(i=start_i; i<=last_non_zero; i++) { | |
945 | 5750 const int j = scantable[i]; |
1715 | 5751 int level = block[j] * qmat[j]; |
945 | 5752 |
5753 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
5754 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
5755 if(((unsigned)(level+threshold1))>threshold2){ | |
5756 if(level>0){ | |
5757 level= (bias + level)>>QMAT_SHIFT; | |
1718 | 5758 coeff[0][i]= level; |
5759 coeff[1][i]= level-1; | |
946 | 5760 // coeff[2][k]= level-2; |
945 | 5761 }else{ |
5762 level= (bias - level)>>QMAT_SHIFT; | |
1718 | 5763 coeff[0][i]= -level; |
5764 coeff[1][i]= -level+1; | |
946 | 5765 // coeff[2][k]= -level+2; |
945 | 5766 } |
1718 | 5767 coeff_count[i]= FFMIN(level, 2); |
5768 assert(coeff_count[i]); | |
945 | 5769 max |=level; |
5770 }else{ | |
1718 | 5771 coeff[0][i]= (level>>31)|1; |
5772 coeff_count[i]= 1; | |
945 | 5773 } |
5774 } | |
2967 | 5775 |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5776 *overflow= s->max_qcoeff < max; //overflow might have happened |
2967 | 5777 |
945 | 5778 if(last_non_zero < start_i){ |
5779 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); | |
5780 return last_non_zero; | |
5781 } | |
5782 | |
1718 | 5783 score_tab[start_i]= 0; |
5784 survivor[0]= start_i; | |
5785 survivor_count= 1; | |
2967 | 5786 |
1718 | 5787 for(i=start_i; i<=last_non_zero; i++){ |
5788 int level_index, j; | |
5789 const int dct_coeff= ABS(block[ scantable[i] ]); | |
945 | 5790 const int zero_distoration= dct_coeff*dct_coeff; |
946 | 5791 int best_score=256*256*256*120; |
945 | 5792 for(level_index=0; level_index < coeff_count[i]; level_index++){ |
5793 int distoration; | |
5794 int level= coeff[level_index][i]; | |
1716 | 5795 const int alevel= ABS(level); |
945 | 5796 int unquant_coeff; |
2967 | 5797 |
945 | 5798 assert(level); |
5799 | |
5800 if(s->out_format == FMT_H263){ | |
1716 | 5801 unquant_coeff= alevel*qmul + qadd; |
947 | 5802 }else{ //MPEG1 |
1718 | 5803 j= s->dsp.idct_permutation[ scantable[i] ]; //FIXME optimize |
947 | 5804 if(s->mb_intra){ |
1716 | 5805 unquant_coeff = (int)( alevel * qscale * s->intra_matrix[j]) >> 3; |
947 | 5806 unquant_coeff = (unquant_coeff - 1) | 1; |
5807 }else{ | |
1716 | 5808 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4; |
947 | 5809 unquant_coeff = (unquant_coeff - 1) | 1; |
5810 } | |
5811 unquant_coeff<<= 3; | |
5812 } | |
946 | 5813 |
1715 | 5814 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration; |
945 | 5815 level+=64; |
5816 if((level&(~127)) == 0){ | |
1718 | 5817 for(j=survivor_count-1; j>=0; j--){ |
5818 int run= i - survivor[j]; | |
947 | 5819 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 5820 score += score_tab[i-run]; |
2967 | 5821 |
945 | 5822 if(score < best_score){ |
1718 | 5823 best_score= score; |
945 | 5824 run_tab[i+1]= run; |
5825 level_tab[i+1]= level-64; | |
5826 } | |
5827 } | |
5828 | |
5829 if(s->out_format == FMT_H263){ | |
1718 | 5830 for(j=survivor_count-1; j>=0; j--){ |
5831 int run= i - survivor[j]; | |
947 | 5832 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 5833 score += score_tab[i-run]; |
946 | 5834 if(score < last_score){ |
5835 last_score= score; | |
5836 last_run= run; | |
5837 last_level= level-64; | |
5838 last_i= i+1; | |
945 | 5839 } |
5840 } | |
5841 } | |
5842 }else{ | |
5843 distoration += esc_length*lambda; | |
1718 | 5844 for(j=survivor_count-1; j>=0; j--){ |
5845 int run= i - survivor[j]; | |
945 | 5846 int score= distoration + score_tab[i-run]; |
2967 | 5847 |
945 | 5848 if(score < best_score){ |
1718 | 5849 best_score= score; |
945 | 5850 run_tab[i+1]= run; |
5851 level_tab[i+1]= level-64; | |
5852 } | |
5853 } | |
5854 | |
5855 if(s->out_format == FMT_H263){ | |
1718 | 5856 for(j=survivor_count-1; j>=0; j--){ |
5857 int run= i - survivor[j]; | |
945 | 5858 int score= distoration + score_tab[i-run]; |
946 | 5859 if(score < last_score){ |
5860 last_score= score; | |
5861 last_run= run; | |
5862 last_level= level-64; | |
5863 last_i= i+1; | |
945 | 5864 } |
5865 } | |
5866 } | |
5867 } | |
5868 } | |
2967 | 5869 |
1718 | 5870 score_tab[i+1]= best_score; |
5871 | |
946 | 5872 //Note: there is a vlc code in mpeg4 which is 1 bit shorter then another one with a shorter run and the same level |
1718 | 5873 if(last_non_zero <= 27){ |
5874 for(; survivor_count; survivor_count--){ | |
5875 if(score_tab[ survivor[survivor_count-1] ] <= best_score) | |
5876 break; | |
5877 } | |
5878 }else{ | |
5879 for(; survivor_count; survivor_count--){ | |
5880 if(score_tab[ survivor[survivor_count-1] ] <= best_score + lambda) | |
5881 break; | |
5882 } | |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
5883 } |
1718 | 5884 |
5885 survivor[ survivor_count++ ]= i+1; | |
945 | 5886 } |
946 | 5887 |
945 | 5888 if(s->out_format != FMT_H263){ |
946 | 5889 last_score= 256*256*256*120; |
1718 | 5890 for(i= survivor[0]; i<=last_non_zero + 1; i++){ |
946 | 5891 int score= score_tab[i]; |
947 | 5892 if(i) score += lambda*2; //FIXME exacter? |
5893 | |
946 | 5894 if(score < last_score){ |
5895 last_score= score; | |
5896 last_i= i; | |
5897 last_level= level_tab[i]; | |
5898 last_run= run_tab[i]; | |
5899 } | |
945 | 5900 } |
5901 } | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5902 |
1715 | 5903 s->coded_score[n] = last_score; |
2967 | 5904 |
1716 | 5905 dc= ABS(block[0]); |
1718 | 5906 last_non_zero= last_i - 1; |
945 | 5907 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); |
2967 | 5908 |
945 | 5909 if(last_non_zero < start_i) |
5910 return last_non_zero; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5911 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5912 if(last_non_zero == 0 && start_i == 0){ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5913 int best_level= 0; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5914 int best_score= dc * dc; |
2967 | 5915 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5916 for(i=0; i<coeff_count[0]; i++){ |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5917 int level= coeff[i][0]; |
1716 | 5918 int alevel= ABS(level); |
5919 int unquant_coeff, score, distortion; | |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5920 |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5921 if(s->out_format == FMT_H263){ |
1716 | 5922 unquant_coeff= (alevel*qmul + qadd)>>3; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5923 }else{ //MPEG1 |
1716 | 5924 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4; |
5925 unquant_coeff = (unquant_coeff - 1) | 1; | |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5926 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5927 unquant_coeff = (unquant_coeff + 4) >> 3; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5928 unquant_coeff<<= 3 + 3; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5929 |
1716 | 5930 distortion= (unquant_coeff - dc) * (unquant_coeff - dc); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5931 level+=64; |
1716 | 5932 if((level&(~127)) == 0) score= distortion + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda; |
5933 else score= distortion + esc_length*lambda; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5934 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5935 if(score < best_score){ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5936 best_score= score; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5937 best_level= level - 64; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5938 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5939 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5940 block[0]= best_level; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5941 s->coded_score[n] = best_score - dc*dc; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5942 if(best_level == 0) return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5943 else return last_non_zero; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5944 } |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5945 |
946 | 5946 i= last_i; |
5947 assert(last_level); | |
1718 | 5948 |
5949 block[ perm_scantable[last_non_zero] ]= last_level; | |
946 | 5950 i -= last_run + 1; |
2967 | 5951 |
1718 | 5952 for(; i>start_i; i -= run_tab[i] + 1){ |
5953 block[ perm_scantable[i-1] ]= level_tab[i]; | |
945 | 5954 } |
5955 | |
5956 return last_non_zero; | |
5957 } | |
5958 | |
1777 | 5959 //#define REFINE_STATS 1 |
5960 static int16_t basis[64][64]; | |
5961 | |
5962 static void build_basis(uint8_t *perm){ | |
5963 int i, j, x, y; | |
5964 emms_c(); | |
5965 for(i=0; i<8; i++){ | |
5966 for(j=0; j<8; j++){ | |
5967 for(y=0; y<8; y++){ | |
5968 for(x=0; x<8; x++){ | |
5969 double s= 0.25*(1<<BASIS_SHIFT); | |
5970 int index= 8*i + j; | |
5971 int perm_index= perm[index]; | |
5972 if(i==0) s*= sqrt(0.5); | |
5973 if(j==0) s*= sqrt(0.5); | |
5974 basis[perm_index][8*x + y]= lrintf(s * cos((M_PI/8.0)*i*(x+0.5)) * cos((M_PI/8.0)*j*(y+0.5))); | |
5975 } | |
5976 } | |
5977 } | |
5978 } | |
5979 } | |
5980 | |
5981 static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? | |
5982 DCTELEM *block, int16_t *weight, DCTELEM *orig, | |
5983 int n, int qscale){ | |
5984 int16_t rem[64]; | |
3089 | 5985 DECLARE_ALIGNED_16(DCTELEM, d1[64]); |
1777 | 5986 const int *qmat; |
5987 const uint8_t *scantable= s->intra_scantable.scantable; | |
5988 const uint8_t *perm_scantable= s->intra_scantable.permutated; | |
5989 // unsigned int threshold1, threshold2; | |
5990 // int bias=0; | |
5991 int run_tab[65]; | |
5992 int prev_run=0; | |
5993 int prev_level=0; | |
5994 int qmul, qadd, start_i, last_non_zero, i, dc; | |
5995 uint8_t * length; | |
5996 uint8_t * last_length; | |
5997 int lambda; | |
5998 int rle_index, run, q, sum; | |
5999 #ifdef REFINE_STATS | |
6000 static int count=0; | |
6001 static int after_last=0; | |
6002 static int to_zero=0; | |
6003 static int from_zero=0; | |
6004 static int raise=0; | |
6005 static int lower=0; | |
6006 static int messed_sign=0; | |
6007 #endif | |
6008 | |
6009 if(basis[0][0] == 0) | |
6010 build_basis(s->dsp.idct_permutation); | |
2967 | 6011 |
1777 | 6012 qmul= qscale*2; |
6013 qadd= (qscale-1)|1; | |
6014 if (s->mb_intra) { | |
6015 if (!s->h263_aic) { | |
6016 if (n < 4) | |
6017 q = s->y_dc_scale; | |
6018 else | |
6019 q = s->c_dc_scale; | |
6020 } else{ | |
6021 /* For AIC we skip quant/dequant of INTRADC */ | |
6022 q = 1; | |
6023 qadd=0; | |
6024 } | |
6025 q <<= RECON_SHIFT-3; | |
6026 /* note: block[0] is assumed to be positive */ | |
6027 dc= block[0]*q; | |
6028 // block[0] = (block[0] + (q >> 1)) / q; | |
6029 start_i = 1; | |
6030 qmat = s->q_intra_matrix[qscale]; | |
6031 // if(s->mpeg_quant || s->out_format == FMT_MPEG1) | |
6032 // bias= 1<<(QMAT_SHIFT-1); | |
6033 length = s->intra_ac_vlc_length; | |
6034 last_length= s->intra_ac_vlc_last_length; | |
6035 } else { | |
6036 dc= 0; | |
6037 start_i = 0; | |
6038 qmat = s->q_inter_matrix[qscale]; | |
6039 length = s->inter_ac_vlc_length; | |
6040 last_length= s->inter_ac_vlc_last_length; | |
6041 } | |
6042 last_non_zero = s->block_last_index[n]; | |
6043 | |
6044 #ifdef REFINE_STATS | |
6045 {START_TIMER | |
6046 #endif | |
1784 | 6047 dc += (1<<(RECON_SHIFT-1)); |
6048 for(i=0; i<64; i++){ | |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
6049 rem[i]= dc - (orig[i]<<RECON_SHIFT); //FIXME use orig dirrectly instead of copying to rem[] |
1777 | 6050 } |
6051 #ifdef REFINE_STATS | |
6052 STOP_TIMER("memset rem[]")} | |
6053 #endif | |
6054 sum=0; | |
6055 for(i=0; i<64; i++){ | |
6056 int one= 36; | |
6057 int qns=4; | |
6058 int w; | |
6059 | |
6060 w= ABS(weight[i]) + qns*one; | |
6061 w= 15 + (48*qns*one + w/2)/w; // 16 .. 63 | |
6062 | |
6063 weight[i] = w; | |
6064 // w=weight[i] = (63*qns + (w/2)) / w; | |
2967 | 6065 |
1777 | 6066 assert(w>0); |
6067 assert(w<(1<<6)); | |
6068 sum += w*w; | |
6069 } | |
6070 lambda= sum*(uint64_t)s->lambda2 >> (FF_LAMBDA_SHIFT - 6 + 6 + 6 + 6); | |
6071 #ifdef REFINE_STATS | |
6072 {START_TIMER | |
6073 #endif | |
6074 run=0; | |
6075 rle_index=0; | |
6076 for(i=start_i; i<=last_non_zero; i++){ | |
6077 int j= perm_scantable[i]; | |
6078 const int level= block[j]; | |
6079 int coeff; | |
2967 | 6080 |
1777 | 6081 if(level){ |
6082 if(level<0) coeff= qmul*level - qadd; | |
6083 else coeff= qmul*level + qadd; | |
6084 run_tab[rle_index++]=run; | |
6085 run=0; | |
6086 | |
1784 | 6087 s->dsp.add_8x8basis(rem, basis[j], coeff); |
1777 | 6088 }else{ |
6089 run++; | |
6090 } | |
6091 } | |
6092 #ifdef REFINE_STATS | |
6093 if(last_non_zero>0){ | |
6094 STOP_TIMER("init rem[]") | |
6095 } | |
6096 } | |
6097 | |
6098 {START_TIMER | |
6099 #endif | |
6100 for(;;){ | |
1784 | 6101 int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0); |
1777 | 6102 int best_coeff=0; |
6103 int best_change=0; | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
6104 int run2, best_unquant_change=0, analyze_gradient; |
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6105 #ifdef REFINE_STATS |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6106 {START_TIMER |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6107 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6108 analyze_gradient = last_non_zero > 2 || s->avctx->quantizer_noise_shaping >= 3; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6109 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6110 if(analyze_gradient){ |
1777 | 6111 #ifdef REFINE_STATS |
6112 {START_TIMER | |
6113 #endif | |
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6114 for(i=0; i<64; i++){ |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6115 int w= weight[i]; |
2967 | 6116 |
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6117 d1[i] = (rem[i]*w*w + (1<<(RECON_SHIFT+12-1)))>>(RECON_SHIFT+12); |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6118 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6119 #ifdef REFINE_STATS |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6120 STOP_TIMER("rem*w*w")} |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6121 {START_TIMER |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6122 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6123 s->dsp.fdct(d1); |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6124 #ifdef REFINE_STATS |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6125 STOP_TIMER("dct")} |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6126 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6127 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6128 |
1777 | 6129 if(start_i){ |
6130 const int level= block[0]; | |
6131 int change, old_coeff; | |
6132 | |
6133 assert(s->mb_intra); | |
2967 | 6134 |
1777 | 6135 old_coeff= q*level; |
2967 | 6136 |
1777 | 6137 for(change=-1; change<=1; change+=2){ |
6138 int new_level= level + change; | |
6139 int score, new_coeff; | |
2967 | 6140 |
1777 | 6141 new_coeff= q*new_level; |
6142 if(new_coeff >= 2048 || new_coeff < 0) | |
6143 continue; | |
6144 | |
1784 | 6145 score= s->dsp.try_8x8basis(rem, weight, basis[0], new_coeff - old_coeff); |
1777 | 6146 if(score<best_score){ |
6147 best_score= score; | |
6148 best_coeff= 0; | |
6149 best_change= change; | |
6150 best_unquant_change= new_coeff - old_coeff; | |
6151 } | |
6152 } | |
6153 } | |
2967 | 6154 |
1777 | 6155 run=0; |
6156 rle_index=0; | |
6157 run2= run_tab[rle_index++]; | |
6158 prev_level=0; | |
6159 prev_run=0; | |
6160 | |
6161 for(i=start_i; i<64; i++){ | |
6162 int j= perm_scantable[i]; | |
6163 const int level= block[j]; | |
6164 int change, old_coeff; | |
6165 | |
6166 if(s->avctx->quantizer_noise_shaping < 3 && i > last_non_zero + 1) | |
6167 break; | |
6168 | |
6169 if(level){ | |
6170 if(level<0) old_coeff= qmul*level - qadd; | |
6171 else old_coeff= qmul*level + qadd; | |
6172 run2= run_tab[rle_index++]; //FIXME ! maybe after last | |
6173 }else{ | |
6174 old_coeff=0; | |
6175 run2--; | |
6176 assert(run2>=0 || i >= last_non_zero ); | |
6177 } | |
2967 | 6178 |
1777 | 6179 for(change=-1; change<=1; change+=2){ |
6180 int new_level= level + change; | |
6181 int score, new_coeff, unquant_change; | |
2967 | 6182 |
1777 | 6183 score=0; |
6184 if(s->avctx->quantizer_noise_shaping < 2 && ABS(new_level) > ABS(level)) | |
6185 continue; | |
6186 | |
6187 if(new_level){ | |
6188 if(new_level<0) new_coeff= qmul*new_level - qadd; | |
6189 else new_coeff= qmul*new_level + qadd; | |
6190 if(new_coeff >= 2048 || new_coeff <= -2048) | |
6191 continue; | |
6192 //FIXME check for overflow | |
2967 | 6193 |
1777 | 6194 if(level){ |
6195 if(level < 63 && level > -63){ | |
6196 if(i < last_non_zero) | |
6197 score += length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
6198 - length[UNI_AC_ENC_INDEX(run, level+64)]; | |
6199 else | |
6200 score += last_length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
6201 - last_length[UNI_AC_ENC_INDEX(run, level+64)]; | |
6202 } | |
6203 }else{ | |
6204 assert(ABS(new_level)==1); | |
2967 | 6205 |
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6206 if(analyze_gradient){ |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6207 int g= d1[ scantable[i] ]; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6208 if(g && (g^new_level) >= 0) |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6209 continue; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6210 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6211 |
1777 | 6212 if(i < last_non_zero){ |
6213 int next_i= i + run2 + 1; | |
6214 int next_level= block[ perm_scantable[next_i] ] + 64; | |
2967 | 6215 |
1777 | 6216 if(next_level&(~127)) |
6217 next_level= 0; | |
6218 | |
6219 if(next_i < last_non_zero) | |
6220 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
6221 + length[UNI_AC_ENC_INDEX(run2, next_level)] | |
6222 - length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
6223 else | |
6224 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
6225 + last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
6226 - last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
6227 }else{ | |
6228 score += last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
6229 if(prev_level){ | |
6230 score += length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
6231 - last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
6232 } | |
6233 } | |
6234 } | |
6235 }else{ | |
6236 new_coeff=0; | |
6237 assert(ABS(level)==1); | |
6238 | |
6239 if(i < last_non_zero){ | |
6240 int next_i= i + run2 + 1; | |
6241 int next_level= block[ perm_scantable[next_i] ] + 64; | |
2967 | 6242 |
1777 | 6243 if(next_level&(~127)) |
6244 next_level= 0; | |
6245 | |
6246 if(next_i < last_non_zero) | |
6247 score += length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
6248 - length[UNI_AC_ENC_INDEX(run2, next_level)] | |
6249 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
6250 else | |
6251 score += last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
6252 - last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
6253 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
6254 }else{ | |
6255 score += -last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
6256 if(prev_level){ | |
6257 score += last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
6258 - length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
6259 } | |
6260 } | |
6261 } | |
2967 | 6262 |
1777 | 6263 score *= lambda; |
6264 | |
6265 unquant_change= new_coeff - old_coeff; | |
6266 assert((score < 100*lambda && score > -100*lambda) || lambda==0); | |
2967 | 6267 |
1784 | 6268 score+= s->dsp.try_8x8basis(rem, weight, basis[j], unquant_change); |
1777 | 6269 if(score<best_score){ |
6270 best_score= score; | |
6271 best_coeff= i; | |
6272 best_change= change; | |
6273 best_unquant_change= unquant_change; | |
6274 } | |
6275 } | |
6276 if(level){ | |
6277 prev_level= level + 64; | |
6278 if(prev_level&(~127)) | |
6279 prev_level= 0; | |
6280 prev_run= run; | |
6281 run=0; | |
6282 }else{ | |
6283 run++; | |
6284 } | |
6285 } | |
6286 #ifdef REFINE_STATS | |
6287 STOP_TIMER("iterative step")} | |
6288 #endif | |
6289 | |
6290 if(best_change){ | |
6291 int j= perm_scantable[ best_coeff ]; | |
2967 | 6292 |
1777 | 6293 block[j] += best_change; |
2967 | 6294 |
1777 | 6295 if(best_coeff > last_non_zero){ |
6296 last_non_zero= best_coeff; | |
6297 assert(block[j]); | |
6298 #ifdef REFINE_STATS | |
6299 after_last++; | |
6300 #endif | |
6301 }else{ | |
6302 #ifdef REFINE_STATS | |
6303 if(block[j]){ | |
6304 if(block[j] - best_change){ | |
6305 if(ABS(block[j]) > ABS(block[j] - best_change)){ | |
6306 raise++; | |
6307 }else{ | |
6308 lower++; | |
6309 } | |
6310 }else{ | |
6311 from_zero++; | |
6312 } | |
6313 }else{ | |
6314 to_zero++; | |
6315 } | |
6316 #endif | |
6317 for(; last_non_zero>=start_i; last_non_zero--){ | |
6318 if(block[perm_scantable[last_non_zero]]) | |
6319 break; | |
6320 } | |
6321 } | |
6322 #ifdef REFINE_STATS | |
6323 count++; | |
6324 if(256*256*256*64 % count == 0){ | |
6325 printf("after_last:%d to_zero:%d from_zero:%d raise:%d lower:%d sign:%d xyp:%d/%d/%d\n", after_last, to_zero, from_zero, raise, lower, messed_sign, s->mb_x, s->mb_y, s->picture_number); | |
6326 } | |
6327 #endif | |
6328 run=0; | |
6329 rle_index=0; | |
6330 for(i=start_i; i<=last_non_zero; i++){ | |
6331 int j= perm_scantable[i]; | |
6332 const int level= block[j]; | |
2967 | 6333 |
1777 | 6334 if(level){ |
6335 run_tab[rle_index++]=run; | |
6336 run=0; | |
6337 }else{ | |
6338 run++; | |
6339 } | |
6340 } | |
2967 | 6341 |
1784 | 6342 s->dsp.add_8x8basis(rem, basis[j], best_unquant_change); |
1777 | 6343 }else{ |
6344 break; | |
6345 } | |
6346 } | |
6347 #ifdef REFINE_STATS | |
6348 if(last_non_zero>0){ | |
6349 STOP_TIMER("iterative search") | |
6350 } | |
6351 } | |
6352 #endif | |
6353 | |
6354 return last_non_zero; | |
6355 } | |
6356 | |
2967 | 6357 static int dct_quantize_c(MpegEncContext *s, |
0 | 6358 DCTELEM *block, int n, |
344 | 6359 int qscale, int *overflow) |
0 | 6360 { |
1715 | 6361 int i, j, level, last_non_zero, q, start_i; |
0 | 6362 const int *qmat; |
1064 | 6363 const uint8_t *scantable= s->intra_scantable.scantable; |
344 | 6364 int bias; |
6365 int max=0; | |
6366 unsigned int threshold1, threshold2; | |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
6367 |
1092 | 6368 s->dsp.fdct (block); |
0 | 6369 |
1597 | 6370 if(s->dct_error_sum) |
1719 | 6371 s->denoise_dct(s, block); |
1597 | 6372 |
0 | 6373 if (s->mb_intra) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6374 if (!s->h263_aic) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6375 if (n < 4) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6376 q = s->y_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6377 else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6378 q = s->c_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6379 q = q << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6380 } else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6381 /* For AIC we skip quant/dequant of INTRADC */ |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6382 q = 1 << 3; |
2967 | 6383 |
0 | 6384 /* note: block[0] is assumed to be positive */ |
6385 block[0] = (block[0] + (q >> 1)) / q; | |
1715 | 6386 start_i = 1; |
0 | 6387 last_non_zero = 0; |
344 | 6388 qmat = s->q_intra_matrix[qscale]; |
635 | 6389 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 6390 } else { |
1715 | 6391 start_i = 0; |
0 | 6392 last_non_zero = -1; |
344 | 6393 qmat = s->q_inter_matrix[qscale]; |
635 | 6394 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 6395 } |
635 | 6396 threshold1= (1<<QMAT_SHIFT) - bias - 1; |
6397 threshold2= (threshold1<<1); | |
1715 | 6398 for(i=63;i>=start_i;i--) { |
764 | 6399 j = scantable[i]; |
1715 | 6400 level = block[j] * qmat[j]; |
6401 | |
6402 if(((unsigned)(level+threshold1))>threshold2){ | |
6403 last_non_zero = i; | |
6404 break; | |
6405 }else{ | |
6406 block[j]=0; | |
6407 } | |
6408 } | |
6409 for(i=start_i; i<=last_non_zero; i++) { | |
6410 j = scantable[i]; | |
6411 level = block[j] * qmat[j]; | |
344 | 6412 |
1215 | 6413 // if( bias+level >= (1<<QMAT_SHIFT) |
6414 // || bias-level >= (1<<QMAT_SHIFT)){ | |
344 | 6415 if(((unsigned)(level+threshold1))>threshold2){ |
6416 if(level>0){ | |
635 | 6417 level= (bias + level)>>QMAT_SHIFT; |
344 | 6418 block[j]= level; |
6419 }else{ | |
635 | 6420 level= (bias - level)>>QMAT_SHIFT; |
344 | 6421 block[j]= -level; |
0 | 6422 } |
344 | 6423 max |=level; |
6424 }else{ | |
6425 block[j]=0; | |
0 | 6426 } |
6427 } | |
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
6428 *overflow= s->max_qcoeff < max; //overflow might have happened |
2967 | 6429 |
764 | 6430 /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */ |
1092 | 6431 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM) |
2979 | 6432 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero); |
764 | 6433 |
0 | 6434 return last_non_zero; |
6435 } | |
6436 | |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
6437 #endif //CONFIG_ENCODERS |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
6438 |
2967 | 6439 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6440 DCTELEM *block, int n, int qscale) |
0 | 6441 { |
200 | 6442 int i, level, nCoeffs; |
1064 | 6443 const uint16_t *quant_matrix; |
0 | 6444 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6445 nCoeffs= s->block_last_index[n]; |
2967 | 6446 |
6447 if (n < 4) | |
1689 | 6448 block[0] = block[0] * s->y_dc_scale; |
6449 else | |
6450 block[0] = block[0] * s->c_dc_scale; | |
6451 /* XXX: only mpeg1 */ | |
6452 quant_matrix = s->intra_matrix; | |
6453 for(i=1;i<=nCoeffs;i++) { | |
6454 int j= s->intra_scantable.permutated[i]; | |
6455 level = block[j]; | |
6456 if (level) { | |
6457 if (level < 0) { | |
6458 level = -level; | |
6459 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6460 level = (level - 1) | 1; | |
6461 level = -level; | |
6462 } else { | |
6463 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6464 level = (level - 1) | 1; | |
0 | 6465 } |
1689 | 6466 block[j] = level; |
0 | 6467 } |
6468 } | |
6469 } | |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6470 |
2967 | 6471 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, |
1689 | 6472 DCTELEM *block, int n, int qscale) |
6473 { | |
6474 int i, level, nCoeffs; | |
6475 const uint16_t *quant_matrix; | |
6476 | |
6477 nCoeffs= s->block_last_index[n]; | |
2967 | 6478 |
1689 | 6479 quant_matrix = s->inter_matrix; |
6480 for(i=0; i<=nCoeffs; i++) { | |
6481 int j= s->intra_scantable.permutated[i]; | |
6482 level = block[j]; | |
6483 if (level) { | |
6484 if (level < 0) { | |
6485 level = -level; | |
6486 level = (((level << 1) + 1) * qscale * | |
6487 ((int) (quant_matrix[j]))) >> 4; | |
6488 level = (level - 1) | 1; | |
6489 level = -level; | |
6490 } else { | |
6491 level = (((level << 1) + 1) * qscale * | |
6492 ((int) (quant_matrix[j]))) >> 4; | |
6493 level = (level - 1) | 1; | |
6494 } | |
6495 block[j] = level; | |
6496 } | |
6497 } | |
6498 } | |
6499 | |
2967 | 6500 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s, |
325 | 6501 DCTELEM *block, int n, int qscale) |
6502 { | |
6503 int i, level, nCoeffs; | |
1064 | 6504 const uint16_t *quant_matrix; |
325 | 6505 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6506 if(s->alternate_scan) nCoeffs= 63; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6507 else nCoeffs= s->block_last_index[n]; |
2967 | 6508 |
6509 if (n < 4) | |
1689 | 6510 block[0] = block[0] * s->y_dc_scale; |
6511 else | |
6512 block[0] = block[0] * s->c_dc_scale; | |
6513 quant_matrix = s->intra_matrix; | |
6514 for(i=1;i<=nCoeffs;i++) { | |
6515 int j= s->intra_scantable.permutated[i]; | |
6516 level = block[j]; | |
6517 if (level) { | |
6518 if (level < 0) { | |
6519 level = -level; | |
6520 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6521 level = -level; | |
6522 } else { | |
6523 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6524 } | |
6525 block[j] = level; | |
6526 } | |
6527 } | |
6528 } | |
6529 | |
2967 | 6530 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, |
1689 | 6531 DCTELEM *block, int n, int qscale) |
6532 { | |
6533 int i, level, nCoeffs; | |
6534 const uint16_t *quant_matrix; | |
6535 int sum=-1; | |
6536 | |
6537 if(s->alternate_scan) nCoeffs= 63; | |
6538 else nCoeffs= s->block_last_index[n]; | |
2967 | 6539 |
1689 | 6540 quant_matrix = s->inter_matrix; |
6541 for(i=0; i<=nCoeffs; i++) { | |
6542 int j= s->intra_scantable.permutated[i]; | |
6543 level = block[j]; | |
6544 if (level) { | |
6545 if (level < 0) { | |
6546 level = -level; | |
6547 level = (((level << 1) + 1) * qscale * | |
6548 ((int) (quant_matrix[j]))) >> 4; | |
6549 level = -level; | |
6550 } else { | |
6551 level = (((level << 1) + 1) * qscale * | |
6552 ((int) (quant_matrix[j]))) >> 4; | |
6553 } | |
6554 block[j] = level; | |
6555 sum+=level; | |
6556 } | |
6557 } | |
6558 block[63]^=sum&1; | |
6559 } | |
6560 | |
2967 | 6561 static void dct_unquantize_h263_intra_c(MpegEncContext *s, |
1689 | 6562 DCTELEM *block, int n, int qscale) |
6563 { | |
6564 int i, level, qmul, qadd; | |
6565 int nCoeffs; | |
2967 | 6566 |
1689 | 6567 assert(s->block_last_index[n]>=0); |
2967 | 6568 |
1689 | 6569 qmul = qscale << 1; |
2967 | 6570 |
1689 | 6571 if (!s->h263_aic) { |
2967 | 6572 if (n < 4) |
325 | 6573 block[0] = block[0] * s->y_dc_scale; |
6574 else | |
6575 block[0] = block[0] * s->c_dc_scale; | |
1689 | 6576 qadd = (qscale - 1) | 1; |
6577 }else{ | |
6578 qadd = 0; | |
6579 } | |
6580 if(s->ac_pred) | |
6581 nCoeffs=63; | |
6582 else | |
6583 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; | |
6584 | |
6585 for(i=1; i<=nCoeffs; i++) { | |
6586 level = block[i]; | |
6587 if (level) { | |
6588 if (level < 0) { | |
6589 level = level * qmul - qadd; | |
6590 } else { | |
6591 level = level * qmul + qadd; | |
325 | 6592 } |
1689 | 6593 block[i] = level; |
325 | 6594 } |
6595 } | |
6596 } | |
6597 | |
2967 | 6598 static void dct_unquantize_h263_inter_c(MpegEncContext *s, |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6599 DCTELEM *block, int n, int qscale) |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6600 { |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6601 int i, level, qmul, qadd; |
200 | 6602 int nCoeffs; |
2967 | 6603 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6604 assert(s->block_last_index[n]>=0); |
2967 | 6605 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6606 qadd = (qscale - 1) | 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6607 qmul = qscale << 1; |
2967 | 6608 |
1689 | 6609 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; |
6610 | |
6611 for(i=0; i<=nCoeffs; i++) { | |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6612 level = block[i]; |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6613 if (level) { |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6614 if (level < 0) { |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6615 level = level * qmul - qadd; |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6616 } else { |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6617 level = level * qmul + qadd; |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6618 } |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6619 block[i] = level; |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6620 } |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6621 } |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6622 } |
0 | 6623 |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
6624 #ifdef CONFIG_ENCODERS |
0 | 6625 AVCodec h263_encoder = { |
6626 "h263", | |
6627 CODEC_TYPE_VIDEO, | |
6628 CODEC_ID_H263, | |
6629 sizeof(MpegEncContext), | |
6630 MPV_encode_init, | |
6631 MPV_encode_picture, | |
6632 MPV_encode_end, | |
2524 | 6633 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
0 | 6634 }; |
6635 | |
6636 AVCodec h263p_encoder = { | |
6637 "h263p", | |
6638 CODEC_TYPE_VIDEO, | |
6639 CODEC_ID_H263P, | |
6640 sizeof(MpegEncContext), | |
6641 MPV_encode_init, | |
6642 MPV_encode_picture, | |
6643 MPV_encode_end, | |
2524 | 6644 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
0 | 6645 }; |
6646 | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6647 AVCodec flv_encoder = { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6648 "flv", |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6649 CODEC_TYPE_VIDEO, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6650 CODEC_ID_FLV1, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6651 sizeof(MpegEncContext), |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6652 MPV_encode_init, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6653 MPV_encode_picture, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6654 MPV_encode_end, |
2524 | 6655 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6656 }; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6657 |
0 | 6658 AVCodec rv10_encoder = { |
6659 "rv10", | |
6660 CODEC_TYPE_VIDEO, | |
6661 CODEC_ID_RV10, | |
6662 sizeof(MpegEncContext), | |
6663 MPV_encode_init, | |
6664 MPV_encode_picture, | |
6665 MPV_encode_end, | |
2524 | 6666 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
0 | 6667 }; |
6668 | |
2380 | 6669 AVCodec rv20_encoder = { |
6670 "rv20", | |
6671 CODEC_TYPE_VIDEO, | |
6672 CODEC_ID_RV20, | |
6673 sizeof(MpegEncContext), | |
6674 MPV_encode_init, | |
6675 MPV_encode_picture, | |
6676 MPV_encode_end, | |
2524 | 6677 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
2380 | 6678 }; |
6679 | |
71 | 6680 AVCodec mpeg4_encoder = { |
6681 "mpeg4", | |
0 | 6682 CODEC_TYPE_VIDEO, |
71 | 6683 CODEC_ID_MPEG4, |
0 | 6684 sizeof(MpegEncContext), |
6685 MPV_encode_init, | |
6686 MPV_encode_picture, | |
6687 MPV_encode_end, | |
2524 | 6688 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
2111 | 6689 .capabilities= CODEC_CAP_DELAY, |
0 | 6690 }; |
6691 | |
307 | 6692 AVCodec msmpeg4v1_encoder = { |
6693 "msmpeg4v1", | |
0 | 6694 CODEC_TYPE_VIDEO, |
307 | 6695 CODEC_ID_MSMPEG4V1, |
0 | 6696 sizeof(MpegEncContext), |
6697 MPV_encode_init, | |
6698 MPV_encode_picture, | |
6699 MPV_encode_end, | |
2524 | 6700 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
0 | 6701 }; |
307 | 6702 |
6703 AVCodec msmpeg4v2_encoder = { | |
6704 "msmpeg4v2", | |
6705 CODEC_TYPE_VIDEO, | |
6706 CODEC_ID_MSMPEG4V2, | |
6707 sizeof(MpegEncContext), | |
6708 MPV_encode_init, | |
6709 MPV_encode_picture, | |
6710 MPV_encode_end, | |
2524 | 6711 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
307 | 6712 }; |
6713 | |
6714 AVCodec msmpeg4v3_encoder = { | |
6715 "msmpeg4", | |
6716 CODEC_TYPE_VIDEO, | |
6717 CODEC_ID_MSMPEG4V3, | |
6718 sizeof(MpegEncContext), | |
6719 MPV_encode_init, | |
6720 MPV_encode_picture, | |
6721 MPV_encode_end, | |
2524 | 6722 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
307 | 6723 }; |
499 | 6724 |
6725 AVCodec wmv1_encoder = { | |
6726 "wmv1", | |
6727 CODEC_TYPE_VIDEO, | |
6728 CODEC_ID_WMV1, | |
6729 sizeof(MpegEncContext), | |
6730 MPV_encode_init, | |
6731 MPV_encode_picture, | |
6732 MPV_encode_end, | |
2524 | 6733 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
499 | 6734 }; |
6735 | |
1042 | 6736 AVCodec mjpeg_encoder = { |
6737 "mjpeg", | |
6738 CODEC_TYPE_VIDEO, | |
6739 CODEC_ID_MJPEG, | |
6740 sizeof(MpegEncContext), | |
6741 MPV_encode_init, | |
6742 MPV_encode_picture, | |
6743 MPV_encode_end, | |
2524 | 6744 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, -1}, |
1042 | 6745 }; |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
6746 |
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
6747 #endif //CONFIG_ENCODERS |