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