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