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