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