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