Mercurial > libavcodec.hg
annotate mpegvideo.c @ 2561:eb72c01df6ed libavcodec
10l (compile fix)
author | lorenm |
---|---|
date | Sat, 12 Mar 2005 03:10:44 +0000 |
parents | 9a7770ebed14 |
children | 682c57163e60 |
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 | |
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
295 | 19 * |
325 | 20 * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at> |
0 | 21 */ |
701 | 22 |
1106 | 23 /** |
24 * @file mpegvideo.c | |
25 * The simplest mpeg encoder (well, it was the simplest!). | |
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 |
1689 | 44 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, |
45 DCTELEM *block, int n, int qscale); | |
46 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, | |
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); |
1689 | 52 static void dct_unquantize_h263_intra_c(MpegEncContext *s, |
53 DCTELEM *block, int n, int qscale); | |
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; |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
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 */ |
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
|
130 |
1064 | 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 */ | |
145 | |
1064 | 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 } |
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
165 |
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 } | |
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); |
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
|
188 |
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; |
764 | 196 |
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 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
207 |
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 |
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
|
231 /* 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
|
232 int DCT_common_init(MpegEncContext *s) |
0 | 233 { |
1689 | 234 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; |
235 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c; | |
236 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c; | |
237 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c; | |
238 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c; | |
239 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; | |
1092 | 240 |
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
|
241 #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
|
242 s->dct_quantize= dct_quantize_c; |
1719 | 243 s->denoise_dct= denoise_dct_c; |
1092 | 244 #endif |
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
|
245 |
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
|
246 #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
|
247 MPV_common_init_mmx(s); |
8 | 248 #endif |
514
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
249 #ifdef ARCH_ALPHA |
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
250 MPV_common_init_axp(s); |
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
251 #endif |
628
f596db4aa871
sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents:
625
diff
changeset
|
252 #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
|
253 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
|
254 #endif |
721
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
255 #ifdef HAVE_MMI |
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
256 MPV_common_init_mmi(s); |
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
257 #endif |
730 | 258 #ifdef ARCH_ARMV4L |
874 | 259 MPV_common_init_armv4l(s); |
730 | 260 #endif |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
261 #ifdef ARCH_POWERPC |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
262 MPV_common_init_ppc(s); |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
263 #endif |
730 | 264 |
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
|
265 #ifdef CONFIG_ENCODERS |
1007 | 266 s->fast_dct_quantize= s->dct_quantize; |
267 | |
945 | 268 if(s->flags&CODEC_FLAG_TRELLIS_QUANT){ |
269 s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_* | |
270 } | |
271 | |
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
|
272 #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
|
273 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
274 /* load & permutate scantables |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
275 note: only wmv uses differnt ones |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
276 */ |
1708 | 277 if(s->alternate_scan){ |
278 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); | |
279 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
280 }else{ | |
281 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); | |
282 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
283 } | |
1273 | 284 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); |
285 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
591 | 286 |
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
|
287 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
|
288 } |
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
289 |
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
|
290 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
|
291 *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
|
292 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
|
293 } |
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
|
294 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
295 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
|
296 int i; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
297 |
1702 | 298 dst->pict_type = src->pict_type; |
299 dst->quality = src->quality; | |
300 dst->coded_picture_number = src->coded_picture_number; | |
301 dst->display_picture_number = src->display_picture_number; | |
302 // dst->reference = src->reference; | |
303 dst->pts = src->pts; | |
304 dst->interlaced_frame = src->interlaced_frame; | |
305 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
|
306 |
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
|
307 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
|
308 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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 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
|
314 if(src->motion_subsample_log2 != dst->motion_subsample_log2) |
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
|
315 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_subsample_log2 doesnt match! (%d!=%d)\n", |
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
|
316 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
|
317 |
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
|
318 memcpy(dst->mb_type, src->mb_type, s->mb_stride * s->mb_height * sizeof(dst->mb_type[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
|
319 |
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
|
320 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
|
321 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
|
322 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
|
323 |
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
|
324 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
|
325 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
|
326 } |
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
|
327 if(src->ref_index[i] && src->ref_index[i] != dst->ref_index[i]){ |
1948 | 328 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
|
329 } |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
330 } |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
331 } |
1702 | 332 } |
333 | |
903 | 334 /** |
924 | 335 * allocates a Picture |
336 * The pixels are allocated/set by calling get_buffer() if shared=0 | |
903 | 337 */ |
924 | 338 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
|
339 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
|
340 const int mb_array_size= s->mb_stride*s->mb_height; |
1655 | 341 const int b8_array_size= s->b8_stride*s->mb_height*2; |
342 const int b4_array_size= s->b4_stride*s->mb_height*4; | |
1168 | 343 int 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
|
344 |
924 | 345 if(shared){ |
346 assert(pic->data[0]); | |
347 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED); | |
348 pic->type= FF_BUFFER_TYPE_SHARED; | |
349 }else{ | |
350 int r; | |
351 | |
352 assert(!pic->data[0]); | |
353 | |
925 | 354 r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic); |
924 | 355 |
356 if(r<0 || !pic->age || !pic->type || !pic->data[0]){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
357 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n", r, pic->age, pic->type, pic->data[0]); |
924 | 358 return -1; |
359 } | |
360 | |
361 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
|
362 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (stride changed)\n"); |
924 | 363 return -1; |
364 } | |
365 | |
366 if(pic->linesize[1] != pic->linesize[2]){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
367 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (uv stride missmatch)\n"); |
924 | 368 return -1; |
369 } | |
370 | |
371 s->linesize = pic->linesize[0]; | |
372 s->uvlinesize= pic->linesize[1]; | |
903 | 373 } |
924 | 374 |
375 if(pic->qscale_table==NULL){ | |
376 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
|
377 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
|
378 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
|
379 CHECKED_ALLOCZ(pic->mb_mean , mb_array_size * sizeof(int8_t)) |
924 | 380 } |
381 | |
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
|
382 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
|
383 CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t)) |
1742 | 384 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
|
385 pic->mb_type= pic->mb_type_base + s->mb_stride+1; |
1168 | 386 if(s->out_format == FMT_H264){ |
387 for(i=0; i<2; i++){ | |
1885 | 388 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+2) * sizeof(int16_t)) |
389 pic->motion_val[i]= pic->motion_val_base[i]+2; | |
1948 | 390 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t)) |
1655 | 391 } |
1669 | 392 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
|
393 }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){ |
1655 | 394 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
|
395 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+2) * sizeof(int16_t)) |
1885 | 396 pic->motion_val[i]= pic->motion_val_base[i]+2; |
1948 | 397 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t)) |
1168 | 398 } |
1669 | 399 pic->motion_subsample_log2= 3; |
1168 | 400 } |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
401 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
|
402 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
|
403 } |
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
|
404 pic->qstride= s->mb_stride; |
1546 | 405 CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan)) |
924 | 406 } |
1168 | 407 |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
408 //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
|
409 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
|
410 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
|
411 if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == B_TYPE) |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
412 pic->age= INT_MAX; // skiped MBs in b frames are quite rare in mpeg1/2 and its a bit tricky to skip them anyway |
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
413 |
903 | 414 return 0; |
415 fail: //for the CHECKED_ALLOCZ macro | |
416 return -1; | |
417 } | |
418 | |
924 | 419 /** |
420 * deallocates a picture | |
421 */ | |
903 | 422 static void free_picture(MpegEncContext *s, Picture *pic){ |
423 int i; | |
924 | 424 |
425 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){ | |
925 | 426 s->avctx->release_buffer(s->avctx, (AVFrame*)pic); |
924 | 427 } |
428 | |
903 | 429 av_freep(&pic->mb_var); |
430 av_freep(&pic->mc_mb_var); | |
431 av_freep(&pic->mb_mean); | |
432 av_freep(&pic->mbskip_table); | |
433 av_freep(&pic->qscale_table); | |
1168 | 434 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
|
435 av_freep(&pic->dct_coeff); |
1546 | 436 av_freep(&pic->pan_scan); |
1168 | 437 pic->mb_type= NULL; |
438 for(i=0; i<2; i++){ | |
1655 | 439 av_freep(&pic->motion_val_base[i]); |
1168 | 440 av_freep(&pic->ref_index[i]); |
441 } | |
1214 | 442 |
443 if(pic->type == FF_BUFFER_TYPE_SHARED){ | |
924 | 444 for(i=0; i<4; i++){ |
445 pic->base[i]= | |
446 pic->data[i]= NULL; | |
447 } | |
448 pic->type= 0; | |
903 | 449 } |
450 } | |
451 | |
1799 | 452 static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ |
453 int i; | |
454 | |
1838 | 455 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264) |
1799 | 456 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance |
457 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17; | |
458 | |
459 //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer() | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
460 CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t)) |
1799 | 461 s->rd_scratchpad= s->me.scratchpad; |
462 s->b_scratchpad= s->me.scratchpad; | |
463 s->obmc_scratchpad= s->me.scratchpad + 16; | |
464 if (s->encoding) { | |
465 CHECKED_ALLOCZ(s->me.map , ME_MAP_SIZE*sizeof(uint32_t)) | |
466 CHECKED_ALLOCZ(s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t)) | |
467 if(s->avctx->noise_reduction){ | |
468 CHECKED_ALLOCZ(s->dct_error_sum, 2 * 64 * sizeof(int)) | |
469 } | |
470 } | |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1846
diff
changeset
|
471 CHECKED_ALLOCZ(s->blocks, 64*12*2 * sizeof(DCTELEM)) |
1799 | 472 s->block= s->blocks[0]; |
473 | |
474 for(i=0;i<12;i++){ | |
475 s->pblocks[i] = (short *)(&s->block[i]); | |
476 } | |
477 return 0; | |
478 fail: | |
479 return -1; //free() through MPV_common_end() | |
480 } | |
481 | |
482 static void free_duplicate_context(MpegEncContext *s){ | |
483 if(s==NULL) return; | |
484 | |
485 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL; | |
486 av_freep(&s->me.scratchpad); | |
487 s->rd_scratchpad= | |
488 s->b_scratchpad= | |
489 s->obmc_scratchpad= NULL; | |
490 | |
491 av_freep(&s->dct_error_sum); | |
492 av_freep(&s->me.map); | |
493 av_freep(&s->me.score_map); | |
494 av_freep(&s->blocks); | |
495 s->block= NULL; | |
496 } | |
497 | |
498 static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){ | |
499 #define COPY(a) bak->a= src->a | |
500 COPY(allocated_edge_emu_buffer); | |
501 COPY(edge_emu_buffer); | |
502 COPY(me.scratchpad); | |
503 COPY(rd_scratchpad); | |
504 COPY(b_scratchpad); | |
505 COPY(obmc_scratchpad); | |
506 COPY(me.map); | |
507 COPY(me.score_map); | |
508 COPY(blocks); | |
509 COPY(block); | |
510 COPY(start_mb_y); | |
511 COPY(end_mb_y); | |
512 COPY(me.map_generation); | |
513 COPY(pb); | |
514 COPY(dct_error_sum); | |
1810 | 515 COPY(dct_count[0]); |
516 COPY(dct_count[1]); | |
1799 | 517 #undef COPY |
518 } | |
519 | |
1827 | 520 void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){ |
1799 | 521 MpegEncContext bak; |
1827 | 522 int i; |
1799 | 523 //FIXME copy only needed parts |
524 //START_TIMER | |
525 backup_duplicate_context(&bak, dst); | |
526 memcpy(dst, src, sizeof(MpegEncContext)); | |
527 backup_duplicate_context(dst, &bak); | |
1827 | 528 for(i=0;i<12;i++){ |
529 dst->pblocks[i] = (short *)(&dst->block[i]); | |
530 } | |
1799 | 531 //STOP_TIMER("update_duplicate_context") //about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads |
532 } | |
533 | |
534 static void update_duplicate_context_after_me(MpegEncContext *dst, MpegEncContext *src){ | |
535 #define COPY(a) dst->a= src->a | |
536 COPY(pict_type); | |
537 COPY(current_picture); | |
538 COPY(f_code); | |
539 COPY(b_code); | |
540 COPY(qscale); | |
541 COPY(lambda); | |
542 COPY(lambda2); | |
543 COPY(picture_in_gop_number); | |
544 COPY(gop_picture_number); | |
545 COPY(frame_pred_frame_dct); //FIXME dont set in encode_header | |
546 COPY(progressive_frame); //FIXME dont set in encode_header | |
547 COPY(partitioned_frame); //FIXME dont set in encode_header | |
548 #undef COPY | |
549 } | |
550 | |
1892 | 551 /** |
552 * sets the given MpegEncContext to common defaults (same for encoding and decoding). | |
553 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
554 */ | |
555 static void MPV_common_defaults(MpegEncContext *s){ | |
556 s->y_dc_scale_table= | |
557 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
558 s->chroma_qscale_table= ff_default_chroma_qscale_table; | |
559 s->progressive_frame= 1; | |
560 s->progressive_sequence= 1; | |
561 s->picture_structure= PICT_FRAME; | |
562 | |
563 s->coded_picture_number = 0; | |
564 s->picture_number = 0; | |
565 s->input_picture_number = 0; | |
566 | |
567 s->picture_in_gop_number = 0; | |
1894 | 568 |
569 s->f_code = 1; | |
570 s->b_code = 1; | |
1892 | 571 } |
572 | |
573 /** | |
574 * sets the given MpegEncContext to defaults for decoding. | |
575 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
576 */ | |
577 void MPV_decode_defaults(MpegEncContext *s){ | |
578 MPV_common_defaults(s); | |
579 } | |
580 | |
581 /** | |
582 * sets the given MpegEncContext to defaults for encoding. | |
583 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
584 */ | |
1902
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
585 |
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
586 #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
|
587 static void MPV_encode_defaults(MpegEncContext *s){ |
1892 | 588 static int done=0; |
589 | |
590 MPV_common_defaults(s); | |
591 | |
592 if(!done){ | |
593 int i; | |
594 done=1; | |
595 | |
596 default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); | |
597 memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1)); | |
598 | |
599 for(i=-16; i<16; i++){ | |
600 default_fcode_tab[i + MAX_MV]= 1; | |
601 } | |
602 } | |
603 s->me.mv_penalty= default_mv_penalty; | |
604 s->fcode_tab= default_fcode_tab; | |
605 } | |
1902
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
606 #endif //CONFIG_ENCODERS |
1892 | 607 |
608 /** | |
609 * init common structure for both encoder and decoder. | |
610 * this assumes that some variables like width/height are already set | |
611 */ | |
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
|
612 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
|
613 { |
1708 | 614 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
|
615 |
1991 | 616 if(s->avctx->thread_count > MAX_THREADS || (16*s->avctx->thread_count > s->height && s->height)){ |
1989 | 617 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n"); |
618 return -1; | |
619 } | |
620 | |
2422 | 621 if((s->width || s->height) && avcodec_check_dimensions(s->avctx, s->width, s->height)) |
622 return -1; | |
623 | |
1092 | 624 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
|
625 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
|
626 |
754 | 627 s->flags= s->avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
628 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
|
629 |
903 | 630 s->mb_width = (s->width + 15) / 16; |
0 | 631 s->mb_height = (s->height + 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
|
632 s->mb_stride = s->mb_width + 1; |
1655 | 633 s->b8_stride = s->mb_width*2 + 1; |
634 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
|
635 mb_array_size= s->mb_height * s->mb_stride; |
1708 | 636 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
|
637 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
638 /* set chroma shifts */ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
639 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
|
640 &(s->chroma_y_shift) ); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
641 |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
642 /* 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
|
643 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
|
644 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
|
645 |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
646 s->mb_num = s->mb_width * s->mb_height; |
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
|
647 |
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
|
648 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
|
649 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
|
650 s->block_wrap[2]= |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
651 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
|
652 s->block_wrap[4]= |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
653 s->block_wrap[5]= s->mb_stride; |
1892 | 654 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
655 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
|
656 c_size = s->mb_stride * (s->mb_height + 1); |
756 | 657 yc_size = y_size + 2 * c_size; |
1892 | 658 |
701 | 659 /* convert fourcc to upper case */ |
1116 | 660 s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF) |
661 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 ) | |
662 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16) | |
663 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24); | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
664 |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
665 s->avctx->stream_codec_tag= toupper( s->avctx->stream_codec_tag &0xFF) |
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
666 + (toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 ) |
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
667 + (toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16) |
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
668 + (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
|
669 |
925 | 670 s->avctx->coded_frame= (AVFrame*)&s->current_picture; |
903 | 671 |
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
|
672 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
|
673 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
|
674 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
|
675 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
|
676 } |
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
|
677 } |
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
|
678 s->mb_index2xy[ s->mb_height*s->mb_width ] = (s->mb_height-1)*s->mb_stride + s->mb_width; //FIXME really needed? |
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 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
680 if (s->encoding) { |
324 | 681 /* 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
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 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
|
691 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
|
692 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
|
693 s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1; |
324 | 694 |
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
695 if(s->msmpeg4_version){ |
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
696 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
|
697 } |
612 | 698 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
|
699 |
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
|
700 /* Allocate MB type table */ |
1708 | 701 CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint16_t)) //needed for encoding |
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
|
702 |
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
|
703 CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int)) |
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
|
704 |
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
|
705 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
|
706 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
|
707 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
|
708 CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t)) |
1556 | 709 CHECKED_ALLOCZ(s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) |
710 CHECKED_ALLOCZ(s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) | |
1597 | 711 |
712 if(s->avctx->noise_reduction){ | |
713 CHECKED_ALLOCZ(s->dct_offset, 2 * 64 * sizeof(uint16_t)) | |
714 } | |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
715 } |
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
716 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
|
717 |
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
|
718 CHECKED_ALLOCZ(s->error_status_table, mb_array_size*sizeof(uint8_t)) |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
719 |
1708 | 720 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
|
721 /* interlaced direct mode decoding tables */ |
1708 | 722 for(i=0; i<2; i++){ |
723 int j, k; | |
724 for(j=0; j<2; j++){ | |
725 for(k=0; k<2; k++){ | |
726 CHECKED_ALLOCZ(s->b_field_mv_table_base[i][j][k] , mv_table_size * 2 * sizeof(int16_t)) | |
727 s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1; | |
728 } | |
729 CHECKED_ALLOCZ(s->b_field_select_table[i][j] , mb_array_size * 2 * sizeof(uint8_t)) | |
730 CHECKED_ALLOCZ(s->p_field_mv_table_base[i][j] , mv_table_size * 2 * sizeof(int16_t)) | |
731 s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1; | |
732 } | |
733 CHECKED_ALLOCZ(s->p_field_select_table[i] , mb_array_size * 2 * sizeof(uint8_t)) | |
734 } | |
0 | 735 } |
767 | 736 if (s->out_format == FMT_H263) { |
0 | 737 /* ac values */ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
738 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
|
739 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
|
740 s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1; |
0 | 741 s->ac_val[2] = s->ac_val[1] + c_size; |
742 | |
743 /* cbp values */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
744 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
|
745 s->coded_block= s->coded_block_base + s->b8_stride + 1; |
333 | 746 |
456 | 747 /* 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
|
748 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
|
749 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
|
750 } |
756 | 751 |
752 if (s->h263_pred || s->h263_plus || !s->encoding) { | |
753 /* dc values */ | |
754 //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
|
755 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
|
756 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
|
757 s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1; |
756 | 758 s->dc_val[2] = s->dc_val[1] + c_size; |
759 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
|
760 s->dc_val_base[i] = 1024; |
756 | 761 } |
762 | |
611
3214d3f4519e
error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents:
608
diff
changeset
|
763 /* 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
|
764 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
|
765 memset(s->mbintra_table, 1, mb_array_size); |
611
3214d3f4519e
error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents:
608
diff
changeset
|
766 |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
767 /* 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
|
768 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
|
769 //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
|
770 CHECKED_ALLOCZ(s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE); |
294 | 771 |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
772 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
|
773 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
|
774 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
|
775 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
|
776 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
|
777 } |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
778 |
0 | 779 s->context_initialized = 1; |
1799 | 780 |
781 s->thread_context[0]= s; | |
782 for(i=1; i<s->avctx->thread_count; i++){ | |
783 s->thread_context[i]= av_malloc(sizeof(MpegEncContext)); | |
784 memcpy(s->thread_context[i], s, sizeof(MpegEncContext)); | |
785 } | |
786 | |
787 for(i=0; i<s->avctx->thread_count; i++){ | |
788 if(init_duplicate_context(s->thread_context[i], s) < 0) | |
789 goto fail; | |
790 s->thread_context[i]->start_mb_y= (s->mb_height*(i ) + s->avctx->thread_count/2) / s->avctx->thread_count; | |
791 s->thread_context[i]->end_mb_y = (s->mb_height*(i+1) + s->avctx->thread_count/2) / s->avctx->thread_count; | |
792 } | |
793 | |
0 | 794 return 0; |
795 fail: | |
244 | 796 MPV_common_end(s); |
797 return -1; | |
798 } | |
799 | |
800 /* init common structure for both encoder and decoder */ | |
801 void MPV_common_end(MpegEncContext *s) | |
802 { | |
1708 | 803 int i, j, k; |
244 | 804 |
1799 | 805 for(i=0; i<s->avctx->thread_count; i++){ |
806 free_duplicate_context(s->thread_context[i]); | |
807 } | |
808 for(i=1; i<s->avctx->thread_count; i++){ | |
809 av_freep(&s->thread_context[i]); | |
810 } | |
811 | |
1344
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
812 av_freep(&s->parse_context.buffer); |
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
813 s->parse_context.buffer_size=0; |
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
814 |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
815 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
|
816 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
|
817 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
|
818 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
|
819 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
|
820 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
|
821 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
|
822 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
|
823 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
|
824 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
|
825 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
|
826 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
|
827 s->b_direct_mv_table= NULL; |
1708 | 828 for(i=0; i<2; i++){ |
829 for(j=0; j<2; j++){ | |
830 for(k=0; k<2; k++){ | |
831 av_freep(&s->b_field_mv_table_base[i][j][k]); | |
832 s->b_field_mv_table[i][j][k]=NULL; | |
833 } | |
834 av_freep(&s->b_field_select_table[i][j]); | |
835 av_freep(&s->p_field_mv_table_base[i][j]); | |
836 s->p_field_mv_table[i][j]=NULL; | |
837 } | |
838 av_freep(&s->p_field_select_table[i]); | |
839 } | |
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
|
840 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
841 av_freep(&s->dc_val_base); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
842 av_freep(&s->ac_val_base); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
843 av_freep(&s->coded_block_base); |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
844 av_freep(&s->mbintra_table); |
456 | 845 av_freep(&s->cbp_table); |
846 av_freep(&s->pred_dir_table); | |
847 | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
848 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
|
849 av_freep(&s->prev_pict_types); |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
850 av_freep(&s->bitstream_buffer); |
2422 | 851 s->allocated_bitstream_buffer_size=0; |
852 | |
612 | 853 av_freep(&s->avctx->stats_out); |
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
854 av_freep(&s->ac_stats); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
855 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
|
856 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
|
857 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
|
858 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
|
859 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
|
860 av_freep(&s->q_intra_matrix16); |
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
861 av_freep(&s->q_inter_matrix16); |
1556 | 862 av_freep(&s->input_picture); |
863 av_freep(&s->reordered_input_picture); | |
1597 | 864 av_freep(&s->dct_offset); |
903 | 865 |
1573 | 866 if(s->picture){ |
867 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
868 free_picture(s, &s->picture[i]); | |
869 } | |
0 | 870 } |
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
871 av_freep(&s->picture); |
0 | 872 s->context_initialized = 0; |
1523 | 873 s->last_picture_ptr= |
874 s->next_picture_ptr= | |
875 s->current_picture_ptr= NULL; | |
2231 | 876 s->linesize= s->uvlinesize= 0; |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
877 |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
878 for(i=0; i<3; i++) |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
879 av_freep(&s->visualization_buffer[i]); |
2231 | 880 |
881 avcodec_default_free_buffers(s->avctx); | |
0 | 882 } |
883 | |
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
|
884 #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
|
885 |
0 | 886 /* init video encoder */ |
887 int MPV_encode_init(AVCodecContext *avctx) | |
888 { | |
889 MpegEncContext *s = avctx->priv_data; | |
1424 | 890 int i, dummy; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
891 int chroma_h_shift, chroma_v_shift; |
1892 | 892 |
893 MPV_encode_defaults(s); | |
315 | 894 |
2442 | 895 if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUV420P){ |
896 av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n"); | |
897 return -1; | |
898 } | |
899 | |
900 if(avctx->codec_id == CODEC_ID_MJPEG || avctx->codec_id == CODEC_ID_LJPEG){ | |
901 if(avctx->strict_std_compliance>=0 && avctx->pix_fmt != PIX_FMT_YUVJ420P){ | |
902 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n"); | |
903 return -1; | |
904 } | |
905 }else{ | |
906 if(avctx->strict_std_compliance>=0 && avctx->pix_fmt != PIX_FMT_YUV420P){ | |
907 av_log(avctx, AV_LOG_ERROR, "colorspace not supported\n"); | |
908 return -1; | |
909 } | |
910 } | |
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1397
diff
changeset
|
911 |
0 | 912 s->bit_rate = avctx->bit_rate; |
913 s->width = avctx->width; | |
914 s->height = avctx->height; | |
456 | 915 if(avctx->gop_size > 600){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
916 av_log(avctx, AV_LOG_ERROR, "Warning keyframe interval too large! reducing it ...\n"); |
456 | 917 avctx->gop_size=600; |
918 } | |
0 | 919 s->gop_size = avctx->gop_size; |
194
27d1773552c9
mpeg4 encoder fix by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
191
diff
changeset
|
920 s->avctx = avctx; |
294 | 921 s->flags= avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
922 s->flags2= avctx->flags2; |
324 | 923 s->max_b_frames= avctx->max_b_frames; |
344 | 924 s->codec_id= avctx->codec->id; |
456 | 925 s->luma_elim_threshold = avctx->luma_elim_threshold; |
926 s->chroma_elim_threshold= avctx->chroma_elim_threshold; | |
927 s->strict_std_compliance= avctx->strict_std_compliance; | |
928 s->data_partitioning= avctx->flags & CODEC_FLAG_PART; | |
936 | 929 s->quarter_sample= (avctx->flags & CODEC_FLAG_QPEL)!=0; |
599 | 930 s->mpeg_quant= avctx->mpeg_quant; |
1661 | 931 s->rtp_mode= !!avctx->rtp_payload_size; |
1992 | 932 s->intra_dc_precision= avctx->intra_dc_precision; |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
933 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
|
934 |
0 | 935 if (s->gop_size <= 1) { |
936 s->intra_only = 1; | |
937 s->gop_size = 12; | |
938 } else { | |
939 s->intra_only = 0; | |
940 } | |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
941 |
936 | 942 s->me_method = avctx->me_method; |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
943 |
320
cda7d0857baf
- ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents:
315
diff
changeset
|
944 /* Fixed QSCALE */ |
1708 | 945 s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE); |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
946 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
947 s->adaptive_quant= ( s->avctx->lumi_masking |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
948 || s->avctx->dark_masking |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
949 || s->avctx->temporal_cplx_masking |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
950 || s->avctx->spatial_cplx_masking |
1616 | 951 || s->avctx->p_masking |
2493
258120c61eea
Border processing adaptive quant patch by (Christophe Massiot |cmassiot freebox fr)
michael
parents:
2492
diff
changeset
|
952 || s->avctx->border_masking |
1616 | 953 || (s->flags&CODEC_FLAG_QP_RD)) |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
954 && !s->fixed_qscale; |
697 | 955 |
1708 | 956 s->obmc= !!(s->flags & CODEC_FLAG_OBMC); |
957 s->loop_filter= !!(s->flags & CODEC_FLAG_LOOP_FILTER); | |
958 s->alternate_scan= !!(s->flags & CODEC_FLAG_ALT_SCAN); | |
1633 | 959 |
1711 | 960 if(avctx->rc_max_rate && !avctx->rc_buffer_size){ |
961 av_log(avctx, AV_LOG_ERROR, "a vbv buffer size is needed, for encoding with a maximum bitrate\n"); | |
962 return -1; | |
963 } | |
964 | |
965 if(avctx->rc_min_rate && avctx->rc_max_rate != avctx->rc_min_rate){ | |
966 av_log(avctx, AV_LOG_INFO, "Warning min_rate > 0 but min_rate != max_rate isnt recommanded!\n"); | |
1907 | 967 } |
968 | |
2063 | 969 if(avctx->rc_min_rate && avctx->rc_min_rate > avctx->bit_rate){ |
970 av_log(avctx, AV_LOG_INFO, "bitrate below min bitrate\n"); | |
971 return -1; | |
972 } | |
973 | |
974 if(avctx->rc_max_rate && avctx->rc_max_rate < avctx->bit_rate){ | |
975 av_log(avctx, AV_LOG_INFO, "bitrate above max bitrate\n"); | |
976 return -1; | |
977 } | |
978 | |
1907 | 979 if( s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate |
980 && (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO) | |
981 && 90000LL * (avctx->rc_buffer_size-1) > s->avctx->rc_max_rate*0xFFFFLL){ | |
1711 | 982 |
1907 | 983 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"); |
984 } | |
985 | |
1633 | 986 if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4 |
1790 | 987 && 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
|
988 av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n"); |
1188 | 989 return -1; |
990 } | |
1711 | 991 |
1633 | 992 if(s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE){ |
993 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with simple mb decission\n"); | |
994 return -1; | |
995 } | |
996 | |
1644 | 997 if(s->obmc && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P){ |
998 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with H263(+)\n"); | |
999 return -1; | |
1000 } | |
1001 | |
1188 | 1002 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
|
1003 av_log(avctx, AV_LOG_ERROR, "qpel not supported by codec\n"); |
1188 | 1004 return -1; |
1005 } | |
1006 | |
1007 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
|
1008 av_log(avctx, AV_LOG_ERROR, "data partitioning not supported by codec\n"); |
1188 | 1009 return -1; |
1010 } | |
1011 | |
1421 | 1012 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
|
1013 av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n"); |
1188 | 1014 return -1; |
1015 } | |
1958 | 1016 |
1017 if((s->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN)) | |
1018 && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO){ | |
1019 av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n"); | |
1020 return -1; | |
1021 } | |
1022 | |
1188 | 1023 if(s->mpeg_quant && s->codec_id != CODEC_ID_MPEG4){ //FIXME mpeg2 uses that too |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1024 av_log(avctx, AV_LOG_ERROR, "mpeg2 style quantization not supporetd by codec\n"); |
1188 | 1025 return -1; |
1026 } | |
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
|
1027 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1028 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
|
1029 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
|
1030 return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1031 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1032 |
1622 | 1033 if((s->flags & CODEC_FLAG_QP_RD) && s->avctx->mb_decision != FF_MB_DECISION_RD){ |
1034 av_log(avctx, AV_LOG_ERROR, "QP RD needs mbd=2\n"); | |
1035 return -1; | |
1036 } | |
1037 | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1038 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
|
1039 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
|
1040 return -1; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1041 } |
1799 | 1042 |
1043 if(s->avctx->thread_count > 1 && s->codec_id != CODEC_ID_MPEG4 | |
1044 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO | |
1045 && (s->codec_id != CODEC_ID_H263P || !(s->flags & CODEC_FLAG_H263P_SLICE_STRUCT))){ | |
1046 av_log(avctx, AV_LOG_ERROR, "multi threaded encoding not supported by codec\n"); | |
1047 return -1; | |
1048 } | |
1049 | |
1050 if(s->avctx->thread_count > 1) | |
1051 s->rtp_mode= 1; | |
1760 | 1052 |
2450 | 1053 if(!avctx->frame_rate || !avctx->frame_rate_base){ |
1054 av_log(avctx, AV_LOG_ERROR, "framerate not set\n"); | |
1055 return -1; | |
1056 } | |
1057 | |
1760 | 1058 i= ff_gcd(avctx->frame_rate, avctx->frame_rate_base); |
1059 if(i > 1){ | |
1060 av_log(avctx, AV_LOG_INFO, "removing common factors from framerate\n"); | |
1061 avctx->frame_rate /= i; | |
1062 avctx->frame_rate_base /= i; | |
1063 // return -1; | |
1064 } | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1065 |
1150 | 1066 if(s->codec_id==CODEC_ID_MJPEG){ |
1067 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x | |
1068 s->inter_quant_bias= 0; | |
1421 | 1069 }else if(s->mpeg_quant || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO){ |
1150 | 1070 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x |
1071 s->inter_quant_bias= 0; | |
1072 }else{ | |
1073 s->intra_quant_bias=0; | |
1074 s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x | |
1075 } | |
1076 | |
1077 if(avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) | |
1078 s->intra_quant_bias= avctx->intra_quant_bias; | |
1079 if(avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS) | |
1080 s->inter_quant_bias= avctx->inter_quant_bias; | |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1081 |
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1082 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
|
1083 |
1424 | 1084 av_reduce(&s->time_increment_resolution, &dummy, s->avctx->frame_rate, s->avctx->frame_rate_base, (1<<16)-1); |
1085 s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1; | |
1086 | |
0 | 1087 switch(avctx->codec->id) { |
1088 case CODEC_ID_MPEG1VIDEO: | |
1089 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
|
1090 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
|
1091 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
0 | 1092 break; |
1421 | 1093 case CODEC_ID_MPEG2VIDEO: |
1094 s->out_format = FMT_MPEG1; | |
1095 s->low_delay= 0; //s->max_b_frames ? 0 : 1; | |
1096 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); | |
1661 | 1097 s->rtp_mode= 1; |
1421 | 1098 break; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1099 case CODEC_ID_LJPEG: |
0 | 1100 case CODEC_ID_MJPEG: |
1101 s->out_format = FMT_MJPEG; | |
1102 s->intra_only = 1; /* force intra only for jpeg */ | |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1103 s->mjpeg_write_tables = 1; /* write all tables */ |
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
365
diff
changeset
|
1104 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
|
1105 s->mjpeg_vsample[0] = 1<<chroma_v_shift; |
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1106 s->mjpeg_vsample[1] = 1; |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1107 s->mjpeg_vsample[2] = 1; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1108 s->mjpeg_hsample[0] = 1<<chroma_h_shift; |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1109 s->mjpeg_hsample[1] = 1; |
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1110 s->mjpeg_hsample[2] = 1; |
0 | 1111 if (mjpeg_init(s) < 0) |
1112 return -1; | |
336 | 1113 avctx->delay=0; |
924 | 1114 s->low_delay=1; |
0 | 1115 break; |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1116 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
|
1117 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
|
1118 avctx->delay=0; |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1119 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
|
1120 break; |
0 | 1121 case CODEC_ID_H263: |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1122 if (h263_get_picture_format(s->width, s->height) == 7) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1123 av_log(avctx, AV_LOG_INFO, "Input picture size isn't suitable for h263 codec! try h263+\n"); |
0 | 1124 return -1; |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1125 } |
0 | 1126 s->out_format = FMT_H263; |
1644 | 1127 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; |
336 | 1128 avctx->delay=0; |
924 | 1129 s->low_delay=1; |
0 | 1130 break; |
1131 case CODEC_ID_H263P: | |
1132 s->out_format = FMT_H263; | |
1133 s->h263_plus = 1; | |
1095
c7604e6291c5
extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents:
1094
diff
changeset
|
1134 /* Fx */ |
1644 | 1135 s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0; |
1095
c7604e6291c5
extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents:
1094
diff
changeset
|
1136 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0; |
1644 | 1137 s->modified_quant= s->h263_aic; |
1637 | 1138 s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0; |
1644 | 1139 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; |
1140 s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0; | |
1141 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; | |
1661 | 1142 s->h263_slice_structured= (s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) ? 1:0; |
1644 | 1143 |
1095
c7604e6291c5
extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents:
1094
diff
changeset
|
1144 /* /Fx */ |
79
82e579c37bc3
Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents:
78
diff
changeset
|
1145 /* These are just to be sure */ |
336 | 1146 avctx->delay=0; |
924 | 1147 s->low_delay=1; |
0 | 1148 break; |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1149 case CODEC_ID_FLV1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1150 s->out_format = FMT_H263; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1151 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
|
1152 s->unrestricted_mv = 1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1153 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
|
1154 avctx->delay=0; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1155 s->low_delay=1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1156 break; |
0 | 1157 case CODEC_ID_RV10: |
1158 s->out_format = FMT_H263; | |
336 | 1159 avctx->delay=0; |
924 | 1160 s->low_delay=1; |
0 | 1161 break; |
2380 | 1162 case CODEC_ID_RV20: |
1163 s->out_format = FMT_H263; | |
1164 avctx->delay=0; | |
1165 s->low_delay=1; | |
1166 s->modified_quant=1; | |
1167 s->h263_aic=1; | |
1168 s->h263_plus=1; | |
1169 s->loop_filter=1; | |
1170 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; | |
1171 break; | |
71 | 1172 case CODEC_ID_MPEG4: |
0 | 1173 s->out_format = FMT_H263; |
1174 s->h263_pred = 1; | |
1175 s->unrestricted_mv = 1; | |
924 | 1176 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
|
1177 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
0 | 1178 break; |
307 | 1179 case CODEC_ID_MSMPEG4V1: |
0 | 1180 s->out_format = FMT_H263; |
1181 s->h263_msmpeg4 = 1; | |
1182 s->h263_pred = 1; | |
1183 s->unrestricted_mv = 1; | |
307 | 1184 s->msmpeg4_version= 1; |
336 | 1185 avctx->delay=0; |
924 | 1186 s->low_delay=1; |
307 | 1187 break; |
1188 case CODEC_ID_MSMPEG4V2: | |
1189 s->out_format = FMT_H263; | |
1190 s->h263_msmpeg4 = 1; | |
1191 s->h263_pred = 1; | |
1192 s->unrestricted_mv = 1; | |
1193 s->msmpeg4_version= 2; | |
336 | 1194 avctx->delay=0; |
924 | 1195 s->low_delay=1; |
307 | 1196 break; |
1197 case CODEC_ID_MSMPEG4V3: | |
1198 s->out_format = FMT_H263; | |
1199 s->h263_msmpeg4 = 1; | |
1200 s->h263_pred = 1; | |
1201 s->unrestricted_mv = 1; | |
1202 s->msmpeg4_version= 3; | |
1163 | 1203 s->flipflop_rounding=1; |
336 | 1204 avctx->delay=0; |
924 | 1205 s->low_delay=1; |
0 | 1206 break; |
499 | 1207 case CODEC_ID_WMV1: |
1208 s->out_format = FMT_H263; | |
1209 s->h263_msmpeg4 = 1; | |
1210 s->h263_pred = 1; | |
1211 s->unrestricted_mv = 1; | |
1212 s->msmpeg4_version= 4; | |
1163 | 1213 s->flipflop_rounding=1; |
499 | 1214 avctx->delay=0; |
924 | 1215 s->low_delay=1; |
499 | 1216 break; |
1217 case CODEC_ID_WMV2: | |
1218 s->out_format = FMT_H263; | |
1219 s->h263_msmpeg4 = 1; | |
1220 s->h263_pred = 1; | |
1221 s->unrestricted_mv = 1; | |
1222 s->msmpeg4_version= 5; | |
1163 | 1223 s->flipflop_rounding=1; |
499 | 1224 avctx->delay=0; |
924 | 1225 s->low_delay=1; |
499 | 1226 break; |
0 | 1227 default: |
1228 return -1; | |
1229 } | |
2042 | 1230 |
1231 avctx->has_b_frames= !s->low_delay; | |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1742
diff
changeset
|
1232 |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1233 s->encoding = 1; |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1234 |
0 | 1235 /* init */ |
1236 if (MPV_common_init(s) < 0) | |
1237 return -1; | |
1678 | 1238 |
1239 if(s->modified_quant) | |
1240 s->chroma_qscale_table= ff_h263_chroma_qscale_table; | |
1241 s->progressive_frame= | |
1708 | 1242 s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)); |
1799 | 1243 s->quant_precision=5; |
0 | 1244 |
1729 | 1245 ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp); |
2382 | 1246 ff_set_cmp(&s->dsp, s->dsp.frame_skip_cmp, s->avctx->frame_skip_cmp); |
1729 | 1247 |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
814
diff
changeset
|
1248 #ifdef CONFIG_ENCODERS |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1249 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
|
1250 ff_h261_encode_init(s); |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1251 if (s->out_format == FMT_H263) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1252 h263_encode_init(s); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1253 if(s->msmpeg4_version) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1254 ff_msmpeg4_encode_init(s); |
1042 | 1255 if (s->out_format == FMT_MPEG1) |
1256 ff_mpeg1_encode_init(s); | |
1257 #endif | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1258 |
1892 | 1259 /* init q matrix */ |
60 | 1260 for(i=0;i<64;i++) { |
1092 | 1261 int j= s->dsp.idct_permutation[i]; |
599 | 1262 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
|
1263 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
|
1264 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
|
1265 }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
|
1266 s->intra_matrix[j] = |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1267 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
1042 | 1268 }else |
1421 | 1269 { /* mpeg1/2 */ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1270 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
|
1271 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
599 | 1272 } |
1411 | 1273 if(s->avctx->intra_matrix) |
1274 s->intra_matrix[j] = s->avctx->intra_matrix[i]; | |
1275 if(s->avctx->inter_matrix) | |
1276 s->inter_matrix[j] = s->avctx->inter_matrix[i]; | |
344 | 1277 } |
1278 | |
1279 /* precompute matrix */ | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
1280 /* for mjpeg, we do include qscale in the matrix */ |
344 | 1281 if (s->out_format != FMT_MJPEG) { |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
1282 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
|
1283 s->intra_matrix, s->intra_quant_bias, avctx->qmin, 31, 1); |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
1284 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
|
1285 s->inter_matrix, s->inter_quant_bias, avctx->qmin, 31, 0); |
60 | 1286 } |
1287 | |
329 | 1288 if(ff_rate_control_init(s) < 0) |
1289 return -1; | |
1892 | 1290 |
0 | 1291 return 0; |
1292 } | |
1293 | |
1294 int MPV_encode_end(AVCodecContext *avctx) | |
1295 { | |
1296 MpegEncContext *s = avctx->priv_data; | |
1297 | |
1298 #ifdef STATS | |
1299 print_stats(); | |
1300 #endif | |
329 | 1301 |
1302 ff_rate_control_uninit(s); | |
1303 | |
0 | 1304 MPV_common_end(s); |
1305 if (s->out_format == FMT_MJPEG) | |
1306 mjpeg_close(s); | |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
1307 |
1424 | 1308 av_freep(&avctx->extradata); |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1309 |
0 | 1310 return 0; |
1311 } | |
1312 | |
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
|
1313 #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
|
1314 |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1315 void init_rl(RLTable *rl, int use_static) |
1042 | 1316 { |
1064 | 1317 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1]; |
1318 uint8_t index_run[MAX_RUN+1]; | |
1042 | 1319 int last, run, level, start, end, i; |
1320 | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1321 /* 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
|
1322 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
|
1323 return; |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1324 |
1042 | 1325 /* compute max_level[], max_run[] and index_run[] */ |
1326 for(last=0;last<2;last++) { | |
1327 if (last == 0) { | |
1328 start = 0; | |
1329 end = rl->last; | |
1330 } else { | |
1331 start = rl->last; | |
1332 end = rl->n; | |
1333 } | |
1334 | |
1335 memset(max_level, 0, MAX_RUN + 1); | |
1336 memset(max_run, 0, MAX_LEVEL + 1); | |
1337 memset(index_run, rl->n, MAX_RUN + 1); | |
1338 for(i=start;i<end;i++) { | |
1339 run = rl->table_run[i]; | |
1340 level = rl->table_level[i]; | |
1341 if (index_run[run] == rl->n) | |
1342 index_run[run] = i; | |
1343 if (level > max_level[run]) | |
1344 max_level[run] = level; | |
1345 if (run > max_run[level]) | |
1346 max_run[level] = run; | |
1347 } | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1348 if(use_static) |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1349 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
|
1350 else |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1351 rl->max_level[last] = av_malloc(MAX_RUN + 1); |
1042 | 1352 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
|
1353 if(use_static) |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1354 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
|
1355 else |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1356 rl->max_run[last] = av_malloc(MAX_LEVEL + 1); |
1042 | 1357 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
|
1358 if(use_static) |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1359 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
|
1360 else |
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1361 rl->index_run[last] = av_malloc(MAX_RUN + 1); |
1042 | 1362 memcpy(rl->index_run[last], index_run, MAX_RUN + 1); |
1363 } | |
1364 } | |
1365 | |
0 | 1366 /* 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
|
1367 //FIXME check that this is ok for mpeg4 interlaced |
1064 | 1368 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w) |
0 | 1369 { |
1064 | 1370 uint8_t *ptr, *last_line; |
0 | 1371 int i; |
1372 | |
1373 last_line = buf + (height - 1) * wrap; | |
1374 for(i=0;i<w;i++) { | |
1375 /* top and bottom */ | |
1376 memcpy(buf - (i + 1) * wrap, buf, width); | |
1377 memcpy(last_line + (i + 1) * wrap, last_line, width); | |
1378 } | |
1379 /* left and right */ | |
1380 ptr = buf; | |
1381 for(i=0;i<height;i++) { | |
1382 memset(ptr - w, ptr[0], w); | |
1383 memset(ptr + width, ptr[width-1], w); | |
1384 ptr += wrap; | |
1385 } | |
1386 /* corners */ | |
1387 for(i=0;i<w;i++) { | |
1388 memset(buf - (i + 1) * wrap - w, buf[0], w); /* top left */ | |
1389 memset(buf - (i + 1) * wrap + width, buf[width-1], w); /* top right */ | |
1390 memset(last_line + (i + 1) * wrap - w, last_line[0], w); /* top left */ | |
1391 memset(last_line + (i + 1) * wrap + width, last_line[width-1], w); /* top right */ | |
1392 } | |
1393 } | |
1394 | |
1586 | 1395 int ff_find_unused_picture(MpegEncContext *s, int shared){ |
924 | 1396 int i; |
1397 | |
1398 if(shared){ | |
1399 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1400 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) return i; |
924 | 1401 } |
1402 }else{ | |
1403 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1404 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) return i; //FIXME |
924 | 1405 } |
1406 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1407 if(s->picture[i].data[0]==NULL) return i; |
924 | 1408 } |
1409 } | |
1410 | |
1586 | 1411 assert(0); |
1412 return -1; | |
924 | 1413 } |
1414 | |
1597 | 1415 static void update_noise_reduction(MpegEncContext *s){ |
1416 int intra, i; | |
1417 | |
1418 for(intra=0; intra<2; intra++){ | |
1419 if(s->dct_count[intra] > (1<<16)){ | |
1420 for(i=0; i<64; i++){ | |
1421 s->dct_error_sum[intra][i] >>=1; | |
1422 } | |
1423 s->dct_count[intra] >>= 1; | |
1424 } | |
1425 | |
1426 for(i=0; i<64; i++){ | |
1427 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); | |
1428 } | |
1429 } | |
1430 } | |
1431 | |
1586 | 1432 /** |
1433 * generic function for encode/decode called after coding/decoding the header and before a frame is coded/decoded | |
1434 */ | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1435 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) |
0 | 1436 { |
924 | 1437 int i; |
925 | 1438 AVFrame *pic; |
46
931417475f5b
fixed mpeg1 first block bug (pb with black picture optimisation for B frames)
glantau
parents:
40
diff
changeset
|
1439 s->mb_skiped = 0; |
1168 | 1440 |
1234 | 1441 assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3); |
1228 | 1442 |
903 | 1443 /* mark&release old frames */ |
1944 | 1444 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 | 1445 avctx->release_buffer(avctx, (AVFrame*)s->last_picture_ptr); |
903 | 1446 |
1447 /* release forgotten pictures */ | |
1448 /* if(mpeg124/h263) */ | |
1449 if(!s->encoding){ | |
1450 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1138 | 1451 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
|
1452 av_log(avctx, AV_LOG_ERROR, "releasing zombie picture\n"); |
925 | 1453 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); |
903 | 1454 } |
1455 } | |
1456 } | |
1457 } | |
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1458 alloc: |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1459 if(!s->encoding){ |
1228 | 1460 /* release non refernce frames */ |
1461 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1462 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
1463 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
1464 } | |
1465 } | |
1466 | |
1586 | 1467 if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL) |
1468 pic= (AVFrame*)s->current_picture_ptr; //we allready have a unused image (maybe it was set before reading the header) | |
1469 else{ | |
1470 i= ff_find_unused_picture(s, 0); | |
1471 pic= (AVFrame*)&s->picture[i]; | |
1472 } | |
1473 | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2534
diff
changeset
|
1474 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
|
1475 && !s->dropable ? 3 : 0; |
1138 | 1476 |
1705 | 1477 pic->coded_picture_number= s->coded_picture_number++; |
903 | 1478 |
1384 | 1479 if( alloc_picture(s, (Picture*)pic, 0) < 0) |
1480 return -1; | |
903 | 1481 |
1586 | 1482 s->current_picture_ptr= (Picture*)pic; |
1658 | 1483 s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic |
1659 | 1484 s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence; |
903 | 1485 } |
456 | 1486 |
1173 | 1487 s->current_picture_ptr->pict_type= s->pict_type; |
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
|
1488 // if(s->flags && CODEC_FLAG_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
|
1489 // 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
|
1490 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE; |
1173 | 1491 |
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
|
1492 copy_picture(&s->current_picture, s->current_picture_ptr); |
1173 | 1493 |
1234 | 1494 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){ |
903 | 1495 if (s->pict_type != B_TYPE) { |
1138 | 1496 s->last_picture_ptr= s->next_picture_ptr; |
1944 | 1497 if(!s->dropable) |
1498 s->next_picture_ptr= s->current_picture_ptr; | |
1499 } | |
1500 /* 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, | |
1501 s->last_picture_ptr ? s->last_picture_ptr->data[0] : NULL, | |
1502 s->next_picture_ptr ? s->next_picture_ptr->data[0] : NULL, | |
1503 s->current_picture_ptr ? s->current_picture_ptr->data[0] : NULL, | |
1504 s->pict_type, s->dropable);*/ | |
1214 | 1505 |
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
|
1506 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
|
1507 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); |
1138 | 1508 |
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
|
1509 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
|
1510 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); |
1393 | 1511 assert(s->pict_type != B_TYPE); //these should have been dropped if we dont have a reference |
1512 goto alloc; | |
1513 } | |
1514 | |
1515 assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0])); | |
1516 | |
1138 | 1517 if(s->picture_structure!=PICT_FRAME){ |
1518 int i; | |
1519 for(i=0; i<4; i++){ | |
1520 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
1521 s->current_picture.data[i] += s->current_picture.linesize[i]; | |
1522 } | |
1523 s->current_picture.linesize[i] *= 2; | |
1524 s->last_picture.linesize[i] *=2; | |
1525 s->next_picture.linesize[i] *=2; | |
1526 } | |
553 | 1527 } |
1168 | 1528 } |
903 | 1529 |
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1530 s->hurry_up= s->avctx->hurry_up; |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1531 s->error_resilience= avctx->error_resilience; |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1532 |
591 | 1533 /* set dequantizer, we cant do it during init as it might change for mpeg4 |
1534 and we cant do it in the header decode as init isnt called for mpeg4 there yet */ | |
1689 | 1535 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){ |
1536 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; | |
1537 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; | |
2345 | 1538 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ |
1689 | 1539 s->dct_unquantize_intra = s->dct_unquantize_h263_intra; |
1540 s->dct_unquantize_inter = s->dct_unquantize_h263_inter; | |
1541 }else{ | |
1542 s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra; | |
1543 s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter; | |
1544 } | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1545 |
1597 | 1546 if(s->dct_error_sum){ |
1547 assert(s->avctx->noise_reduction && s->encoding); | |
1548 | |
1549 update_noise_reduction(s); | |
1550 } | |
1551 | |
1381 | 1552 #ifdef HAVE_XVMC |
1553 if(s->avctx->xvmc_acceleration) | |
1554 return XVMC_field_start(s, avctx); | |
1555 #endif | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1556 return 0; |
0 | 1557 } |
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
|
1558 |
0 | 1559 /* generic function for encode/decode called after a frame has been coded/decoded */ |
1560 void MPV_frame_end(MpegEncContext *s) | |
1561 { | |
903 | 1562 int i; |
0 | 1563 /* draw edge for correct motion prediction if outside */ |
1381 | 1564 #ifdef HAVE_XVMC |
1565 //just to make sure that all data is rendered. | |
1566 if(s->avctx->xvmc_acceleration){ | |
1567 XVMC_field_end(s); | |
1568 }else | |
1569 #endif | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2534
diff
changeset
|
1570 if(s->unrestricted_mv && s->current_picture.reference && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) { |
903 | 1571 draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH ); |
1572 draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
1573 draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
0 | 1574 } |
207 | 1575 emms_c(); |
329 | 1576 |
612 | 1577 s->last_pict_type = s->pict_type; |
329 | 1578 if(s->pict_type!=B_TYPE){ |
1579 s->last_non_b_pict_type= s->pict_type; | |
1580 } | |
1138 | 1581 #if 0 |
1582 /* copy back current_picture variables */ | |
903 | 1583 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
1584 if(s->picture[i].data[0] == s->current_picture.data[0]){ | |
1585 s->picture[i]= s->current_picture; | |
1586 break; | |
1587 } | |
1588 } | |
1589 assert(i<MAX_PICTURE_COUNT); | |
1138 | 1590 #endif |
903 | 1591 |
1228 | 1592 if(s->encoding){ |
1593 /* release non refernce frames */ | |
1594 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1595 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
1596 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
1597 } | |
1598 } | |
324 | 1599 } |
1138 | 1600 // clear copies, to avoid confusion |
1601 #if 0 | |
1602 memset(&s->last_picture, 0, sizeof(Picture)); | |
1603 memset(&s->next_picture, 0, sizeof(Picture)); | |
1604 memset(&s->current_picture, 0, sizeof(Picture)); | |
1605 #endif | |
2213 | 1606 s->avctx->coded_frame= (AVFrame*)s->current_picture_ptr; |
903 | 1607 } |
1608 | |
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
|
1609 /** |
1285 | 1610 * draws an line from (ex, ey) -> (sx, sy). |
1611 * @param w width of the image | |
1612 * @param h height of the image | |
1613 * @param stride stride/linesize of the image | |
1614 * @param color color of the arrow | |
1615 */ | |
1616 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
|
1617 int t, x, y, fr, f; |
1285 | 1618 |
1619 sx= clip(sx, 0, w-1); | |
1620 sy= clip(sy, 0, h-1); | |
1621 ex= clip(ex, 0, w-1); | |
1622 ey= clip(ey, 0, h-1); | |
1623 | |
1624 buf[sy*stride + sx]+= color; | |
1625 | |
1626 if(ABS(ex - sx) > ABS(ey - sy)){ | |
1627 if(sx > ex){ | |
1628 t=sx; sx=ex; ex=t; | |
1629 t=sy; sy=ey; ey=t; | |
1630 } | |
1631 buf+= sx + sy*stride; | |
1632 ex-= sx; | |
1633 f= ((ey-sy)<<16)/ex; | |
1634 for(x= 0; x <= ex; x++){ | |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1635 y = (x*f)>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1636 fr= (x*f)&0xFFFF; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1637 buf[ y *stride + x]+= (color*(0x10000-fr))>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1638 buf[(y+1)*stride + x]+= (color* fr )>>16; |
1285 | 1639 } |
1640 }else{ | |
1641 if(sy > ey){ | |
1642 t=sx; sx=ex; ex=t; | |
1643 t=sy; sy=ey; ey=t; | |
1644 } | |
1645 buf+= sx + sy*stride; | |
1646 ey-= sy; | |
1647 if(ey) f= ((ex-sx)<<16)/ey; | |
1648 else f= 0; | |
1649 for(y= 0; y <= ey; y++){ | |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1650 x = (y*f)>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1651 fr= (y*f)&0xFFFF; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1652 buf[y*stride + x ]+= (color*(0x10000-fr))>>16;; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1653 buf[y*stride + x+1]+= (color* fr )>>16;; |
1285 | 1654 } |
1655 } | |
1656 } | |
1657 | |
1658 /** | |
1659 * draws an arrow from (ex, ey) -> (sx, sy). | |
1660 * @param w width of the image | |
1661 * @param h height of the image | |
1662 * @param stride stride/linesize of the image | |
1663 * @param color color of the arrow | |
1664 */ | |
1665 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ | |
1666 int dx,dy; | |
1667 | |
1668 sx= clip(sx, -100, w+100); | |
1669 sy= clip(sy, -100, h+100); | |
1670 ex= clip(ex, -100, w+100); | |
1671 ey= clip(ey, -100, h+100); | |
1672 | |
1673 dx= ex - sx; | |
1674 dy= ey - sy; | |
1675 | |
1676 if(dx*dx + dy*dy > 3*3){ | |
1677 int rx= dx + dy; | |
1678 int ry= -dx + dy; | |
1679 int length= ff_sqrt((rx*rx + ry*ry)<<8); | |
1680 | |
1681 //FIXME subpixel accuracy | |
1682 rx= ROUNDED_DIV(rx*3<<4, length); | |
1683 ry= ROUNDED_DIV(ry*3<<4, length); | |
1684 | |
1685 draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color); | |
1686 draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color); | |
1687 } | |
1688 draw_line(buf, sx, sy, ex, ey, w, h, stride, color); | |
1689 } | |
1690 | |
1691 /** | |
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
|
1692 * 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
|
1693 */ |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1694 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
|
1695 |
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
|
1696 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
|
1697 |
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
|
1698 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
|
1699 int x,y; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1700 |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1701 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
|
1702 switch (pict->pict_type) { |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1703 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
|
1704 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
|
1705 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
|
1706 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
|
1707 case FF_SI_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SI\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1708 case FF_SP_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SP\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1709 } |
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
|
1710 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
|
1711 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
|
1712 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
|
1713 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
|
1714 if(count>9) count=9; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1715 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
|
1716 } |
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
|
1717 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
|
1718 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
|
1719 } |
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
|
1720 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
|
1721 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
|
1722 //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
|
1723 if(IS_PCM(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1724 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
|
1725 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
|
1726 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
|
1727 else if(IS_INTRA4x4(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1728 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
|
1729 else if(IS_INTRA16x16(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1730 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
|
1731 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
|
1732 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
|
1733 else if(IS_DIRECT(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1734 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
|
1735 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
|
1736 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
|
1737 else if(IS_GMC(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1738 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
|
1739 else if(IS_SKIP(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1740 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
|
1741 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
|
1742 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
|
1743 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
|
1744 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
|
1745 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
|
1746 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
|
1747 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
|
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 |
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 //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
|
1751 if(IS_8X8(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1752 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
|
1753 else if(IS_16X8(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1754 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
|
1755 else if(IS_8X16(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1756 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
|
1757 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
|
1758 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
|
1759 else |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1760 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
|
1761 |
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 |
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(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
|
1764 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
|
1765 else |
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, " "); |
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 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1768 // 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
|
1769 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1770 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
|
1771 } |
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 } |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
1773 |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1774 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){ |
1285 | 1775 const int shift= 1 + s->quarter_sample; |
1776 int mb_y; | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1777 uint8_t *ptr; |
1707 | 1778 int i; |
1723
033d889d7c2c
non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1722
diff
changeset
|
1779 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
|
1780 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
|
1781 const int height= s->avctx->height; |
2395 | 1782 const int mv_sample_log2= 4 - pict->motion_subsample_log2; |
1783 const int mv_stride= (s->mb_width << mv_sample_log2) + 1; | |
1285 | 1784 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
|
1785 |
1723
033d889d7c2c
non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1722
diff
changeset
|
1786 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
|
1787 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
|
1788 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
|
1789 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
|
1790 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1791 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
|
1792 ptr= pict->data[0]; |
1285 | 1793 |
1794 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
1795 int mb_x; | |
1796 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
1797 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
|
1798 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
|
1799 int type; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1800 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
|
1801 int direction = 0; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1802 switch (type) { |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1803 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
|
1804 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1805 direction = 0; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1806 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1807 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
|
1808 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1809 direction = 0; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1810 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1811 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
|
1812 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1813 direction = 1; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1814 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1815 } |
1712 | 1816 if(!USES_LIST(pict->mb_type[mb_index], direction)) |
1817 continue; | |
1818 | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1819 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
|
1820 int i; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1821 for(i=0; i<4; i++){ |
1285 | 1822 int sx= mb_x*16 + 4 + 8*(i&1); |
1823 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
|
1824 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
|
1825 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
|
1826 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
|
1827 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
|
1828 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1829 }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
|
1830 int i; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1831 for(i=0; i<2; i++){ |
1629
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1832 int sx=mb_x*16 + 8; |
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1833 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
|
1834 int xy= (mb_x*2 + (mb_y*2 + i)*mv_stride) << (mv_sample_log2-1); |
2395 | 1835 int mx=(pict->motion_val[direction][xy][0]>>shift); |
1836 int my=(pict->motion_val[direction][xy][1]>>shift); | |
1837 | |
1838 if(IS_INTERLACED(pict->mb_type[mb_index])) | |
1839 my*=2; | |
1840 | |
1841 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100); | |
1842 } | |
1843 }else if(IS_8X16(pict->mb_type[mb_index])){ | |
1844 int i; | |
1845 for(i=0; i<2; i++){ | |
1846 int sx=mb_x*16 + 4 + 8*i; | |
1847 int sy=mb_y*16 + 8; | |
2522
e25782262d7d
kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents:
2514
diff
changeset
|
1848 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
|
1849 int mx=(pict->motion_val[direction][xy][0]>>shift); |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1850 int my=(pict->motion_val[direction][xy][1]>>shift); |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1851 |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1852 if(IS_INTERLACED(pict->mb_type[mb_index])) |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1853 my*=2; |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1854 |
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
|
1855 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
|
1856 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1857 }else{ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1858 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
|
1859 int sy= mb_y*16 + 8; |
2395 | 1860 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
|
1861 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
|
1862 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
|
1863 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
|
1864 } |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1865 } |
1685 | 1866 } |
1867 if((s->avctx->debug&FF_DEBUG_VIS_QP) && pict->motion_val){ | |
1868 uint64_t c= (pict->qscale_table[mb_index]*128/31) * 0x0101010101010101ULL; | |
1869 int y; | |
1870 for(y=0; y<8; y++){ | |
1871 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= c; | |
1872 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= c; | |
1873 } | |
1874 } | |
1875 if((s->avctx->debug&FF_DEBUG_VIS_MB_TYPE) && pict->motion_val){ | |
1876 int mb_type= pict->mb_type[mb_index]; | |
1877 uint64_t u,v; | |
1878 int y; | |
1879 #define COLOR(theta, r)\ | |
1880 u= (int)(128 + r*cos(theta*3.141592/180));\ | |
1881 v= (int)(128 + r*sin(theta*3.141592/180)); | |
1882 | |
1883 | |
1884 u=v=128; | |
1885 if(IS_PCM(mb_type)){ | |
1886 COLOR(120,48) | |
1887 }else if((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) || IS_INTRA16x16(mb_type)){ | |
1888 COLOR(30,48) | |
1889 }else if(IS_INTRA4x4(mb_type)){ | |
1890 COLOR(90,48) | |
1891 }else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type)){ | |
1892 // COLOR(120,48) | |
1893 }else if(IS_DIRECT(mb_type)){ | |
1894 COLOR(150,48) | |
1895 }else if(IS_GMC(mb_type) && IS_SKIP(mb_type)){ | |
1896 COLOR(170,48) | |
1897 }else if(IS_GMC(mb_type)){ | |
1898 COLOR(190,48) | |
1899 }else if(IS_SKIP(mb_type)){ | |
1900 // COLOR(180,48) | |
1901 }else if(!USES_LIST(mb_type, 1)){ | |
1902 COLOR(240,48) | |
1903 }else if(!USES_LIST(mb_type, 0)){ | |
1904 COLOR(0,48) | |
1905 }else{ | |
1906 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); | |
1907 COLOR(300,48) | |
1908 } | |
1909 | |
1910 u*= 0x0101010101010101ULL; | |
1911 v*= 0x0101010101010101ULL; | |
1912 for(y=0; y<8; y++){ | |
1913 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= u; | |
1914 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= v; | |
1915 } | |
1916 | |
1917 //segmentation | |
1918 if(IS_8X8(mb_type) || IS_16X8(mb_type)){ | |
1919 *(uint64_t*)(pict->data[0] + 16*mb_x + 0 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL; | |
1920 *(uint64_t*)(pict->data[0] + 16*mb_x + 8 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL; | |
1921 } | |
1922 if(IS_8X8(mb_type) || IS_8X16(mb_type)){ | |
1923 for(y=0; y<16; y++) | |
1924 pict->data[0][16*mb_x + 8 + (16*mb_y + y)*pict->linesize[0]]^= 0x80; | |
1925 } | |
2534 | 1926 if(IS_8X8(mb_type) && mv_sample_log2 >= 2){ |
1927 int dm= 1 << (mv_sample_log2-2); | |
1928 for(i=0; i<4; i++){ | |
1929 int sx= mb_x*16 + 8*(i&1); | |
1930 int sy= mb_y*16 + 8*(i>>1); | |
1931 int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << (mv_sample_log2-1); | |
1932 //FIXME bidir | |
1933 int32_t *mv = (int32_t*)&pict->motion_val[0][xy]; | |
1934 if(mv[0] != mv[dm] || mv[dm*mv_stride] != mv[dm*(mv_stride+1)]) | |
1935 for(y=0; y<8; y++) | |
1936 pict->data[0][sx + 4 + (sy + y)*pict->linesize[0]]^= 0x80; | |
1937 if(mv[0] != mv[dm*mv_stride] || mv[dm] != mv[dm*(mv_stride+1)]) | |
1938 *(uint64_t*)(pict->data[0] + sx + (sy + 4)*pict->linesize[0])^= 0x8080808080808080ULL; | |
1939 } | |
1940 } | |
1685 | 1941 |
1942 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264){ | |
1943 // hmm | |
1944 } | |
1285 | 1945 } |
1946 s->mbskip_table[mb_index]=0; | |
1947 } | |
1948 } | |
1949 } | |
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
|
1950 } |
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
|
1951 |
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
|
1952 #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
|
1953 |
915 | 1954 static int get_sae(uint8_t *src, int ref, int stride){ |
1955 int x,y; | |
1956 int acc=0; | |
1957 | |
1958 for(y=0; y<16; y++){ | |
1959 for(x=0; x<16; x++){ | |
1960 acc+= ABS(src[x+y*stride] - ref); | |
1961 } | |
1962 } | |
1963 | |
1964 return acc; | |
1965 } | |
1966 | |
1967 static int get_intra_count(MpegEncContext *s, uint8_t *src, uint8_t *ref, int stride){ | |
1968 int x, y, w, h; | |
1969 int acc=0; | |
1970 | |
1971 w= s->width &~15; | |
1972 h= s->height&~15; | |
1973 | |
1974 for(y=0; y<h; y+=16){ | |
1975 for(x=0; x<w; x+=16){ | |
1976 int offset= x + y*stride; | |
1708 | 1977 int sad = s->dsp.sad[0](NULL, src + offset, ref + offset, stride, 16); |
915 | 1978 int mean= (s->dsp.pix_sum(src + offset, stride) + 128)>>8; |
1979 int sae = get_sae(src + offset, mean, stride); | |
1980 | |
1981 acc+= sae + 500 < sad; | |
1982 } | |
1983 } | |
1984 return acc; | |
1985 } | |
1986 | |
924 | 1987 |
925 | 1988 static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){ |
1373 | 1989 AVFrame *pic=NULL; |
2427 | 1990 int64_t pts; |
924 | 1991 int i; |
903 | 1992 const int encoding_delay= s->max_b_frames; |
924 | 1993 int direct=1; |
1373 | 1994 |
2419 | 1995 if(pic_arg){ |
2427 | 1996 pts= pic_arg->pts; |
1997 pic_arg->display_picture_number= s->input_picture_number++; | |
1998 | |
1999 if(pts != AV_NOPTS_VALUE){ | |
2419 | 2000 if(s->user_specified_pts != AV_NOPTS_VALUE){ |
2427 | 2001 int64_t time= av_rescale(pts, s->avctx->frame_rate, s->avctx->frame_rate_base*(int64_t)AV_TIME_BASE); |
2419 | 2002 int64_t last= av_rescale(s->user_specified_pts, s->avctx->frame_rate, s->avctx->frame_rate_base*(int64_t)AV_TIME_BASE); |
2003 | |
2004 if(time <= last){ | |
2427 | 2005 av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%Ld, last=%Ld\n", pts, s->user_specified_pts); |
2419 | 2006 return -1; |
2007 } | |
2008 } | |
2427 | 2009 s->user_specified_pts= pts; |
2419 | 2010 }else{ |
2011 if(s->user_specified_pts != AV_NOPTS_VALUE){ | |
2012 s->user_specified_pts= | |
2427 | 2013 pts= s->user_specified_pts + AV_TIME_BASE*(int64_t)s->avctx->frame_rate_base / s->avctx->frame_rate; |
2014 av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%Ld)\n", pts); | |
2419 | 2015 }else{ |
2427 | 2016 pts= av_rescale(pic_arg->display_picture_number*(int64_t)s->avctx->frame_rate_base, AV_TIME_BASE, s->avctx->frame_rate); |
2419 | 2017 } |
2018 } | |
2019 } | |
2020 | |
1373 | 2021 if(pic_arg){ |
924 | 2022 if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0; |
2023 if(pic_arg->linesize[0] != s->linesize) direct=0; | |
2024 if(pic_arg->linesize[1] != s->uvlinesize) direct=0; | |
2025 if(pic_arg->linesize[2] != s->uvlinesize) direct=0; | |
2026 | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2027 // av_log(AV_LOG_DEBUG, "%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize); |
924 | 2028 |
2029 if(direct){ | |
1586 | 2030 i= ff_find_unused_picture(s, 1); |
924 | 2031 |
925 | 2032 pic= (AVFrame*)&s->picture[i]; |
1168 | 2033 pic->reference= 3; |
903 | 2034 |
924 | 2035 for(i=0; i<4; i++){ |
2036 pic->data[i]= pic_arg->data[i]; | |
2037 pic->linesize[i]= pic_arg->linesize[i]; | |
2038 } | |
2039 alloc_picture(s, (Picture*)pic, 1); | |
2040 }else{ | |
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
|
2041 int offset= 16; |
1586 | 2042 i= ff_find_unused_picture(s, 0); |
924 | 2043 |
925 | 2044 pic= (AVFrame*)&s->picture[i]; |
1168 | 2045 pic->reference= 3; |
924 | 2046 |
2047 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
|
2048 |
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
|
2049 if( pic->data[0] + offset == pic_arg->data[0] |
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
|
2050 && pic->data[1] + offset == pic_arg->data[1] |
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
|
2051 && pic->data[2] + offset == pic_arg->data[2]){ |
924 | 2052 // empty |
2053 }else{ | |
2054 int h_chroma_shift, v_chroma_shift; | |
2055 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); | |
2056 | |
2057 for(i=0; i<3; i++){ | |
2058 int src_stride= pic_arg->linesize[i]; | |
2059 int dst_stride= i ? s->uvlinesize : s->linesize; | |
2060 int h_shift= i ? h_chroma_shift : 0; | |
2061 int v_shift= i ? v_chroma_shift : 0; | |
2062 int w= s->width >>h_shift; | |
2063 int h= s->height>>v_shift; | |
2064 uint8_t *src= pic_arg->data[i]; | |
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
|
2065 uint8_t *dst= pic->data[i] + offset; |
924 | 2066 |
2067 if(src_stride==dst_stride) | |
2068 memcpy(dst, src, src_stride*h); | |
2069 else{ | |
2070 while(h--){ | |
2071 memcpy(dst, src, w); | |
2072 dst += dst_stride; | |
2073 src += src_stride; | |
2074 } | |
2075 } | |
2076 } | |
2077 } | |
324 | 2078 } |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
2079 copy_picture_attributes(s, pic, pic_arg); |
2427 | 2080 pic->pts= pts; //we set this here to avoid modifiying pic_arg |
1373 | 2081 } |
1829 | 2082 |
903 | 2083 /* shift buffer entries */ |
2084 for(i=1; i<MAX_PICTURE_COUNT /*s->encoding_delay+1*/; i++) | |
2085 s->input_picture[i-1]= s->input_picture[i]; | |
2086 | |
2087 s->input_picture[encoding_delay]= (Picture*)pic; | |
2088 | |
2089 return 0; | |
2090 } | |
2091 | |
2381 | 2092 static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){ |
2093 int x, y, plane; | |
2094 int score=0; | |
2382 | 2095 int64_t score64=0; |
2381 | 2096 |
2097 for(plane=0; plane<3; plane++){ | |
2098 const int stride= p->linesize[plane]; | |
2099 const int bw= plane ? 1 : 2; | |
2100 for(y=0; y<s->mb_height*bw; y++){ | |
2101 for(x=0; x<s->mb_width*bw; x++){ | |
2382 | 2102 int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride), ref->data[plane] + 8*(x + y*stride), stride, 8); |
2381 | 2103 |
2382 | 2104 switch(s->avctx->frame_skip_exp){ |
2105 case 0: score= FFMAX(score, v); break; | |
2106 case 1: score+= ABS(v);break; | |
2107 case 2: score+= v*v;break; | |
2108 case 3: score64+= ABS(v*v*(int64_t)v);break; | |
2109 case 4: score64+= v*v*(int64_t)(v*v);break; | |
2110 } | |
2381 | 2111 } |
2112 } | |
2113 } | |
2382 | 2114 |
2115 if(score) score64= score; | |
2116 | |
2117 if(score64 < s->avctx->frame_skip_threshold) | |
2381 | 2118 return 1; |
2382 | 2119 if(score64 < ((s->avctx->frame_skip_factor * (int64_t)s->lambda)>>8)) |
2381 | 2120 return 1; |
2121 return 0; | |
2122 } | |
2123 | |
903 | 2124 static void select_input_picture(MpegEncContext *s){ |
2125 int i; | |
924 | 2126 |
903 | 2127 for(i=1; i<MAX_PICTURE_COUNT; i++) |
2128 s->reordered_input_picture[i-1]= s->reordered_input_picture[i]; | |
2129 s->reordered_input_picture[MAX_PICTURE_COUNT-1]= NULL; | |
2130 | |
2131 /* set next picture types & ordering */ | |
2132 if(s->reordered_input_picture[0]==NULL && s->input_picture[0]){ | |
1138 | 2133 if(/*s->picture_in_gop_number >= s->gop_size ||*/ s->next_picture_ptr==NULL || s->intra_only){ |
915 | 2134 s->reordered_input_picture[0]= s->input_picture[0]; |
2135 s->reordered_input_picture[0]->pict_type= I_TYPE; | |
1705 | 2136 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
915 | 2137 }else{ |
2138 int b_frames; | |
2381 | 2139 |
2140 if(s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor){ | |
2141 if(skip_check(s, s->input_picture[0], s->next_picture_ptr)){ | |
2142 //av_log(NULL, AV_LOG_DEBUG, "skip %p %Ld\n", s->input_picture[0]->data[0], s->input_picture[0]->pts); | |
2143 | |
2144 if(s->input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ | |
2145 for(i=0; i<4; i++) | |
2146 s->input_picture[0]->data[i]= NULL; | |
2147 s->input_picture[0]->type= 0; | |
2148 }else{ | |
2149 assert( s->input_picture[0]->type==FF_BUFFER_TYPE_USER | |
2150 || s->input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); | |
915 | 2151 |
2381 | 2152 s->avctx->release_buffer(s->avctx, (AVFrame*)s->input_picture[0]); |
2153 } | |
2154 | |
2155 goto no_output_pic; | |
2156 } | |
2157 } | |
2158 | |
915 | 2159 if(s->flags&CODEC_FLAG_PASS2){ |
2160 for(i=0; i<s->max_b_frames+1; i++){ | |
2161 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
|
2162 |
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
|
2163 if(pict_num >= s->rc_context.num_entries) |
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
|
2164 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
|
2165 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
|
2166 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
|
2167 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
|
2168 } |
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
|
2169 |
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
|
2170 s->input_picture[i]->pict_type= |
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
|
2171 s->rc_context.entry[pict_num].new_pict_type; |
915 | 2172 } |
2173 } | |
924 | 2174 |
2297 | 2175 if(s->avctx->b_frame_strategy==0){ |
915 | 2176 b_frames= s->max_b_frames; |
1373 | 2177 while(b_frames && !s->input_picture[b_frames]) b_frames--; |
1687 | 2178 }else if(s->avctx->b_frame_strategy==1){ |
915 | 2179 for(i=1; i<s->max_b_frames+1; i++){ |
1373 | 2180 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){ |
915 | 2181 s->input_picture[i]->b_frame_score= |
924 | 2182 get_intra_count(s, s->input_picture[i ]->data[0], |
2183 s->input_picture[i-1]->data[0], s->linesize) + 1; | |
915 | 2184 } |
2185 } | |
2186 for(i=0; i<s->max_b_frames; i++){ | |
1373 | 2187 if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/40) break; |
915 | 2188 } |
2189 | |
2190 b_frames= FFMAX(0, i-1); | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2191 |
915 | 2192 /* reset scores */ |
2193 for(i=0; i<b_frames+1; i++){ | |
2194 s->input_picture[i]->b_frame_score=0; | |
2195 } | |
2196 }else{ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2197 av_log(s->avctx, AV_LOG_ERROR, "illegal b frame strategy\n"); |
915 | 2198 b_frames=0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2199 } |
915 | 2200 |
2201 emms_c(); | |
2202 //static int b_count=0; | |
2203 //b_count+= b_frames; | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2204 //av_log(s->avctx, AV_LOG_DEBUG, "b_frames: %d\n", b_count); |
2297 | 2205 |
2206 for(i= b_frames - 1; i>=0; i--){ | |
2207 int type= s->input_picture[i]->pict_type; | |
2208 if(type && type != B_TYPE) | |
2209 b_frames= i; | |
2210 } | |
2211 if(s->input_picture[b_frames]->pict_type == B_TYPE && b_frames == s->max_b_frames){ | |
2212 av_log(s->avctx, AV_LOG_ERROR, "warning, too many bframes in a row\n"); | |
2213 } | |
2214 | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2215 if(s->picture_in_gop_number + b_frames >= s->gop_size){ |
2298 | 2216 if((s->flags2 & CODEC_FLAG2_STRICT_GOP) && s->gop_size > s->picture_in_gop_number){ |
2217 b_frames= s->gop_size - s->picture_in_gop_number - 1; | |
2218 }else{ | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2219 if(s->flags & CODEC_FLAG_CLOSED_GOP) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2220 b_frames=0; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2221 s->input_picture[b_frames]->pict_type= I_TYPE; |
2298 | 2222 } |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2223 } |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2224 |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2225 if( (s->flags & CODEC_FLAG_CLOSED_GOP) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2226 && b_frames |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2227 && 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
|
2228 b_frames--; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2229 |
915 | 2230 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
|
2231 if(s->reordered_input_picture[0]->pict_type != I_TYPE) |
915 | 2232 s->reordered_input_picture[0]->pict_type= P_TYPE; |
1705 | 2233 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
915 | 2234 for(i=0; i<b_frames; i++){ |
2235 s->reordered_input_picture[i+1]= s->input_picture[i]; | |
2236 s->reordered_input_picture[i+1]->pict_type= B_TYPE; | |
1705 | 2237 s->reordered_input_picture[i+1]->coded_picture_number= s->coded_picture_number++; |
903 | 2238 } |
324 | 2239 } |
2240 } | |
2381 | 2241 no_output_pic: |
903 | 2242 if(s->reordered_input_picture[0]){ |
1168 | 2243 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=B_TYPE ? 3 : 0; |
1138 | 2244 |
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
|
2245 copy_picture(&s->new_picture, s->reordered_input_picture[0]); |
924 | 2246 |
2247 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ | |
1138 | 2248 // input is a shared pix, so we cant modifiy it -> alloc a new one & ensure that the shared one is reuseable |
2249 | |
1586 | 2250 int i= ff_find_unused_picture(s, 0); |
924 | 2251 Picture *pic= &s->picture[i]; |
2252 | |
2253 /* mark us unused / free shared pic */ | |
2254 for(i=0; i<4; i++) | |
2255 s->reordered_input_picture[0]->data[i]= NULL; | |
2256 s->reordered_input_picture[0]->type= 0; | |
2257 | |
1702 | 2258 pic->reference = s->reordered_input_picture[0]->reference; |
924 | 2259 |
2260 alloc_picture(s, pic, 0); | |
2261 | |
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
|
2262 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
|
2263 |
1138 | 2264 s->current_picture_ptr= pic; |
924 | 2265 }else{ |
1138 | 2266 // input is not a shared pix -> reuse buffer for current_pix |
2267 | |
924 | 2268 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER |
2269 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); | |
2270 | |
1138 | 2271 s->current_picture_ptr= s->reordered_input_picture[0]; |
924 | 2272 for(i=0; i<4; i++){ |
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
|
2273 s->new_picture.data[i]+=16; |
924 | 2274 } |
903 | 2275 } |
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
|
2276 copy_picture(&s->current_picture, s->current_picture_ptr); |
903 | 2277 |
2278 s->picture_number= s->new_picture.display_picture_number; | |
2279 //printf("dpn:%d\n", s->picture_number); | |
2280 }else{ | |
2281 memset(&s->new_picture, 0, sizeof(Picture)); | |
324 | 2282 } |
2283 } | |
2284 | |
0 | 2285 int MPV_encode_picture(AVCodecContext *avctx, |
2286 unsigned char *buf, int buf_size, void *data) | |
2287 { | |
2288 MpegEncContext *s = avctx->priv_data; | |
925 | 2289 AVFrame *pic_arg = data; |
1684 | 2290 int i, stuffing_count; |
0 | 2291 |
2442 | 2292 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
|
2293 av_log(avctx, AV_LOG_ERROR, "this codec supports only YUV420P\n"); |
1397 | 2294 return -1; |
2295 } | |
2296 | |
1799 | 2297 for(i=0; i<avctx->thread_count; i++){ |
1838 | 2298 int start_y= s->thread_context[i]->start_mb_y; |
2299 int end_y= s->thread_context[i]-> end_mb_y; | |
1799 | 2300 int h= s->mb_height; |
1838 | 2301 uint8_t *start= buf + buf_size*start_y/h; |
2302 uint8_t *end = buf + buf_size* end_y/h; | |
1799 | 2303 |
2304 init_put_bits(&s->thread_context[i]->pb, start, end - start); | |
2305 } | |
0 | 2306 |
903 | 2307 s->picture_in_gop_number++; |
2308 | |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2309 if(load_input_picture(s, pic_arg) < 0) |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2310 return -1; |
329 | 2311 |
903 | 2312 select_input_picture(s); |
324 | 2313 |
2314 /* output? */ | |
903 | 2315 if(s->new_picture.data[0]){ |
2316 s->pict_type= s->new_picture.pict_type; | |
2317 //emms_c(); | |
2318 //printf("qs:%f %f %d\n", s->new_picture.quality, s->current_picture.quality, s->qscale); | |
553 | 2319 MPV_frame_start(s, avctx); |
286 | 2320 |
324 | 2321 encode_picture(s, s->picture_number); |
652 | 2322 |
376 | 2323 avctx->real_pict_num = s->picture_number; |
324 | 2324 avctx->header_bits = s->header_bits; |
2325 avctx->mv_bits = s->mv_bits; | |
2326 avctx->misc_bits = s->misc_bits; | |
2327 avctx->i_tex_bits = s->i_tex_bits; | |
2328 avctx->p_tex_bits = s->p_tex_bits; | |
2329 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
|
2330 avctx->p_count = s->mb_num - s->i_count - s->skip_count; //FIXME f/b_count in avctx |
324 | 2331 avctx->skip_count = s->skip_count; |
0 | 2332 |
324 | 2333 MPV_frame_end(s); |
2334 | |
2335 if (s->out_format == FMT_MJPEG) | |
2336 mjpeg_picture_trailer(s); | |
329 | 2337 |
2338 if(s->flags&CODEC_FLAG_PASS1) | |
2339 ff_write_pass1_stats(s); | |
1138 | 2340 |
2341 for(i=0; i<4; i++){ | |
2342 avctx->error[i] += s->current_picture_ptr->error[i]; | |
2343 } | |
1766 | 2344 |
2428
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
2345 if(s->flags&CODEC_FLAG_PASS1) |
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
2346 assert(avctx->header_bits + avctx->mv_bits + avctx->misc_bits + avctx->i_tex_bits + avctx->p_tex_bits == put_bits_count(&s->pb)); |
1684 | 2347 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
|
2348 s->frame_bits = put_bits_count(&s->pb); |
1766 | 2349 |
2350 stuffing_count= ff_vbv_update(s, s->frame_bits); | |
2351 if(stuffing_count){ | |
2422 | 2352 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < stuffing_count + 50){ |
2353 av_log(s->avctx, AV_LOG_ERROR, "stuffing too large\n"); | |
2354 return -1; | |
2355 } | |
2356 | |
1766 | 2357 switch(s->codec_id){ |
2358 case CODEC_ID_MPEG1VIDEO: | |
2359 case CODEC_ID_MPEG2VIDEO: | |
2360 while(stuffing_count--){ | |
2361 put_bits(&s->pb, 8, 0); | |
2362 } | |
2363 break; | |
2364 case CODEC_ID_MPEG4: | |
2365 put_bits(&s->pb, 16, 0); | |
2366 put_bits(&s->pb, 16, 0x1C3); | |
2367 stuffing_count -= 4; | |
2368 while(stuffing_count--){ | |
2369 put_bits(&s->pb, 8, 0xFF); | |
2370 } | |
2371 break; | |
2372 default: | |
2373 av_log(s->avctx, AV_LOG_ERROR, "vbv buffer overflow\n"); | |
2374 } | |
2375 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
|
2376 s->frame_bits = put_bits_count(&s->pb); |
1766 | 2377 } |
2378 | |
2379 /* update mpeg1/2 vbv_delay for CBR */ | |
1907 | 2380 if(s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate && s->out_format == FMT_MPEG1 |
2381 && 90000LL * (avctx->rc_buffer_size-1) <= s->avctx->rc_max_rate*0xFFFFLL){ | |
1766 | 2382 int vbv_delay; |
2383 | |
2384 assert(s->repeat_first_field==0); | |
2385 | |
2386 vbv_delay= lrintf(90000 * s->rc_context.buffer_index / s->avctx->rc_max_rate); | |
2387 assert(vbv_delay < 0xFFFF); | |
2388 | |
2389 s->vbv_delay_ptr[0] &= 0xF8; | |
2390 s->vbv_delay_ptr[0] |= vbv_delay>>13; | |
2391 s->vbv_delay_ptr[1] = vbv_delay>>5; | |
2392 s->vbv_delay_ptr[2] &= 0x07; | |
2393 s->vbv_delay_ptr[2] |= vbv_delay<<3; | |
2394 } | |
2395 s->total_bits += s->frame_bits; | |
2396 avctx->frame_bits = s->frame_bits; | |
2397 }else{ | |
2398 assert((pbBufPtr(&s->pb) == s->pb.buf)); | |
2399 s->frame_bits=0; | |
1684 | 2400 } |
1766 | 2401 assert((s->frame_bits&7)==0); |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2402 |
1684 | 2403 return s->frame_bits/8; |
0 | 2404 } |
2405 | |
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
|
2406 #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
|
2407 |
255 | 2408 static inline void gmc1_motion(MpegEncContext *s, |
1064 | 2409 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
|
2410 uint8_t **ref_picture) |
255 | 2411 { |
1064 | 2412 uint8_t *ptr; |
556 | 2413 int offset, src_x, src_y, linesize, uvlinesize; |
255 | 2414 int motion_x, motion_y; |
566 | 2415 int emu=0; |
255 | 2416 |
2417 motion_x= s->sprite_offset[0][0]; | |
2418 motion_y= s->sprite_offset[0][1]; | |
2419 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
2420 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
2421 motion_x<<=(3-s->sprite_warping_accuracy); | |
2422 motion_y<<=(3-s->sprite_warping_accuracy); | |
2423 src_x = clip(src_x, -16, s->width); | |
2424 if (src_x == s->width) | |
2425 motion_x =0; | |
2426 src_y = clip(src_y, -16, s->height); | |
2427 if (src_y == s->height) | |
2428 motion_y =0; | |
753 | 2429 |
255 | 2430 linesize = s->linesize; |
556 | 2431 uvlinesize = s->uvlinesize; |
753 | 2432 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2433 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
|
2434 |
566 | 2435 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
|
2436 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
|
2437 || (unsigned)src_y >= s->v_edge_pos - 17){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2438 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 | 2439 ptr= s->edge_emu_buffer; |
2440 } | |
2441 } | |
753 | 2442 |
2443 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
|
2444 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
|
2445 s->dsp.gmc1(dest_y+8, ptr+8, linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding); |
753 | 2446 }else{ |
2447 int dxy; | |
2448 | |
2449 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2); | |
2450 if (s->no_rounding){ | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2451 s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16); |
753 | 2452 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2453 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
|
2454 } |
753 | 2455 } |
2456 | |
2457 if(s->flags&CODEC_FLAG_GRAY) return; | |
255 | 2458 |
2459 motion_x= s->sprite_offset[1][0]; | |
2460 motion_y= s->sprite_offset[1][1]; | |
2461 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
2462 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
2463 motion_x<<=(3-s->sprite_warping_accuracy); | |
2464 motion_y<<=(3-s->sprite_warping_accuracy); | |
2465 src_x = clip(src_x, -8, s->width>>1); | |
2466 if (src_x == s->width>>1) | |
2467 motion_x =0; | |
2468 src_y = clip(src_y, -8, s->height>>1); | |
2469 if (src_y == s->height>>1) | |
2470 motion_y =0; | |
2471 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2472 offset = (src_y * uvlinesize) + src_x; |
255 | 2473 ptr = ref_picture[1] + offset; |
1002 | 2474 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
|
2475 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
|
2476 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2477 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 | 2478 ptr= s->edge_emu_buffer; |
2479 emu=1; | |
2480 } | |
566 | 2481 } |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2482 s->dsp.gmc1(dest_cb, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
566 | 2483 |
255 | 2484 ptr = ref_picture[2] + offset; |
566 | 2485 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2486 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 | 2487 ptr= s->edge_emu_buffer; |
2488 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2489 s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
255 | 2490 |
2491 return; | |
2492 } | |
2493 | |
753 | 2494 static inline void gmc_motion(MpegEncContext *s, |
1064 | 2495 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
|
2496 uint8_t **ref_picture) |
753 | 2497 { |
1064 | 2498 uint8_t *ptr; |
753 | 2499 int linesize, uvlinesize; |
2500 const int a= s->sprite_warping_accuracy; | |
2501 int ox, oy; | |
2502 | |
2503 linesize = s->linesize; | |
2504 uvlinesize = s->uvlinesize; | |
2505 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2506 ptr = ref_picture[0]; |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2507 |
753 | 2508 ox= s->sprite_offset[0][0] + s->sprite_delta[0][0]*s->mb_x*16 + s->sprite_delta[0][1]*s->mb_y*16; |
2509 oy= s->sprite_offset[0][1] + s->sprite_delta[1][0]*s->mb_x*16 + s->sprite_delta[1][1]*s->mb_y*16; | |
2510 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2511 s->dsp.gmc(dest_y, ptr, linesize, 16, |
753 | 2512 ox, |
2513 oy, | |
2514 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2515 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2516 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2517 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
|
2518 s->dsp.gmc(dest_y+8, ptr, linesize, 16, |
753 | 2519 ox + s->sprite_delta[0][0]*8, |
2520 oy + s->sprite_delta[1][0]*8, | |
2521 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2522 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2523 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2524 s->h_edge_pos, s->v_edge_pos); | |
2525 | |
2526 if(s->flags&CODEC_FLAG_GRAY) return; | |
2527 | |
2528 ox= s->sprite_offset[1][0] + s->sprite_delta[0][0]*s->mb_x*8 + s->sprite_delta[0][1]*s->mb_y*8; | |
2529 oy= s->sprite_offset[1][1] + s->sprite_delta[1][0]*s->mb_x*8 + s->sprite_delta[1][1]*s->mb_y*8; | |
2530 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2531 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
|
2532 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8, |
753 | 2533 ox, |
2534 oy, | |
2535 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2536 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2537 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2538 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2539 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2540 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
|
2541 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8, |
753 | 2542 ox, |
2543 oy, | |
2544 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2545 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2546 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2547 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2548 } | |
2549 | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2550 /** |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2551 * 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
|
2552 * @param buf destination buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2553 * @param src source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2554 * @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
|
2555 * @param block_w width of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2556 * @param block_h height of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2557 * @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
|
2558 * @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
|
2559 * @param w width of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2560 * @param h height of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2561 */ |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2562 void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h, |
553 | 2563 int src_x, int src_y, int w, int h){ |
2564 int x, y; | |
2565 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
|
2566 |
553 | 2567 if(src_y>= h){ |
2568 src+= (h-1-src_y)*linesize; | |
2569 src_y=h-1; | |
554 | 2570 }else if(src_y<=-block_h){ |
2571 src+= (1-block_h-src_y)*linesize; | |
2572 src_y=1-block_h; | |
553 | 2573 } |
2574 if(src_x>= w){ | |
2575 src+= (w-1-src_x); | |
2576 src_x=w-1; | |
554 | 2577 }else if(src_x<=-block_w){ |
2578 src+= (1-block_w-src_x); | |
2579 src_x=1-block_w; | |
553 | 2580 } |
2581 | |
847 | 2582 start_y= FFMAX(0, -src_y); |
2583 start_x= FFMAX(0, -src_x); | |
2584 end_y= FFMIN(block_h, h-src_y); | |
2585 end_x= FFMIN(block_w, w-src_x); | |
566 | 2586 |
553 | 2587 // copy existing part |
2588 for(y=start_y; y<end_y; y++){ | |
2589 for(x=start_x; x<end_x; x++){ | |
2590 buf[x + y*linesize]= src[x + y*linesize]; | |
2591 } | |
2592 } | |
2593 | |
2594 //top | |
2595 for(y=0; y<start_y; y++){ | |
2596 for(x=start_x; x<end_x; x++){ | |
2597 buf[x + y*linesize]= buf[x + start_y*linesize]; | |
2598 } | |
2599 } | |
2600 | |
2601 //bottom | |
2602 for(y=end_y; y<block_h; y++){ | |
2603 for(x=start_x; x<end_x; x++){ | |
2604 buf[x + y*linesize]= buf[x + (end_y-1)*linesize]; | |
2605 } | |
2606 } | |
2607 | |
2608 for(y=0; y<block_h; y++){ | |
2609 //left | |
2610 for(x=0; x<start_x; x++){ | |
2611 buf[x + y*linesize]= buf[start_x + y*linesize]; | |
2612 } | |
2613 | |
2614 //right | |
2615 for(x=end_x; x<block_w; x++){ | |
2616 buf[x + y*linesize]= buf[end_x - 1 + y*linesize]; | |
2617 } | |
2618 } | |
2619 } | |
2620 | |
1633 | 2621 static inline int hpel_motion(MpegEncContext *s, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2622 uint8_t *dest, uint8_t *src, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2623 int field_based, int field_select, |
1633 | 2624 int src_x, int src_y, |
2625 int width, int height, int stride, | |
2626 int h_edge_pos, int v_edge_pos, | |
2627 int w, int h, op_pixels_func *pix_op, | |
2628 int motion_x, int motion_y) | |
2629 { | |
2630 int dxy; | |
2631 int emu=0; | |
2632 | |
2633 dxy = ((motion_y & 1) << 1) | (motion_x & 1); | |
2634 src_x += motion_x >> 1; | |
2635 src_y += motion_y >> 1; | |
2636 | |
2637 /* WARNING: do no forget half pels */ | |
2638 src_x = clip(src_x, -16, width); //FIXME unneeded for emu? | |
2639 if (src_x == width) | |
2640 dxy &= ~1; | |
2641 src_y = clip(src_y, -16, height); | |
2642 if (src_y == height) | |
2643 dxy &= ~2; | |
2644 src += src_y * stride + src_x; | |
2645 | |
2646 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){ | |
2647 if( (unsigned)src_x > h_edge_pos - (motion_x&1) - w | |
2648 || (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
|
2649 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
|
2650 src_x, src_y<<field_based, h_edge_pos, s->v_edge_pos); |
1633 | 2651 src= s->edge_emu_buffer; |
2652 emu=1; | |
2653 } | |
2654 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2655 if(field_select) |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2656 src += s->linesize; |
1633 | 2657 pix_op[dxy](dest, src, stride, h); |
2658 return emu; | |
2659 } | |
553 | 2660 |
2292 | 2661 static inline int hpel_motion_lowres(MpegEncContext *s, |
2662 uint8_t *dest, uint8_t *src, | |
2663 int field_based, int field_select, | |
2664 int src_x, int src_y, | |
2665 int width, int height, int stride, | |
2666 int h_edge_pos, int v_edge_pos, | |
2667 int w, int h, h264_chroma_mc_func *pix_op, | |
2668 int motion_x, int motion_y) | |
2669 { | |
2670 const int lowres= s->avctx->lowres; | |
2671 const int s_mask= (2<<lowres)-1; | |
2672 int emu=0; | |
2673 int sx, sy; | |
2674 | |
2675 if(s->quarter_sample){ | |
2676 motion_x/=2; | |
2677 motion_y/=2; | |
2678 } | |
2679 | |
2680 sx= motion_x & s_mask; | |
2681 sy= motion_y & s_mask; | |
2682 src_x += motion_x >> (lowres+1); | |
2683 src_y += motion_y >> (lowres+1); | |
2684 | |
2685 src += src_y * stride + src_x; | |
2686 | |
2687 if( (unsigned)src_x > h_edge_pos - (!!sx) - w | |
2688 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
2689 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based, | |
2690 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
2691 src= s->edge_emu_buffer; | |
2692 emu=1; | |
2693 } | |
2694 | |
2695 sx <<= 2 - lowres; | |
2696 sy <<= 2 - lowres; | |
2697 if(field_select) | |
2698 src += s->linesize; | |
2699 pix_op[lowres](dest, src, stride, h, sx, sy); | |
2700 return emu; | |
2701 } | |
2702 | |
0 | 2703 /* 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
|
2704 static always_inline void mpeg_motion(MpegEncContext *s, |
1064 | 2705 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
|
2706 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
|
2707 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
0 | 2708 int motion_x, int motion_y, int h) |
2709 { | |
1846 | 2710 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
2711 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize; | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2712 |
651 | 2713 #if 0 |
255 | 2714 if(s->quarter_sample) |
2715 { | |
2716 motion_x>>=1; | |
2717 motion_y>>=1; | |
2718 } | |
651 | 2719 #endif |
1633 | 2720 |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
2721 v_edge_pos = s->v_edge_pos >> field_based; |
1846 | 2722 linesize = s->current_picture.linesize[0] << field_based; |
1138 | 2723 uvlinesize = s->current_picture.linesize[1] << field_based; |
1633 | 2724 |
1846 | 2725 dxy = ((motion_y & 1) << 1) | (motion_x & 1); |
2726 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
|
2727 src_y =(s->mb_y<<(4-field_based)) + (motion_y >> 1); |
485 | 2728 |
0 | 2729 if (s->out_format == FMT_H263) { |
1916 | 2730 if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){ |
2731 mx = (motion_x>>1)|(motion_x&1); | |
2732 my = motion_y >>1; | |
2733 uvdxy = ((my & 1) << 1) | (mx & 1); | |
2734 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
|
2735 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1); |
1916 | 2736 }else{ |
2737 uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1); | |
2738 uvsrc_x = src_x>>1; | |
2739 uvsrc_y = src_y>>1; | |
2740 } | |
2044
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2741 }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
|
2742 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
|
2743 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
|
2744 uvdxy = 0; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2745 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
|
2746 uvsrc_y = s->mb_y*8 + my; |
0 | 2747 } else { |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2748 if(s->chroma_y_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2749 mx = motion_x / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2750 my = motion_y / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2751 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
|
2752 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
|
2753 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
|
2754 } else { |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2755 if(s->chroma_x_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2756 //Chroma422 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2757 mx = motion_x / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2758 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
|
2759 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
|
2760 uvsrc_y = src_y; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2761 } else { |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2762 //Chroma444 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2763 uvdxy = dxy; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2764 uvsrc_x = src_x; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2765 uvsrc_y = src_y; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2766 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2767 } |
1846 | 2768 } |
2769 | |
2770 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2771 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2772 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2773 | |
2774 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16 | |
2775 || (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
|
2776 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
|
2777 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
|
2778 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
|
2779 return ; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2780 } |
1846 | 2781 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, |
2782 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); | |
2783 ptr_y = s->edge_emu_buffer; | |
2784 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1874 | 2785 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; |
1846 | 2786 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, |
2787 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2788 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, | |
2789 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2790 ptr_cb= uvbuf; | |
2791 ptr_cr= uvbuf+16; | |
2792 } | |
2793 } | |
2794 | |
2795 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data | |
2796 dest_y += s->linesize; | |
2797 dest_cb+= s->uvlinesize; | |
2798 dest_cr+= s->uvlinesize; | |
2799 } | |
2800 | |
2801 if(field_select){ | |
2802 ptr_y += s->linesize; | |
2803 ptr_cb+= s->uvlinesize; | |
2804 ptr_cr+= s->uvlinesize; | |
2805 } | |
2806 | |
2807 pix_op[0][dxy](dest_y, ptr_y, linesize, h); | |
0 | 2808 |
1846 | 2809 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
|
2810 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
|
2811 pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift); |
1846 | 2812 } |
2291 | 2813 if(s->out_format == FMT_H261){ |
2814 ff_h261_loop_filter(s); | |
2815 } | |
0 | 2816 } |
2256 | 2817 |
2818 /* apply one mpeg motion vector to the three components */ | |
2819 static always_inline void mpeg_motion_lowres(MpegEncContext *s, | |
2820 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2821 int field_based, int bottom_field, int field_select, | |
2822 uint8_t **ref_picture, h264_chroma_mc_func *pix_op, | |
2823 int motion_x, int motion_y, int h) | |
2824 { | |
2825 uint8_t *ptr_y, *ptr_cb, *ptr_cr; | |
2826 int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, uvlinesize, linesize, sx, sy, uvsx, uvsy; | |
2827 const int lowres= s->avctx->lowres; | |
2828 const int block_s= 8>>lowres; | |
2829 const int s_mask= (2<<lowres)-1; | |
2830 const int h_edge_pos = s->h_edge_pos >> lowres; | |
2831 const int v_edge_pos = s->v_edge_pos >> lowres; | |
2832 linesize = s->current_picture.linesize[0] << field_based; | |
2833 uvlinesize = s->current_picture.linesize[1] << field_based; | |
2834 | |
2260 | 2835 if(s->quarter_sample){ //FIXME obviously not perfect but qpel wont work in lowres anyway |
2836 motion_x/=2; | |
2837 motion_y/=2; | |
2838 } | |
2839 | |
2840 if(field_based){ | |
2841 motion_y += (bottom_field - field_select)*((1<<lowres)-1); | |
2842 } | |
2843 | |
2256 | 2844 sx= motion_x & s_mask; |
2845 sy= motion_y & s_mask; | |
2846 src_x = s->mb_x*2*block_s + (motion_x >> (lowres+1)); | |
2260 | 2847 src_y =(s->mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1)); |
2256 | 2848 |
2849 if (s->out_format == FMT_H263) { | |
2265 | 2850 uvsx = ((motion_x>>1) & s_mask) | (sx&1); |
2851 uvsy = ((motion_y>>1) & s_mask) | (sy&1); | |
2256 | 2852 uvsrc_x = src_x>>1; |
2853 uvsrc_y = src_y>>1; | |
2854 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261 | |
2855 mx = motion_x / 4; | |
2856 my = motion_y / 4; | |
2857 uvsx = (2*mx) & s_mask; | |
2858 uvsy = (2*my) & s_mask; | |
2859 uvsrc_x = s->mb_x*block_s + (mx >> lowres); | |
2860 uvsrc_y = s->mb_y*block_s + (my >> lowres); | |
2861 } else { | |
2862 mx = motion_x / 2; | |
2863 my = motion_y / 2; | |
2864 uvsx = mx & s_mask; | |
2865 uvsy = my & s_mask; | |
2866 uvsrc_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
2260 | 2867 uvsrc_y =(s->mb_y*block_s>>field_based) + (my >> (lowres+1)); |
2256 | 2868 } |
2869 | |
2870 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2871 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2872 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2873 | |
2874 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s | |
2875 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
2876 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, | |
2877 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
2878 ptr_y = s->edge_emu_buffer; | |
2879 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2880 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; | |
2881 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, | |
2882 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); | |
2883 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, | |
2884 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); | |
2885 ptr_cb= uvbuf; | |
2886 ptr_cr= uvbuf+16; | |
2887 } | |
2888 } | |
2889 | |
2260 | 2890 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data |
2891 dest_y += s->linesize; | |
2892 dest_cb+= s->uvlinesize; | |
2893 dest_cr+= s->uvlinesize; | |
2894 } | |
2895 | |
2896 if(field_select){ | |
2897 ptr_y += s->linesize; | |
2898 ptr_cb+= s->uvlinesize; | |
2899 ptr_cr+= s->uvlinesize; | |
2900 } | |
2901 | |
2256 | 2902 sx <<= 2 - lowres; |
2903 sy <<= 2 - lowres; | |
2904 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy); | |
2905 | |
2906 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2907 uvsx <<= 2 - lowres; | |
2908 uvsy <<= 2 - lowres; | |
2909 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
2910 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
2911 } | |
2291 | 2912 //FIXME h261 lowres loop filter |
2256 | 2913 } |
2914 | |
1633 | 2915 //FIXME move to dsputil, avg variant, 16x16 version |
2916 static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride){ | |
2917 int x; | |
2918 uint8_t * const top = src[1]; | |
2919 uint8_t * const left = src[2]; | |
2920 uint8_t * const mid = src[0]; | |
2921 uint8_t * const right = src[3]; | |
2922 uint8_t * const bottom= src[4]; | |
2923 #define OBMC_FILTER(x, t, l, m, r, b)\ | |
2924 dst[x]= (t*top[x] + l*left[x] + m*mid[x] + r*right[x] + b*bottom[x] + 4)>>3 | |
2925 #define OBMC_FILTER4(x, t, l, m, r, b)\ | |
2926 OBMC_FILTER(x , t, l, m, r, b);\ | |
2927 OBMC_FILTER(x+1 , t, l, m, r, b);\ | |
2928 OBMC_FILTER(x +stride, t, l, m, r, b);\ | |
2929 OBMC_FILTER(x+1+stride, t, l, m, r, b); | |
2930 | |
2931 x=0; | |
2932 OBMC_FILTER (x , 2, 2, 4, 0, 0); | |
2933 OBMC_FILTER (x+1, 2, 1, 5, 0, 0); | |
2934 OBMC_FILTER4(x+2, 2, 1, 5, 0, 0); | |
2935 OBMC_FILTER4(x+4, 2, 0, 5, 1, 0); | |
2936 OBMC_FILTER (x+6, 2, 0, 5, 1, 0); | |
2937 OBMC_FILTER (x+7, 2, 0, 4, 2, 0); | |
2938 x+= stride; | |
2939 OBMC_FILTER (x , 1, 2, 5, 0, 0); | |
2940 OBMC_FILTER (x+1, 1, 2, 5, 0, 0); | |
2941 OBMC_FILTER (x+6, 1, 0, 5, 2, 0); | |
2942 OBMC_FILTER (x+7, 1, 0, 5, 2, 0); | |
2943 x+= stride; | |
2944 OBMC_FILTER4(x , 1, 2, 5, 0, 0); | |
2945 OBMC_FILTER4(x+2, 1, 1, 6, 0, 0); | |
2946 OBMC_FILTER4(x+4, 1, 0, 6, 1, 0); | |
2947 OBMC_FILTER4(x+6, 1, 0, 5, 2, 0); | |
2948 x+= 2*stride; | |
2949 OBMC_FILTER4(x , 0, 2, 5, 0, 1); | |
2950 OBMC_FILTER4(x+2, 0, 1, 6, 0, 1); | |
2951 OBMC_FILTER4(x+4, 0, 0, 6, 1, 1); | |
2952 OBMC_FILTER4(x+6, 0, 0, 5, 2, 1); | |
2953 x+= 2*stride; | |
2954 OBMC_FILTER (x , 0, 2, 5, 0, 1); | |
2955 OBMC_FILTER (x+1, 0, 2, 5, 0, 1); | |
2956 OBMC_FILTER4(x+2, 0, 1, 5, 0, 2); | |
2957 OBMC_FILTER4(x+4, 0, 0, 5, 1, 2); | |
2958 OBMC_FILTER (x+6, 0, 0, 5, 2, 1); | |
2959 OBMC_FILTER (x+7, 0, 0, 5, 2, 1); | |
2960 x+= stride; | |
2961 OBMC_FILTER (x , 0, 2, 4, 0, 2); | |
2962 OBMC_FILTER (x+1, 0, 1, 5, 0, 2); | |
2963 OBMC_FILTER (x+6, 0, 0, 5, 1, 2); | |
2964 OBMC_FILTER (x+7, 0, 0, 4, 2, 2); | |
2965 } | |
2966 | |
2967 /* obmc for 1 8x8 luma block */ | |
2968 static inline void obmc_motion(MpegEncContext *s, | |
2969 uint8_t *dest, uint8_t *src, | |
2970 int src_x, int src_y, | |
2971 op_pixels_func *pix_op, | |
2972 int16_t mv[5][2]/* mid top left right bottom*/) | |
2973 #define MID 0 | |
2974 { | |
2975 int i; | |
2976 uint8_t *ptr[5]; | |
2977 | |
2978 assert(s->quarter_sample==0); | |
2979 | |
2980 for(i=0; i<5; i++){ | |
2981 if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){ | |
2982 ptr[i]= ptr[MID]; | |
2983 }else{ | |
1799 | 2984 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
|
2985 hpel_motion(s, ptr[i], src, 0, 0, |
1633 | 2986 src_x, src_y, |
2987 s->width, s->height, s->linesize, | |
2988 s->h_edge_pos, s->v_edge_pos, | |
2989 8, 8, pix_op, | |
2990 mv[i][0], mv[i][1]); | |
2991 } | |
2992 } | |
2993 | |
2994 put_obmc(dest, ptr, s->linesize); | |
2995 } | |
0 | 2996 |
255 | 2997 static inline void qpel_motion(MpegEncContext *s, |
1064 | 2998 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
|
2999 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
|
3000 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
651 | 3001 qpel_mc_func (*qpix_op)[16], |
255 | 3002 int motion_x, int motion_y, int h) |
3003 { | |
1846 | 3004 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
3005 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
|
3006 |
255 | 3007 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
1846 | 3008 src_x = s->mb_x * 16 + (motion_x >> 2); |
255 | 3009 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2); |
3010 | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
3011 v_edge_pos = s->v_edge_pos >> field_based; |
255 | 3012 linesize = s->linesize << field_based; |
671 | 3013 uvlinesize = s->uvlinesize << field_based; |
554 | 3014 |
671 | 3015 if(field_based){ |
3016 mx= motion_x/2; | |
3017 my= motion_y>>1; | |
1048 | 3018 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){ |
3019 static const int rtab[8]= {0,0,1,1,0,0,0,1}; | |
3020 mx= (motion_x>>1) + rtab[motion_x&7]; | |
3021 my= (motion_y>>1) + rtab[motion_y&7]; | |
760 | 3022 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){ |
671 | 3023 mx= (motion_x>>1)|(motion_x&1); |
3024 my= (motion_y>>1)|(motion_y&1); | |
3025 }else{ | |
3026 mx= motion_x/2; | |
3027 my= motion_y/2; | |
3028 } | |
3029 mx= (mx>>1)|(mx&1); | |
3030 my= (my>>1)|(my&1); | |
1048 | 3031 |
1846 | 3032 uvdxy= (mx&1) | ((my&1)<<1); |
671 | 3033 mx>>=1; |
3034 my>>=1; | |
255 | 3035 |
1846 | 3036 uvsrc_x = s->mb_x * 8 + mx; |
3037 uvsrc_y = s->mb_y * (8 >> field_based) + my; | |
3038 | |
3039 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
3040 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
3041 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
3042 | |
3043 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16 | |
3044 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){ | |
3045 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, | |
3046 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); | |
3047 ptr_y= s->edge_emu_buffer; | |
3048 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1874 | 3049 uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize; |
1846 | 3050 ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based, |
3051 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
3052 ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based, | |
3053 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
3054 ptr_cb= uvbuf; | |
3055 ptr_cr= uvbuf + 16; | |
3056 } | |
3057 } | |
3058 | |
3059 if(!field_based) | |
3060 qpix_op[0][dxy](dest_y, ptr_y, linesize); | |
3061 else{ | |
3062 if(bottom_field){ | |
3063 dest_y += s->linesize; | |
3064 dest_cb+= s->uvlinesize; | |
3065 dest_cr+= s->uvlinesize; | |
3066 } | |
3067 | |
3068 if(field_select){ | |
3069 ptr_y += s->linesize; | |
3070 ptr_cb += s->uvlinesize; | |
3071 ptr_cr += s->uvlinesize; | |
3072 } | |
3073 //damn interlaced mode | |
3074 //FIXME boundary mirroring is not exactly correct here | |
3075 qpix_op[1][dxy](dest_y , ptr_y , linesize); | |
3076 qpix_op[1][dxy](dest_y+8, ptr_y+8, linesize); | |
3077 } | |
3078 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
3079 pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1); | |
3080 pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1); | |
3081 } | |
255 | 3082 } |
3083 | |
1013 | 3084 inline int ff_h263_round_chroma(int x){ |
3085 if (x >= 0) | |
3086 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
3087 else { | |
3088 x = -x; | |
3089 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
3090 } | |
3091 } | |
255 | 3092 |
1225 | 3093 /** |
1633 | 3094 * h263 chorma 4mv motion compensation. |
3095 */ | |
3096 static inline void chroma_4mv_motion(MpegEncContext *s, | |
3097 uint8_t *dest_cb, uint8_t *dest_cr, | |
3098 uint8_t **ref_picture, | |
3099 op_pixels_func *pix_op, | |
3100 int mx, int my){ | |
3101 int dxy, emu=0, src_x, src_y, offset; | |
3102 uint8_t *ptr; | |
3103 | |
3104 /* In case of 8X8, we construct a single chroma motion vector | |
3105 with a special rounding */ | |
3106 mx= ff_h263_round_chroma(mx); | |
3107 my= ff_h263_round_chroma(my); | |
3108 | |
3109 dxy = ((my & 1) << 1) | (mx & 1); | |
3110 mx >>= 1; | |
3111 my >>= 1; | |
3112 | |
3113 src_x = s->mb_x * 8 + mx; | |
3114 src_y = s->mb_y * 8 + my; | |
3115 src_x = clip(src_x, -8, s->width/2); | |
3116 if (src_x == s->width/2) | |
3117 dxy &= ~1; | |
3118 src_y = clip(src_y, -8, s->height/2); | |
3119 if (src_y == s->height/2) | |
3120 dxy &= ~2; | |
3121 | |
3122 offset = (src_y * (s->uvlinesize)) + src_x; | |
3123 ptr = ref_picture[1] + offset; | |
3124 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
3125 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8 | |
3126 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){ | |
3127 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); | |
3128 ptr= s->edge_emu_buffer; | |
3129 emu=1; | |
3130 } | |
3131 } | |
3132 pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8); | |
3133 | |
3134 ptr = ref_picture[2] + offset; | |
3135 if(emu){ | |
3136 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); | |
3137 ptr= s->edge_emu_buffer; | |
3138 } | |
3139 pix_op[dxy](dest_cr, ptr, s->uvlinesize, 8); | |
3140 } | |
3141 | |
2292 | 3142 static inline void chroma_4mv_motion_lowres(MpegEncContext *s, |
3143 uint8_t *dest_cb, uint8_t *dest_cr, | |
3144 uint8_t **ref_picture, | |
3145 h264_chroma_mc_func *pix_op, | |
3146 int mx, int my){ | |
3147 const int lowres= s->avctx->lowres; | |
3148 const int block_s= 8>>lowres; | |
3149 const int s_mask= (2<<lowres)-1; | |
3150 const int h_edge_pos = s->h_edge_pos >> (lowres+1); | |
3151 const int v_edge_pos = s->v_edge_pos >> (lowres+1); | |
3152 int emu=0, src_x, src_y, offset, sx, sy; | |
3153 uint8_t *ptr; | |
3154 | |
3155 if(s->quarter_sample){ | |
3156 mx/=2; | |
3157 my/=2; | |
3158 } | |
3159 | |
3160 /* In case of 8X8, we construct a single chroma motion vector | |
3161 with a special rounding */ | |
3162 mx= ff_h263_round_chroma(mx); | |
3163 my= ff_h263_round_chroma(my); | |
3164 | |
3165 sx= mx & s_mask; | |
3166 sy= my & s_mask; | |
3167 src_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
3168 src_y = s->mb_y*block_s + (my >> (lowres+1)); | |
3169 | |
3170 offset = src_y * s->uvlinesize + src_x; | |
3171 ptr = ref_picture[1] + offset; | |
3172 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
3173 if( (unsigned)src_x > h_edge_pos - (!!sx) - block_s | |
3174 || (unsigned)src_y > v_edge_pos - (!!sy) - block_s){ | |
3175 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
3176 ptr= s->edge_emu_buffer; | |
3177 emu=1; | |
3178 } | |
3179 } | |
3180 sx <<= 2 - lowres; | |
3181 sy <<= 2 - lowres; | |
3182 pix_op[lowres](dest_cb, ptr, s->uvlinesize, block_s, sx, sy); | |
3183 | |
3184 ptr = ref_picture[2] + offset; | |
3185 if(emu){ | |
3186 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
3187 ptr= s->edge_emu_buffer; | |
3188 } | |
3189 pix_op[lowres](dest_cr, ptr, s->uvlinesize, block_s, sx, sy); | |
3190 } | |
3191 | |
1633 | 3192 /** |
1225 | 3193 * motion compesation of a single macroblock |
3194 * @param s context | |
3195 * @param dest_y luma destination pointer | |
3196 * @param dest_cb chroma cb/u destination pointer | |
3197 * @param dest_cr chroma cr/v destination pointer | |
3198 * @param dir direction (0->forward, 1->backward) | |
3199 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
3200 * @param pic_op halfpel motion compensation function (average or put normally) | |
3201 * @param pic_op qpel motion compensation function (average or put normally) | |
3202 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
3203 */ | |
0 | 3204 static inline void MPV_motion(MpegEncContext *s, |
1064 | 3205 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
3206 int dir, uint8_t **ref_picture, | |
651 | 3207 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]) |
0 | 3208 { |
1633 | 3209 int dxy, mx, my, src_x, src_y, motion_x, motion_y; |
0 | 3210 int mb_x, mb_y, i; |
1064 | 3211 uint8_t *ptr, *dest; |
0 | 3212 |
3213 mb_x = s->mb_x; | |
3214 mb_y = s->mb_y; | |
3215 | |
1655 | 3216 if(s->obmc && s->pict_type != B_TYPE){ |
1633 | 3217 int16_t mv_cache[4][4][2]; |
3218 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
|
3219 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
|
3220 const int mot_xy= mb_x*2 + mb_y*2*mot_stride; |
1633 | 3221 |
3222 assert(!s->mb_skiped); | |
3223 | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3224 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
|
3225 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
|
3226 memcpy(mv_cache[3][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4); |
1633 | 3227 |
3228 if(mb_y==0 || IS_INTRA(s->current_picture.mb_type[xy-s->mb_stride])){ | |
3229 memcpy(mv_cache[0][1], mv_cache[1][1], sizeof(int16_t)*4); | |
3230 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3231 memcpy(mv_cache[0][1], s->current_picture.motion_val[0][mot_xy-mot_stride], sizeof(int16_t)*4); |
1633 | 3232 } |
3233 | |
3234 if(mb_x==0 || IS_INTRA(s->current_picture.mb_type[xy-1])){ | |
3235 *(int32_t*)mv_cache[1][0]= *(int32_t*)mv_cache[1][1]; | |
3236 *(int32_t*)mv_cache[2][0]= *(int32_t*)mv_cache[2][1]; | |
3237 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3238 *(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
|
3239 *(int32_t*)mv_cache[2][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1+mot_stride]; |
1633 | 3240 } |
3241 | |
3242 if(mb_x+1>=s->mb_width || IS_INTRA(s->current_picture.mb_type[xy+1])){ | |
3243 *(int32_t*)mv_cache[1][3]= *(int32_t*)mv_cache[1][2]; | |
3244 *(int32_t*)mv_cache[2][3]= *(int32_t*)mv_cache[2][2]; | |
3245 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3246 *(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
|
3247 *(int32_t*)mv_cache[2][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2+mot_stride]; |
1633 | 3248 } |
3249 | |
3250 mx = 0; | |
3251 my = 0; | |
3252 for(i=0;i<4;i++) { | |
3253 const int x= (i&1)+1; | |
3254 const int y= (i>>1)+1; | |
3255 int16_t mv[5][2]= { | |
3256 {mv_cache[y][x ][0], mv_cache[y][x ][1]}, | |
3257 {mv_cache[y-1][x][0], mv_cache[y-1][x][1]}, | |
3258 {mv_cache[y][x-1][0], mv_cache[y][x-1][1]}, | |
3259 {mv_cache[y][x+1][0], mv_cache[y][x+1][1]}, | |
3260 {mv_cache[y+1][x][0], mv_cache[y+1][x][1]}}; | |
3261 //FIXME cleanup | |
3262 obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize, | |
3263 ref_picture[0], | |
3264 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, | |
3265 pix_op[1], | |
3266 mv); | |
3267 | |
3268 mx += mv[0][0]; | |
3269 my += mv[0][1]; | |
3270 } | |
3271 if(!(s->flags&CODEC_FLAG_GRAY)) | |
3272 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
3273 | |
3274 return; | |
3275 } | |
3276 | |
0 | 3277 switch(s->mv_type) { |
3278 case MV_TYPE_16X16: | |
255 | 3279 if(s->mcsel){ |
753 | 3280 if(s->real_sprite_warping_points==1){ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3281 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
|
3282 ref_picture); |
753 | 3283 }else{ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3284 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
|
3285 ref_picture); |
753 | 3286 } |
651 | 3287 }else if(s->quarter_sample){ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3288 qpel_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3289 0, 0, 0, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3290 ref_picture, pix_op, qpix_op, |
255 | 3291 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
936 | 3292 }else if(s->mspel){ |
3293 ff_mspel_motion(s, dest_y, dest_cb, dest_cr, | |
3294 ref_picture, pix_op, | |
3295 s->mv[dir][0][0], s->mv[dir][0][1], 16); | |
1042 | 3296 }else |
3297 { | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3298 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
|
3299 0, 0, 0, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3300 ref_picture, pix_op, |
255 | 3301 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
3302 } | |
0 | 3303 break; |
3304 case MV_TYPE_8X8: | |
673 | 3305 mx = 0; |
3306 my = 0; | |
3307 if(s->quarter_sample){ | |
3308 for(i=0;i<4;i++) { | |
3309 motion_x = s->mv[dir][i][0]; | |
3310 motion_y = s->mv[dir][i][1]; | |
0 | 3311 |
673 | 3312 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
3313 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8; | |
3314 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8; | |
3315 | |
3316 /* WARNING: do no forget half pels */ | |
3317 src_x = clip(src_x, -16, s->width); | |
3318 if (src_x == s->width) | |
3319 dxy &= ~3; | |
3320 src_y = clip(src_y, -16, s->height); | |
3321 if (src_y == s->height) | |
3322 dxy &= ~12; | |
0 | 3323 |
673 | 3324 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x); |
3325 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
|
3326 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 8 |
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
3327 || (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
|
3328 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 | 3329 ptr= s->edge_emu_buffer; |
3330 } | |
3331 } | |
3332 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize; | |
3333 qpix_op[1][dxy](dest, ptr, s->linesize); | |
3334 | |
3335 mx += s->mv[dir][i][0]/2; | |
3336 my += s->mv[dir][i][1]/2; | |
3337 } | |
3338 }else{ | |
3339 for(i=0;i<4;i++) { | |
1633 | 3340 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
|
3341 ref_picture[0], 0, 0, |
1633 | 3342 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, |
3343 s->width, s->height, s->linesize, | |
3344 s->h_edge_pos, s->v_edge_pos, | |
3345 8, 8, pix_op[1], | |
3346 s->mv[dir][i][0], s->mv[dir][i][1]); | |
673 | 3347 |
3348 mx += s->mv[dir][i][0]; | |
3349 my += s->mv[dir][i][1]; | |
554 | 3350 } |
0 | 3351 } |
673 | 3352 |
1633 | 3353 if(!(s->flags&CODEC_FLAG_GRAY)) |
3354 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
0 | 3355 break; |
3356 case MV_TYPE_FIELD: | |
3357 if (s->picture_structure == PICT_FRAME) { | |
671 | 3358 if(s->quarter_sample){ |
1843 | 3359 for(i=0; i<2; i++){ |
3360 qpel_motion(s, dest_y, dest_cb, dest_cr, | |
3361 1, i, s->field_select[dir][i], | |
3362 ref_picture, pix_op, qpix_op, | |
3363 s->mv[dir][i][0], s->mv[dir][i][1], 8); | |
3364 } | |
671 | 3365 }else{ |
3366 /* top field */ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3367 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
|
3368 1, 0, s->field_select[dir][0], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3369 ref_picture, pix_op, |
671 | 3370 s->mv[dir][0][0], s->mv[dir][0][1], 8); |
3371 /* bottom field */ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3372 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
|
3373 1, 1, s->field_select[dir][1], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3374 ref_picture, pix_op, |
671 | 3375 s->mv[dir][1][0], s->mv[dir][1][1], 8); |
3376 } | |
0 | 3377 } else { |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3378 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
|
3379 ref_picture= s->current_picture_ptr->data; |
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
|
3380 } |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
3381 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3382 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
|
3383 0, 0, s->field_select[dir][0], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3384 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
|
3385 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
0 | 3386 } |
3387 break; | |
1843 | 3388 case MV_TYPE_16X8: |
3389 for(i=0; i<2; i++){ | |
3390 uint8_t ** ref2picture; | |
3391 | |
3392 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
|
3393 ref2picture= ref_picture; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3394 }else{ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3395 ref2picture= s->current_picture_ptr->data; |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3396 } |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3397 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3398 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
1843 | 3399 0, 0, s->field_select[dir][i], |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3400 ref2picture, pix_op, |
1843 | 3401 s->mv[dir][i][0], s->mv[dir][i][1] + 16*i, 8); |
3402 | |
3403 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
|
3404 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
|
3405 dest_cr+= (16>>s->chroma_y_shift)*s->uvlinesize; |
1843 | 3406 } |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3407 break; |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3408 case MV_TYPE_DMV: |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3409 if(s->picture_structure == PICT_FRAME){ |
1843 | 3410 for(i=0; i<2; i++){ |
3411 int j; | |
3412 for(j=0; j<2; j++){ | |
3413 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
3414 1, j, j^i, | |
3415 ref_picture, pix_op, | |
3416 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], 8); | |
3417 } | |
3418 pix_op = s->dsp.avg_pixels_tab; | |
3419 } | |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3420 }else{ |
1843 | 3421 for(i=0; i<2; i++){ |
3422 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
3423 0, 0, s->picture_structure != i+1, | |
3424 ref_picture, pix_op, | |
3425 s->mv[dir][2*i][0],s->mv[dir][2*i][1],16); | |
3426 | |
3427 // after put we make avg of the same block | |
3428 pix_op=s->dsp.avg_pixels_tab; | |
3429 | |
3430 //opposite parity is always in the same frame if this is second field | |
3431 if(!s->first_field){ | |
3432 ref_picture = s->current_picture_ptr->data; | |
3433 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3434 } |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3435 } |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3436 break; |
1633 | 3437 default: assert(0); |
0 | 3438 } |
3439 } | |
3440 | |
2256 | 3441 /** |
3442 * motion compesation of a single macroblock | |
3443 * @param s context | |
3444 * @param dest_y luma destination pointer | |
3445 * @param dest_cb chroma cb/u destination pointer | |
3446 * @param dest_cr chroma cr/v destination pointer | |
3447 * @param dir direction (0->forward, 1->backward) | |
3448 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
3449 * @param pic_op halfpel motion compensation function (average or put normally) | |
3450 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
3451 */ | |
3452 static inline void MPV_motion_lowres(MpegEncContext *s, | |
3453 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
3454 int dir, uint8_t **ref_picture, | |
3455 h264_chroma_mc_func *pix_op) | |
3456 { | |
2292 | 3457 int mx, my; |
2260 | 3458 int mb_x, mb_y, i; |
3459 const int lowres= s->avctx->lowres; | |
3460 const int block_s= 8>>lowres; | |
3461 | |
3462 mb_x = s->mb_x; | |
3463 mb_y = s->mb_y; | |
3464 | |
3465 switch(s->mv_type) { | |
3466 case MV_TYPE_16X16: | |
3467 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3468 0, 0, 0, | |
3469 ref_picture, pix_op, | |
3470 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
3471 break; | |
2292 | 3472 case MV_TYPE_8X8: |
2260 | 3473 mx = 0; |
3474 my = 0; | |
3475 for(i=0;i<4;i++) { | |
2292 | 3476 hpel_motion_lowres(s, dest_y + ((i & 1) + (i >> 1) * s->linesize)*block_s, |
2260 | 3477 ref_picture[0], 0, 0, |
2292 | 3478 (2*mb_x + (i & 1))*block_s, (2*mb_y + (i >>1))*block_s, |
2260 | 3479 s->width, s->height, s->linesize, |
2292 | 3480 s->h_edge_pos >> lowres, s->v_edge_pos >> lowres, |
3481 block_s, block_s, pix_op, | |
2260 | 3482 s->mv[dir][i][0], s->mv[dir][i][1]); |
3483 | |
3484 mx += s->mv[dir][i][0]; | |
3485 my += s->mv[dir][i][1]; | |
3486 } | |
3487 | |
3488 if(!(s->flags&CODEC_FLAG_GRAY)) | |
2292 | 3489 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my); |
3490 break; | |
2260 | 3491 case MV_TYPE_FIELD: |
3492 if (s->picture_structure == PICT_FRAME) { | |
3493 /* top field */ | |
3494 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3495 1, 0, s->field_select[dir][0], | |
3496 ref_picture, pix_op, | |
3497 s->mv[dir][0][0], s->mv[dir][0][1], block_s); | |
3498 /* bottom field */ | |
3499 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3500 1, 1, s->field_select[dir][1], | |
3501 ref_picture, pix_op, | |
3502 s->mv[dir][1][0], s->mv[dir][1][1], block_s); | |
3503 } else { | |
3504 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ | |
3505 ref_picture= s->current_picture_ptr->data; | |
3506 } | |
3507 | |
3508 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3509 0, 0, s->field_select[dir][0], | |
3510 ref_picture, pix_op, | |
3511 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
3512 } | |
3513 break; | |
3514 case MV_TYPE_16X8: | |
3515 for(i=0; i<2; i++){ | |
3516 uint8_t ** ref2picture; | |
3517 | |
3518 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ | |
3519 ref2picture= ref_picture; | |
3520 }else{ | |
3521 ref2picture= s->current_picture_ptr->data; | |
3522 } | |
3523 | |
3524 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3525 0, 0, s->field_select[dir][i], | |
3526 ref2picture, pix_op, | |
3527 s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s); | |
3528 | |
3529 dest_y += 2*block_s*s->linesize; | |
3530 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
3531 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
3532 } | |
3533 break; | |
3534 case MV_TYPE_DMV: | |
3535 if(s->picture_structure == PICT_FRAME){ | |
3536 for(i=0; i<2; i++){ | |
3537 int j; | |
3538 for(j=0; j<2; j++){ | |
3539 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3540 1, j, j^i, | |
3541 ref_picture, pix_op, | |
3542 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s); | |
3543 } | |
3544 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
3545 } | |
3546 }else{ | |
3547 for(i=0; i<2; i++){ | |
3548 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3549 0, 0, s->picture_structure != i+1, | |
3550 ref_picture, pix_op, | |
3551 s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s); | |
3552 | |
3553 // after put we make avg of the same block | |
3554 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
3555 | |
3556 //opposite parity is always in the same frame if this is second field | |
3557 if(!s->first_field){ | |
3558 ref_picture = s->current_picture_ptr->data; | |
3559 } | |
3560 } | |
3561 } | |
3562 break; | |
3563 default: assert(0); | |
3564 } | |
2256 | 3565 } |
0 | 3566 |
3567 /* put block[] to dest[] */ | |
3568 static inline void put_dct(MpegEncContext *s, | |
1651 | 3569 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
0 | 3570 { |
1689 | 3571 s->dct_unquantize_intra(s, block, i, qscale); |
1092 | 3572 s->dsp.idct_put (dest, line_size, block); |
0 | 3573 } |
3574 | |
3575 /* add block[] to dest[] */ | |
3576 static inline void add_dct(MpegEncContext *s, | |
1064 | 3577 DCTELEM *block, int i, uint8_t *dest, int line_size) |
0 | 3578 { |
3579 if (s->block_last_index[i] >= 0) { | |
1092 | 3580 s->dsp.idct_add (dest, line_size, block); |
481 | 3581 } |
3582 } | |
3583 | |
3584 static inline void add_dequant_dct(MpegEncContext *s, | |
1644 | 3585 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
481 | 3586 { |
3587 if (s->block_last_index[i] >= 0) { | |
1689 | 3588 s->dct_unquantize_inter(s, block, i, qscale); |
324 | 3589 |
1092 | 3590 s->dsp.idct_add (dest, line_size, block); |
0 | 3591 } |
3592 } | |
3593 | |
456 | 3594 /** |
3595 * cleans dc, ac, coded_block for the current non intra MB | |
3596 */ | |
3597 void ff_clean_intra_table_entries(MpegEncContext *s) | |
3598 { | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3599 int wrap = s->b8_stride; |
456 | 3600 int xy = s->block_index[0]; |
3601 | |
3602 s->dc_val[0][xy ] = | |
3603 s->dc_val[0][xy + 1 ] = | |
3604 s->dc_val[0][xy + wrap] = | |
3605 s->dc_val[0][xy + 1 + wrap] = 1024; | |
3606 /* ac pred */ | |
1064 | 3607 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); |
3608 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); | |
456 | 3609 if (s->msmpeg4_version>=3) { |
3610 s->coded_block[xy ] = | |
3611 s->coded_block[xy + 1 ] = | |
3612 s->coded_block[xy + wrap] = | |
3613 s->coded_block[xy + 1 + wrap] = 0; | |
3614 } | |
3615 /* chroma */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3616 wrap = s->mb_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3617 xy = s->mb_x + s->mb_y * wrap; |
456 | 3618 s->dc_val[1][xy] = |
3619 s->dc_val[2][xy] = 1024; | |
3620 /* ac pred */ | |
1064 | 3621 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t)); |
3622 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t)); | |
456 | 3623 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3624 s->mbintra_table[xy]= 0; |
456 | 3625 } |
3626 | |
0 | 3627 /* generic function called after a macroblock has been parsed by the |
3628 decoder or after it has been encoded by the encoder. | |
3629 | |
3630 Important variables used: | |
3631 s->mb_intra : true if intra macroblock | |
3632 s->mv_dir : motion vector direction | |
3633 s->mv_type : motion vector type | |
3634 s->mv : motion vector | |
3635 s->interlaced_dct : true if interlaced dct used (mpeg2) | |
3636 */ | |
2256 | 3637 static always_inline void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], int lowres_flag) |
0 | 3638 { |
244 | 3639 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
|
3640 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; |
1381 | 3641 #ifdef HAVE_XVMC |
3642 if(s->avctx->xvmc_acceleration){ | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1579
diff
changeset
|
3643 XVMC_decode_mb(s);//xvmc uses pblocks |
1381 | 3644 return; |
3645 } | |
3646 #endif | |
0 | 3647 |
3648 mb_x = s->mb_x; | |
3649 mb_y = s->mb_y; | |
3650 | |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3651 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
|
3652 /* save DCT coefficients */ |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3653 int i,j; |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3654 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
|
3655 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
|
3656 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
|
3657 *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
|
3658 } |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3659 |
903 | 3660 s->current_picture.qscale_table[mb_xy]= s->qscale; |
108
1e4a4af694d1
exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents:
79
diff
changeset
|
3661 |
0 | 3662 /* update DC predictors for P macroblocks */ |
3663 if (!s->mb_intra) { | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3664 if (s->h263_pred || s->h263_aic) { |
481 | 3665 if(s->mbintra_table[mb_xy]) |
456 | 3666 ff_clean_intra_table_entries(s); |
0 | 3667 } else { |
456 | 3668 s->last_dc[0] = |
3669 s->last_dc[1] = | |
0 | 3670 s->last_dc[2] = 128 << s->intra_dc_precision; |
3671 } | |
3672 } | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3673 else if (s->h263_pred || s->h263_aic) |
481 | 3674 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
|
3675 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3676 if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { //FIXME precalc |
1064 | 3677 uint8_t *dest_y, *dest_cb, *dest_cr; |
481 | 3678 int dct_linesize, dct_offset; |
651 | 3679 op_pixels_func (*op_pix)[4]; |
3680 qpel_mc_func (*op_qpix)[16]; | |
1138 | 3681 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics |
3682 const int uvlinesize= s->current_picture.linesize[1]; | |
2256 | 3683 const int readable= s->pict_type != B_TYPE || s->encoding || s->avctx->draw_horiz_band || lowres_flag; |
3684 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
|
3685 |
903 | 3686 /* avoid copy if macroblock skipped in last frame too */ |
3687 /* skip only during decoding as we might trash the buffers during encoding a bit */ | |
3688 if(!s->encoding){ | |
1064 | 3689 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy]; |
903 | 3690 const int age= s->current_picture.age; |
3691 | |
3692 assert(age); | |
3693 | |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3694 if (s->mb_skiped) { |
903 | 3695 s->mb_skiped= 0; |
3696 assert(s->pict_type!=I_TYPE); | |
3697 | |
556 | 3698 (*mbskip_ptr) ++; /* indicate that this time we skiped it */ |
3699 if(*mbskip_ptr >99) *mbskip_ptr= 99; | |
3700 | |
903 | 3701 /* 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
|
3702 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
|
3703 return; |
903 | 3704 } |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3705 } 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
|
3706 (*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
|
3707 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
|
3708 } else{ |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3709 *mbskip_ptr = 0; /* not skipped */ |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3710 } |
717 | 3711 } |
2256 | 3712 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3713 dct_linesize = linesize << s->interlaced_dct; |
2256 | 3714 dct_offset =(s->interlaced_dct)? linesize : linesize*block_size; |
3715 | |
1632 | 3716 if(readable){ |
3717 dest_y= s->dest[0]; | |
3718 dest_cb= s->dest[1]; | |
3719 dest_cr= s->dest[2]; | |
3720 }else{ | |
1799 | 3721 dest_y = s->b_scratchpad; |
1834 | 3722 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
|
3723 dest_cr= s->b_scratchpad+32*linesize; |
1632 | 3724 } |
2256 | 3725 |
0 | 3726 if (!s->mb_intra) { |
3727 /* motion handling */ | |
456 | 3728 /* decoding or more than one mb_type (MC was allready done otherwise) */ |
1389 | 3729 if(!s->encoding){ |
2256 | 3730 if(lowres_flag){ |
3731 h264_chroma_mc_func *op_pix = s->dsp.put_h264_chroma_pixels_tab; | |
3732 | |
3733 if (s->mv_dir & MV_DIR_FORWARD) { | |
3734 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix); | |
3735 op_pix = s->dsp.avg_h264_chroma_pixels_tab; | |
3736 } | |
3737 if (s->mv_dir & MV_DIR_BACKWARD) { | |
3738 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix); | |
3739 } | |
324 | 3740 }else{ |
2256 | 3741 if ((!s->no_rounding) || s->pict_type==B_TYPE){ |
3742 op_pix = s->dsp.put_pixels_tab; | |
3743 op_qpix= s->dsp.put_qpel_pixels_tab; | |
3744 }else{ | |
3745 op_pix = s->dsp.put_no_rnd_pixels_tab; | |
3746 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; | |
3747 } | |
3748 if (s->mv_dir & MV_DIR_FORWARD) { | |
3749 MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix); | |
3750 op_pix = s->dsp.avg_pixels_tab; | |
3751 op_qpix= s->dsp.avg_qpel_pixels_tab; | |
3752 } | |
3753 if (s->mv_dir & MV_DIR_BACKWARD) { | |
3754 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); | |
3755 } | |
324 | 3756 } |
0 | 3757 } |
3758 | |
481 | 3759 /* skip dequant / idct if we are really late ;) */ |
814 | 3760 if(s->hurry_up>1) return; |
481 | 3761 |
0 | 3762 /* add dct residue */ |
1421 | 3763 if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO |
711 | 3764 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){ |
2256 | 3765 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
3766 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
3767 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
3768 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
0 | 3769 |
485 | 3770 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1644 | 3771 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
3772 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
485 | 3773 } |
936 | 3774 } else if(s->codec_id != CODEC_ID_WMV2){ |
2256 | 3775 add_dct(s, block[0], 0, dest_y , dct_linesize); |
3776 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize); | |
3777 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize); | |
3778 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize); | |
481 | 3779 |
485 | 3780 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
|
3781 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
|
3782 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
|
3783 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
|
3784 }else{ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3785 //chroma422 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3786 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
|
3787 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
|
3788 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3789 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
|
3790 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
|
3791 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
|
3792 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
|
3793 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
|
3794 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
|
3795 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
|
3796 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
|
3797 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
|
3798 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3799 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3800 }//fi gray |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3801 } |
1042 | 3802 else{ |
936 | 3803 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); |
481 | 3804 } |
0 | 3805 } else { |
3806 /* dct only in intra block */ | |
1421 | 3807 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ |
2256 | 3808 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
3809 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
3810 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
3811 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
0 | 3812 |
711 | 3813 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1651 | 3814 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
3815 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
711 | 3816 } |
3817 }else{ | |
2256 | 3818 s->dsp.idct_put(dest_y , dct_linesize, block[0]); |
3819 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]); | |
3820 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]); | |
3821 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]); | |
711 | 3822 |
3823 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
|
3824 if(s->chroma_y_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3825 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
|
3826 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
|
3827 }else{ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3828 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3829 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
|
3830 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
|
3831 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3832 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
|
3833 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
|
3834 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
|
3835 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
|
3836 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
|
3837 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
|
3838 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
|
3839 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
|
3840 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
|
3841 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3842 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3843 }//gray |
485 | 3844 } |
0 | 3845 } |
1632 | 3846 if(!readable){ |
3847 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
|
3848 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
|
3849 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift); |
1632 | 3850 } |
0 | 3851 } |
294 | 3852 } |
3853 | |
2256 | 3854 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){ |
3855 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1); | |
3856 else MPV_decode_mb_internal(s, block, 0); | |
3857 } | |
3858 | |
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
|
3859 #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
|
3860 |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3861 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold) |
456 | 3862 { |
3863 static const char tab[64]= | |
3864 {3,2,2,1,1,1,1,1, | |
3865 1,1,1,1,1,1,1,1, | |
3866 1,1,1,1,1,1,1,1, | |
3867 0,0,0,0,0,0,0,0, | |
3868 0,0,0,0,0,0,0,0, | |
3869 0,0,0,0,0,0,0,0, | |
3870 0,0,0,0,0,0,0,0, | |
3871 0,0,0,0,0,0,0,0}; | |
3872 int score=0; | |
3873 int run=0; | |
3874 int i; | |
3875 DCTELEM *block= s->block[n]; | |
3876 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
|
3877 int skip_dc; |
456 | 3878 |
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
|
3879 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
|
3880 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
|
3881 threshold= -threshold; |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3882 }else |
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3883 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
|
3884 |
456 | 3885 /* are all which we could set to zero are allready zero? */ |
3886 if(last_index<=skip_dc - 1) return; | |
3887 | |
3888 for(i=0; i<=last_index; i++){ | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3889 const int j = s->intra_scantable.permutated[i]; |
456 | 3890 const int level = ABS(block[j]); |
3891 if(level==1){ | |
3892 if(skip_dc && i==0) continue; | |
3893 score+= tab[run]; | |
3894 run=0; | |
3895 }else if(level>1){ | |
3896 return; | |
3897 }else{ | |
3898 run++; | |
3899 } | |
3900 } | |
3901 if(score >= threshold) return; | |
3902 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
|
3903 const int j = s->intra_scantable.permutated[i]; |
456 | 3904 block[j]=0; |
3905 } | |
3906 if(block[0]) s->block_last_index[n]= 0; | |
3907 else s->block_last_index[n]= -1; | |
3908 } | |
3909 | |
344 | 3910 static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index) |
3911 { | |
3912 int i; | |
3913 const int maxlevel= s->max_qcoeff; | |
3914 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
|
3915 int overflow=0; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3916 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3917 if(s->mb_intra){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3918 i=1; //skip clipping of intra dc |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3919 }else |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3920 i=0; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3921 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3922 for(;i<=last_index; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3923 const int j= s->intra_scantable.permutated[i]; |
344 | 3924 int level = block[j]; |
3925 | |
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
|
3926 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
|
3927 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
|
3928 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
|
3929 }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
|
3930 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
|
3931 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
|
3932 } |
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
|
3933 |
344 | 3934 block[j]= level; |
3935 } | |
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
|
3936 |
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
|
3937 if(overflow && s->avctx->mb_decision == FF_MB_DECISION_SIMPLE) |
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
|
3938 av_log(s->avctx, AV_LOG_INFO, "warning, cliping %d dct coefficents to %d..%d\n", overflow, minlevel, maxlevel); |
344 | 3939 } |
324 | 3940 |
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
|
3941 #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
|
3942 |
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3943 /** |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3944 * |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3945 * @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
|
3946 */ |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3947 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){ |
1368 | 3948 if (s->avctx->draw_horiz_band) { |
1370 | 3949 AVFrame *src; |
1368 | 3950 int offset[4]; |
1370 | 3951 |
3952 if(s->picture_structure != PICT_FRAME){ | |
3953 h <<= 1; | |
3954 y <<= 1; | |
3955 if(s->first_field && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return; | |
3956 } | |
3957 | |
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
|
3958 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
|
3959 |
1370 | 3960 if(s->pict_type==B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER)) |
3961 src= (AVFrame*)s->current_picture_ptr; | |
3962 else if(s->last_picture_ptr) | |
3963 src= (AVFrame*)s->last_picture_ptr; | |
3964 else | |
3965 return; | |
3966 | |
1369 | 3967 if(s->pict_type==B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){ |
1368 | 3968 offset[0]= |
3969 offset[1]= | |
3970 offset[2]= | |
3971 offset[3]= 0; | |
3972 }else{ | |
3973 offset[0]= y * s->linesize;; | |
3974 offset[1]= | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3975 offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize; |
1368 | 3976 offset[3]= 0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3977 } |
1368 | 3978 |
813 | 3979 emms_c(); |
3980 | |
1370 | 3981 s->avctx->draw_horiz_band(s->avctx, src, offset, |
3982 y, s->picture_structure, h); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3983 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3984 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3985 |
1389 | 3986 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename |
3987 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics | |
3988 const int uvlinesize= s->current_picture.linesize[1]; | |
2256 | 3989 const int mb_size= 4 - s->avctx->lowres; |
1389 | 3990 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3991 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
|
3992 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
|
3993 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
|
3994 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
|
3995 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
|
3996 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
|
3997 //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
|
3998 |
2256 | 3999 s->dest[0] = s->current_picture.data[0] + ((s->mb_x - 1) << mb_size); |
4000 s->dest[1] = s->current_picture.data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
4001 s->dest[2] = s->current_picture.data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
2168 | 4002 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4003 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
|
4004 { |
2256 | 4005 s->dest[0] += s->mb_y * linesize << mb_size; |
4006 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift); | |
4007 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
|
4008 } |
1389 | 4009 } |
4010 | |
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
|
4011 #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
|
4012 |
1777 | 4013 static void get_vissual_weight(int16_t *weight, uint8_t *ptr, int stride){ |
4014 int x, y; | |
4015 //FIXME optimize | |
4016 for(y=0; y<8; y++){ | |
4017 for(x=0; x<8; x++){ | |
4018 int x2, y2; | |
4019 int sum=0; | |
4020 int sqr=0; | |
4021 int count=0; | |
4022 | |
4023 for(y2= FFMAX(y-1, 0); y2 < FFMIN(8, y+2); y2++){ | |
4024 for(x2= FFMAX(x-1, 0); x2 < FFMIN(8, x+2); x2++){ | |
4025 int v= ptr[x2 + y2*stride]; | |
4026 sum += v; | |
4027 sqr += v*v; | |
4028 count++; | |
4029 } | |
4030 } | |
4031 weight[x + 8*y]= (36*ff_sqrt(count*sqr - sum*sum)) / count; | |
4032 } | |
4033 } | |
4034 } | |
4035 | |
324 | 4036 static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) |
294 | 4037 { |
1777 | 4038 int16_t weight[6][64]; |
4039 DCTELEM orig[6][64]; | |
294 | 4040 const int mb_x= s->mb_x; |
4041 const int mb_y= s->mb_y; | |
4042 int i; | |
456 | 4043 int skip_dct[6]; |
697 | 4044 int dct_offset = s->linesize*8; //default for progressive frames |
1778 | 4045 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
4046 int wrap_y, wrap_c; | |
697 | 4047 |
456 | 4048 for(i=0; i<6; i++) skip_dct[i]=0; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4049 |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4050 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
|
4051 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
|
4052 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
|
4053 |
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
|
4054 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
|
4055 update_qscale(s); |
1616 | 4056 |
4057 if(!(s->flags&CODEC_FLAG_QP_RD)){ | |
4058 s->dquant= s->qscale - last_qp; | |
4059 | |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4060 if(s->out_format==FMT_H263){ |
1616 | 4061 s->dquant= clip(s->dquant, -2, 2); //FIXME RD |
697 | 4062 |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4063 if(s->codec_id==CODEC_ID_MPEG4){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4064 if(!s->mb_intra){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4065 if(s->pict_type == B_TYPE){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4066 if(s->dquant&1) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4067 s->dquant= (s->dquant/2)*2; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4068 if(s->mv_dir&MV_DIRECT) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4069 s->dquant= 0; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4070 } |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4071 if(s->mv_type==MV_TYPE_8X8) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4072 s->dquant=0; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4073 } |
1616 | 4074 } |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4075 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4076 } |
1652 | 4077 ff_set_qscale(s, last_qp + s->dquant); |
2054 | 4078 }else if(s->flags&CODEC_FLAG_QP_RD) |
4079 ff_set_qscale(s, s->qscale + s->dquant); | |
294 | 4080 |
1778 | 4081 wrap_y = s->linesize; |
4082 wrap_c = s->uvlinesize; | |
4083 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16; | |
4084 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
4085 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
4086 | |
4087 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
|
4088 uint8_t *ebuf= s->edge_emu_buffer + 32; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4089 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
|
4090 ptr_y= ebuf; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4091 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
|
4092 ptr_cb= ebuf+18*wrap_y; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4093 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
|
4094 ptr_cr= ebuf+18*wrap_y+8; |
1778 | 4095 } |
4096 | |
324 | 4097 if (s->mb_intra) { |
697 | 4098 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
4099 int progressive_score, interlaced_score; | |
1708 | 4100 |
1729 | 4101 s->interlaced_dct=0; |
1777 | 4102 progressive_score= s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y, 8) |
4103 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y*8, NULL, wrap_y, 8) - 400; | |
1729 | 4104 |
4105 if(progressive_score > 0){ | |
1777 | 4106 interlaced_score = s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y*2, 8) |
4107 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y , NULL, wrap_y*2, 8); | |
1729 | 4108 if(progressive_score > interlaced_score){ |
4109 s->interlaced_dct=1; | |
697 | 4110 |
1729 | 4111 dct_offset= wrap_y; |
4112 wrap_y<<=1; | |
4113 } | |
4114 } | |
697 | 4115 } |
4116 | |
1777 | 4117 s->dsp.get_pixels(s->block[0], ptr_y , wrap_y); |
4118 s->dsp.get_pixels(s->block[1], ptr_y + 8, wrap_y); | |
4119 s->dsp.get_pixels(s->block[2], ptr_y + dct_offset , wrap_y); | |
4120 s->dsp.get_pixels(s->block[3], ptr_y + dct_offset + 8, wrap_y); | |
294 | 4121 |
487 | 4122 if(s->flags&CODEC_FLAG_GRAY){ |
4123 skip_dct[4]= 1; | |
4124 skip_dct[5]= 1; | |
4125 }else{ | |
1777 | 4126 s->dsp.get_pixels(s->block[4], ptr_cb, wrap_c); |
4127 s->dsp.get_pixels(s->block[5], ptr_cr, wrap_c); | |
4128 } | |
324 | 4129 }else{ |
651 | 4130 op_pixels_func (*op_pix)[4]; |
4131 qpel_mc_func (*op_qpix)[16]; | |
1064 | 4132 uint8_t *dest_y, *dest_cb, *dest_cr; |
294 | 4133 |
1389 | 4134 dest_y = s->dest[0]; |
4135 dest_cb = s->dest[1]; | |
4136 dest_cr = s->dest[2]; | |
324 | 4137 |
327 | 4138 if ((!s->no_rounding) || s->pict_type==B_TYPE){ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4139 op_pix = s->dsp.put_pixels_tab; |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4140 op_qpix= s->dsp.put_qpel_pixels_tab; |
295 | 4141 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4142 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
|
4143 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; |
324 | 4144 } |
295 | 4145 |
324 | 4146 if (s->mv_dir & MV_DIR_FORWARD) { |
903 | 4147 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
|
4148 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
|
4149 op_qpix= s->dsp.avg_qpel_pixels_tab; |
324 | 4150 } |
4151 if (s->mv_dir & MV_DIR_BACKWARD) { | |
903 | 4152 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); |
324 | 4153 } |
295 | 4154 |
697 | 4155 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
4156 int progressive_score, interlaced_score; | |
1729 | 4157 |
4158 s->interlaced_dct=0; | |
4159 progressive_score= s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y, 8) | |
4160 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y*8, ptr_y + wrap_y*8, wrap_y, 8) - 400; | |
697 | 4161 |
1729 | 4162 if(s->avctx->ildct_cmp == FF_CMP_VSSE) progressive_score -= 400; |
4163 | |
4164 if(progressive_score>0){ | |
4165 interlaced_score = s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y*2, 8) | |
4166 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y , ptr_y + wrap_y , wrap_y*2, 8); | |
697 | 4167 |
1729 | 4168 if(progressive_score > interlaced_score){ |
4169 s->interlaced_dct=1; | |
4170 | |
4171 dct_offset= wrap_y; | |
4172 wrap_y<<=1; | |
4173 } | |
4174 } | |
697 | 4175 } |
4176 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4177 s->dsp.diff_pixels(s->block[0], ptr_y , dest_y , wrap_y); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4178 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
|
4179 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
|
4180 s->dsp.diff_pixels(s->block[3], ptr_y + dct_offset + 8, dest_y + dct_offset + 8, wrap_y); |
487 | 4181 |
4182 if(s->flags&CODEC_FLAG_GRAY){ | |
4183 skip_dct[4]= 1; | |
4184 skip_dct[5]= 1; | |
4185 }else{ | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4186 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
|
4187 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c); |
487 | 4188 } |
456 | 4189 /* 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
|
4190 if(s->current_picture.mc_mb_var[s->mb_stride*mb_y+ mb_x]<2*s->qscale*s->qscale){ |
697 | 4191 //FIXME optimize |
1708 | 4192 if(s->dsp.sad[1](NULL, ptr_y , dest_y , wrap_y, 8) < 20*s->qscale) skip_dct[0]= 1; |
4193 if(s->dsp.sad[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20*s->qscale) skip_dct[1]= 1; | |
4194 if(s->dsp.sad[1](NULL, ptr_y +dct_offset , dest_y +dct_offset , wrap_y, 8) < 20*s->qscale) skip_dct[2]= 1; | |
4195 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; | |
4196 if(s->dsp.sad[1](NULL, ptr_cb , dest_cb , wrap_c, 8) < 20*s->qscale) skip_dct[4]= 1; | |
4197 if(s->dsp.sad[1](NULL, ptr_cr , dest_cr , wrap_c, 8) < 20*s->qscale) skip_dct[5]= 1; | |
456 | 4198 } |
1778 | 4199 } |
4200 | |
4201 if(s->avctx->quantizer_noise_shaping){ | |
4202 if(!skip_dct[0]) get_vissual_weight(weight[0], ptr_y , wrap_y); | |
4203 if(!skip_dct[1]) get_vissual_weight(weight[1], ptr_y + 8, wrap_y); | |
4204 if(!skip_dct[2]) get_vissual_weight(weight[2], ptr_y + dct_offset , wrap_y); | |
4205 if(!skip_dct[3]) get_vissual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y); | |
4206 if(!skip_dct[4]) get_vissual_weight(weight[4], ptr_cb , wrap_c); | |
4207 if(!skip_dct[5]) get_vissual_weight(weight[5], ptr_cr , wrap_c); | |
4208 memcpy(orig[0], s->block[0], sizeof(DCTELEM)*64*6); | |
294 | 4209 } |
4210 | |
4211 /* DCT & quantize */ | |
1778 | 4212 assert(s->out_format!=FMT_MJPEG || s->qscale==8); |
4213 { | |
344 | 4214 for(i=0;i<6;i++) { |
456 | 4215 if(!skip_dct[i]){ |
4216 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
|
4217 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, s->qscale, &overflow); |
344 | 4218 // 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
|
4219 // 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
|
4220 // of improve it. Just INTRADC clipping deserves changes in quantizer |
456 | 4221 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); |
4222 }else | |
4223 s->block_last_index[i]= -1; | |
344 | 4224 } |
1777 | 4225 if(s->avctx->quantizer_noise_shaping){ |
4226 for(i=0;i<6;i++) { | |
4227 if(!skip_dct[i]){ | |
4228 s->block_last_index[i] = dct_quantize_refine(s, s->block[i], weight[i], orig[i], i, s->qscale); | |
4229 } | |
4230 } | |
4231 } | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4232 |
456 | 4233 if(s->luma_elim_threshold && !s->mb_intra) |
4234 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
|
4235 dct_single_coeff_elimination(s, i, s->luma_elim_threshold); |
456 | 4236 if(s->chroma_elim_threshold && !s->mb_intra) |
4237 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
|
4238 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold); |
1497 | 4239 |
4240 if(s->flags & CODEC_FLAG_CBP_RD){ | |
4241 for(i=0;i<6;i++) { | |
4242 if(s->block_last_index[i] == -1) | |
4243 s->coded_score[i]= INT_MAX/256; | |
4244 } | |
4245 } | |
294 | 4246 } |
4247 | |
487 | 4248 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ |
4249 s->block_last_index[4]= | |
4250 s->block_last_index[5]= 0; | |
4251 s->block[4][0]= | |
1011 | 4252 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale; |
487 | 4253 } |
4254 | |
1708 | 4255 //non c quantize code returns incorrect block_last_index FIXME |
4256 if(s->alternate_scan && s->dct_quantize != dct_quantize_c){ | |
4257 for(i=0; i<6; i++){ | |
4258 int j; | |
4259 if(s->block_last_index[i]>0){ | |
4260 for(j=63; j>0; j--){ | |
4261 if(s->block[i][ s->intra_scantable.permutated[j] ]) break; | |
4262 } | |
4263 s->block_last_index[i]= j; | |
4264 } | |
4265 } | |
4266 } | |
4267 | |
294 | 4268 /* huffman encode */ |
936 | 4269 switch(s->codec_id){ //FIXME funct ptr could be slightly faster |
4270 case CODEC_ID_MPEG1VIDEO: | |
1421 | 4271 case CODEC_ID_MPEG2VIDEO: |
936 | 4272 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; |
4273 case CODEC_ID_MPEG4: | |
4274 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
4275 case CODEC_ID_MSMPEG4V2: | |
4276 case CODEC_ID_MSMPEG4V3: | |
4277 case CODEC_ID_WMV1: | |
4278 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
4279 case CODEC_ID_WMV2: | |
4280 ff_wmv2_encode_mb(s, s->block, motion_x, motion_y); break; | |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4281 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
|
4282 ff_h261_encode_mb(s, s->block, motion_x, motion_y); break; |
936 | 4283 case CODEC_ID_H263: |
4284 case CODEC_ID_H263P: | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4285 case CODEC_ID_FLV1: |
936 | 4286 case CODEC_ID_RV10: |
2380 | 4287 case CODEC_ID_RV20: |
936 | 4288 h263_encode_mb(s, s->block, motion_x, motion_y); break; |
1042 | 4289 case CODEC_ID_MJPEG: |
4290 mjpeg_encode_mb(s, s->block); break; | |
936 | 4291 default: |
4292 assert(0); | |
294 | 4293 } |
4294 } | |
4295 | |
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
|
4296 #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
|
4297 |
1368 | 4298 void ff_mpeg_flush(AVCodecContext *avctx){ |
4299 int i; | |
4300 MpegEncContext *s = avctx->priv_data; | |
4301 | |
1751 | 4302 if(s==NULL || s->picture==NULL) |
4303 return; | |
4304 | |
1368 | 4305 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
4306 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL | |
4307 || s->picture[i].type == FF_BUFFER_TYPE_USER)) | |
4308 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); | |
4309 } | |
1601 | 4310 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL; |
1395 | 4311 |
2380 | 4312 s->mb_x= s->mb_y= 0; |
4313 | |
1395 | 4314 s->parse_context.state= -1; |
4315 s->parse_context.frame_start_found= 0; | |
4316 s->parse_context.overread= 0; | |
4317 s->parse_context.overread_index= 0; | |
4318 s->parse_context.index= 0; | |
4319 s->parse_context.last_index= 0; | |
1851 | 4320 s->bitstream_buffer_size=0; |
1368 | 4321 } |
4322 | |
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
|
4323 #ifdef CONFIG_ENCODERS |
1064 | 4324 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) |
294 | 4325 { |
1810 | 4326 const uint16_t *srcw= (uint16_t*)src; |
1799 | 4327 int words= length>>4; |
326 | 4328 int bits= length&15; |
4329 int i; | |
4330 | |
456 | 4331 if(length==0) return; |
1799 | 4332 |
1803 | 4333 if(words < 16){ |
4334 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); | |
4335 }else if(put_bits_count(pb)&7){ | |
4336 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
|
4337 }else{ |
1803 | 4338 for(i=0; put_bits_count(pb)&31; i++) |
4339 put_bits(pb, 8, src[i]); | |
1799 | 4340 flush_put_bits(pb); |
1803 | 4341 memcpy(pbBufPtr(pb), src+i, 2*words-i); |
4342 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
|
4343 } |
1799 | 4344 |
1803 | 4345 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits)); |
0 | 4346 } |
4347 | |
456 | 4348 static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 4349 int i; |
4350 | |
4351 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
4352 | |
4353 /* mpeg1 */ | |
1160 | 4354 d->mb_skip_run= s->mb_skip_run; |
326 | 4355 for(i=0; i<3; i++) |
4356 d->last_dc[i]= s->last_dc[i]; | |
4357 | |
4358 /* statistics */ | |
4359 d->mv_bits= s->mv_bits; | |
4360 d->i_tex_bits= s->i_tex_bits; | |
4361 d->p_tex_bits= s->p_tex_bits; | |
4362 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
|
4363 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
|
4364 d->b_count= s->b_count; |
326 | 4365 d->skip_count= s->skip_count; |
4366 d->misc_bits= s->misc_bits; | |
329 | 4367 d->last_bits= 0; |
327 | 4368 |
1389 | 4369 d->mb_skiped= 0; |
912 | 4370 d->qscale= s->qscale; |
1616 | 4371 d->dquant= s->dquant; |
326 | 4372 } |
4373 | |
456 | 4374 static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 4375 int i; |
4376 | |
4377 memcpy(d->mv, s->mv, 2*4*2*sizeof(int)); | |
4378 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
4379 | |
4380 /* mpeg1 */ | |
1160 | 4381 d->mb_skip_run= s->mb_skip_run; |
326 | 4382 for(i=0; i<3; i++) |
4383 d->last_dc[i]= s->last_dc[i]; | |
4384 | |
4385 /* statistics */ | |
4386 d->mv_bits= s->mv_bits; | |
4387 d->i_tex_bits= s->i_tex_bits; | |
4388 d->p_tex_bits= s->p_tex_bits; | |
4389 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
|
4390 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
|
4391 d->b_count= s->b_count; |
326 | 4392 d->skip_count= s->skip_count; |
4393 d->misc_bits= s->misc_bits; | |
4394 | |
4395 d->mb_intra= s->mb_intra; | |
327 | 4396 d->mb_skiped= s->mb_skiped; |
326 | 4397 d->mv_type= s->mv_type; |
4398 d->mv_dir= s->mv_dir; | |
4399 d->pb= s->pb; | |
456 | 4400 if(s->data_partitioning){ |
4401 d->pb2= s->pb2; | |
4402 d->tex_pb= s->tex_pb; | |
4403 } | |
326 | 4404 d->block= s->block; |
4405 for(i=0; i<6; i++) | |
4406 d->block_last_index[i]= s->block_last_index[i]; | |
755 | 4407 d->interlaced_dct= s->interlaced_dct; |
912 | 4408 d->qscale= s->qscale; |
326 | 4409 } |
4410 | |
456 | 4411 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type, |
4412 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2], | |
4413 int *dmin, int *next_block, int motion_x, int motion_y) | |
4414 { | |
1389 | 4415 int score; |
4416 uint8_t *dest_backup[3]; | |
456 | 4417 |
4418 copy_context_before_encode(s, backup, type); | |
4419 | |
4420 s->block= s->blocks[*next_block]; | |
4421 s->pb= pb[*next_block]; | |
4422 if(s->data_partitioning){ | |
4423 s->pb2 = pb2 [*next_block]; | |
4424 s->tex_pb= tex_pb[*next_block]; | |
4425 } | |
1389 | 4426 |
4427 if(*next_block){ | |
4428 memcpy(dest_backup, s->dest, sizeof(s->dest)); | |
1799 | 4429 s->dest[0] = s->rd_scratchpad; |
4430 s->dest[1] = s->rd_scratchpad + 16*s->linesize; | |
4431 s->dest[2] = s->rd_scratchpad + 16*s->linesize + 8; | |
4432 assert(s->linesize >= 32); //FIXME | |
1389 | 4433 } |
456 | 4434 |
4435 encode_mb(s, motion_x, motion_y); | |
1389 | 4436 |
1786 | 4437 score= put_bits_count(&s->pb); |
456 | 4438 if(s->data_partitioning){ |
1786 | 4439 score+= put_bits_count(&s->pb2); |
4440 score+= put_bits_count(&s->tex_pb); | |
456 | 4441 } |
1389 | 4442 |
4443 if(s->avctx->mb_decision == FF_MB_DECISION_RD){ | |
4444 MPV_decode_mb(s, s->block); | |
4445 | |
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
|
4446 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
|
4447 score += sse_mb(s) << FF_LAMBDA_SHIFT; |
1389 | 4448 } |
4449 | |
4450 if(*next_block){ | |
4451 memcpy(s->dest, dest_backup, sizeof(s->dest)); | |
4452 } | |
4453 | |
4454 if(score<*dmin){ | |
4455 *dmin= score; | |
456 | 4456 *next_block^=1; |
4457 | |
4458 copy_context_after_encode(best, s, type); | |
4459 } | |
4460 } | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4461 |
1389 | 4462 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
|
4463 uint32_t *sq = squareTbl + 256; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4464 int acc=0; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4465 int x,y; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4466 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4467 if(w==16 && h==16) |
1708 | 4468 return s->dsp.sse[0](NULL, src1, src2, stride, 16); |
936 | 4469 else if(w==8 && h==8) |
1708 | 4470 return s->dsp.sse[1](NULL, src1, src2, stride, 8); |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4471 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4472 for(y=0; y<h; y++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4473 for(x=0; x<w; x++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4474 acc+= sq[src1[x + y*stride] - src2[x + y*stride]]; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4475 } |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4476 } |
936 | 4477 |
4478 assert(acc>=0); | |
4479 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4480 return acc; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4481 } |
326 | 4482 |
1389 | 4483 static int sse_mb(MpegEncContext *s){ |
4484 int w= 16; | |
4485 int h= 16; | |
4486 | |
4487 if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; | |
4488 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; | |
4489 | |
4490 if(w==16 && h==16) | |
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4491 if(s->avctx->mb_cmp == FF_CMP_NSSE){ |
2066 | 4492 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) |
4493 +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) | |
4494 +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
|
4495 }else{ |
1708 | 4496 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) |
4497 +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) | |
4498 +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
|
4499 } |
1389 | 4500 else |
4501 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) | |
4502 +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) | |
4503 +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); | |
4504 } | |
4505 | |
1799 | 4506 static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){ |
4507 MpegEncContext *s= arg; | |
4508 | |
4509 | |
4510 s->me.pre_pass=1; | |
4511 s->me.dia_size= s->avctx->pre_dia_size; | |
4512 s->first_slice_line=1; | |
4513 for(s->mb_y= s->end_mb_y-1; s->mb_y >= s->start_mb_y; s->mb_y--) { | |
4514 for(s->mb_x=s->mb_width-1; s->mb_x >=0 ;s->mb_x--) { | |
4515 ff_pre_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
4516 } | |
4517 s->first_slice_line=0; | |
4518 } | |
4519 | |
4520 s->me.pre_pass=0; | |
4521 | |
4522 return 0; | |
4523 } | |
4524 | |
4525 static int estimate_motion_thread(AVCodecContext *c, void *arg){ | |
4526 MpegEncContext *s= arg; | |
4527 | |
4528 s->me.dia_size= s->avctx->dia_size; | |
4529 s->first_slice_line=1; | |
4530 for(s->mb_y= s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) { | |
4531 s->mb_x=0; //for block init below | |
4532 ff_init_block_index(s); | |
4533 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { | |
4534 s->block_index[0]+=2; | |
4535 s->block_index[1]+=2; | |
4536 s->block_index[2]+=2; | |
4537 s->block_index[3]+=2; | |
4538 | |
4539 /* compute motion vector & mb_type and store in context */ | |
4540 if(s->pict_type==B_TYPE) | |
4541 ff_estimate_b_frame_motion(s, s->mb_x, s->mb_y); | |
4542 else | |
4543 ff_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
4544 } | |
4545 s->first_slice_line=0; | |
4546 } | |
4547 return 0; | |
4548 } | |
4549 | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4550 static int mb_var_thread(AVCodecContext *c, void *arg){ |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4551 MpegEncContext *s= arg; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4552 int mb_x, mb_y; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4553 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4554 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
|
4555 for(mb_x=0; mb_x < s->mb_width; mb_x++) { |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4556 int xx = mb_x * 16; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4557 int yy = mb_y * 16; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4558 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
|
4559 int varc; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4560 int sum = s->dsp.pix_sum(pix, s->linesize); |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4561 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4562 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
|
4563 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4564 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
|
4565 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
|
4566 s->me.mb_var_sum_temp += varc; |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4567 } |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4568 } |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4569 return 0; |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4570 } |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4571 |
1799 | 4572 static void write_slice_end(MpegEncContext *s){ |
4573 if(s->codec_id==CODEC_ID_MPEG4){ | |
4574 if(s->partitioned_frame){ | |
4575 ff_mpeg4_merge_partitions(s); | |
4576 } | |
4577 | |
4578 ff_mpeg4_stuffing(&s->pb); | |
4579 }else if(s->out_format == FMT_MJPEG){ | |
4580 ff_mjpeg_stuffing(&s->pb); | |
4581 } | |
4582 | |
4583 align_put_bits(&s->pb); | |
4584 flush_put_bits(&s->pb); | |
2428
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
4585 |
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
4586 if((s->flags&CODEC_FLAG_PASS1) && !s->partitioned_frame) |
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
4587 s->misc_bits+= get_bits_diff(s); |
1799 | 4588 } |
4589 | |
4590 static int encode_thread(AVCodecContext *c, void *arg){ | |
4591 MpegEncContext *s= arg; | |
766 | 4592 int mb_x, mb_y, pdif = 0; |
1708 | 4593 int i, j; |
326 | 4594 MpegEncContext best_s, backup_s; |
2422 | 4595 uint8_t bit_buf[2][MAX_MB_BYTES]; |
4596 uint8_t bit_buf2[2][MAX_MB_BYTES]; | |
4597 uint8_t bit_buf_tex[2][MAX_MB_BYTES]; | |
456 | 4598 PutBitContext pb[2], pb2[2], tex_pb[2]; |
1799 | 4599 //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y); |
456 | 4600 |
4601 for(i=0; i<2; i++){ | |
2422 | 4602 init_put_bits(&pb [i], bit_buf [i], MAX_MB_BYTES); |
4603 init_put_bits(&pb2 [i], bit_buf2 [i], MAX_MB_BYTES); | |
4604 init_put_bits(&tex_pb[i], bit_buf_tex[i], MAX_MB_BYTES); | |
456 | 4605 } |
0 | 4606 |
1786 | 4607 s->last_bits= put_bits_count(&s->pb); |
286 | 4608 s->mv_bits=0; |
4609 s->misc_bits=0; | |
4610 s->i_tex_bits=0; | |
4611 s->p_tex_bits=0; | |
4612 s->i_count=0; | |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4613 s->f_count=0; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4614 s->b_count=0; |
286 | 4615 s->skip_count=0; |
4616 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4617 for(i=0; i<3; i++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4618 /* init last dc values */ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4619 /* note: quant matrix value (8) is implied here */ |
1992 | 4620 s->last_dc[i] = 128 << s->intra_dc_precision; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4621 |
1148 | 4622 s->current_picture_ptr->error[i] = 0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4623 } |
1160 | 4624 s->mb_skip_run = 0; |
1708 | 4625 memset(s->last_mv, 0, sizeof(s->last_mv)); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4626 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4627 s->last_mv_dir = 0; |
0 | 4628 |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4629 switch(s->codec_id){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4630 case CODEC_ID_H263: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4631 case CODEC_ID_H263P: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4632 case CODEC_ID_FLV1: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4633 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
|
4634 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4635 case CODEC_ID_MPEG4: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4636 if(s->partitioned_frame) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4637 ff_mpeg4_init_partitions(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4638 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4639 } |
456 | 4640 |
4641 s->resync_mb_x=0; | |
1799 | 4642 s->resync_mb_y=0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4643 s->first_slice_line = 1; |
766 | 4644 s->ptr_lastgob = s->pb.buf; |
1799 | 4645 for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { |
4646 // printf("row %d at %X\n", s->mb_y, (int)s); | |
1389 | 4647 s->mb_x=0; |
4648 s->mb_y= mb_y; | |
4649 | |
1652 | 4650 ff_set_qscale(s, s->qscale); |
1389 | 4651 ff_init_block_index(s); |
233
3f5b72726118
- More work on preliminary bit rate control, just to be able to get an
pulento
parents:
232
diff
changeset
|
4652 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4653 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
|
4654 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
|
4655 int mb_type= s->mb_type[xy]; |
456 | 4656 // int d; |
1389 | 4657 int dmin= INT_MAX; |
1708 | 4658 int dir; |
0 | 4659 |
2422 | 4660 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < MAX_MB_BYTES){ |
4661 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
4662 return -1; | |
4663 } | |
4664 if(s->data_partitioning){ | |
4665 if( s->pb2 .buf_end - s->pb2 .buf - (put_bits_count(&s-> pb2)>>3) < MAX_MB_BYTES | |
4666 || s->tex_pb.buf_end - s->tex_pb.buf - (put_bits_count(&s->tex_pb )>>3) < MAX_MB_BYTES){ | |
4667 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
4668 return -1; | |
4669 } | |
4670 } | |
4671 | |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4672 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
|
4673 s->mb_y = mb_y; // moved into loop, can get changed by H.261 |
1389 | 4674 ff_update_block_index(s); |
456 | 4675 |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4676 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
|
4677 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
|
4678 xy= s->mb_y*s->mb_stride + s->mb_x; |
2345 | 4679 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
|
4680 } |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4681 |
766 | 4682 /* write gob / video packet header */ |
1661 | 4683 if(s->rtp_mode){ |
766 | 4684 int current_packet_size, is_gob_start; |
4685 | |
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
4686 current_packet_size= ((put_bits_count(&s->pb)+7)>>3) - (s->ptr_lastgob - s->pb.buf); |
1661 | 4687 |
4688 is_gob_start= s->avctx->rtp_payload_size && current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x>0; | |
4689 | |
1799 | 4690 if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0) is_gob_start=1; |
4691 | |
1661 | 4692 switch(s->codec_id){ |
4693 case CODEC_ID_H263: | |
4694 case CODEC_ID_H263P: | |
4695 if(!s->h263_slice_structured) | |
4696 if(s->mb_x || s->mb_y%s->gob_index) is_gob_start=0; | |
4697 break; | |
4698 case CODEC_ID_MPEG2VIDEO: | |
4699 if(s->mb_x==0 && s->mb_y!=0) is_gob_start=1; | |
4700 case CODEC_ID_MPEG1VIDEO: | |
4701 if(s->mb_skip_run) is_gob_start=0; | |
4702 break; | |
4703 } | |
1799 | 4704 |
1661 | 4705 if(is_gob_start){ |
1799 | 4706 if(s->start_mb_y != mb_y || mb_x!=0){ |
4707 write_slice_end(s); | |
4708 | |
4709 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame){ | |
4710 ff_mpeg4_init_partitions(s); | |
4711 } | |
1661 | 4712 } |
4713 | |
1786 | 4714 assert((put_bits_count(&s->pb)&7) == 0); |
1661 | 4715 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob; |
1688 | 4716 |
4717 if(s->avctx->error_rate && s->resync_mb_x + s->resync_mb_y > 0){ | |
2371 | 4718 int r= put_bits_count(&s->pb)/8 + s->picture_number + 16 + s->mb_x + s->mb_y; |
1688 | 4719 int d= 100 / s->avctx->error_rate; |
4720 if(r % d == 0){ | |
4721 current_packet_size=0; | |
4722 #ifndef ALT_BITSTREAM_WRITER | |
4723 s->pb.buf_ptr= s->ptr_lastgob; | |
4724 #endif | |
4725 assert(pbBufPtr(&s->pb) == s->ptr_lastgob); | |
4726 } | |
4727 } | |
2492
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4728 |
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4729 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
|
4730 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
|
4731 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
|
4732 } |
1661 | 4733 |
4734 switch(s->codec_id){ | |
4735 case CODEC_ID_MPEG4: | |
456 | 4736 ff_mpeg4_encode_video_packet_header(s); |
4737 ff_mpeg4_clean_buffers(s); | |
1661 | 4738 break; |
4739 case CODEC_ID_MPEG1VIDEO: | |
4740 case CODEC_ID_MPEG2VIDEO: | |
1421 | 4741 ff_mpeg1_encode_slice_header(s); |
4742 ff_mpeg1_clean_buffers(s); | |
1661 | 4743 break; |
4744 case CODEC_ID_H263: | |
4745 case CODEC_ID_H263P: | |
4746 h263_encode_gob_header(s, mb_y); | |
4747 break; | |
1160 | 4748 } |
1661 | 4749 |
4750 if(s->flags&CODEC_FLAG_PASS1){ | |
1786 | 4751 int bits= put_bits_count(&s->pb); |
1661 | 4752 s->misc_bits+= bits - s->last_bits; |
4753 s->last_bits= bits; | |
766 | 4754 } |
1661 | 4755 |
1662 | 4756 s->ptr_lastgob += current_packet_size; |
456 | 4757 s->first_slice_line=1; |
4758 s->resync_mb_x=mb_x; | |
4759 s->resync_mb_y=mb_y; | |
4760 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4761 } |
456 | 4762 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4763 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
|
4764 && s->resync_mb_y+1 == s->mb_y){ |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4765 s->first_slice_line=0; |
456 | 4766 } |
4767 | |
1389 | 4768 s->mb_skiped=0; |
1616 | 4769 s->dquant=0; //only for QP_RD |
4770 | |
2230 | 4771 if(mb_type & (mb_type-1) || (s->flags & CODEC_FLAG_QP_RD)){ // more than 1 MB type possible or CODEC_FLAG_QP_RD |
327 | 4772 int next_block=0; |
456 | 4773 int pb_bits_count, pb2_bits_count, tex_pb_bits_count; |
326 | 4774 |
4775 copy_context_before_encode(&backup_s, s, -1); | |
456 | 4776 backup_s.pb= s->pb; |
4777 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
|
4778 best_s.partitioned_frame= s->partitioned_frame; |
456 | 4779 if(s->data_partitioning){ |
4780 backup_s.pb2= s->pb2; | |
4781 backup_s.tex_pb= s->tex_pb; | |
4782 } | |
326 | 4783 |
1708 | 4784 if(mb_type&CANDIDATE_MB_TYPE_INTER){ |
327 | 4785 s->mv_dir = MV_DIR_FORWARD; |
295 | 4786 s->mv_type = MV_TYPE_16X16; |
294 | 4787 s->mb_intra= 0; |
324 | 4788 s->mv[0][0][0] = s->p_mv_table[xy][0]; |
4789 s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
1708 | 4790 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb, |
456 | 4791 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
0 | 4792 } |
1708 | 4793 if(mb_type&CANDIDATE_MB_TYPE_INTER_I){ |
4794 s->mv_dir = MV_DIR_FORWARD; | |
4795 s->mv_type = MV_TYPE_FIELD; | |
4796 s->mb_intra= 0; | |
4797 for(i=0; i<2; i++){ | |
4798 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
4799 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
4800 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
4801 } | |
4802 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb, | |
4803 &dmin, &next_block, 0, 0); | |
4804 } | |
4805 if(mb_type&CANDIDATE_MB_TYPE_SKIPED){ | |
1494
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
4806 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
|
4807 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
|
4808 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
|
4809 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
|
4810 s->mv[0][0][1] = 0; |
1708 | 4811 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_SKIPED, 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
|
4812 &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
|
4813 } |
1708 | 4814 if(mb_type&CANDIDATE_MB_TYPE_INTER4V){ |
327 | 4815 s->mv_dir = MV_DIR_FORWARD; |
295 | 4816 s->mv_type = MV_TYPE_8X8; |
4817 s->mb_intra= 0; | |
4818 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
|
4819 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
|
4820 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
295 | 4821 } |
1708 | 4822 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb, |
456 | 4823 &dmin, &next_block, 0, 0); |
327 | 4824 } |
1708 | 4825 if(mb_type&CANDIDATE_MB_TYPE_FORWARD){ |
327 | 4826 s->mv_dir = MV_DIR_FORWARD; |
4827 s->mv_type = MV_TYPE_16X16; | |
4828 s->mb_intra= 0; | |
4829 s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
4830 s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
1708 | 4831 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb, |
456 | 4832 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
327 | 4833 } |
1708 | 4834 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD){ |
327 | 4835 s->mv_dir = MV_DIR_BACKWARD; |
4836 s->mv_type = MV_TYPE_16X16; | |
4837 s->mb_intra= 0; | |
4838 s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
4839 s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
1708 | 4840 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb, |
456 | 4841 &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]); |
327 | 4842 } |
1708 | 4843 if(mb_type&CANDIDATE_MB_TYPE_BIDIR){ |
327 | 4844 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
4845 s->mv_type = MV_TYPE_16X16; | |
4846 s->mb_intra= 0; | |
4847 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
4848 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
4849 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
4850 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
1708 | 4851 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb, |
456 | 4852 &dmin, &next_block, 0, 0); |
327 | 4853 } |
1708 | 4854 if(mb_type&CANDIDATE_MB_TYPE_DIRECT){ |
936 | 4855 int mx= s->b_direct_mv_table[xy][0]; |
4856 int my= s->b_direct_mv_table[xy][1]; | |
4857 | |
327 | 4858 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
4859 s->mb_intra= 0; | |
936 | 4860 ff_mpeg4_set_direct_mv(s, mx, my); |
1708 | 4861 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb, |
936 | 4862 &dmin, &next_block, mx, my); |
295 | 4863 } |
1708 | 4864 if(mb_type&CANDIDATE_MB_TYPE_FORWARD_I){ |
4865 s->mv_dir = MV_DIR_FORWARD; | |
4866 s->mv_type = MV_TYPE_FIELD; | |
4867 s->mb_intra= 0; | |
4868 for(i=0; i<2; i++){ | |
4869 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
4870 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
4871 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
4872 } | |
4873 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb, | |
4874 &dmin, &next_block, 0, 0); | |
4875 } | |
4876 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD_I){ | |
4877 s->mv_dir = MV_DIR_BACKWARD; | |
4878 s->mv_type = MV_TYPE_FIELD; | |
4879 s->mb_intra= 0; | |
4880 for(i=0; i<2; i++){ | |
4881 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
4882 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
4883 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
4884 } | |
4885 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb, | |
4886 &dmin, &next_block, 0, 0); | |
4887 } | |
4888 if(mb_type&CANDIDATE_MB_TYPE_BIDIR_I){ | |
4889 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
4890 s->mv_type = MV_TYPE_FIELD; | |
4891 s->mb_intra= 0; | |
4892 for(dir=0; dir<2; dir++){ | |
4893 for(i=0; i<2; i++){ | |
4894 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
4895 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
4896 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
4897 } | |
4898 } | |
4899 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb, | |
4900 &dmin, &next_block, 0, 0); | |
4901 } | |
4902 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
|
4903 s->mv_dir = 0; |
295 | 4904 s->mv_type = MV_TYPE_16X16; |
294 | 4905 s->mb_intra= 1; |
4906 s->mv[0][0][0] = 0; | |
4907 s->mv[0][0][1] = 0; | |
1708 | 4908 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb, |
456 | 4909 &dmin, &next_block, 0, 0); |
1389 | 4910 if(s->h263_pred || s->h263_aic){ |
4911 if(best_s.mb_intra) | |
4912 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1; | |
4913 else | |
4914 ff_clean_intra_table_entries(s); //old mode? | |
4915 } | |
295 | 4916 } |
1616 | 4917 |
4918 if(s->flags & CODEC_FLAG_QP_RD){ | |
4919 if(best_s.mv_type==MV_TYPE_16X16 && !(best_s.mv_dir&MV_DIRECT)){ | |
4920 const int last_qp= backup_s.qscale; | |
4921 int dquant, dir, qp, dc[6]; | |
1617 | 4922 DCTELEM ac[6][16]; |
1623 | 4923 const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0; |
1616 | 4924 |
4925 assert(backup_s.dquant == 0); | |
4926 | |
4927 //FIXME intra | |
4928 s->mv_dir= best_s.mv_dir; | |
4929 s->mv_type = MV_TYPE_16X16; | |
4930 s->mb_intra= best_s.mb_intra; | |
4931 s->mv[0][0][0] = best_s.mv[0][0][0]; | |
4932 s->mv[0][0][1] = best_s.mv[0][0][1]; | |
4933 s->mv[1][0][0] = best_s.mv[1][0][0]; | |
4934 s->mv[1][0][1] = best_s.mv[1][0][1]; | |
4935 | |
4936 dir= s->pict_type == B_TYPE ? 2 : 1; | |
1623 | 4937 if(last_qp + dir > s->avctx->qmax) dir= -dir; |
1616 | 4938 for(dquant= dir; dquant<=2 && dquant>=-2; dquant += dir){ |
4939 qp= last_qp + dquant; | |
4940 if(qp < s->avctx->qmin || qp > s->avctx->qmax) | |
4941 break; | |
4942 backup_s.dquant= dquant; | |
2229 | 4943 if(s->mb_intra && s->dc_val[0]){ |
1617 | 4944 for(i=0; i<6; i++){ |
4945 dc[i]= s->dc_val[0][ s->block_index[i] ]; | |
4946 memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(DCTELEM)*16); | |
4947 } | |
1616 | 4948 } |
1617 | 4949 |
1708 | 4950 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb, |
1623 | 4951 &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]); |
1616 | 4952 if(best_s.qscale != qp){ |
2229 | 4953 if(s->mb_intra && s->dc_val[0]){ |
1617 | 4954 for(i=0; i<6; i++){ |
4955 s->dc_val[0][ s->block_index[i] ]= dc[i]; | |
4956 memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM)*16); | |
4957 } | |
1616 | 4958 } |
4959 if(dir > 0 && dquant==dir){ | |
4960 dquant= 0; | |
4961 dir= -dir; | |
4962 }else | |
4963 break; | |
4964 } | |
4965 } | |
4966 qp= best_s.qscale; | |
4967 s->current_picture.qscale_table[xy]= qp; | |
4968 } | |
4969 } | |
4970 | |
326 | 4971 copy_context_after_encode(s, &best_s, -1); |
456 | 4972 |
1786 | 4973 pb_bits_count= put_bits_count(&s->pb); |
456 | 4974 flush_put_bits(&s->pb); |
4975 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count); | |
4976 s->pb= backup_s.pb; | |
4977 | |
4978 if(s->data_partitioning){ | |
1786 | 4979 pb2_bits_count= put_bits_count(&s->pb2); |
456 | 4980 flush_put_bits(&s->pb2); |
4981 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count); | |
4982 s->pb2= backup_s.pb2; | |
4983 | |
1786 | 4984 tex_pb_bits_count= put_bits_count(&s->tex_pb); |
456 | 4985 flush_put_bits(&s->tex_pb); |
4986 ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count); | |
4987 s->tex_pb= backup_s.tex_pb; | |
4988 } | |
1786 | 4989 s->last_bits= put_bits_count(&s->pb); |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4990 |
1389 | 4991 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
4992 ff_h263_update_motion_val(s); | |
4993 | |
1799 | 4994 if(next_block==0){ //FIXME 16 vs linesize16 |
4995 s->dsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16); | |
4996 s->dsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8); | |
4997 s->dsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8); | |
1389 | 4998 } |
4999 | |
5000 if(s->avctx->mb_decision == FF_MB_DECISION_BITS) | |
5001 MPV_decode_mb(s, s->block); | |
294 | 5002 } else { |
324 | 5003 int motion_x, motion_y; |
5004 s->mv_type=MV_TYPE_16X16; | |
294 | 5005 // only one MB-Type possible |
1013 | 5006 |
327 | 5007 switch(mb_type){ |
1708 | 5008 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
|
5009 s->mv_dir = 0; |
294 | 5010 s->mb_intra= 1; |
324 | 5011 motion_x= s->mv[0][0][0] = 0; |
5012 motion_y= s->mv[0][0][1] = 0; | |
327 | 5013 break; |
1708 | 5014 case CANDIDATE_MB_TYPE_INTER: |
324 | 5015 s->mv_dir = MV_DIR_FORWARD; |
5016 s->mb_intra= 0; | |
5017 motion_x= s->mv[0][0][0] = s->p_mv_table[xy][0]; | |
5018 motion_y= s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
327 | 5019 break; |
1708 | 5020 case CANDIDATE_MB_TYPE_INTER_I: |
5021 s->mv_dir = MV_DIR_FORWARD; | |
5022 s->mv_type = MV_TYPE_FIELD; | |
5023 s->mb_intra= 0; | |
5024 for(i=0; i<2; i++){ | |
5025 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
5026 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
5027 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
5028 } | |
5029 motion_x = motion_y = 0; | |
5030 break; | |
5031 case CANDIDATE_MB_TYPE_INTER4V: | |
456 | 5032 s->mv_dir = MV_DIR_FORWARD; |
5033 s->mv_type = MV_TYPE_8X8; | |
5034 s->mb_intra= 0; | |
5035 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
|
5036 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
|
5037 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
456 | 5038 } |
5039 motion_x= motion_y= 0; | |
5040 break; | |
1708 | 5041 case CANDIDATE_MB_TYPE_DIRECT: |
324 | 5042 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
5043 s->mb_intra= 0; | |
327 | 5044 motion_x=s->b_direct_mv_table[xy][0]; |
5045 motion_y=s->b_direct_mv_table[xy][1]; | |
936 | 5046 ff_mpeg4_set_direct_mv(s, motion_x, motion_y); |
327 | 5047 break; |
1708 | 5048 case CANDIDATE_MB_TYPE_BIDIR: |
324 | 5049 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
294 | 5050 s->mb_intra= 0; |
324 | 5051 motion_x=0; |
5052 motion_y=0; | |
5053 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
5054 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
5055 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
5056 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
327 | 5057 break; |
1708 | 5058 case CANDIDATE_MB_TYPE_BACKWARD: |
324 | 5059 s->mv_dir = MV_DIR_BACKWARD; |
5060 s->mb_intra= 0; | |
5061 motion_x= s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
5062 motion_y= s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
327 | 5063 break; |
1708 | 5064 case CANDIDATE_MB_TYPE_FORWARD: |
324 | 5065 s->mv_dir = MV_DIR_FORWARD; |
5066 s->mb_intra= 0; | |
5067 motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
5068 motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
5069 // printf(" %d %d ", motion_x, motion_y); | |
327 | 5070 break; |
1708 | 5071 case CANDIDATE_MB_TYPE_FORWARD_I: |
5072 s->mv_dir = MV_DIR_FORWARD; | |
5073 s->mv_type = MV_TYPE_FIELD; | |
5074 s->mb_intra= 0; | |
5075 for(i=0; i<2; i++){ | |
5076 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
5077 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
5078 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
5079 } | |
5080 motion_x=motion_y=0; | |
5081 break; | |
5082 case CANDIDATE_MB_TYPE_BACKWARD_I: | |
5083 s->mv_dir = MV_DIR_BACKWARD; | |
5084 s->mv_type = MV_TYPE_FIELD; | |
5085 s->mb_intra= 0; | |
5086 for(i=0; i<2; i++){ | |
5087 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
5088 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
5089 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
5090 } | |
5091 motion_x=motion_y=0; | |
5092 break; | |
5093 case CANDIDATE_MB_TYPE_BIDIR_I: | |
5094 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
5095 s->mv_type = MV_TYPE_FIELD; | |
5096 s->mb_intra= 0; | |
5097 for(dir=0; dir<2; dir++){ | |
5098 for(i=0; i<2; i++){ | |
5099 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
5100 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
5101 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
5102 } | |
5103 } | |
5104 motion_x=motion_y=0; | |
5105 break; | |
327 | 5106 default: |
324 | 5107 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
|
5108 av_log(s->avctx, AV_LOG_ERROR, "illegal MB type\n"); |
294 | 5109 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5110 |
324 | 5111 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
|
5112 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5113 // RAL: Update last macrobloc type |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5114 s->last_mv_dir = s->mv_dir; |
1389 | 5115 |
5116 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) | |
5117 ff_h263_update_motion_val(s); | |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
5118 |
1389 | 5119 MPV_decode_mb(s, s->block); |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
244
diff
changeset
|
5120 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5121 |
327 | 5122 /* clean the MV table in IPS frames for direct mode in B frames */ |
5123 if(s->mb_intra /* && I,P,S_TYPE */){ | |
5124 s->p_mv_table[xy][0]=0; | |
5125 s->p_mv_table[xy][1]=0; | |
5126 } | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5127 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5128 if(s->flags&CODEC_FLAG_PSNR){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5129 int w= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5130 int h= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5131 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5132 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
|
5133 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; |
936 | 5134 |
1148 | 5135 s->current_picture_ptr->error[0] += sse( |
1389 | 5136 s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, |
5137 s->dest[0], w, h, s->linesize); | |
1148 | 5138 s->current_picture_ptr->error[1] += sse( |
1389 | 5139 s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
5140 s->dest[1], w>>1, h>>1, s->uvlinesize); | |
1148 | 5141 s->current_picture_ptr->error[2] += sse( |
1389 | 5142 s, s->new_picture .data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
5143 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
|
5144 } |
2345 | 5145 if(s->loop_filter){ |
5146 if(s->out_format == FMT_H263) | |
5147 ff_h263_loop_filter(s); | |
5148 } | |
1786 | 5149 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb)); |
0 | 5150 } |
5151 } | |
286 | 5152 |
1799 | 5153 //not beautifull here but we must write it before flushing so it has to be here |
456 | 5154 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE) |
208 | 5155 msmpeg4_encode_ext_header(s); |
456 | 5156 |
1799 | 5157 write_slice_end(s); |
5158 | |
231 | 5159 /* Send the last GOB if RTP */ |
1661 | 5160 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
|
5161 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
|
5162 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob; |
231 | 5163 /* Call the RTP callback to send the last GOB */ |
1799 | 5164 emms_c(); |
2492
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
5165 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb); |
231 | 5166 } |
1799 | 5167 |
5168 return 0; | |
5169 } | |
5170 | |
5171 #define MERGE(field) dst->field += src->field; src->field=0 | |
5172 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
|
5173 MERGE(me.scene_change_score); |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5174 MERGE(me.mc_mb_var_sum_temp); |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5175 MERGE(me.mb_var_sum_temp); |
1799 | 5176 } |
5177 | |
5178 static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src){ | |
5179 int i; | |
5180 | |
5181 MERGE(dct_count[0]); //note, the other dct vars are not part of the context | |
5182 MERGE(dct_count[1]); | |
5183 MERGE(mv_bits); | |
5184 MERGE(i_tex_bits); | |
5185 MERGE(p_tex_bits); | |
5186 MERGE(i_count); | |
5187 MERGE(f_count); | |
5188 MERGE(b_count); | |
5189 MERGE(skip_count); | |
5190 MERGE(misc_bits); | |
5191 MERGE(error_count); | |
5192 MERGE(padding_bug_score); | |
5193 | |
5194 if(dst->avctx->noise_reduction){ | |
5195 for(i=0; i<64; i++){ | |
5196 MERGE(dct_error_sum[0][i]); | |
5197 MERGE(dct_error_sum[1][i]); | |
5198 } | |
5199 } | |
5200 | |
5201 assert(put_bits_count(&src->pb) % 8 ==0); | |
5202 assert(put_bits_count(&dst->pb) % 8 ==0); | |
5203 ff_copy_bits(&dst->pb, src->pb.buf, put_bits_count(&src->pb)); | |
5204 flush_put_bits(&dst->pb); | |
5205 } | |
5206 | |
5207 static void encode_picture(MpegEncContext *s, int picture_number) | |
5208 { | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5209 int i; |
1799 | 5210 int bits; |
5211 | |
5212 s->picture_number = picture_number; | |
5213 | |
5214 /* Reset the average MB variance */ | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5215 s->me.mb_var_sum_temp = |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5216 s->me.mc_mb_var_sum_temp = 0; |
1799 | 5217 |
5218 /* we need to initialize some time vars before we can encode b-frames */ | |
5219 // RAL: Condition added for MPEG1VIDEO | |
5220 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4)) | |
1834 | 5221 ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar |
1799 | 5222 |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5223 s->me.scene_change_score=0; |
1799 | 5224 |
2053 | 5225 // s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration |
1799 | 5226 |
5227 if(s->pict_type==I_TYPE){ | |
5228 if(s->msmpeg4_version >= 3) s->no_rounding=1; | |
5229 else s->no_rounding=0; | |
5230 }else if(s->pict_type!=B_TYPE){ | |
5231 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4) | |
5232 s->no_rounding ^= 1; | |
5233 } | |
5234 | |
5235 s->mb_intra=0; //for the rate distoration & bit compare functions | |
5236 for(i=1; i<s->avctx->thread_count; i++){ | |
1827 | 5237 ff_update_duplicate_context(s->thread_context[i], s); |
1799 | 5238 } |
1962 | 5239 |
5240 ff_init_me(s); | |
5241 | |
1799 | 5242 /* Estimate motion for every MB */ |
5243 if(s->pict_type != I_TYPE){ | |
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
|
5244 if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){ |
1799 | 5245 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ |
5246 s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5247 } | |
5248 } | |
5249 | |
5250 s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5251 }else /* if(s->pict_type == I_TYPE) */{ | |
5252 /* I-Frame */ | |
5253 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
5254 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
5255 | |
5256 if(!s->fixed_qscale){ | |
5257 /* finding spatial complexity for I-frame rate control */ | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5258 s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); |
1799 | 5259 } |
5260 } | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5261 for(i=1; i<s->avctx->thread_count; i++){ |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5262 merge_context_after_me(s, s->thread_context[i]); |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5263 } |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5264 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
|
5265 s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp; |
1799 | 5266 emms_c(); |
5267 | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5268 if(s->me.scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){ |
1799 | 5269 s->pict_type= I_TYPE; |
5270 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
5271 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
5272 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); | |
5273 } | |
5274 | |
5275 if(!s->umvplus){ | |
5276 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { | |
5277 s->f_code= ff_get_best_fcode(s, s->p_mv_table, CANDIDATE_MB_TYPE_INTER); | |
5278 | |
5279 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
5280 int a,b; | |
5281 a= ff_get_best_fcode(s, s->p_field_mv_table[0][0], CANDIDATE_MB_TYPE_INTER_I); //FIXME field_select | |
5282 b= ff_get_best_fcode(s, s->p_field_mv_table[1][1], CANDIDATE_MB_TYPE_INTER_I); | |
5283 s->f_code= FFMAX(s->f_code, FFMAX(a,b)); | |
5284 } | |
5285 | |
5286 ff_fix_long_p_mvs(s); | |
5287 ff_fix_long_mvs(s, NULL, 0, s->p_mv_table, s->f_code, CANDIDATE_MB_TYPE_INTER, 0); | |
5288 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
|
5289 int j; |
1799 | 5290 for(i=0; i<2; i++){ |
5291 for(j=0; j<2; j++) | |
5292 ff_fix_long_mvs(s, s->p_field_select_table[i], j, | |
5293 s->p_field_mv_table[i][j], s->f_code, CANDIDATE_MB_TYPE_INTER_I, 0); | |
5294 } | |
5295 } | |
5296 } | |
5297 | |
5298 if(s->pict_type==B_TYPE){ | |
5299 int a, b; | |
5300 | |
5301 a = ff_get_best_fcode(s, s->b_forw_mv_table, CANDIDATE_MB_TYPE_FORWARD); | |
5302 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
5303 s->f_code = FFMAX(a, b); | |
5304 | |
5305 a = ff_get_best_fcode(s, s->b_back_mv_table, CANDIDATE_MB_TYPE_BACKWARD); | |
5306 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
5307 s->b_code = FFMAX(a, b); | |
5308 | |
5309 ff_fix_long_mvs(s, NULL, 0, s->b_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_FORWARD, 1); | |
5310 ff_fix_long_mvs(s, NULL, 0, s->b_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BACKWARD, 1); | |
5311 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
5312 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
5313 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
|
5314 int dir, j; |
1799 | 5315 for(dir=0; dir<2; dir++){ |
5316 for(i=0; i<2; i++){ | |
5317 for(j=0; j<2; j++){ | |
5318 int type= dir ? (CANDIDATE_MB_TYPE_BACKWARD_I|CANDIDATE_MB_TYPE_BIDIR_I) | |
5319 : (CANDIDATE_MB_TYPE_FORWARD_I |CANDIDATE_MB_TYPE_BIDIR_I); | |
5320 ff_fix_long_mvs(s, s->b_field_select_table[dir][i], j, | |
5321 s->b_field_mv_table[dir][i][j], dir ? s->b_code : s->f_code, type, 1); | |
5322 } | |
5323 } | |
5324 } | |
5325 } | |
5326 } | |
5327 } | |
5328 | |
5329 if (!s->fixed_qscale) | |
5330 s->current_picture.quality = ff_rate_estimate_qscale(s); //FIXME pic_ptr | |
5331 | |
5332 if(s->adaptive_quant){ | |
5333 switch(s->codec_id){ | |
5334 case CODEC_ID_MPEG4: | |
5335 ff_clean_mpeg4_qscales(s); | |
5336 break; | |
5337 case CODEC_ID_H263: | |
5338 case CODEC_ID_H263P: | |
5339 case CODEC_ID_FLV1: | |
5340 ff_clean_h263_qscales(s); | |
5341 break; | |
5342 } | |
5343 | |
5344 s->lambda= s->lambda_table[0]; | |
5345 //FIXME broken | |
5346 }else | |
5347 s->lambda= s->current_picture.quality; | |
5348 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); | |
5349 update_qscale(s); | |
5350 | |
5351 if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(s->flags & CODEC_FLAG_QSCALE)) | |
5352 s->qscale= 3; //reduce cliping problems | |
5353 | |
5354 if (s->out_format == FMT_MJPEG) { | |
5355 /* for mjpeg, we do include qscale in the matrix */ | |
5356 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; | |
5357 for(i=1;i<64;i++){ | |
5358 int j= s->dsp.idct_permutation[i]; | |
5359 | |
5360 s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3); | |
5361 } | |
5362 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
|
5363 s->intra_matrix, s->intra_quant_bias, 8, 8, 1); |
1799 | 5364 s->qscale= 8; |
5365 } | |
5366 | |
5367 //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
|
5368 s->current_picture_ptr->key_frame= |
1799 | 5369 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
|
5370 s->current_picture_ptr->pict_type= |
1799 | 5371 s->current_picture.pict_type= s->pict_type; |
5372 | |
5373 if(s->current_picture.key_frame) | |
5374 s->picture_in_gop_number=0; | |
5375 | |
5376 s->last_bits= put_bits_count(&s->pb); | |
5377 switch(s->out_format) { | |
5378 case FMT_MJPEG: | |
5379 mjpeg_picture_header(s); | |
5380 break; | |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5381 case FMT_H261: |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5382 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
|
5383 break; |
1799 | 5384 case FMT_H263: |
5385 if (s->codec_id == CODEC_ID_WMV2) | |
5386 ff_wmv2_encode_picture_header(s, picture_number); | |
5387 else if (s->h263_msmpeg4) | |
5388 msmpeg4_encode_picture_header(s, picture_number); | |
5389 else if (s->h263_pred) | |
5390 mpeg4_encode_picture_header(s, picture_number); | |
5391 else if (s->codec_id == CODEC_ID_RV10) | |
5392 rv10_encode_picture_header(s, picture_number); | |
2380 | 5393 else if (s->codec_id == CODEC_ID_RV20) |
5394 rv20_encode_picture_header(s, picture_number); | |
1799 | 5395 else if (s->codec_id == CODEC_ID_FLV1) |
5396 ff_flv_encode_picture_header(s, picture_number); | |
5397 else | |
5398 h263_encode_picture_header(s, picture_number); | |
5399 break; | |
5400 case FMT_MPEG1: | |
5401 mpeg1_encode_picture_header(s, picture_number); | |
5402 break; | |
5403 case FMT_H264: | |
5404 break; | |
5405 default: | |
5406 assert(0); | |
5407 } | |
5408 bits= put_bits_count(&s->pb); | |
5409 s->header_bits= bits - s->last_bits; | |
5410 | |
5411 for(i=1; i<s->avctx->thread_count; i++){ | |
5412 update_duplicate_context_after_me(s->thread_context[i], s); | |
5413 } | |
5414 s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5415 for(i=1; i<s->avctx->thread_count; i++){ | |
5416 merge_context_after_encode(s, s->thread_context[i]); | |
5417 } | |
5418 emms_c(); | |
0 | 5419 } |
5420 | |
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5421 #endif //CONFIG_ENCODERS |
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5422 |
1719 | 5423 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block){ |
1597 | 5424 const int intra= s->mb_intra; |
5425 int i; | |
5426 | |
1599 | 5427 s->dct_count[intra]++; |
5428 | |
1597 | 5429 for(i=0; i<64; i++){ |
5430 int level= block[i]; | |
5431 | |
5432 if(level){ | |
5433 if(level>0){ | |
5434 s->dct_error_sum[intra][i] += level; | |
5435 level -= s->dct_offset[intra][i]; | |
5436 if(level<0) level=0; | |
5437 }else{ | |
5438 s->dct_error_sum[intra][i] -= level; | |
5439 level += s->dct_offset[intra][i]; | |
5440 if(level>0) level=0; | |
5441 } | |
5442 block[i]= level; | |
5443 } | |
5444 } | |
5445 } | |
5446 | |
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5447 #ifdef CONFIG_ENCODERS |
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5448 |
945 | 5449 static int dct_quantize_trellis_c(MpegEncContext *s, |
5450 DCTELEM *block, int n, | |
5451 int qscale, int *overflow){ | |
5452 const int *qmat; | |
1064 | 5453 const uint8_t *scantable= s->intra_scantable.scantable; |
1718 | 5454 const uint8_t *perm_scantable= s->intra_scantable.permutated; |
945 | 5455 int max=0; |
5456 unsigned int threshold1, threshold2; | |
5457 int bias=0; | |
5458 int run_tab[65]; | |
5459 int level_tab[65]; | |
5460 int score_tab[65]; | |
1718 | 5461 int survivor[65]; |
5462 int survivor_count; | |
946 | 5463 int last_run=0; |
5464 int last_level=0; | |
5465 int last_score= 0; | |
1718 | 5466 int last_i; |
1715 | 5467 int coeff[2][64]; |
945 | 5468 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
|
5469 int qmul, qadd, start_i, last_non_zero, i, dc; |
945 | 5470 const int esc_length= s->ac_esc_length; |
5471 uint8_t * length; | |
5472 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
|
5473 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
945 | 5474 |
1092 | 5475 s->dsp.fdct (block); |
1597 | 5476 |
5477 if(s->dct_error_sum) | |
1719 | 5478 s->denoise_dct(s, block); |
945 | 5479 qmul= qscale*16; |
5480 qadd= ((qscale-1)|1)*8; | |
946 | 5481 |
945 | 5482 if (s->mb_intra) { |
5483 int q; | |
5484 if (!s->h263_aic) { | |
5485 if (n < 4) | |
5486 q = s->y_dc_scale; | |
5487 else | |
5488 q = s->c_dc_scale; | |
5489 q = q << 3; | |
5490 } else{ | |
5491 /* For AIC we skip quant/dequant of INTRADC */ | |
5492 q = 1 << 3; | |
5493 qadd=0; | |
5494 } | |
5495 | |
5496 /* note: block[0] is assumed to be positive */ | |
5497 block[0] = (block[0] + (q >> 1)) / q; | |
5498 start_i = 1; | |
5499 last_non_zero = 0; | |
5500 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
|
5501 if(s->mpeg_quant || s->out_format == FMT_MPEG1) |
945 | 5502 bias= 1<<(QMAT_SHIFT-1); |
5503 length = s->intra_ac_vlc_length; | |
5504 last_length= s->intra_ac_vlc_last_length; | |
5505 } else { | |
5506 start_i = 0; | |
5507 last_non_zero = -1; | |
5508 qmat = s->q_inter_matrix[qscale]; | |
5509 length = s->inter_ac_vlc_length; | |
5510 last_length= s->inter_ac_vlc_last_length; | |
5511 } | |
1718 | 5512 last_i= start_i; |
945 | 5513 |
5514 threshold1= (1<<QMAT_SHIFT) - bias - 1; | |
5515 threshold2= (threshold1<<1); | |
946 | 5516 |
1715 | 5517 for(i=63; i>=start_i; i--) { |
5518 const int j = scantable[i]; | |
5519 int level = block[j] * qmat[j]; | |
5520 | |
5521 if(((unsigned)(level+threshold1))>threshold2){ | |
5522 last_non_zero = i; | |
5523 break; | |
5524 } | |
5525 } | |
5526 | |
5527 for(i=start_i; i<=last_non_zero; i++) { | |
945 | 5528 const int j = scantable[i]; |
1715 | 5529 int level = block[j] * qmat[j]; |
945 | 5530 |
5531 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
5532 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
5533 if(((unsigned)(level+threshold1))>threshold2){ | |
5534 if(level>0){ | |
5535 level= (bias + level)>>QMAT_SHIFT; | |
1718 | 5536 coeff[0][i]= level; |
5537 coeff[1][i]= level-1; | |
946 | 5538 // coeff[2][k]= level-2; |
945 | 5539 }else{ |
5540 level= (bias - level)>>QMAT_SHIFT; | |
1718 | 5541 coeff[0][i]= -level; |
5542 coeff[1][i]= -level+1; | |
946 | 5543 // coeff[2][k]= -level+2; |
945 | 5544 } |
1718 | 5545 coeff_count[i]= FFMIN(level, 2); |
5546 assert(coeff_count[i]); | |
945 | 5547 max |=level; |
5548 }else{ | |
1718 | 5549 coeff[0][i]= (level>>31)|1; |
5550 coeff_count[i]= 1; | |
945 | 5551 } |
5552 } | |
5553 | |
5554 *overflow= s->max_qcoeff < max; //overflow might have happend | |
5555 | |
5556 if(last_non_zero < start_i){ | |
5557 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); | |
5558 return last_non_zero; | |
5559 } | |
5560 | |
1718 | 5561 score_tab[start_i]= 0; |
5562 survivor[0]= start_i; | |
5563 survivor_count= 1; | |
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
|
5564 |
1718 | 5565 for(i=start_i; i<=last_non_zero; i++){ |
5566 int level_index, j; | |
5567 const int dct_coeff= ABS(block[ scantable[i] ]); | |
945 | 5568 const int zero_distoration= dct_coeff*dct_coeff; |
946 | 5569 int best_score=256*256*256*120; |
945 | 5570 for(level_index=0; level_index < coeff_count[i]; level_index++){ |
5571 int distoration; | |
5572 int level= coeff[level_index][i]; | |
1716 | 5573 const int alevel= ABS(level); |
945 | 5574 int unquant_coeff; |
5575 | |
5576 assert(level); | |
5577 | |
5578 if(s->out_format == FMT_H263){ | |
1716 | 5579 unquant_coeff= alevel*qmul + qadd; |
947 | 5580 }else{ //MPEG1 |
1718 | 5581 j= s->dsp.idct_permutation[ scantable[i] ]; //FIXME optimize |
947 | 5582 if(s->mb_intra){ |
1716 | 5583 unquant_coeff = (int)( alevel * qscale * s->intra_matrix[j]) >> 3; |
947 | 5584 unquant_coeff = (unquant_coeff - 1) | 1; |
5585 }else{ | |
1716 | 5586 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4; |
947 | 5587 unquant_coeff = (unquant_coeff - 1) | 1; |
5588 } | |
5589 unquant_coeff<<= 3; | |
5590 } | |
946 | 5591 |
1715 | 5592 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration; |
945 | 5593 level+=64; |
5594 if((level&(~127)) == 0){ | |
1718 | 5595 for(j=survivor_count-1; j>=0; j--){ |
5596 int run= i - survivor[j]; | |
947 | 5597 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 5598 score += score_tab[i-run]; |
5599 | |
5600 if(score < best_score){ | |
1718 | 5601 best_score= score; |
945 | 5602 run_tab[i+1]= run; |
5603 level_tab[i+1]= level-64; | |
5604 } | |
5605 } | |
5606 | |
5607 if(s->out_format == FMT_H263){ | |
1718 | 5608 for(j=survivor_count-1; j>=0; j--){ |
5609 int run= i - survivor[j]; | |
947 | 5610 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 5611 score += score_tab[i-run]; |
946 | 5612 if(score < last_score){ |
5613 last_score= score; | |
5614 last_run= run; | |
5615 last_level= level-64; | |
5616 last_i= i+1; | |
945 | 5617 } |
5618 } | |
5619 } | |
5620 }else{ | |
5621 distoration += esc_length*lambda; | |
1718 | 5622 for(j=survivor_count-1; j>=0; j--){ |
5623 int run= i - survivor[j]; | |
945 | 5624 int score= distoration + score_tab[i-run]; |
5625 | |
5626 if(score < best_score){ | |
1718 | 5627 best_score= score; |
945 | 5628 run_tab[i+1]= run; |
5629 level_tab[i+1]= level-64; | |
5630 } | |
5631 } | |
5632 | |
5633 if(s->out_format == FMT_H263){ | |
1718 | 5634 for(j=survivor_count-1; j>=0; j--){ |
5635 int run= i - survivor[j]; | |
945 | 5636 int score= distoration + score_tab[i-run]; |
946 | 5637 if(score < last_score){ |
5638 last_score= score; | |
5639 last_run= run; | |
5640 last_level= level-64; | |
5641 last_i= i+1; | |
945 | 5642 } |
5643 } | |
5644 } | |
5645 } | |
5646 } | |
946 | 5647 |
1718 | 5648 score_tab[i+1]= best_score; |
5649 | |
946 | 5650 //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 | 5651 if(last_non_zero <= 27){ |
5652 for(; survivor_count; survivor_count--){ | |
5653 if(score_tab[ survivor[survivor_count-1] ] <= best_score) | |
5654 break; | |
5655 } | |
5656 }else{ | |
5657 for(; survivor_count; survivor_count--){ | |
5658 if(score_tab[ survivor[survivor_count-1] ] <= best_score + lambda) | |
5659 break; | |
5660 } | |
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
|
5661 } |
1718 | 5662 |
5663 survivor[ survivor_count++ ]= i+1; | |
945 | 5664 } |
946 | 5665 |
945 | 5666 if(s->out_format != FMT_H263){ |
946 | 5667 last_score= 256*256*256*120; |
1718 | 5668 for(i= survivor[0]; i<=last_non_zero + 1; i++){ |
946 | 5669 int score= score_tab[i]; |
947 | 5670 if(i) score += lambda*2; //FIXME exacter? |
5671 | |
946 | 5672 if(score < last_score){ |
5673 last_score= score; | |
5674 last_i= i; | |
5675 last_level= level_tab[i]; | |
5676 last_run= run_tab[i]; | |
5677 } | |
945 | 5678 } |
5679 } | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5680 |
1715 | 5681 s->coded_score[n] = last_score; |
945 | 5682 |
1716 | 5683 dc= ABS(block[0]); |
1718 | 5684 last_non_zero= last_i - 1; |
945 | 5685 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); |
5686 | |
5687 if(last_non_zero < start_i) | |
5688 return last_non_zero; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5689 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5690 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
|
5691 int best_level= 0; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5692 int best_score= dc * dc; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5693 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5694 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
|
5695 int level= coeff[i][0]; |
1716 | 5696 int alevel= ABS(level); |
5697 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
|
5698 |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5699 if(s->out_format == FMT_H263){ |
1716 | 5700 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
|
5701 }else{ //MPEG1 |
1716 | 5702 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4; |
5703 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
|
5704 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5705 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
|
5706 unquant_coeff<<= 3 + 3; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5707 |
1716 | 5708 distortion= (unquant_coeff - dc) * (unquant_coeff - dc); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5709 level+=64; |
1716 | 5710 if((level&(~127)) == 0) score= distortion + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda; |
5711 else score= distortion + esc_length*lambda; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5712 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5713 if(score < best_score){ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5714 best_score= score; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5715 best_level= level - 64; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5716 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5717 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5718 block[0]= best_level; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5719 s->coded_score[n] = best_score - dc*dc; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5720 if(best_level == 0) return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5721 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
|
5722 } |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5723 |
946 | 5724 i= last_i; |
5725 assert(last_level); | |
1718 | 5726 |
5727 block[ perm_scantable[last_non_zero] ]= last_level; | |
946 | 5728 i -= last_run + 1; |
945 | 5729 |
1718 | 5730 for(; i>start_i; i -= run_tab[i] + 1){ |
5731 block[ perm_scantable[i-1] ]= level_tab[i]; | |
945 | 5732 } |
5733 | |
5734 return last_non_zero; | |
5735 } | |
5736 | |
1777 | 5737 //#define REFINE_STATS 1 |
5738 static int16_t basis[64][64]; | |
5739 | |
5740 static void build_basis(uint8_t *perm){ | |
5741 int i, j, x, y; | |
5742 emms_c(); | |
5743 for(i=0; i<8; i++){ | |
5744 for(j=0; j<8; j++){ | |
5745 for(y=0; y<8; y++){ | |
5746 for(x=0; x<8; x++){ | |
5747 double s= 0.25*(1<<BASIS_SHIFT); | |
5748 int index= 8*i + j; | |
5749 int perm_index= perm[index]; | |
5750 if(i==0) s*= sqrt(0.5); | |
5751 if(j==0) s*= sqrt(0.5); | |
5752 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))); | |
5753 } | |
5754 } | |
5755 } | |
5756 } | |
5757 } | |
5758 | |
5759 static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? | |
5760 DCTELEM *block, int16_t *weight, DCTELEM *orig, | |
5761 int n, int qscale){ | |
5762 int16_t rem[64]; | |
2289
5443c3fc2448
Quantizer noise shaping crashes on SSE2 machines patch by (Milan Cutka <cutka at szm dot sk>)
michael
parents:
2266
diff
changeset
|
5763 DCTELEM d1[64] __align16; |
1777 | 5764 const int *qmat; |
5765 const uint8_t *scantable= s->intra_scantable.scantable; | |
5766 const uint8_t *perm_scantable= s->intra_scantable.permutated; | |
5767 // unsigned int threshold1, threshold2; | |
5768 // int bias=0; | |
5769 int run_tab[65]; | |
5770 int prev_run=0; | |
5771 int prev_level=0; | |
5772 int qmul, qadd, start_i, last_non_zero, i, dc; | |
5773 uint8_t * length; | |
5774 uint8_t * last_length; | |
5775 int lambda; | |
5776 int rle_index, run, q, sum; | |
5777 #ifdef REFINE_STATS | |
5778 static int count=0; | |
5779 static int after_last=0; | |
5780 static int to_zero=0; | |
5781 static int from_zero=0; | |
5782 static int raise=0; | |
5783 static int lower=0; | |
5784 static int messed_sign=0; | |
5785 #endif | |
5786 | |
5787 if(basis[0][0] == 0) | |
5788 build_basis(s->dsp.idct_permutation); | |
5789 | |
5790 qmul= qscale*2; | |
5791 qadd= (qscale-1)|1; | |
5792 if (s->mb_intra) { | |
5793 if (!s->h263_aic) { | |
5794 if (n < 4) | |
5795 q = s->y_dc_scale; | |
5796 else | |
5797 q = s->c_dc_scale; | |
5798 } else{ | |
5799 /* For AIC we skip quant/dequant of INTRADC */ | |
5800 q = 1; | |
5801 qadd=0; | |
5802 } | |
5803 q <<= RECON_SHIFT-3; | |
5804 /* note: block[0] is assumed to be positive */ | |
5805 dc= block[0]*q; | |
5806 // block[0] = (block[0] + (q >> 1)) / q; | |
5807 start_i = 1; | |
5808 qmat = s->q_intra_matrix[qscale]; | |
5809 // if(s->mpeg_quant || s->out_format == FMT_MPEG1) | |
5810 // bias= 1<<(QMAT_SHIFT-1); | |
5811 length = s->intra_ac_vlc_length; | |
5812 last_length= s->intra_ac_vlc_last_length; | |
5813 } else { | |
5814 dc= 0; | |
5815 start_i = 0; | |
5816 qmat = s->q_inter_matrix[qscale]; | |
5817 length = s->inter_ac_vlc_length; | |
5818 last_length= s->inter_ac_vlc_last_length; | |
5819 } | |
5820 last_non_zero = s->block_last_index[n]; | |
5821 | |
5822 #ifdef REFINE_STATS | |
5823 {START_TIMER | |
5824 #endif | |
1784 | 5825 dc += (1<<(RECON_SHIFT-1)); |
5826 for(i=0; i<64; i++){ | |
5827 rem[i]= dc - (orig[i]<<RECON_SHIFT); //FIXME use orig dirrectly insteadof copying to rem[] | |
1777 | 5828 } |
5829 #ifdef REFINE_STATS | |
5830 STOP_TIMER("memset rem[]")} | |
5831 #endif | |
5832 sum=0; | |
5833 for(i=0; i<64; i++){ | |
5834 int one= 36; | |
5835 int qns=4; | |
5836 int w; | |
5837 | |
5838 w= ABS(weight[i]) + qns*one; | |
5839 w= 15 + (48*qns*one + w/2)/w; // 16 .. 63 | |
5840 | |
5841 weight[i] = w; | |
5842 // w=weight[i] = (63*qns + (w/2)) / w; | |
5843 | |
5844 assert(w>0); | |
5845 assert(w<(1<<6)); | |
5846 sum += w*w; | |
5847 } | |
5848 lambda= sum*(uint64_t)s->lambda2 >> (FF_LAMBDA_SHIFT - 6 + 6 + 6 + 6); | |
5849 #ifdef REFINE_STATS | |
5850 {START_TIMER | |
5851 #endif | |
5852 run=0; | |
5853 rle_index=0; | |
5854 for(i=start_i; i<=last_non_zero; i++){ | |
5855 int j= perm_scantable[i]; | |
5856 const int level= block[j]; | |
5857 int coeff; | |
5858 | |
5859 if(level){ | |
5860 if(level<0) coeff= qmul*level - qadd; | |
5861 else coeff= qmul*level + qadd; | |
5862 run_tab[rle_index++]=run; | |
5863 run=0; | |
5864 | |
1784 | 5865 s->dsp.add_8x8basis(rem, basis[j], coeff); |
1777 | 5866 }else{ |
5867 run++; | |
5868 } | |
5869 } | |
5870 #ifdef REFINE_STATS | |
5871 if(last_non_zero>0){ | |
5872 STOP_TIMER("init rem[]") | |
5873 } | |
5874 } | |
5875 | |
5876 {START_TIMER | |
5877 #endif | |
5878 for(;;){ | |
1784 | 5879 int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0); |
1777 | 5880 int best_coeff=0; |
5881 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
|
5882 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
|
5883 #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
|
5884 {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
|
5885 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5886 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
|
5887 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5888 if(analyze_gradient){ |
1777 | 5889 #ifdef REFINE_STATS |
5890 {START_TIMER | |
5891 #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
|
5892 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
|
5893 int w= weight[i]; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5894 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5895 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
|
5896 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5897 #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
|
5898 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
|
5899 {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
|
5900 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5901 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
|
5902 #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
|
5903 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
|
5904 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5905 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5906 |
1777 | 5907 if(start_i){ |
5908 const int level= block[0]; | |
5909 int change, old_coeff; | |
5910 | |
5911 assert(s->mb_intra); | |
5912 | |
5913 old_coeff= q*level; | |
5914 | |
5915 for(change=-1; change<=1; change+=2){ | |
5916 int new_level= level + change; | |
5917 int score, new_coeff; | |
5918 | |
5919 new_coeff= q*new_level; | |
5920 if(new_coeff >= 2048 || new_coeff < 0) | |
5921 continue; | |
5922 | |
1784 | 5923 score= s->dsp.try_8x8basis(rem, weight, basis[0], new_coeff - old_coeff); |
1777 | 5924 if(score<best_score){ |
5925 best_score= score; | |
5926 best_coeff= 0; | |
5927 best_change= change; | |
5928 best_unquant_change= new_coeff - old_coeff; | |
5929 } | |
5930 } | |
5931 } | |
5932 | |
5933 run=0; | |
5934 rle_index=0; | |
5935 run2= run_tab[rle_index++]; | |
5936 prev_level=0; | |
5937 prev_run=0; | |
5938 | |
5939 for(i=start_i; i<64; i++){ | |
5940 int j= perm_scantable[i]; | |
5941 const int level= block[j]; | |
5942 int change, old_coeff; | |
5943 | |
5944 if(s->avctx->quantizer_noise_shaping < 3 && i > last_non_zero + 1) | |
5945 break; | |
5946 | |
5947 if(level){ | |
5948 if(level<0) old_coeff= qmul*level - qadd; | |
5949 else old_coeff= qmul*level + qadd; | |
5950 run2= run_tab[rle_index++]; //FIXME ! maybe after last | |
5951 }else{ | |
5952 old_coeff=0; | |
5953 run2--; | |
5954 assert(run2>=0 || i >= last_non_zero ); | |
5955 } | |
5956 | |
5957 for(change=-1; change<=1; change+=2){ | |
5958 int new_level= level + change; | |
5959 int score, new_coeff, unquant_change; | |
5960 | |
5961 score=0; | |
5962 if(s->avctx->quantizer_noise_shaping < 2 && ABS(new_level) > ABS(level)) | |
5963 continue; | |
5964 | |
5965 if(new_level){ | |
5966 if(new_level<0) new_coeff= qmul*new_level - qadd; | |
5967 else new_coeff= qmul*new_level + qadd; | |
5968 if(new_coeff >= 2048 || new_coeff <= -2048) | |
5969 continue; | |
5970 //FIXME check for overflow | |
5971 | |
5972 if(level){ | |
5973 if(level < 63 && level > -63){ | |
5974 if(i < last_non_zero) | |
5975 score += length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
5976 - length[UNI_AC_ENC_INDEX(run, level+64)]; | |
5977 else | |
5978 score += last_length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
5979 - last_length[UNI_AC_ENC_INDEX(run, level+64)]; | |
5980 } | |
5981 }else{ | |
5982 assert(ABS(new_level)==1); | |
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5983 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5984 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
|
5985 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
|
5986 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
|
5987 continue; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5988 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5989 |
1777 | 5990 if(i < last_non_zero){ |
5991 int next_i= i + run2 + 1; | |
5992 int next_level= block[ perm_scantable[next_i] ] + 64; | |
5993 | |
5994 if(next_level&(~127)) | |
5995 next_level= 0; | |
5996 | |
5997 if(next_i < last_non_zero) | |
5998 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
5999 + length[UNI_AC_ENC_INDEX(run2, next_level)] | |
6000 - length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
6001 else | |
6002 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
6003 + last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
6004 - last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
6005 }else{ | |
6006 score += last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
6007 if(prev_level){ | |
6008 score += length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
6009 - last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
6010 } | |
6011 } | |
6012 } | |
6013 }else{ | |
6014 new_coeff=0; | |
6015 assert(ABS(level)==1); | |
6016 | |
6017 if(i < last_non_zero){ | |
6018 int next_i= i + run2 + 1; | |
6019 int next_level= block[ perm_scantable[next_i] ] + 64; | |
6020 | |
6021 if(next_level&(~127)) | |
6022 next_level= 0; | |
6023 | |
6024 if(next_i < last_non_zero) | |
6025 score += length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
6026 - length[UNI_AC_ENC_INDEX(run2, next_level)] | |
6027 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
6028 else | |
6029 score += last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
6030 - last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
6031 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
6032 }else{ | |
6033 score += -last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
6034 if(prev_level){ | |
6035 score += last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
6036 - length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
6037 } | |
6038 } | |
6039 } | |
6040 | |
6041 score *= lambda; | |
6042 | |
6043 unquant_change= new_coeff - old_coeff; | |
6044 assert((score < 100*lambda && score > -100*lambda) || lambda==0); | |
6045 | |
1784 | 6046 score+= s->dsp.try_8x8basis(rem, weight, basis[j], unquant_change); |
1777 | 6047 if(score<best_score){ |
6048 best_score= score; | |
6049 best_coeff= i; | |
6050 best_change= change; | |
6051 best_unquant_change= unquant_change; | |
6052 } | |
6053 } | |
6054 if(level){ | |
6055 prev_level= level + 64; | |
6056 if(prev_level&(~127)) | |
6057 prev_level= 0; | |
6058 prev_run= run; | |
6059 run=0; | |
6060 }else{ | |
6061 run++; | |
6062 } | |
6063 } | |
6064 #ifdef REFINE_STATS | |
6065 STOP_TIMER("iterative step")} | |
6066 #endif | |
6067 | |
6068 if(best_change){ | |
6069 int j= perm_scantable[ best_coeff ]; | |
6070 | |
6071 block[j] += best_change; | |
6072 | |
6073 if(best_coeff > last_non_zero){ | |
6074 last_non_zero= best_coeff; | |
6075 assert(block[j]); | |
6076 #ifdef REFINE_STATS | |
6077 after_last++; | |
6078 #endif | |
6079 }else{ | |
6080 #ifdef REFINE_STATS | |
6081 if(block[j]){ | |
6082 if(block[j] - best_change){ | |
6083 if(ABS(block[j]) > ABS(block[j] - best_change)){ | |
6084 raise++; | |
6085 }else{ | |
6086 lower++; | |
6087 } | |
6088 }else{ | |
6089 from_zero++; | |
6090 } | |
6091 }else{ | |
6092 to_zero++; | |
6093 } | |
6094 #endif | |
6095 for(; last_non_zero>=start_i; last_non_zero--){ | |
6096 if(block[perm_scantable[last_non_zero]]) | |
6097 break; | |
6098 } | |
6099 } | |
6100 #ifdef REFINE_STATS | |
6101 count++; | |
6102 if(256*256*256*64 % count == 0){ | |
6103 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); | |
6104 } | |
6105 #endif | |
6106 run=0; | |
6107 rle_index=0; | |
6108 for(i=start_i; i<=last_non_zero; i++){ | |
6109 int j= perm_scantable[i]; | |
6110 const int level= block[j]; | |
6111 | |
6112 if(level){ | |
6113 run_tab[rle_index++]=run; | |
6114 run=0; | |
6115 }else{ | |
6116 run++; | |
6117 } | |
6118 } | |
6119 | |
1784 | 6120 s->dsp.add_8x8basis(rem, basis[j], best_unquant_change); |
1777 | 6121 }else{ |
6122 break; | |
6123 } | |
6124 } | |
6125 #ifdef REFINE_STATS | |
6126 if(last_non_zero>0){ | |
6127 STOP_TIMER("iterative search") | |
6128 } | |
6129 } | |
6130 #endif | |
6131 | |
6132 return last_non_zero; | |
6133 } | |
6134 | |
220 | 6135 static int dct_quantize_c(MpegEncContext *s, |
0 | 6136 DCTELEM *block, int n, |
344 | 6137 int qscale, int *overflow) |
0 | 6138 { |
1715 | 6139 int i, j, level, last_non_zero, q, start_i; |
0 | 6140 const int *qmat; |
1064 | 6141 const uint8_t *scantable= s->intra_scantable.scantable; |
344 | 6142 int bias; |
6143 int max=0; | |
6144 unsigned int threshold1, threshold2; | |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
6145 |
1092 | 6146 s->dsp.fdct (block); |
0 | 6147 |
1597 | 6148 if(s->dct_error_sum) |
1719 | 6149 s->denoise_dct(s, block); |
1597 | 6150 |
0 | 6151 if (s->mb_intra) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6152 if (!s->h263_aic) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6153 if (n < 4) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6154 q = s->y_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6155 else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6156 q = s->c_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6157 q = q << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6158 } else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6159 /* 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
|
6160 q = 1 << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6161 |
0 | 6162 /* note: block[0] is assumed to be positive */ |
6163 block[0] = (block[0] + (q >> 1)) / q; | |
1715 | 6164 start_i = 1; |
0 | 6165 last_non_zero = 0; |
344 | 6166 qmat = s->q_intra_matrix[qscale]; |
635 | 6167 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 6168 } else { |
1715 | 6169 start_i = 0; |
0 | 6170 last_non_zero = -1; |
344 | 6171 qmat = s->q_inter_matrix[qscale]; |
635 | 6172 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 6173 } |
635 | 6174 threshold1= (1<<QMAT_SHIFT) - bias - 1; |
6175 threshold2= (threshold1<<1); | |
1715 | 6176 for(i=63;i>=start_i;i--) { |
764 | 6177 j = scantable[i]; |
1715 | 6178 level = block[j] * qmat[j]; |
6179 | |
6180 if(((unsigned)(level+threshold1))>threshold2){ | |
6181 last_non_zero = i; | |
6182 break; | |
6183 }else{ | |
6184 block[j]=0; | |
6185 } | |
6186 } | |
6187 for(i=start_i; i<=last_non_zero; i++) { | |
6188 j = scantable[i]; | |
6189 level = block[j] * qmat[j]; | |
344 | 6190 |
1215 | 6191 // if( bias+level >= (1<<QMAT_SHIFT) |
6192 // || bias-level >= (1<<QMAT_SHIFT)){ | |
344 | 6193 if(((unsigned)(level+threshold1))>threshold2){ |
6194 if(level>0){ | |
635 | 6195 level= (bias + level)>>QMAT_SHIFT; |
344 | 6196 block[j]= level; |
6197 }else{ | |
635 | 6198 level= (bias - level)>>QMAT_SHIFT; |
344 | 6199 block[j]= -level; |
0 | 6200 } |
344 | 6201 max |=level; |
6202 }else{ | |
6203 block[j]=0; | |
0 | 6204 } |
6205 } | |
344 | 6206 *overflow= s->max_qcoeff < max; //overflow might have happend |
6207 | |
764 | 6208 /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */ |
1092 | 6209 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM) |
6210 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero); | |
764 | 6211 |
0 | 6212 return last_non_zero; |
6213 } | |
6214 | |
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
|
6215 #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
|
6216 |
1689 | 6217 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
|
6218 DCTELEM *block, int n, int qscale) |
0 | 6219 { |
200 | 6220 int i, level, nCoeffs; |
1064 | 6221 const uint16_t *quant_matrix; |
0 | 6222 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6223 nCoeffs= s->block_last_index[n]; |
200 | 6224 |
1689 | 6225 if (n < 4) |
6226 block[0] = block[0] * s->y_dc_scale; | |
6227 else | |
6228 block[0] = block[0] * s->c_dc_scale; | |
6229 /* XXX: only mpeg1 */ | |
6230 quant_matrix = s->intra_matrix; | |
6231 for(i=1;i<=nCoeffs;i++) { | |
6232 int j= s->intra_scantable.permutated[i]; | |
6233 level = block[j]; | |
6234 if (level) { | |
6235 if (level < 0) { | |
6236 level = -level; | |
6237 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6238 level = (level - 1) | 1; | |
6239 level = -level; | |
6240 } else { | |
6241 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6242 level = (level - 1) | 1; | |
0 | 6243 } |
1689 | 6244 block[j] = level; |
0 | 6245 } |
6246 } | |
6247 } | |
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
|
6248 |
1689 | 6249 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, |
6250 DCTELEM *block, int n, int qscale) | |
6251 { | |
6252 int i, level, nCoeffs; | |
6253 const uint16_t *quant_matrix; | |
6254 | |
6255 nCoeffs= s->block_last_index[n]; | |
6256 | |
6257 quant_matrix = s->inter_matrix; | |
6258 for(i=0; i<=nCoeffs; i++) { | |
6259 int j= s->intra_scantable.permutated[i]; | |
6260 level = block[j]; | |
6261 if (level) { | |
6262 if (level < 0) { | |
6263 level = -level; | |
6264 level = (((level << 1) + 1) * qscale * | |
6265 ((int) (quant_matrix[j]))) >> 4; | |
6266 level = (level - 1) | 1; | |
6267 level = -level; | |
6268 } else { | |
6269 level = (((level << 1) + 1) * qscale * | |
6270 ((int) (quant_matrix[j]))) >> 4; | |
6271 level = (level - 1) | 1; | |
6272 } | |
6273 block[j] = level; | |
6274 } | |
6275 } | |
6276 } | |
6277 | |
6278 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s, | |
325 | 6279 DCTELEM *block, int n, int qscale) |
6280 { | |
6281 int i, level, nCoeffs; | |
1064 | 6282 const uint16_t *quant_matrix; |
325 | 6283 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6284 if(s->alternate_scan) nCoeffs= 63; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6285 else nCoeffs= s->block_last_index[n]; |
325 | 6286 |
1689 | 6287 if (n < 4) |
6288 block[0] = block[0] * s->y_dc_scale; | |
6289 else | |
6290 block[0] = block[0] * s->c_dc_scale; | |
6291 quant_matrix = s->intra_matrix; | |
6292 for(i=1;i<=nCoeffs;i++) { | |
6293 int j= s->intra_scantable.permutated[i]; | |
6294 level = block[j]; | |
6295 if (level) { | |
6296 if (level < 0) { | |
6297 level = -level; | |
6298 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6299 level = -level; | |
6300 } else { | |
6301 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6302 } | |
6303 block[j] = level; | |
6304 } | |
6305 } | |
6306 } | |
6307 | |
6308 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, | |
6309 DCTELEM *block, int n, int qscale) | |
6310 { | |
6311 int i, level, nCoeffs; | |
6312 const uint16_t *quant_matrix; | |
6313 int sum=-1; | |
6314 | |
6315 if(s->alternate_scan) nCoeffs= 63; | |
6316 else nCoeffs= s->block_last_index[n]; | |
6317 | |
6318 quant_matrix = s->inter_matrix; | |
6319 for(i=0; i<=nCoeffs; i++) { | |
6320 int j= s->intra_scantable.permutated[i]; | |
6321 level = block[j]; | |
6322 if (level) { | |
6323 if (level < 0) { | |
6324 level = -level; | |
6325 level = (((level << 1) + 1) * qscale * | |
6326 ((int) (quant_matrix[j]))) >> 4; | |
6327 level = -level; | |
6328 } else { | |
6329 level = (((level << 1) + 1) * qscale * | |
6330 ((int) (quant_matrix[j]))) >> 4; | |
6331 } | |
6332 block[j] = level; | |
6333 sum+=level; | |
6334 } | |
6335 } | |
6336 block[63]^=sum&1; | |
6337 } | |
6338 | |
6339 static void dct_unquantize_h263_intra_c(MpegEncContext *s, | |
6340 DCTELEM *block, int n, int qscale) | |
6341 { | |
6342 int i, level, qmul, qadd; | |
6343 int nCoeffs; | |
6344 | |
6345 assert(s->block_last_index[n]>=0); | |
6346 | |
6347 qmul = qscale << 1; | |
6348 | |
6349 if (!s->h263_aic) { | |
325 | 6350 if (n < 4) |
6351 block[0] = block[0] * s->y_dc_scale; | |
6352 else | |
6353 block[0] = block[0] * s->c_dc_scale; | |
1689 | 6354 qadd = (qscale - 1) | 1; |
6355 }else{ | |
6356 qadd = 0; | |
6357 } | |
6358 if(s->ac_pred) | |
6359 nCoeffs=63; | |
6360 else | |
6361 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; | |
6362 | |
6363 for(i=1; i<=nCoeffs; i++) { | |
6364 level = block[i]; | |
6365 if (level) { | |
6366 if (level < 0) { | |
6367 level = level * qmul - qadd; | |
6368 } else { | |
6369 level = level * qmul + qadd; | |
325 | 6370 } |
1689 | 6371 block[i] = level; |
325 | 6372 } |
6373 } | |
6374 } | |
6375 | |
1689 | 6376 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
|
6377 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
|
6378 { |
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
|
6379 int i, level, qmul, qadd; |
200 | 6380 int nCoeffs; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
6381 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6382 assert(s->block_last_index[n]>=0); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6383 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6384 qadd = (qscale - 1) | 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6385 qmul = qscale << 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6386 |
1689 | 6387 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; |
6388 | |
6389 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
|
6390 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
|
6391 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
|
6392 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
|
6393 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
|
6394 } 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
|
6395 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
|
6396 } |
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
|
6397 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
|
6398 } |
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
|
6399 } |
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
|
6400 } |
0 | 6401 |
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
|
6402 #ifdef CONFIG_ENCODERS |
0 | 6403 AVCodec h263_encoder = { |
6404 "h263", | |
6405 CODEC_TYPE_VIDEO, | |
6406 CODEC_ID_H263, | |
6407 sizeof(MpegEncContext), | |
6408 MPV_encode_init, | |
6409 MPV_encode_picture, | |
6410 MPV_encode_end, | |
2524 | 6411 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
0 | 6412 }; |
6413 | |
6414 AVCodec h263p_encoder = { | |
6415 "h263p", | |
6416 CODEC_TYPE_VIDEO, | |
6417 CODEC_ID_H263P, | |
6418 sizeof(MpegEncContext), | |
6419 MPV_encode_init, | |
6420 MPV_encode_picture, | |
6421 MPV_encode_end, | |
2524 | 6422 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
0 | 6423 }; |
6424 | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6425 AVCodec flv_encoder = { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6426 "flv", |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6427 CODEC_TYPE_VIDEO, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6428 CODEC_ID_FLV1, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6429 sizeof(MpegEncContext), |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6430 MPV_encode_init, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6431 MPV_encode_picture, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6432 MPV_encode_end, |
2524 | 6433 .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
|
6434 }; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6435 |
0 | 6436 AVCodec rv10_encoder = { |
6437 "rv10", | |
6438 CODEC_TYPE_VIDEO, | |
6439 CODEC_ID_RV10, | |
6440 sizeof(MpegEncContext), | |
6441 MPV_encode_init, | |
6442 MPV_encode_picture, | |
6443 MPV_encode_end, | |
2524 | 6444 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
0 | 6445 }; |
6446 | |
2380 | 6447 AVCodec rv20_encoder = { |
6448 "rv20", | |
6449 CODEC_TYPE_VIDEO, | |
6450 CODEC_ID_RV20, | |
6451 sizeof(MpegEncContext), | |
6452 MPV_encode_init, | |
6453 MPV_encode_picture, | |
6454 MPV_encode_end, | |
2524 | 6455 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
2380 | 6456 }; |
6457 | |
71 | 6458 AVCodec mpeg4_encoder = { |
6459 "mpeg4", | |
0 | 6460 CODEC_TYPE_VIDEO, |
71 | 6461 CODEC_ID_MPEG4, |
0 | 6462 sizeof(MpegEncContext), |
6463 MPV_encode_init, | |
6464 MPV_encode_picture, | |
6465 MPV_encode_end, | |
2524 | 6466 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
2111 | 6467 .capabilities= CODEC_CAP_DELAY, |
0 | 6468 }; |
6469 | |
307 | 6470 AVCodec msmpeg4v1_encoder = { |
6471 "msmpeg4v1", | |
0 | 6472 CODEC_TYPE_VIDEO, |
307 | 6473 CODEC_ID_MSMPEG4V1, |
0 | 6474 sizeof(MpegEncContext), |
6475 MPV_encode_init, | |
6476 MPV_encode_picture, | |
6477 MPV_encode_end, | |
2524 | 6478 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
0 | 6479 }; |
307 | 6480 |
6481 AVCodec msmpeg4v2_encoder = { | |
6482 "msmpeg4v2", | |
6483 CODEC_TYPE_VIDEO, | |
6484 CODEC_ID_MSMPEG4V2, | |
6485 sizeof(MpegEncContext), | |
6486 MPV_encode_init, | |
6487 MPV_encode_picture, | |
6488 MPV_encode_end, | |
2524 | 6489 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
307 | 6490 }; |
6491 | |
6492 AVCodec msmpeg4v3_encoder = { | |
6493 "msmpeg4", | |
6494 CODEC_TYPE_VIDEO, | |
6495 CODEC_ID_MSMPEG4V3, | |
6496 sizeof(MpegEncContext), | |
6497 MPV_encode_init, | |
6498 MPV_encode_picture, | |
6499 MPV_encode_end, | |
2524 | 6500 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
307 | 6501 }; |
499 | 6502 |
6503 AVCodec wmv1_encoder = { | |
6504 "wmv1", | |
6505 CODEC_TYPE_VIDEO, | |
6506 CODEC_ID_WMV1, | |
6507 sizeof(MpegEncContext), | |
6508 MPV_encode_init, | |
6509 MPV_encode_picture, | |
6510 MPV_encode_end, | |
2524 | 6511 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
499 | 6512 }; |
6513 | |
1042 | 6514 AVCodec mjpeg_encoder = { |
6515 "mjpeg", | |
6516 CODEC_TYPE_VIDEO, | |
6517 CODEC_ID_MJPEG, | |
6518 sizeof(MpegEncContext), | |
6519 MPV_encode_init, | |
6520 MPV_encode_picture, | |
6521 MPV_encode_end, | |
2524 | 6522 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, -1}, |
1042 | 6523 }; |
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
|
6524 |
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
|
6525 #endif //CONFIG_ENCODERS |