Mercurial > libavcodec.hg
annotate mpegvideo.c @ 1553:541681146f83 libavcodec
move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
author | michael |
---|---|
date | Wed, 22 Oct 2003 10:59:39 +0000 |
parents | 26c6ecba99a1 |
children | d736e24bf303 |
rev | line source |
---|---|
0 | 1 /* |
2 * The simplest mpeg encoder (well, it was the simplest!) | |
429 | 3 * Copyright (c) 2000,2001 Fabrice Bellard. |
0 | 4 * |
429 | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
0 | 9 * |
429 | 10 * This library is distributed in the hope that it will be useful, |
0 | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 * Lesser General Public License for more details. | |
0 | 14 * |
429 | 15 * You should have received a copy of the GNU Lesser General Public |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
295 | 18 * |
325 | 19 * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at> |
0 | 20 */ |
701 | 21 |
1106 | 22 /** |
23 * @file mpegvideo.c | |
24 * The simplest mpeg encoder (well, it was the simplest!). | |
25 */ | |
26 | |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
27 #include <limits.h> |
0 | 28 #include "avcodec.h" |
29 #include "dsputil.h" | |
30 #include "mpegvideo.h" | |
31 | |
17
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
32 #ifdef USE_FASTMEMCPY |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
33 #include "fastmemcpy.h" |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
34 #endif |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
35 |
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
|
36 //#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
|
37 //#include <assert.h> |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
38 |
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
|
39 #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
|
40 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
|
41 #endif //CONFIG_ENCODERS |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
42 static void dct_unquantize_mpeg1_c(MpegEncContext *s, |
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 DCTELEM *block, int n, int qscale); |
325 | 44 static void dct_unquantize_mpeg2_c(MpegEncContext *s, |
45 DCTELEM *block, int n, int qscale); | |
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
|
46 static void dct_unquantize_h263_c(MpegEncContext *s, |
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
|
47 DCTELEM *block, int n, int qscale); |
1064 | 48 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
|
49 #ifdef CONFIG_ENCODERS |
344 | 50 static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); |
945 | 51 static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); |
1389 | 52 static int sse_mb(MpegEncContext *s); |
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
|
53 #endif //CONFIG_ENCODERS |
206 | 54 |
1381 | 55 #ifdef HAVE_XVMC |
56 extern int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx); | |
57 extern void XVMC_field_end(MpegEncContext *s); | |
58 extern void XVMC_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); | |
59 #endif | |
60 | |
1064 | 61 void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, int w)= draw_edges_c; |
206 | 62 |
0 | 63 |
64 /* enable all paranoid tests for rounding, overflows, etc... */ | |
65 //#define PARANOID | |
66 | |
67 //#define DEBUG | |
68 | |
321 | 69 |
0 | 70 /* for jpeg fast DCT */ |
71 #define CONST_BITS 14 | |
72 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
73 static const uint16_t aanscales[64] = { |
0 | 74 /* precomputed values scaled up by 14 bits */ |
75 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | |
76 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270, | |
77 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906, | |
78 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315, | |
79 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | |
80 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552, | |
936 | 81 8867 , 12299, 11585, 10426, 8867, 6967, 4799, 2446, |
82 4520 , 6270, 5906, 5315, 4520, 3552, 2446, 1247 | |
0 | 83 }; |
84 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
85 static const uint8_t h263_chroma_roundtab[16] = { |
1013 | 86 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
0 | 87 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, |
88 }; | |
89 | |
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
|
90 #ifdef CONFIG_ENCODERS |
1162 | 91 static uint8_t (*default_mv_penalty)[MAX_MV*2+1]=NULL; |
1064 | 92 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
|
93 |
998 | 94 enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1}; |
95 | |
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
|
96 static void convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16)[64], uint16_t (*qmat16_bias)[64], |
1064 | 97 const uint16_t *quant_matrix, int bias, int qmin, int qmax) |
0 | 98 { |
344 | 99 int qscale; |
0 | 100 |
709
afeff6ccb7f5
convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents:
706
diff
changeset
|
101 for(qscale=qmin; qscale<=qmax; qscale++){ |
344 | 102 int i; |
1092 | 103 if (s->dsp.fdct == ff_jpeg_fdct_islow) { |
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
|
104 for(i=0;i<64;i++) { |
1092 | 105 const int j= s->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
|
106 /* 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
|
107 /* 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
|
108 /* (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
|
109 /* 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
|
110 |
1064 | 111 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
|
112 (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
|
113 } |
1092 | 114 } else if (s->dsp.fdct == fdct_ifast) { |
344 | 115 for(i=0;i<64;i++) { |
1092 | 116 const int j= s->dsp.idct_permutation[i]; |
344 | 117 /* 16 <= qscale * quant_matrix[i] <= 7905 */ |
118 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ | |
119 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ | |
120 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */ | |
121 | |
1064 | 122 qmat[qscale][i] = (int)((uint64_t_C(1) << (QMAT_SHIFT + 14)) / |
344 | 123 (aanscales[i] * qscale * quant_matrix[j])); |
124 } | |
125 } else { | |
126 for(i=0;i<64;i++) { | |
1092 | 127 const int j= s->dsp.idct_permutation[i]; |
344 | 128 /* We can safely suppose that 16 <= quant_matrix[i] <= 255 |
129 So 16 <= qscale * quant_matrix[i] <= 7905 | |
130 so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 | |
131 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 | |
132 */ | |
1064 | 133 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j])); |
945 | 134 // qmat [qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]); |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
135 qmat16[qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]); |
344 | 136 |
137 if(qmat16[qscale][i]==0 || qmat16[qscale][i]==128*256) qmat16[qscale][i]=128*256-1; | |
138 qmat16_bias[qscale][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][i]); | |
139 } | |
0 | 140 } |
141 } | |
142 } | |
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
|
143 |
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
|
144 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
|
145 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
|
146 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
|
147 |
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
|
148 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
|
149 } |
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
|
150 #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
|
151 |
1273 | 152 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
|
153 int i; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
154 int end; |
764 | 155 |
156 st->scantable= src_scantable; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
157 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
158 for(i=0; i<64; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
159 int j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
160 j = src_scantable[i]; |
1273 | 161 st->permutated[i] = permutation[j]; |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
162 #ifdef ARCH_POWERPC |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
163 st->inverse[j] = i; |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
164 #endif |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
165 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
166 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
167 end=-1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
168 for(i=0; i<64; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
169 int j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
170 j = st->permutated[i]; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
171 if(j>end) end=j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
172 st->raster_end[i]= end; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
173 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
174 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
175 |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1523
diff
changeset
|
176 #ifdef CONFIG_ENCODERS |
1411 | 177 void ff_write_quant_matrix(PutBitContext *pb, int16_t *matrix){ |
178 int i; | |
179 | |
180 if(matrix){ | |
181 put_bits(pb, 1, 1); | |
182 for(i=0;i<64;i++) { | |
183 put_bits(pb, 8, matrix[ ff_zigzag_direct[i] ]); | |
184 } | |
185 }else | |
186 put_bits(pb, 1, 0); | |
187 } | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1523
diff
changeset
|
188 #endif //CONFIG_ENCODERS |
1411 | 189 |
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
|
190 /* 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
|
191 int DCT_common_init(MpegEncContext *s) |
0 | 192 { |
312 | 193 s->dct_unquantize_h263 = dct_unquantize_h263_c; |
325 | 194 s->dct_unquantize_mpeg1 = dct_unquantize_mpeg1_c; |
195 s->dct_unquantize_mpeg2 = dct_unquantize_mpeg2_c; | |
1092 | 196 |
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
|
197 #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
|
198 s->dct_quantize= dct_quantize_c; |
1092 | 199 #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
|
200 |
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
|
201 #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
|
202 MPV_common_init_mmx(s); |
8 | 203 #endif |
514
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
204 #ifdef ARCH_ALPHA |
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
205 MPV_common_init_axp(s); |
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
206 #endif |
628
f596db4aa871
sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents:
625
diff
changeset
|
207 #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
|
208 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
|
209 #endif |
721
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
210 #ifdef HAVE_MMI |
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
211 MPV_common_init_mmi(s); |
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
212 #endif |
730 | 213 #ifdef ARCH_ARMV4L |
874 | 214 MPV_common_init_armv4l(s); |
730 | 215 #endif |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
216 #ifdef ARCH_POWERPC |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
217 MPV_common_init_ppc(s); |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
218 #endif |
730 | 219 |
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
|
220 #ifdef CONFIG_ENCODERS |
1007 | 221 s->fast_dct_quantize= s->dct_quantize; |
222 | |
945 | 223 if(s->flags&CODEC_FLAG_TRELLIS_QUANT){ |
224 s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_* | |
225 } | |
226 | |
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
|
227 #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
|
228 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
229 /* load & permutate scantables |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
230 note: only wmv uses differnt ones |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
231 */ |
1273 | 232 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); |
233 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
234 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); | |
235 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
591 | 236 |
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
|
237 s->picture_structure= PICT_FRAME; |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
238 |
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
|
239 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
|
240 } |
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
241 |
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
|
242 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
|
243 *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
|
244 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
|
245 } |
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
|
246 |
903 | 247 /** |
924 | 248 * allocates a Picture |
249 * The pixels are allocated/set by calling get_buffer() if shared=0 | |
903 | 250 */ |
924 | 251 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
|
252 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
|
253 const int mb_array_size= s->mb_stride*s->mb_height; |
1168 | 254 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
|
255 |
924 | 256 if(shared){ |
257 assert(pic->data[0]); | |
258 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED); | |
259 pic->type= FF_BUFFER_TYPE_SHARED; | |
260 }else{ | |
261 int r; | |
262 | |
263 assert(!pic->data[0]); | |
264 | |
925 | 265 r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic); |
924 | 266 |
267 if(r<0 || !pic->age || !pic->type || !pic->data[0]){ | |
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M«©ns Rullg«©rd))
michaelni
parents:
1013
diff
changeset
|
268 fprintf(stderr, "get_buffer() failed (%d %d %d %p)\n", r, pic->age, pic->type, pic->data[0]); |
924 | 269 return -1; |
270 } | |
271 | |
272 if(s->linesize && (s->linesize != pic->linesize[0] || s->uvlinesize != pic->linesize[1])){ | |
273 fprintf(stderr, "get_buffer() failed (stride changed)\n"); | |
274 return -1; | |
275 } | |
276 | |
277 if(pic->linesize[1] != pic->linesize[2]){ | |
278 fprintf(stderr, "get_buffer() failed (uv stride missmatch)\n"); | |
279 return -1; | |
280 } | |
281 | |
282 s->linesize = pic->linesize[0]; | |
283 s->uvlinesize= pic->linesize[1]; | |
903 | 284 } |
924 | 285 |
286 if(pic->qscale_table==NULL){ | |
287 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
|
288 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
|
289 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
|
290 CHECKED_ALLOCZ(pic->mb_mean , mb_array_size * sizeof(int8_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
|
291 CHECKED_ALLOCZ(pic->mb_cmp_score, mb_array_size * sizeof(int32_t)) |
924 | 292 } |
293 | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
294 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
|
295 CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_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
|
296 CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(int)) |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
297 pic->mb_type= pic->mb_type_base + s->mb_stride+1; |
1168 | 298 if(s->out_format == FMT_H264){ |
299 for(i=0; i<2; i++){ | |
300 CHECKED_ALLOCZ(pic->motion_val[i], 2 * 16 * s->mb_num * sizeof(uint16_t)) | |
301 CHECKED_ALLOCZ(pic->ref_index[i] , 4 * s->mb_num * sizeof(uint8_t)) | |
302 } | |
303 } | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
304 pic->qstride= s->mb_stride; |
1546 | 305 CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan)) |
924 | 306 } |
1168 | 307 |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
308 //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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 |
903 | 314 return 0; |
315 fail: //for the CHECKED_ALLOCZ macro | |
316 return -1; | |
317 } | |
318 | |
924 | 319 /** |
320 * deallocates a picture | |
321 */ | |
903 | 322 static void free_picture(MpegEncContext *s, Picture *pic){ |
323 int i; | |
924 | 324 |
325 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){ | |
925 | 326 s->avctx->release_buffer(s->avctx, (AVFrame*)pic); |
924 | 327 } |
328 | |
903 | 329 av_freep(&pic->mb_var); |
330 av_freep(&pic->mc_mb_var); | |
331 av_freep(&pic->mb_mean); | |
1013 | 332 av_freep(&pic->mb_cmp_score); |
903 | 333 av_freep(&pic->mbskip_table); |
334 av_freep(&pic->qscale_table); | |
1168 | 335 av_freep(&pic->mb_type_base); |
1546 | 336 av_freep(&pic->pan_scan); |
1168 | 337 pic->mb_type= NULL; |
338 for(i=0; i<2; i++){ | |
339 av_freep(&pic->motion_val[i]); | |
340 av_freep(&pic->ref_index[i]); | |
341 } | |
1214 | 342 |
343 if(pic->type == FF_BUFFER_TYPE_SHARED){ | |
924 | 344 for(i=0; i<4; i++){ |
345 pic->base[i]= | |
346 pic->data[i]= NULL; | |
347 } | |
348 pic->type= 0; | |
903 | 349 } |
350 } | |
351 | |
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
|
352 /* init common structure 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
|
353 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
|
354 { |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
355 int y_size, c_size, yc_size, i, mb_array_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
|
356 |
1092 | 357 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
|
358 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
|
359 |
754 | 360 s->flags= s->avctx->flags; |
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
|
361 |
903 | 362 s->mb_width = (s->width + 15) / 16; |
0 | 363 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
|
364 s->mb_stride = s->mb_width + 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
|
365 mb_array_size= s->mb_height * s->mb_stride; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
366 |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
367 /* 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
|
368 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
|
369 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
|
370 |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
371 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
|
372 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
373 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
|
374 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
|
375 s->block_wrap[2]= |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
376 s->block_wrap[3]= s->mb_width*2 + 2; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
377 s->block_wrap[4]= |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
378 s->block_wrap[5]= s->mb_width + 2; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
379 |
756 | 380 y_size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2); |
381 c_size = (s->mb_width + 2) * (s->mb_height + 2); | |
382 yc_size = y_size + 2 * c_size; | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
383 |
701 | 384 /* convert fourcc to upper case */ |
1116 | 385 s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF) |
386 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 ) | |
387 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16) | |
388 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24); | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
389 |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
390 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
|
391 + (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
|
392 + (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
|
393 + (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
|
394 |
956
45bd748e305f
negative linesize support (so mplayer -flip works)
michaelni
parents:
955
diff
changeset
|
395 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance |
45bd748e305f
negative linesize support (so mplayer -flip works)
michaelni
parents:
955
diff
changeset
|
396 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17; |
903 | 397 |
925 | 398 s->avctx->coded_frame= (AVFrame*)&s->current_picture; |
903 | 399 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
400 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
|
401 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
|
402 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
|
403 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
|
404 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
405 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
406 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
|
407 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
408 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
|
409 int mv_table_size= s->mb_stride * (s->mb_height+2) + 1; |
324 | 410 |
411 /* 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
|
412 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
|
413 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
|
414 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
|
415 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
|
416 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
|
417 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
|
418 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
|
419 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
|
420 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
|
421 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
|
422 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
|
423 s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1; |
324 | 424 |
903 | 425 //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer() |
936 | 426 CHECKED_ALLOCZ(s->me.scratchpad, s->width*2*16*3*sizeof(uint8_t)) |
456 | 427 |
936 | 428 CHECKED_ALLOCZ(s->me.map , ME_MAP_SIZE*sizeof(uint32_t)) |
429 CHECKED_ALLOCZ(s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t)) | |
327 | 430 |
456 | 431 if(s->codec_id==CODEC_ID_MPEG4){ |
432 CHECKED_ALLOCZ(s->tex_pb_buffer, PB_BUFFER_SIZE); | |
433 CHECKED_ALLOCZ( s->pb2_buffer, PB_BUFFER_SIZE); | |
434 } | |
612 | 435 |
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
436 if(s->msmpeg4_version){ |
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
437 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
|
438 } |
612 | 439 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
|
440 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
441 /* Allocate MB type table */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
442 CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint8_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
|
443 |
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
|
444 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
|
445 |
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
|
446 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
|
447 CHECKED_ALLOCZ(s->q_inter_matrix, 64*32 * sizeof(int)) |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
448 } |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
449 |
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
450 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
|
451 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
452 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
|
453 |
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
|
454 if (s->out_format == FMT_H263 || s->encoding) { |
0 | 455 int size; |
456 | 456 |
0 | 457 /* MV prediction */ |
458 size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2); | |
1064 | 459 CHECKED_ALLOCZ(s->motion_val, size * 2 * sizeof(int16_t)); |
664 | 460 } |
461 | |
462 if(s->codec_id==CODEC_ID_MPEG4){ | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
463 /* interlaced direct mode decoding 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
|
464 CHECKED_ALLOCZ(s->field_mv_table, mb_array_size*2*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
|
465 CHECKED_ALLOCZ(s->field_select_table, mb_array_size*2* sizeof(int8_t)) |
0 | 466 } |
767 | 467 if (s->out_format == FMT_H263) { |
0 | 468 /* ac values */ |
1064 | 469 CHECKED_ALLOCZ(s->ac_val[0], yc_size * sizeof(int16_t) * 16); |
0 | 470 s->ac_val[1] = s->ac_val[0] + y_size; |
471 s->ac_val[2] = s->ac_val[1] + c_size; | |
472 | |
473 /* cbp values */ | |
456 | 474 CHECKED_ALLOCZ(s->coded_block, y_size); |
333 | 475 |
476 /* divx501 bitstream reorder buffer */ | |
456 | 477 CHECKED_ALLOCZ(s->bitstream_buffer, BITSTREAM_BUFFER_SIZE); |
843 | 478 |
456 | 479 /* 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
|
480 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
|
481 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
|
482 } |
756 | 483 |
484 if (s->h263_pred || s->h263_plus || !s->encoding) { | |
485 /* dc values */ | |
486 //MN: we need these for error resilience of intra-frames | |
1064 | 487 CHECKED_ALLOCZ(s->dc_val[0], yc_size * sizeof(int16_t)); |
756 | 488 s->dc_val[1] = s->dc_val[0] + y_size; |
489 s->dc_val[2] = s->dc_val[1] + c_size; | |
490 for(i=0;i<yc_size;i++) | |
491 s->dc_val[0][i] = 1024; | |
492 } | |
493 | |
611
3214d3f4519e
error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents:
608
diff
changeset
|
494 /* 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
|
495 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
|
496 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
|
497 |
0 | 498 /* default structure is frame */ |
499 s->picture_structure = PICT_FRAME; | |
553 | 500 |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
501 /* 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
|
502 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
|
503 //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
|
504 CHECKED_ALLOCZ(s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE); |
294 | 505 |
327 | 506 s->block= s->blocks[0]; |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
507 |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
508 s->parse_context.state= -1; |
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
509 |
0 | 510 s->context_initialized = 1; |
511 return 0; | |
512 fail: | |
244 | 513 MPV_common_end(s); |
514 return -1; | |
515 } | |
516 | |
456 | 517 |
518 //extern int sads; | |
519 | |
244 | 520 /* init common structure for both encoder and decoder */ |
521 void MPV_common_end(MpegEncContext *s) | |
522 { | |
523 int i; | |
524 | |
1344
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
525 av_freep(&s->parse_context.buffer); |
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
526 s->parse_context.buffer_size=0; |
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
527 |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
528 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
|
529 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
|
530 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
|
531 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
|
532 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
|
533 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
|
534 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
|
535 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
|
536 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
|
537 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
|
538 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
|
539 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
|
540 s->b_direct_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
|
541 |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
542 av_freep(&s->motion_val); |
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
543 av_freep(&s->dc_val[0]); |
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
544 av_freep(&s->ac_val[0]); |
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
545 av_freep(&s->coded_block); |
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
546 av_freep(&s->mbintra_table); |
456 | 547 av_freep(&s->cbp_table); |
548 av_freep(&s->pred_dir_table); | |
936 | 549 av_freep(&s->me.scratchpad); |
550 av_freep(&s->me.map); | |
551 av_freep(&s->me.score_map); | |
456 | 552 |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
553 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
|
554 av_freep(&s->prev_pict_types); |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
555 av_freep(&s->bitstream_buffer); |
456 | 556 av_freep(&s->tex_pb_buffer); |
557 av_freep(&s->pb2_buffer); | |
956
45bd748e305f
negative linesize support (so mplayer -flip works)
michaelni
parents:
955
diff
changeset
|
558 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL; |
664 | 559 av_freep(&s->field_mv_table); |
560 av_freep(&s->field_select_table); | |
612 | 561 av_freep(&s->avctx->stats_out); |
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
562 av_freep(&s->ac_stats); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
563 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
|
564 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
|
565 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
|
566 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
|
567 av_freep(&s->q_inter_matrix); |
903 | 568 |
569 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
570 free_picture(s, &s->picture[i]); | |
0 | 571 } |
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
572 av_freep(&s->picture); |
1214 | 573 avcodec_default_free_buffers(s->avctx); |
0 | 574 s->context_initialized = 0; |
1523 | 575 s->last_picture_ptr= |
576 s->next_picture_ptr= | |
577 s->current_picture_ptr= NULL; | |
0 | 578 } |
579 | |
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
|
580 #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
|
581 |
0 | 582 /* init video encoder */ |
583 int MPV_encode_init(AVCodecContext *avctx) | |
584 { | |
585 MpegEncContext *s = avctx->priv_data; | |
1424 | 586 int i, dummy; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
587 int chroma_h_shift, chroma_v_shift; |
315 | 588 |
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1397
diff
changeset
|
589 avctx->pix_fmt = PIX_FMT_YUV420P; // FIXME |
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1397
diff
changeset
|
590 |
0 | 591 s->bit_rate = avctx->bit_rate; |
268 | 592 s->bit_rate_tolerance = avctx->bit_rate_tolerance; |
0 | 593 s->width = avctx->width; |
594 s->height = avctx->height; | |
456 | 595 if(avctx->gop_size > 600){ |
462
3fdd0627f6bd
typo (found by Bohdan Horst <nexus at hoth.amu.edu.pl>)
michaelni
parents:
461
diff
changeset
|
596 fprintf(stderr, "Warning keyframe interval too large! reducing it ...\n"); |
456 | 597 avctx->gop_size=600; |
598 } | |
0 | 599 s->gop_size = avctx->gop_size; |
162 | 600 s->rtp_mode = avctx->rtp_mode; |
601 s->rtp_payload_size = avctx->rtp_payload_size; | |
231 | 602 if (avctx->rtp_callback) |
603 s->rtp_callback = avctx->rtp_callback; | |
268 | 604 s->max_qdiff= avctx->max_qdiff; |
605 s->qcompress= avctx->qcompress; | |
606 s->qblur= avctx->qblur; | |
194
27d1773552c9
mpeg4 encoder fix by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
191
diff
changeset
|
607 s->avctx = avctx; |
294 | 608 s->flags= avctx->flags; |
324 | 609 s->max_b_frames= avctx->max_b_frames; |
329 | 610 s->b_frame_strategy= avctx->b_frame_strategy; |
344 | 611 s->codec_id= avctx->codec->id; |
456 | 612 s->luma_elim_threshold = avctx->luma_elim_threshold; |
613 s->chroma_elim_threshold= avctx->chroma_elim_threshold; | |
614 s->strict_std_compliance= avctx->strict_std_compliance; | |
615 s->data_partitioning= avctx->flags & CODEC_FLAG_PART; | |
936 | 616 s->quarter_sample= (avctx->flags & CODEC_FLAG_QPEL)!=0; |
599 | 617 s->mpeg_quant= avctx->mpeg_quant; |
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
|
618 |
0 | 619 if (s->gop_size <= 1) { |
620 s->intra_only = 1; | |
621 s->gop_size = 12; | |
622 } else { | |
623 s->intra_only = 0; | |
624 } | |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
625 |
936 | 626 s->me_method = avctx->me_method; |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
627 |
320
cda7d0857baf
- ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents:
315
diff
changeset
|
628 /* Fixed QSCALE */ |
0 | 629 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
|
630 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
631 s->adaptive_quant= ( s->avctx->lumi_masking |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
632 || s->avctx->dark_masking |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
633 || s->avctx->temporal_cplx_masking |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
634 || s->avctx->spatial_cplx_masking |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
635 || s->avctx->p_masking) |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
636 && !s->fixed_qscale; |
697 | 637 |
638 s->progressive_sequence= !(avctx->flags & CODEC_FLAG_INTERLACED_DCT); | |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
639 |
1188 | 640 if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4){ |
641 fprintf(stderr, "4MV not supporetd by codec\n"); | |
642 return -1; | |
643 } | |
644 | |
645 if(s->quarter_sample && s->codec_id != CODEC_ID_MPEG4){ | |
646 fprintf(stderr, "qpel not supporetd by codec\n"); | |
647 return -1; | |
648 } | |
649 | |
650 if(s->data_partitioning && s->codec_id != CODEC_ID_MPEG4){ | |
651 fprintf(stderr, "data partitioning not supporetd by codec\n"); | |
652 return -1; | |
653 } | |
654 | |
1421 | 655 if(s->max_b_frames && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO){ |
1188 | 656 fprintf(stderr, "b frames not supporetd by codec\n"); |
657 return -1; | |
658 } | |
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
|
659 |
1188 | 660 if(s->mpeg_quant && s->codec_id != CODEC_ID_MPEG4){ //FIXME mpeg2 uses that too |
661 fprintf(stderr, "mpeg2 style quantization not supporetd by codec\n"); | |
662 return -1; | |
663 } | |
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
|
664 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
665 if((s->flags & CODEC_FLAG_CBP_RD) && !(s->flags & CODEC_FLAG_TRELLIS_QUANT)){ |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
666 fprintf(stderr, "CBP RD needs trellis quant\n"); |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
667 return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
668 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
669 |
1150 | 670 if(s->codec_id==CODEC_ID_MJPEG){ |
671 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x | |
672 s->inter_quant_bias= 0; | |
1421 | 673 }else if(s->mpeg_quant || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO){ |
1150 | 674 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x |
675 s->inter_quant_bias= 0; | |
676 }else{ | |
677 s->intra_quant_bias=0; | |
678 s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x | |
679 } | |
680 | |
681 if(avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) | |
682 s->intra_quant_bias= avctx->intra_quant_bias; | |
683 if(avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS) | |
684 s->inter_quant_bias= avctx->inter_quant_bias; | |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
685 |
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
686 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
|
687 |
1424 | 688 av_reduce(&s->time_increment_resolution, &dummy, s->avctx->frame_rate, s->avctx->frame_rate_base, (1<<16)-1); |
689 s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1; | |
690 | |
0 | 691 switch(avctx->codec->id) { |
692 case CODEC_ID_MPEG1VIDEO: | |
693 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
|
694 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
|
695 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
0 | 696 break; |
1421 | 697 case CODEC_ID_MPEG2VIDEO: |
698 s->out_format = FMT_MPEG1; | |
699 s->low_delay= 0; //s->max_b_frames ? 0 : 1; | |
700 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); | |
701 s->rtp_mode= 1; // mpeg2 must have slices | |
702 if(s->rtp_payload_size == 0) s->rtp_payload_size= 256*256*256; | |
703 break; | |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
704 case CODEC_ID_LJPEG: |
0 | 705 case CODEC_ID_MJPEG: |
706 s->out_format = FMT_MJPEG; | |
707 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
|
708 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
|
709 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
|
710 s->mjpeg_vsample[0] = 1<<chroma_v_shift; |
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
711 s->mjpeg_vsample[1] = 1; |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
712 s->mjpeg_vsample[2] = 1; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
713 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
|
714 s->mjpeg_hsample[1] = 1; |
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
715 s->mjpeg_hsample[2] = 1; |
0 | 716 if (mjpeg_init(s) < 0) |
717 return -1; | |
336 | 718 avctx->delay=0; |
924 | 719 s->low_delay=1; |
0 | 720 break; |
1042 | 721 #ifdef CONFIG_RISKY |
0 | 722 case CODEC_ID_H263: |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
723 if (h263_get_picture_format(s->width, s->height) == 7) { |
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
724 printf("Input picture size isn't suitable for h263 codec! try h263+\n"); |
0 | 725 return -1; |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
726 } |
0 | 727 s->out_format = FMT_H263; |
336 | 728 avctx->delay=0; |
924 | 729 s->low_delay=1; |
0 | 730 break; |
731 case CODEC_ID_H263P: | |
732 s->out_format = FMT_H263; | |
733 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
|
734 /* Fx */ |
c7604e6291c5
extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents:
1094
diff
changeset
|
735 s->unrestricted_mv=(avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0; |
c7604e6291c5
extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents:
1094
diff
changeset
|
736 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0; |
c7604e6291c5
extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents:
1094
diff
changeset
|
737 /* /Fx */ |
79
82e579c37bc3
Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents:
78
diff
changeset
|
738 /* These are just to be sure */ |
1089 | 739 s->umvplus = 1; |
336 | 740 avctx->delay=0; |
924 | 741 s->low_delay=1; |
0 | 742 break; |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
743 case CODEC_ID_FLV1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
744 s->out_format = FMT_H263; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
745 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
|
746 s->unrestricted_mv = 1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
747 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
|
748 avctx->delay=0; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
749 s->low_delay=1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
750 break; |
0 | 751 case CODEC_ID_RV10: |
752 s->out_format = FMT_H263; | |
753 s->h263_rv10 = 1; | |
336 | 754 avctx->delay=0; |
924 | 755 s->low_delay=1; |
0 | 756 break; |
71 | 757 case CODEC_ID_MPEG4: |
0 | 758 s->out_format = FMT_H263; |
759 s->h263_pred = 1; | |
760 s->unrestricted_mv = 1; | |
924 | 761 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
|
762 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
0 | 763 break; |
307 | 764 case CODEC_ID_MSMPEG4V1: |
0 | 765 s->out_format = FMT_H263; |
766 s->h263_msmpeg4 = 1; | |
767 s->h263_pred = 1; | |
768 s->unrestricted_mv = 1; | |
307 | 769 s->msmpeg4_version= 1; |
336 | 770 avctx->delay=0; |
924 | 771 s->low_delay=1; |
307 | 772 break; |
773 case CODEC_ID_MSMPEG4V2: | |
774 s->out_format = FMT_H263; | |
775 s->h263_msmpeg4 = 1; | |
776 s->h263_pred = 1; | |
777 s->unrestricted_mv = 1; | |
778 s->msmpeg4_version= 2; | |
336 | 779 avctx->delay=0; |
924 | 780 s->low_delay=1; |
307 | 781 break; |
782 case CODEC_ID_MSMPEG4V3: | |
783 s->out_format = FMT_H263; | |
784 s->h263_msmpeg4 = 1; | |
785 s->h263_pred = 1; | |
786 s->unrestricted_mv = 1; | |
787 s->msmpeg4_version= 3; | |
1163 | 788 s->flipflop_rounding=1; |
336 | 789 avctx->delay=0; |
924 | 790 s->low_delay=1; |
0 | 791 break; |
499 | 792 case CODEC_ID_WMV1: |
793 s->out_format = FMT_H263; | |
794 s->h263_msmpeg4 = 1; | |
795 s->h263_pred = 1; | |
796 s->unrestricted_mv = 1; | |
797 s->msmpeg4_version= 4; | |
1163 | 798 s->flipflop_rounding=1; |
499 | 799 avctx->delay=0; |
924 | 800 s->low_delay=1; |
499 | 801 break; |
802 case CODEC_ID_WMV2: | |
803 s->out_format = FMT_H263; | |
804 s->h263_msmpeg4 = 1; | |
805 s->h263_pred = 1; | |
806 s->unrestricted_mv = 1; | |
807 s->msmpeg4_version= 5; | |
1163 | 808 s->flipflop_rounding=1; |
499 | 809 avctx->delay=0; |
924 | 810 s->low_delay=1; |
499 | 811 break; |
1042 | 812 #endif |
0 | 813 default: |
814 return -1; | |
815 } | |
295 | 816 |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
817 { /* set up some save defaults, some codecs might override them later */ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
818 static int done=0; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
819 if(!done){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
820 int i; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
821 done=1; |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
814
diff
changeset
|
822 |
1162 | 823 default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); |
824 memset(default_mv_penalty, 0, sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1)); | |
1064 | 825 memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1)); |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
826 |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
827 for(i=-16; i<16; i++){ |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
828 default_fcode_tab[i + MAX_MV]= 1; |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
829 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
830 } |
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
831 } |
936 | 832 s->me.mv_penalty= default_mv_penalty; |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
833 s->fcode_tab= default_fcode_tab; |
506
b9ed0ae72d51
init dc_scale tables to defaults (fixes mjpeg sig11)
michaelni
parents:
499
diff
changeset
|
834 s->y_dc_scale_table= |
b9ed0ae72d51
init dc_scale tables to defaults (fixes mjpeg sig11)
michaelni
parents:
499
diff
changeset
|
835 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; |
b9ed0ae72d51
init dc_scale tables to defaults (fixes mjpeg sig11)
michaelni
parents:
499
diff
changeset
|
836 |
287 | 837 /* dont use mv_penalty table for crap MV as it would be confused */ |
936 | 838 //FIXME remove after fixing / removing old ME |
839 if (s->me_method < ME_EPZS) s->me.mv_penalty = default_mv_penalty; | |
287 | 840 |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
841 s->encoding = 1; |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
842 |
0 | 843 /* init */ |
844 if (MPV_common_init(s) < 0) | |
845 return -1; | |
846 | |
936 | 847 ff_init_me(s); |
848 | |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
814
diff
changeset
|
849 #ifdef CONFIG_ENCODERS |
1042 | 850 #ifdef CONFIG_RISKY |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
851 if (s->out_format == FMT_H263) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
852 h263_encode_init(s); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
853 if(s->msmpeg4_version) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
854 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
|
855 #endif |
1042 | 856 if (s->out_format == FMT_MPEG1) |
857 ff_mpeg1_encode_init(s); | |
858 #endif | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
859 |
60 | 860 /* init default q matrix */ |
861 for(i=0;i<64;i++) { | |
1092 | 862 int j= s->dsp.idct_permutation[i]; |
1042 | 863 #ifdef CONFIG_RISKY |
599 | 864 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
|
865 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
|
866 s->inter_matrix[j] = ff_mpeg4_default_non_intra_matrix[i]; |
599 | 867 }else if(s->out_format == FMT_H263){ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
868 s->intra_matrix[j] = |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
869 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
1042 | 870 }else |
871 #endif | |
1421 | 872 { /* mpeg1/2 */ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
873 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
|
874 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
599 | 875 } |
1411 | 876 if(s->avctx->intra_matrix) |
877 s->intra_matrix[j] = s->avctx->intra_matrix[i]; | |
878 if(s->avctx->inter_matrix) | |
879 s->inter_matrix[j] = s->avctx->inter_matrix[i]; | |
344 | 880 } |
881 | |
882 /* precompute matrix */ | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
883 /* for mjpeg, we do include qscale in the matrix */ |
344 | 884 if (s->out_format != FMT_MJPEG) { |
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
|
885 convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, s->q_intra_matrix16_bias, |
709
afeff6ccb7f5
convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents:
706
diff
changeset
|
886 s->intra_matrix, s->intra_quant_bias, 1, 31); |
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
|
887 convert_matrix(s, s->q_inter_matrix, s->q_inter_matrix16, s->q_inter_matrix16_bias, |
709
afeff6ccb7f5
convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents:
706
diff
changeset
|
888 s->inter_matrix, s->inter_quant_bias, 1, 31); |
60 | 889 } |
890 | |
329 | 891 if(ff_rate_control_init(s) < 0) |
892 return -1; | |
0 | 893 |
894 s->picture_number = 0; | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
895 s->picture_in_gop_number = 0; |
0 | 896 s->fake_picture_number = 0; |
897 /* motion detector init */ | |
898 s->f_code = 1; | |
324 | 899 s->b_code = 1; |
0 | 900 |
901 return 0; | |
902 } | |
903 | |
904 int MPV_encode_end(AVCodecContext *avctx) | |
905 { | |
906 MpegEncContext *s = avctx->priv_data; | |
907 | |
908 #ifdef STATS | |
909 print_stats(); | |
910 #endif | |
329 | 911 |
912 ff_rate_control_uninit(s); | |
913 | |
0 | 914 MPV_common_end(s); |
915 if (s->out_format == FMT_MJPEG) | |
916 mjpeg_close(s); | |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
917 |
1424 | 918 av_freep(&avctx->extradata); |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
919 |
0 | 920 return 0; |
921 } | |
922 | |
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
|
923 #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
|
924 |
1042 | 925 void init_rl(RLTable *rl) |
926 { | |
1064 | 927 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1]; |
928 uint8_t index_run[MAX_RUN+1]; | |
1042 | 929 int last, run, level, start, end, i; |
930 | |
931 /* compute max_level[], max_run[] and index_run[] */ | |
932 for(last=0;last<2;last++) { | |
933 if (last == 0) { | |
934 start = 0; | |
935 end = rl->last; | |
936 } else { | |
937 start = rl->last; | |
938 end = rl->n; | |
939 } | |
940 | |
941 memset(max_level, 0, MAX_RUN + 1); | |
942 memset(max_run, 0, MAX_LEVEL + 1); | |
943 memset(index_run, rl->n, MAX_RUN + 1); | |
944 for(i=start;i<end;i++) { | |
945 run = rl->table_run[i]; | |
946 level = rl->table_level[i]; | |
947 if (index_run[run] == rl->n) | |
948 index_run[run] = i; | |
949 if (level > max_level[run]) | |
950 max_level[run] = level; | |
951 if (run > max_run[level]) | |
952 max_run[level] = run; | |
953 } | |
954 rl->max_level[last] = av_malloc(MAX_RUN + 1); | |
955 memcpy(rl->max_level[last], max_level, MAX_RUN + 1); | |
956 rl->max_run[last] = av_malloc(MAX_LEVEL + 1); | |
957 memcpy(rl->max_run[last], max_run, MAX_LEVEL + 1); | |
958 rl->index_run[last] = av_malloc(MAX_RUN + 1); | |
959 memcpy(rl->index_run[last], index_run, MAX_RUN + 1); | |
960 } | |
961 } | |
962 | |
0 | 963 /* 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
|
964 //FIXME check that this is ok for mpeg4 interlaced |
1064 | 965 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w) |
0 | 966 { |
1064 | 967 uint8_t *ptr, *last_line; |
0 | 968 int i; |
969 | |
970 last_line = buf + (height - 1) * wrap; | |
971 for(i=0;i<w;i++) { | |
972 /* top and bottom */ | |
973 memcpy(buf - (i + 1) * wrap, buf, width); | |
974 memcpy(last_line + (i + 1) * wrap, last_line, width); | |
975 } | |
976 /* left and right */ | |
977 ptr = buf; | |
978 for(i=0;i<height;i++) { | |
979 memset(ptr - w, ptr[0], w); | |
980 memset(ptr + width, ptr[width-1], w); | |
981 ptr += wrap; | |
982 } | |
983 /* corners */ | |
984 for(i=0;i<w;i++) { | |
985 memset(buf - (i + 1) * wrap - w, buf[0], w); /* top left */ | |
986 memset(buf - (i + 1) * wrap + width, buf[width-1], w); /* top right */ | |
987 memset(last_line + (i + 1) * wrap - w, last_line[0], w); /* top left */ | |
988 memset(last_line + (i + 1) * wrap + width, last_line[width-1], w); /* top right */ | |
989 } | |
990 } | |
991 | |
924 | 992 static int find_unused_picture(MpegEncContext *s, int shared){ |
993 int i; | |
994 | |
995 if(shared){ | |
996 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
997 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) break; | |
998 } | |
999 }else{ | |
1000 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1168 | 1001 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) break; //FIXME |
924 | 1002 } |
1003 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1004 if(s->picture[i].data[0]==NULL) break; | |
1005 } | |
1006 } | |
1007 | |
1008 assert(i<MAX_PICTURE_COUNT); | |
1009 return i; | |
1010 } | |
1011 | |
0 | 1012 /* generic function for encode/decode called before a frame is coded/decoded */ |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1013 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) |
0 | 1014 { |
924 | 1015 int i; |
925 | 1016 AVFrame *pic; |
0 | 1017 |
46
931417475f5b
fixed mpeg1 first block bug (pb with black picture optimisation for B frames)
glantau
parents:
40
diff
changeset
|
1018 s->mb_skiped = 0; |
1168 | 1019 |
1234 | 1020 assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3); |
1228 | 1021 |
903 | 1022 /* mark&release old frames */ |
1396 | 1023 if (s->pict_type != B_TYPE && s->last_picture_ptr && s->last_picture_ptr->data[0]) { |
1138 | 1024 avctx->release_buffer(avctx, (AVFrame*)s->last_picture_ptr); |
903 | 1025 |
1026 /* release forgotten pictures */ | |
1027 /* if(mpeg124/h263) */ | |
1028 if(!s->encoding){ | |
1029 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1138 | 1030 if(s->picture[i].data[0] && &s->picture[i] != s->next_picture_ptr && s->picture[i].reference){ |
903 | 1031 fprintf(stderr, "releasing zombie picture\n"); |
925 | 1032 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); |
903 | 1033 } |
1034 } | |
1035 } | |
1036 } | |
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1037 alloc: |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1038 if(!s->encoding){ |
1228 | 1039 /* release non refernce frames */ |
1040 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1041 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
1042 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
1043 } | |
1044 } | |
1045 | |
924 | 1046 i= find_unused_picture(s, 0); |
903 | 1047 |
925 | 1048 pic= (AVFrame*)&s->picture[i]; |
1168 | 1049 pic->reference= s->pict_type != B_TYPE ? 3 : 0; |
1138 | 1050 |
1051 if(s->current_picture_ptr) | |
1052 pic->coded_picture_number= s->current_picture_ptr->coded_picture_number+1; | |
903 | 1053 |
1384 | 1054 if( alloc_picture(s, (Picture*)pic, 0) < 0) |
1055 return -1; | |
903 | 1056 |
1138 | 1057 s->current_picture_ptr= &s->picture[i]; |
903 | 1058 } |
456 | 1059 |
1173 | 1060 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
|
1061 // 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
|
1062 // 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
|
1063 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE; |
1173 | 1064 |
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
|
1065 copy_picture(&s->current_picture, s->current_picture_ptr); |
1173 | 1066 |
1234 | 1067 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){ |
903 | 1068 if (s->pict_type != B_TYPE) { |
1138 | 1069 s->last_picture_ptr= s->next_picture_ptr; |
1070 s->next_picture_ptr= s->current_picture_ptr; | |
1071 } | |
1214 | 1072 |
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
|
1073 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
|
1074 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); |
1138 | 1075 |
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
|
1076 if(s->pict_type != I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL)){ |
1393 | 1077 fprintf(stderr, "warning: first frame is no keyframe\n"); |
1078 assert(s->pict_type != B_TYPE); //these should have been dropped if we dont have a reference | |
1079 goto alloc; | |
1080 } | |
1081 | |
1082 assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0])); | |
1083 | |
1138 | 1084 if(s->picture_structure!=PICT_FRAME){ |
1085 int i; | |
1086 for(i=0; i<4; i++){ | |
1087 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
1088 s->current_picture.data[i] += s->current_picture.linesize[i]; | |
1089 } | |
1090 s->current_picture.linesize[i] *= 2; | |
1091 s->last_picture.linesize[i] *=2; | |
1092 s->next_picture.linesize[i] *=2; | |
1093 } | |
553 | 1094 } |
1168 | 1095 } |
903 | 1096 |
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1097 s->hurry_up= s->avctx->hurry_up; |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1098 s->error_resilience= avctx->error_resilience; |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1099 |
591 | 1100 /* set dequantizer, we cant do it during init as it might change for mpeg4 |
1101 and we cant do it in the header decode as init isnt called for mpeg4 there yet */ | |
1421 | 1102 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO) |
1103 s->dct_unquantize = s->dct_unquantize_mpeg2; | |
1104 else if(s->out_format == FMT_H263) | |
1105 s->dct_unquantize = s->dct_unquantize_h263; | |
1106 else | |
591 | 1107 s->dct_unquantize = s->dct_unquantize_mpeg1; |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1108 |
1381 | 1109 #ifdef HAVE_XVMC |
1110 if(s->avctx->xvmc_acceleration) | |
1111 return XVMC_field_start(s, avctx); | |
1112 #endif | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1113 return 0; |
0 | 1114 } |
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
|
1115 |
0 | 1116 /* generic function for encode/decode called after a frame has been coded/decoded */ |
1117 void MPV_frame_end(MpegEncContext *s) | |
1118 { | |
903 | 1119 int i; |
0 | 1120 /* draw edge for correct motion prediction if outside */ |
1381 | 1121 #ifdef HAVE_XVMC |
1122 //just to make sure that all data is rendered. | |
1123 if(s->avctx->xvmc_acceleration){ | |
1124 XVMC_field_end(s); | |
1125 }else | |
1126 #endif | |
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
1127 if(s->unrestricted_mv && s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) { |
903 | 1128 draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH ); |
1129 draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
1130 draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
0 | 1131 } |
207 | 1132 emms_c(); |
329 | 1133 |
612 | 1134 s->last_pict_type = s->pict_type; |
329 | 1135 if(s->pict_type!=B_TYPE){ |
1136 s->last_non_b_pict_type= s->pict_type; | |
1137 } | |
1138 | 1138 #if 0 |
1139 /* copy back current_picture variables */ | |
903 | 1140 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
1141 if(s->picture[i].data[0] == s->current_picture.data[0]){ | |
1142 s->picture[i]= s->current_picture; | |
1143 break; | |
1144 } | |
1145 } | |
1146 assert(i<MAX_PICTURE_COUNT); | |
1138 | 1147 #endif |
903 | 1148 |
1228 | 1149 if(s->encoding){ |
1150 /* release non refernce frames */ | |
1151 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1152 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
1153 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
1154 } | |
1155 } | |
324 | 1156 } |
1138 | 1157 // clear copies, to avoid confusion |
1158 #if 0 | |
1159 memset(&s->last_picture, 0, sizeof(Picture)); | |
1160 memset(&s->next_picture, 0, sizeof(Picture)); | |
1161 memset(&s->current_picture, 0, sizeof(Picture)); | |
1162 #endif | |
903 | 1163 } |
1164 | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1165 /** |
1285 | 1166 * draws an line from (ex, ey) -> (sx, sy). |
1167 * @param w width of the image | |
1168 * @param h height of the image | |
1169 * @param stride stride/linesize of the image | |
1170 * @param color color of the arrow | |
1171 */ | |
1172 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ | |
1173 int t, x, y, f; | |
1174 | |
1175 sx= clip(sx, 0, w-1); | |
1176 sy= clip(sy, 0, h-1); | |
1177 ex= clip(ex, 0, w-1); | |
1178 ey= clip(ey, 0, h-1); | |
1179 | |
1180 buf[sy*stride + sx]+= color; | |
1181 | |
1182 if(ABS(ex - sx) > ABS(ey - sy)){ | |
1183 if(sx > ex){ | |
1184 t=sx; sx=ex; ex=t; | |
1185 t=sy; sy=ey; ey=t; | |
1186 } | |
1187 buf+= sx + sy*stride; | |
1188 ex-= sx; | |
1189 f= ((ey-sy)<<16)/ex; | |
1190 for(x= 0; x <= ex; x++){ | |
1191 y= ((x*f) + (1<<15))>>16; | |
1192 buf[y*stride + x]+= color; | |
1193 } | |
1194 }else{ | |
1195 if(sy > ey){ | |
1196 t=sx; sx=ex; ex=t; | |
1197 t=sy; sy=ey; ey=t; | |
1198 } | |
1199 buf+= sx + sy*stride; | |
1200 ey-= sy; | |
1201 if(ey) f= ((ex-sx)<<16)/ey; | |
1202 else f= 0; | |
1203 for(y= 0; y <= ey; y++){ | |
1204 x= ((y*f) + (1<<15))>>16; | |
1205 buf[y*stride + x]+= color; | |
1206 } | |
1207 } | |
1208 } | |
1209 | |
1210 /** | |
1211 * draws an arrow from (ex, ey) -> (sx, sy). | |
1212 * @param w width of the image | |
1213 * @param h height of the image | |
1214 * @param stride stride/linesize of the image | |
1215 * @param color color of the arrow | |
1216 */ | |
1217 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ | |
1218 int dx,dy; | |
1219 | |
1220 sx= clip(sx, -100, w+100); | |
1221 sy= clip(sy, -100, h+100); | |
1222 ex= clip(ex, -100, w+100); | |
1223 ey= clip(ey, -100, h+100); | |
1224 | |
1225 dx= ex - sx; | |
1226 dy= ey - sy; | |
1227 | |
1228 if(dx*dx + dy*dy > 3*3){ | |
1229 int rx= dx + dy; | |
1230 int ry= -dx + dy; | |
1231 int length= ff_sqrt((rx*rx + ry*ry)<<8); | |
1232 | |
1233 //FIXME subpixel accuracy | |
1234 rx= ROUNDED_DIV(rx*3<<4, length); | |
1235 ry= ROUNDED_DIV(ry*3<<4, length); | |
1236 | |
1237 draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color); | |
1238 draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color); | |
1239 } | |
1240 draw_line(buf, sx, sy, ex, ey, w, h, stride, color); | |
1241 } | |
1242 | |
1243 /** | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1244 * 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
|
1245 */ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1246 void ff_print_debug_info(MpegEncContext *s, Picture *pict){ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1247 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1248 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
|
1249 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1250 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
|
1251 int x,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
|
1252 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1253 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
|
1254 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
|
1255 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
|
1256 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
|
1257 if(count>9) count=9; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1258 printf("%1d", count); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1259 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1260 if(s->avctx->debug&FF_DEBUG_QP){ |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1261 printf("%2d", pict->qscale_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
|
1262 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1263 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
|
1264 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
|
1265 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1266 //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
|
1267 if(IS_PCM(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
|
1268 printf("P"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1269 else if(IS_INTRA(mb_type) && IS_ACPRED(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
|
1270 printf("A"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1271 else if(IS_INTRA4x4(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
|
1272 printf("i"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1273 else if(IS_INTRA16x16(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
|
1274 printf("I"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1275 else if(IS_DIRECT(mb_type) && IS_SKIP(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
|
1276 printf("d"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1277 else if(IS_DIRECT(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
|
1278 printf("D"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1279 else if(IS_GMC(mb_type) && IS_SKIP(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
|
1280 printf("g"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1281 else if(IS_GMC(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
|
1282 printf("G"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1283 else if(IS_SKIP(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
|
1284 printf("S"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1285 else if(!USES_LIST(mb_type, 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
|
1286 printf(">"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1287 else if(!USES_LIST(mb_type, 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
|
1288 printf("<"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1289 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
|
1290 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 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
|
1291 printf("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
|
1292 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1293 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1294 //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
|
1295 if(IS_8X8(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
|
1296 printf("+"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1297 else if(IS_16X8(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
|
1298 printf("-"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1299 else if(IS_8X16(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
|
1300 printf("¦"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1301 else if(IS_INTRA(mb_type) || IS_16X16(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
|
1302 printf(" "); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1303 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
|
1304 printf("?"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1305 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1306 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1307 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264) |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1308 printf("="); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1309 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
|
1310 printf(" "); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1311 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1312 // printf(" "); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1313 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1314 printf("\n"); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1315 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1316 } |
1285 | 1317 |
1318 if((s->avctx->debug&FF_DEBUG_VIS_MV) && s->motion_val){ | |
1319 const int shift= 1 + s->quarter_sample; | |
1320 int mb_y; | |
1321 uint8_t *ptr= pict->data[0]; | |
1322 s->low_delay=0; //needed to see the vectors without trashing the buffers | |
1323 | |
1324 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
1325 int mb_x; | |
1326 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
1327 const int mb_index= mb_x + mb_y*s->mb_stride; | |
1328 if(IS_8X8(s->current_picture.mb_type[mb_index])){ | |
1329 int i; | |
1330 for(i=0; i<4; i++){ | |
1331 int sx= mb_x*16 + 4 + 8*(i&1); | |
1332 int sy= mb_y*16 + 4 + 8*(i>>1); | |
1333 int xy= 1 + mb_x*2 + (i&1) + (mb_y*2 + 1 + (i>>1))*(s->mb_width*2 + 2); | |
1334 int mx= (s->motion_val[xy][0]>>shift) + sx; | |
1335 int my= (s->motion_val[xy][1]>>shift) + sy; | |
1336 draw_arrow(ptr, sx, sy, mx, my, s->width, s->height, s->linesize, 100); | |
1337 } | |
1338 }else{ | |
1339 int sx= mb_x*16 + 8; | |
1340 int sy= mb_y*16 + 8; | |
1341 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2); | |
1342 int mx= (s->motion_val[xy][0]>>shift) + sx; | |
1343 int my= (s->motion_val[xy][1]>>shift) + sy; | |
1344 draw_arrow(ptr, sx, sy, mx, my, s->width, s->height, s->linesize, 100); | |
1345 } | |
1346 s->mbskip_table[mb_index]=0; | |
1347 } | |
1348 } | |
1349 } | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1350 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1351 |
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
|
1352 #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
|
1353 |
915 | 1354 static int get_sae(uint8_t *src, int ref, int stride){ |
1355 int x,y; | |
1356 int acc=0; | |
1357 | |
1358 for(y=0; y<16; y++){ | |
1359 for(x=0; x<16; x++){ | |
1360 acc+= ABS(src[x+y*stride] - ref); | |
1361 } | |
1362 } | |
1363 | |
1364 return acc; | |
1365 } | |
1366 | |
1367 static int get_intra_count(MpegEncContext *s, uint8_t *src, uint8_t *ref, int stride){ | |
1368 int x, y, w, h; | |
1369 int acc=0; | |
1370 | |
1371 w= s->width &~15; | |
1372 h= s->height&~15; | |
1373 | |
1374 for(y=0; y<h; y+=16){ | |
1375 for(x=0; x<w; x+=16){ | |
1376 int offset= x + y*stride; | |
1377 int sad = s->dsp.pix_abs16x16(src + offset, ref + offset, stride); | |
1378 int mean= (s->dsp.pix_sum(src + offset, stride) + 128)>>8; | |
1379 int sae = get_sae(src + offset, mean, stride); | |
1380 | |
1381 acc+= sae + 500 < sad; | |
1382 } | |
1383 } | |
1384 return acc; | |
1385 } | |
1386 | |
924 | 1387 |
925 | 1388 static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){ |
1373 | 1389 AVFrame *pic=NULL; |
924 | 1390 int i; |
903 | 1391 const int encoding_delay= s->max_b_frames; |
924 | 1392 int direct=1; |
1373 | 1393 |
1394 if(pic_arg){ | |
924 | 1395 if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0; |
1396 if(pic_arg->linesize[0] != s->linesize) direct=0; | |
1397 if(pic_arg->linesize[1] != s->uvlinesize) direct=0; | |
1398 if(pic_arg->linesize[2] != s->uvlinesize) direct=0; | |
1399 | |
1400 // printf("%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize); | |
1401 | |
1402 if(direct){ | |
1403 i= find_unused_picture(s, 1); | |
1404 | |
925 | 1405 pic= (AVFrame*)&s->picture[i]; |
1168 | 1406 pic->reference= 3; |
903 | 1407 |
924 | 1408 for(i=0; i<4; i++){ |
1409 pic->data[i]= pic_arg->data[i]; | |
1410 pic->linesize[i]= pic_arg->linesize[i]; | |
1411 } | |
1412 alloc_picture(s, (Picture*)pic, 1); | |
1413 }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
|
1414 int offset= 16; |
924 | 1415 i= find_unused_picture(s, 0); |
1416 | |
925 | 1417 pic= (AVFrame*)&s->picture[i]; |
1168 | 1418 pic->reference= 3; |
924 | 1419 |
1420 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
|
1421 |
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
1422 if( 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
|
1423 && 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
|
1424 && pic->data[2] + offset == pic_arg->data[2]){ |
924 | 1425 // empty |
1426 }else{ | |
1427 int h_chroma_shift, v_chroma_shift; | |
1428 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); | |
1429 | |
1430 for(i=0; i<3; i++){ | |
1431 int src_stride= pic_arg->linesize[i]; | |
1432 int dst_stride= i ? s->uvlinesize : s->linesize; | |
1433 int h_shift= i ? h_chroma_shift : 0; | |
1434 int v_shift= i ? v_chroma_shift : 0; | |
1435 int w= s->width >>h_shift; | |
1436 int h= s->height>>v_shift; | |
1437 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
|
1438 uint8_t *dst= pic->data[i] + offset; |
924 | 1439 |
1440 if(src_stride==dst_stride) | |
1441 memcpy(dst, src, src_stride*h); | |
1442 else{ | |
1443 while(h--){ | |
1444 memcpy(dst, src, w); | |
1445 dst += dst_stride; | |
1446 src += src_stride; | |
1447 } | |
1448 } | |
1449 } | |
1450 } | |
324 | 1451 } |
924 | 1452 pic->quality= pic_arg->quality; |
1453 pic->pict_type= pic_arg->pict_type; | |
955
8f5d4c666806
pts encoding fix patch by (Thomas Jarosch <tomj at simonv dot com>)
michaelni
parents:
954
diff
changeset
|
1454 pic->pts = pic_arg->pts; |
903 | 1455 |
1456 if(s->input_picture[encoding_delay]) | |
1457 pic->display_picture_number= s->input_picture[encoding_delay]->display_picture_number + 1; | |
1373 | 1458 |
1459 } | |
903 | 1460 |
1461 /* shift buffer entries */ | |
1462 for(i=1; i<MAX_PICTURE_COUNT /*s->encoding_delay+1*/; i++) | |
1463 s->input_picture[i-1]= s->input_picture[i]; | |
1464 | |
1465 s->input_picture[encoding_delay]= (Picture*)pic; | |
1466 | |
1467 return 0; | |
1468 } | |
1469 | |
1470 static void select_input_picture(MpegEncContext *s){ | |
1471 int i; | |
1472 int coded_pic_num=0; | |
1473 | |
1474 if(s->reordered_input_picture[0]) | |
1475 coded_pic_num= s->reordered_input_picture[0]->coded_picture_number + 1; | |
924 | 1476 |
903 | 1477 for(i=1; i<MAX_PICTURE_COUNT; i++) |
1478 s->reordered_input_picture[i-1]= s->reordered_input_picture[i]; | |
1479 s->reordered_input_picture[MAX_PICTURE_COUNT-1]= NULL; | |
1480 | |
1481 /* set next picture types & ordering */ | |
1482 if(s->reordered_input_picture[0]==NULL && s->input_picture[0]){ | |
1138 | 1483 if(/*s->picture_in_gop_number >= s->gop_size ||*/ s->next_picture_ptr==NULL || s->intra_only){ |
915 | 1484 s->reordered_input_picture[0]= s->input_picture[0]; |
1485 s->reordered_input_picture[0]->pict_type= I_TYPE; | |
1486 s->reordered_input_picture[0]->coded_picture_number= coded_pic_num; | |
1487 }else{ | |
1488 int b_frames; | |
1489 | |
1490 if(s->flags&CODEC_FLAG_PASS2){ | |
1491 for(i=0; i<s->max_b_frames+1; i++){ | |
1492 int pict_num= s->input_picture[0]->display_picture_number + i; | |
1493 int pict_type= s->rc_context.entry[pict_num].new_pict_type; | |
1494 s->input_picture[i]->pict_type= pict_type; | |
1495 | |
1496 if(i + 1 >= s->rc_context.num_entries) break; | |
1497 } | |
1498 } | |
924 | 1499 |
915 | 1500 if(s->input_picture[0]->pict_type){ |
1501 /* user selected pict_type */ | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1502 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
|
1503 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
|
1504 } |
915 | 1505 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1506 if(b_frames > s->max_b_frames){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1507 fprintf(stderr, "warning, too many bframes in a row\n"); |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1508 b_frames = s->max_b_frames; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1509 } |
915 | 1510 }else if(s->b_frame_strategy==0){ |
1511 b_frames= s->max_b_frames; | |
1373 | 1512 while(b_frames && !s->input_picture[b_frames]) b_frames--; |
915 | 1513 }else if(s->b_frame_strategy==1){ |
1514 for(i=1; i<s->max_b_frames+1; i++){ | |
1373 | 1515 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){ |
915 | 1516 s->input_picture[i]->b_frame_score= |
924 | 1517 get_intra_count(s, s->input_picture[i ]->data[0], |
1518 s->input_picture[i-1]->data[0], s->linesize) + 1; | |
915 | 1519 } |
1520 } | |
1521 for(i=0; i<s->max_b_frames; i++){ | |
1373 | 1522 if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/40) break; |
915 | 1523 } |
1524 | |
1525 b_frames= FFMAX(0, i-1); | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1526 |
915 | 1527 /* reset scores */ |
1528 for(i=0; i<b_frames+1; i++){ | |
1529 s->input_picture[i]->b_frame_score=0; | |
1530 } | |
1531 }else{ | |
1532 fprintf(stderr, "illegal b frame strategy\n"); | |
1533 b_frames=0; | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1534 } |
915 | 1535 |
1536 emms_c(); | |
1537 //static int b_count=0; | |
1538 //b_count+= b_frames; | |
1539 //printf("b_frames: %d\n", b_count); | |
1540 | |
1541 s->reordered_input_picture[0]= s->input_picture[b_frames]; | |
1542 if( s->picture_in_gop_number + b_frames >= s->gop_size | |
1543 || s->reordered_input_picture[0]->pict_type== I_TYPE) | |
903 | 1544 s->reordered_input_picture[0]->pict_type= I_TYPE; |
915 | 1545 else |
1546 s->reordered_input_picture[0]->pict_type= P_TYPE; | |
1547 s->reordered_input_picture[0]->coded_picture_number= coded_pic_num; | |
1548 for(i=0; i<b_frames; i++){ | |
1549 coded_pic_num++; | |
1550 s->reordered_input_picture[i+1]= s->input_picture[i]; | |
1551 s->reordered_input_picture[i+1]->pict_type= B_TYPE; | |
1552 s->reordered_input_picture[i+1]->coded_picture_number= coded_pic_num; | |
903 | 1553 } |
324 | 1554 } |
1555 } | |
903 | 1556 |
1557 if(s->reordered_input_picture[0]){ | |
1168 | 1558 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=B_TYPE ? 3 : 0; |
1138 | 1559 |
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
|
1560 copy_picture(&s->new_picture, s->reordered_input_picture[0]); |
924 | 1561 |
1562 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ | |
1138 | 1563 // input is a shared pix, so we cant modifiy it -> alloc a new one & ensure that the shared one is reuseable |
1564 | |
924 | 1565 int i= find_unused_picture(s, 0); |
1566 Picture *pic= &s->picture[i]; | |
1567 | |
1568 /* mark us unused / free shared pic */ | |
1569 for(i=0; i<4; i++) | |
1570 s->reordered_input_picture[0]->data[i]= NULL; | |
1571 s->reordered_input_picture[0]->type= 0; | |
1572 | |
1138 | 1573 //FIXME bad, copy * except |
924 | 1574 pic->pict_type = s->reordered_input_picture[0]->pict_type; |
1575 pic->quality = s->reordered_input_picture[0]->quality; | |
1576 pic->coded_picture_number = s->reordered_input_picture[0]->coded_picture_number; | |
1577 pic->reference = s->reordered_input_picture[0]->reference; | |
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1397
diff
changeset
|
1578 pic->pts = s->reordered_input_picture[0]->pts; |
924 | 1579 |
1580 alloc_picture(s, pic, 0); | |
1581 | |
1138 | 1582 s->current_picture_ptr= pic; |
924 | 1583 }else{ |
1138 | 1584 // input is not a shared pix -> reuse buffer for current_pix |
1585 | |
924 | 1586 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER |
1587 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); | |
1588 | |
1138 | 1589 s->current_picture_ptr= s->reordered_input_picture[0]; |
924 | 1590 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
|
1591 s->new_picture.data[i]+=16; |
924 | 1592 } |
903 | 1593 } |
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
|
1594 copy_picture(&s->current_picture, s->current_picture_ptr); |
903 | 1595 |
1596 s->picture_number= s->new_picture.display_picture_number; | |
1597 //printf("dpn:%d\n", s->picture_number); | |
1598 }else{ | |
1599 memset(&s->new_picture, 0, sizeof(Picture)); | |
324 | 1600 } |
1601 } | |
1602 | |
0 | 1603 int MPV_encode_picture(AVCodecContext *avctx, |
1604 unsigned char *buf, int buf_size, void *data) | |
1605 { | |
1606 MpegEncContext *s = avctx->priv_data; | |
925 | 1607 AVFrame *pic_arg = data; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1608 int i; |
0 | 1609 |
1397 | 1610 if(avctx->pix_fmt != PIX_FMT_YUV420P){ |
1611 fprintf(stderr, "this codec supports only YUV420P\n"); | |
1612 return -1; | |
1613 } | |
1614 | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1505
diff
changeset
|
1615 init_put_bits(&s->pb, buf, buf_size); |
0 | 1616 |
903 | 1617 s->picture_in_gop_number++; |
1618 | |
1619 load_input_picture(s, pic_arg); | |
329 | 1620 |
903 | 1621 select_input_picture(s); |
324 | 1622 |
1623 /* output? */ | |
903 | 1624 if(s->new_picture.data[0]){ |
1625 | |
1626 s->pict_type= s->new_picture.pict_type; | |
1627 //emms_c(); | |
1628 //printf("qs:%f %f %d\n", s->new_picture.quality, s->current_picture.quality, s->qscale); | |
553 | 1629 MPV_frame_start(s, avctx); |
286 | 1630 |
324 | 1631 encode_picture(s, s->picture_number); |
652 | 1632 |
376 | 1633 avctx->real_pict_num = s->picture_number; |
324 | 1634 avctx->header_bits = s->header_bits; |
1635 avctx->mv_bits = s->mv_bits; | |
1636 avctx->misc_bits = s->misc_bits; | |
1637 avctx->i_tex_bits = s->i_tex_bits; | |
1638 avctx->p_tex_bits = s->p_tex_bits; | |
1639 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
|
1640 avctx->p_count = s->mb_num - s->i_count - s->skip_count; //FIXME f/b_count in avctx |
324 | 1641 avctx->skip_count = s->skip_count; |
0 | 1642 |
324 | 1643 MPV_frame_end(s); |
1644 | |
1645 if (s->out_format == FMT_MJPEG) | |
1646 mjpeg_picture_trailer(s); | |
329 | 1647 |
1648 if(s->flags&CODEC_FLAG_PASS1) | |
1649 ff_write_pass1_stats(s); | |
1138 | 1650 |
1651 for(i=0; i<4; i++){ | |
1652 avctx->error[i] += s->current_picture_ptr->error[i]; | |
1653 } | |
324 | 1654 } |
1655 | |
1656 s->input_picture_number++; | |
0 | 1657 |
1658 flush_put_bits(&s->pb); | |
268 | 1659 s->frame_bits = (pbBufPtr(&s->pb) - s->pb.buf) * 8; |
612 | 1660 |
268 | 1661 s->total_bits += s->frame_bits; |
286 | 1662 avctx->frame_bits = s->frame_bits; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
1663 |
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
|
1664 return pbBufPtr(&s->pb) - s->pb.buf; |
0 | 1665 } |
1666 | |
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
|
1667 #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
|
1668 |
255 | 1669 static inline void gmc1_motion(MpegEncContext *s, |
1064 | 1670 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
255 | 1671 int dest_offset, |
1064 | 1672 uint8_t **ref_picture, int src_offset) |
255 | 1673 { |
1064 | 1674 uint8_t *ptr; |
556 | 1675 int offset, src_x, src_y, linesize, uvlinesize; |
255 | 1676 int motion_x, motion_y; |
566 | 1677 int emu=0; |
255 | 1678 |
1679 motion_x= s->sprite_offset[0][0]; | |
1680 motion_y= s->sprite_offset[0][1]; | |
1681 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
1682 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
1683 motion_x<<=(3-s->sprite_warping_accuracy); | |
1684 motion_y<<=(3-s->sprite_warping_accuracy); | |
1685 src_x = clip(src_x, -16, s->width); | |
1686 if (src_x == s->width) | |
1687 motion_x =0; | |
1688 src_y = clip(src_y, -16, s->height); | |
1689 if (src_y == s->height) | |
1690 motion_y =0; | |
753 | 1691 |
255 | 1692 linesize = s->linesize; |
556 | 1693 uvlinesize = s->uvlinesize; |
753 | 1694 |
255 | 1695 ptr = ref_picture[0] + (src_y * linesize) + src_x + src_offset; |
1696 | |
1697 dest_y+=dest_offset; | |
566 | 1698 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
|
1699 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
|
1700 || (unsigned)src_y >= s->v_edge_pos - 17){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1701 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 | 1702 ptr= s->edge_emu_buffer; |
1703 } | |
1704 } | |
753 | 1705 |
1706 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
|
1707 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
|
1708 s->dsp.gmc1(dest_y+8, ptr+8, linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding); |
753 | 1709 }else{ |
1710 int dxy; | |
1711 | |
1712 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2); | |
1713 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
|
1714 s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16); |
753 | 1715 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
1716 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
|
1717 } |
753 | 1718 } |
1719 | |
1720 if(s->flags&CODEC_FLAG_GRAY) return; | |
255 | 1721 |
1722 motion_x= s->sprite_offset[1][0]; | |
1723 motion_y= s->sprite_offset[1][1]; | |
1724 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
1725 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
1726 motion_x<<=(3-s->sprite_warping_accuracy); | |
1727 motion_y<<=(3-s->sprite_warping_accuracy); | |
1728 src_x = clip(src_x, -8, s->width>>1); | |
1729 if (src_x == s->width>>1) | |
1730 motion_x =0; | |
1731 src_y = clip(src_y, -8, s->height>>1); | |
1732 if (src_y == s->height>>1) | |
1733 motion_y =0; | |
1734 | |
556 | 1735 offset = (src_y * uvlinesize) + src_x + (src_offset>>1); |
255 | 1736 ptr = ref_picture[1] + offset; |
1002 | 1737 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
|
1738 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
|
1739 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1740 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 | 1741 ptr= s->edge_emu_buffer; |
1742 emu=1; | |
1743 } | |
566 | 1744 } |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
1745 s->dsp.gmc1(dest_cb + (dest_offset>>1), ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
566 | 1746 |
255 | 1747 ptr = ref_picture[2] + offset; |
566 | 1748 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1749 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 | 1750 ptr= s->edge_emu_buffer; |
1751 } | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
1752 s->dsp.gmc1(dest_cr + (dest_offset>>1), ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
255 | 1753 |
1754 return; | |
1755 } | |
1756 | |
753 | 1757 static inline void gmc_motion(MpegEncContext *s, |
1064 | 1758 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
753 | 1759 int dest_offset, |
1064 | 1760 uint8_t **ref_picture, int src_offset) |
753 | 1761 { |
1064 | 1762 uint8_t *ptr; |
753 | 1763 int linesize, uvlinesize; |
1764 const int a= s->sprite_warping_accuracy; | |
1765 int ox, oy; | |
1766 | |
1767 linesize = s->linesize; | |
1768 uvlinesize = s->uvlinesize; | |
1769 | |
1770 ptr = ref_picture[0] + src_offset; | |
1771 | |
1772 dest_y+=dest_offset; | |
1773 | |
1774 ox= s->sprite_offset[0][0] + s->sprite_delta[0][0]*s->mb_x*16 + s->sprite_delta[0][1]*s->mb_y*16; | |
1775 oy= s->sprite_offset[0][1] + s->sprite_delta[1][0]*s->mb_x*16 + s->sprite_delta[1][1]*s->mb_y*16; | |
1776 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
1777 s->dsp.gmc(dest_y, ptr, linesize, 16, |
753 | 1778 ox, |
1779 oy, | |
1780 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
1781 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
1782 a+1, (1<<(2*a+1)) - s->no_rounding, | |
1783 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
|
1784 s->dsp.gmc(dest_y+8, ptr, linesize, 16, |
753 | 1785 ox + s->sprite_delta[0][0]*8, |
1786 oy + s->sprite_delta[1][0]*8, | |
1787 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
1788 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
1789 a+1, (1<<(2*a+1)) - s->no_rounding, | |
1790 s->h_edge_pos, s->v_edge_pos); | |
1791 | |
1792 if(s->flags&CODEC_FLAG_GRAY) return; | |
1793 | |
1794 | |
1795 dest_cb+=dest_offset>>1; | |
1796 dest_cr+=dest_offset>>1; | |
1797 | |
1798 ox= s->sprite_offset[1][0] + s->sprite_delta[0][0]*s->mb_x*8 + s->sprite_delta[0][1]*s->mb_y*8; | |
1799 oy= s->sprite_offset[1][1] + s->sprite_delta[1][0]*s->mb_x*8 + s->sprite_delta[1][1]*s->mb_y*8; | |
1800 | |
1801 ptr = ref_picture[1] + (src_offset>>1); | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
1802 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8, |
753 | 1803 ox, |
1804 oy, | |
1805 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
1806 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
1807 a+1, (1<<(2*a+1)) - s->no_rounding, | |
1808 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
1809 | |
1810 ptr = ref_picture[2] + (src_offset>>1); | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
1811 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8, |
753 | 1812 ox, |
1813 oy, | |
1814 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
1815 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
1816 a+1, (1<<(2*a+1)) - s->no_rounding, | |
1817 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
1818 } | |
1819 | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1820 /** |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1821 * 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
|
1822 * @param buf destination buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1823 * @param src source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1824 * @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
|
1825 * @param block_w width of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1826 * @param block_h height of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1827 * @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
|
1828 * @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
|
1829 * @param w width of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1830 * @param h height of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1831 */ |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1832 void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h, |
553 | 1833 int src_x, int src_y, int w, int h){ |
1834 int x, y; | |
1835 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
|
1836 |
553 | 1837 if(src_y>= h){ |
1838 src+= (h-1-src_y)*linesize; | |
1839 src_y=h-1; | |
554 | 1840 }else if(src_y<=-block_h){ |
1841 src+= (1-block_h-src_y)*linesize; | |
1842 src_y=1-block_h; | |
553 | 1843 } |
1844 if(src_x>= w){ | |
1845 src+= (w-1-src_x); | |
1846 src_x=w-1; | |
554 | 1847 }else if(src_x<=-block_w){ |
1848 src+= (1-block_w-src_x); | |
1849 src_x=1-block_w; | |
553 | 1850 } |
1851 | |
847 | 1852 start_y= FFMAX(0, -src_y); |
1853 start_x= FFMAX(0, -src_x); | |
1854 end_y= FFMIN(block_h, h-src_y); | |
1855 end_x= FFMIN(block_w, w-src_x); | |
566 | 1856 |
553 | 1857 // copy existing part |
1858 for(y=start_y; y<end_y; y++){ | |
1859 for(x=start_x; x<end_x; x++){ | |
1860 buf[x + y*linesize]= src[x + y*linesize]; | |
1861 } | |
1862 } | |
1863 | |
1864 //top | |
1865 for(y=0; y<start_y; y++){ | |
1866 for(x=start_x; x<end_x; x++){ | |
1867 buf[x + y*linesize]= buf[x + start_y*linesize]; | |
1868 } | |
1869 } | |
1870 | |
1871 //bottom | |
1872 for(y=end_y; y<block_h; y++){ | |
1873 for(x=start_x; x<end_x; x++){ | |
1874 buf[x + y*linesize]= buf[x + (end_y-1)*linesize]; | |
1875 } | |
1876 } | |
1877 | |
1878 for(y=0; y<block_h; y++){ | |
1879 //left | |
1880 for(x=0; x<start_x; x++){ | |
1881 buf[x + y*linesize]= buf[start_x + y*linesize]; | |
1882 } | |
1883 | |
1884 //right | |
1885 for(x=end_x; x<block_w; x++){ | |
1886 buf[x + y*linesize]= buf[end_x - 1 + y*linesize]; | |
1887 } | |
1888 } | |
1889 } | |
1890 | |
1891 | |
0 | 1892 /* apply one mpeg motion vector to the three components */ |
1893 static inline void mpeg_motion(MpegEncContext *s, | |
1064 | 1894 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
0 | 1895 int dest_offset, |
1064 | 1896 uint8_t **ref_picture, int src_offset, |
651 | 1897 int field_based, op_pixels_func (*pix_op)[4], |
0 | 1898 int motion_x, int motion_y, int h) |
1899 { | |
1064 | 1900 uint8_t *ptr; |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
1901 int dxy, offset, mx, my, src_x, src_y, height, v_edge_pos, linesize, uvlinesize; |
553 | 1902 int emu=0; |
651 | 1903 #if 0 |
255 | 1904 if(s->quarter_sample) |
1905 { | |
1906 motion_x>>=1; | |
1907 motion_y>>=1; | |
1908 } | |
651 | 1909 #endif |
0 | 1910 dxy = ((motion_y & 1) << 1) | (motion_x & 1); |
1911 src_x = s->mb_x * 16 + (motion_x >> 1); | |
1912 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 1); | |
1913 | |
1914 /* WARNING: do no forget half pels */ | |
1915 height = s->height >> field_based; | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
1916 v_edge_pos = s->v_edge_pos >> field_based; |
0 | 1917 src_x = clip(src_x, -16, s->width); |
1918 if (src_x == s->width) | |
1919 dxy &= ~1; | |
1920 src_y = clip(src_y, -16, height); | |
1921 if (src_y == height) | |
1922 dxy &= ~2; | |
1138 | 1923 linesize = s->current_picture.linesize[0] << field_based; |
1924 uvlinesize = s->current_picture.linesize[1] << field_based; | |
0 | 1925 ptr = ref_picture[0] + (src_y * linesize) + (src_x) + src_offset; |
1926 dest_y += dest_offset; | |
553 | 1927 |
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
1928 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){ |
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
1929 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16 |
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
1930 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1931 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - src_offset, s->linesize, 17, 17+field_based, //FIXME linesize? and uv below |
763 | 1932 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); |
1933 ptr= s->edge_emu_buffer + src_offset; | |
553 | 1934 emu=1; |
1935 } | |
1936 } | |
651 | 1937 pix_op[0][dxy](dest_y, ptr, linesize, h); |
0 | 1938 |
485 | 1939 if(s->flags&CODEC_FLAG_GRAY) return; |
1940 | |
0 | 1941 if (s->out_format == FMT_H263) { |
1942 dxy = 0; | |
1943 if ((motion_x & 3) != 0) | |
1944 dxy |= 1; | |
1945 if ((motion_y & 3) != 0) | |
1946 dxy |= 2; | |
1947 mx = motion_x >> 2; | |
1948 my = motion_y >> 2; | |
1949 } else { | |
1950 mx = motion_x / 2; | |
1951 my = motion_y / 2; | |
1952 dxy = ((my & 1) << 1) | (mx & 1); | |
1953 mx >>= 1; | |
1954 my >>= 1; | |
1955 } | |
1956 | |
1957 src_x = s->mb_x * 8 + mx; | |
1958 src_y = s->mb_y * (8 >> field_based) + my; | |
1959 src_x = clip(src_x, -8, s->width >> 1); | |
1960 if (src_x == (s->width >> 1)) | |
1961 dxy &= ~1; | |
1962 src_y = clip(src_y, -8, height >> 1); | |
1963 if (src_y == (height >> 1)) | |
1964 dxy &= ~2; | |
565
44d744901ded
interlaced mpeg2 fix ... replacing linesize>>1 by uvlinesize brainlessly wasnt a good idea
michaelni
parents:
562
diff
changeset
|
1965 offset = (src_y * uvlinesize) + src_x + (src_offset >> 1); |
0 | 1966 ptr = ref_picture[1] + offset; |
553 | 1967 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1968 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - (src_offset >> 1), s->uvlinesize, 9, 9+field_based, |
763 | 1969 src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
1970 ptr= s->edge_emu_buffer + (src_offset >> 1); | |
553 | 1971 } |
651 | 1972 pix_op[1][dxy](dest_cb + (dest_offset >> 1), ptr, uvlinesize, h >> 1); |
553 | 1973 |
0 | 1974 ptr = ref_picture[2] + offset; |
553 | 1975 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
1976 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - (src_offset >> 1), s->uvlinesize, 9, 9+field_based, |
763 | 1977 src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
1978 ptr= s->edge_emu_buffer + (src_offset >> 1); | |
553 | 1979 } |
651 | 1980 pix_op[1][dxy](dest_cr + (dest_offset >> 1), ptr, uvlinesize, h >> 1); |
0 | 1981 } |
1982 | |
255 | 1983 static inline void qpel_motion(MpegEncContext *s, |
1064 | 1984 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
255 | 1985 int dest_offset, |
1064 | 1986 uint8_t **ref_picture, int src_offset, |
651 | 1987 int field_based, op_pixels_func (*pix_op)[4], |
1988 qpel_mc_func (*qpix_op)[16], | |
255 | 1989 int motion_x, int motion_y, int h) |
1990 { | |
1064 | 1991 uint8_t *ptr; |
671 | 1992 int dxy, offset, mx, my, src_x, src_y, height, v_edge_pos, linesize, uvlinesize; |
554 | 1993 int emu=0; |
255 | 1994 |
1995 dxy = ((motion_y & 3) << 2) | (motion_x & 3); | |
1996 src_x = s->mb_x * 16 + (motion_x >> 2); | |
1997 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2); | |
1998 | |
1999 height = s->height >> field_based; | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
2000 v_edge_pos = s->v_edge_pos >> field_based; |
255 | 2001 src_x = clip(src_x, -16, s->width); |
2002 if (src_x == s->width) | |
2003 dxy &= ~3; | |
2004 src_y = clip(src_y, -16, height); | |
2005 if (src_y == height) | |
2006 dxy &= ~12; | |
2007 linesize = s->linesize << field_based; | |
671 | 2008 uvlinesize = s->uvlinesize << field_based; |
255 | 2009 ptr = ref_picture[0] + (src_y * linesize) + src_x + src_offset; |
2010 dest_y += dest_offset; | |
2011 //printf("%d %d %d\n", src_x, src_y, dxy); | |
554 | 2012 |
2013 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
|
2014 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16 |
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
2015 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2016 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - src_offset, s->linesize, 17, 17+field_based, |
763 | 2017 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); |
2018 ptr= s->edge_emu_buffer + src_offset; | |
554 | 2019 emu=1; |
2020 } | |
2021 } | |
671 | 2022 if(!field_based) |
2023 qpix_op[0][dxy](dest_y, ptr, linesize); | |
2024 else{ | |
2025 //damn interlaced mode | |
2026 //FIXME boundary mirroring is not exactly correct here | |
2027 qpix_op[1][dxy](dest_y , ptr , linesize); | |
2028 qpix_op[1][dxy](dest_y+8, ptr+8, linesize); | |
2029 } | |
651 | 2030 |
485 | 2031 if(s->flags&CODEC_FLAG_GRAY) return; |
2032 | |
671 | 2033 if(field_based){ |
2034 mx= motion_x/2; | |
2035 my= motion_y>>1; | |
1048 | 2036 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){ |
2037 static const int rtab[8]= {0,0,1,1,0,0,0,1}; | |
2038 mx= (motion_x>>1) + rtab[motion_x&7]; | |
2039 my= (motion_y>>1) + rtab[motion_y&7]; | |
760 | 2040 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){ |
671 | 2041 mx= (motion_x>>1)|(motion_x&1); |
2042 my= (motion_y>>1)|(motion_y&1); | |
2043 }else{ | |
2044 mx= motion_x/2; | |
2045 my= motion_y/2; | |
2046 } | |
2047 mx= (mx>>1)|(mx&1); | |
2048 my= (my>>1)|(my&1); | |
1048 | 2049 |
671 | 2050 dxy= (mx&1) | ((my&1)<<1); |
2051 mx>>=1; | |
2052 my>>=1; | |
255 | 2053 |
2054 src_x = s->mb_x * 8 + mx; | |
2055 src_y = s->mb_y * (8 >> field_based) + my; | |
2056 src_x = clip(src_x, -8, s->width >> 1); | |
2057 if (src_x == (s->width >> 1)) | |
2058 dxy &= ~1; | |
2059 src_y = clip(src_y, -8, height >> 1); | |
2060 if (src_y == (height >> 1)) | |
2061 dxy &= ~2; | |
2062 | |
671 | 2063 offset = (src_y * uvlinesize) + src_x + (src_offset >> 1); |
255 | 2064 ptr = ref_picture[1] + offset; |
554 | 2065 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2066 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - (src_offset >> 1), s->uvlinesize, 9, 9 + field_based, |
763 | 2067 src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
2068 ptr= s->edge_emu_buffer + (src_offset >> 1); | |
554 | 2069 } |
671 | 2070 pix_op[1][dxy](dest_cb + (dest_offset >> 1), ptr, uvlinesize, h >> 1); |
554 | 2071 |
255 | 2072 ptr = ref_picture[2] + offset; |
554 | 2073 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2074 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - (src_offset >> 1), s->uvlinesize, 9, 9 + field_based, |
763 | 2075 src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
2076 ptr= s->edge_emu_buffer + (src_offset >> 1); | |
554 | 2077 } |
671 | 2078 pix_op[1][dxy](dest_cr + (dest_offset >> 1), ptr, uvlinesize, h >> 1); |
255 | 2079 } |
2080 | |
1013 | 2081 inline int ff_h263_round_chroma(int x){ |
2082 if (x >= 0) | |
2083 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
2084 else { | |
2085 x = -x; | |
2086 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
2087 } | |
2088 } | |
255 | 2089 |
1225 | 2090 /** |
2091 * motion compesation of a single macroblock | |
2092 * @param s context | |
2093 * @param dest_y luma destination pointer | |
2094 * @param dest_cb chroma cb/u destination pointer | |
2095 * @param dest_cr chroma cr/v destination pointer | |
2096 * @param dir direction (0->forward, 1->backward) | |
2097 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
2098 * @param pic_op halfpel motion compensation function (average or put normally) | |
2099 * @param pic_op qpel motion compensation function (average or put normally) | |
2100 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
2101 */ | |
0 | 2102 static inline void MPV_motion(MpegEncContext *s, |
1064 | 2103 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
2104 int dir, uint8_t **ref_picture, | |
651 | 2105 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]) |
0 | 2106 { |
2107 int dxy, offset, mx, my, src_x, src_y, motion_x, motion_y; | |
2108 int mb_x, mb_y, i; | |
1064 | 2109 uint8_t *ptr, *dest; |
554 | 2110 int emu=0; |
0 | 2111 |
2112 mb_x = s->mb_x; | |
2113 mb_y = s->mb_y; | |
2114 | |
2115 switch(s->mv_type) { | |
2116 case MV_TYPE_16X16: | |
1042 | 2117 #ifdef CONFIG_RISKY |
255 | 2118 if(s->mcsel){ |
753 | 2119 if(s->real_sprite_warping_points==1){ |
2120 gmc1_motion(s, dest_y, dest_cb, dest_cr, 0, | |
2121 ref_picture, 0); | |
2122 }else{ | |
2123 gmc_motion(s, dest_y, dest_cb, dest_cr, 0, | |
2124 ref_picture, 0); | |
2125 } | |
651 | 2126 }else if(s->quarter_sample){ |
255 | 2127 qpel_motion(s, dest_y, dest_cb, dest_cr, 0, |
2128 ref_picture, 0, | |
2129 0, pix_op, qpix_op, | |
2130 s->mv[dir][0][0], s->mv[dir][0][1], 16); | |
936 | 2131 }else if(s->mspel){ |
2132 ff_mspel_motion(s, dest_y, dest_cb, dest_cr, | |
2133 ref_picture, pix_op, | |
2134 s->mv[dir][0][0], s->mv[dir][0][1], 16); | |
1042 | 2135 }else |
2136 #endif | |
2137 { | |
255 | 2138 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, |
2139 ref_picture, 0, | |
2140 0, pix_op, | |
2141 s->mv[dir][0][0], s->mv[dir][0][1], 16); | |
2142 } | |
0 | 2143 break; |
2144 case MV_TYPE_8X8: | |
673 | 2145 mx = 0; |
2146 my = 0; | |
2147 if(s->quarter_sample){ | |
2148 for(i=0;i<4;i++) { | |
2149 motion_x = s->mv[dir][i][0]; | |
2150 motion_y = s->mv[dir][i][1]; | |
0 | 2151 |
673 | 2152 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
2153 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8; | |
2154 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8; | |
2155 | |
2156 /* WARNING: do no forget half pels */ | |
2157 src_x = clip(src_x, -16, s->width); | |
2158 if (src_x == s->width) | |
2159 dxy &= ~3; | |
2160 src_y = clip(src_y, -16, s->height); | |
2161 if (src_y == s->height) | |
2162 dxy &= ~12; | |
0 | 2163 |
673 | 2164 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x); |
2165 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
|
2166 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
|
2167 || (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
|
2168 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 | 2169 ptr= s->edge_emu_buffer; |
2170 } | |
2171 } | |
2172 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize; | |
2173 qpix_op[1][dxy](dest, ptr, s->linesize); | |
2174 | |
2175 mx += s->mv[dir][i][0]/2; | |
2176 my += s->mv[dir][i][1]/2; | |
2177 } | |
2178 }else{ | |
2179 for(i=0;i<4;i++) { | |
2180 motion_x = s->mv[dir][i][0]; | |
2181 motion_y = s->mv[dir][i][1]; | |
2182 | |
2183 dxy = ((motion_y & 1) << 1) | (motion_x & 1); | |
2184 src_x = mb_x * 16 + (motion_x >> 1) + (i & 1) * 8; | |
2185 src_y = mb_y * 16 + (motion_y >> 1) + (i >>1) * 8; | |
0 | 2186 |
673 | 2187 /* WARNING: do no forget half pels */ |
2188 src_x = clip(src_x, -16, s->width); | |
2189 if (src_x == s->width) | |
2190 dxy &= ~1; | |
2191 src_y = clip(src_y, -16, s->height); | |
2192 if (src_y == s->height) | |
2193 dxy &= ~2; | |
2194 | |
2195 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x); | |
2196 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
|
2197 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 8 |
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
2198 || (unsigned)src_y > s->v_edge_pos - (motion_y&1) - 8){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2199 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 | 2200 ptr= s->edge_emu_buffer; |
2201 } | |
554 | 2202 } |
673 | 2203 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize; |
2204 pix_op[1][dxy](dest, ptr, s->linesize, 8); | |
2205 | |
2206 mx += s->mv[dir][i][0]; | |
2207 my += s->mv[dir][i][1]; | |
554 | 2208 } |
0 | 2209 } |
673 | 2210 |
485 | 2211 if(s->flags&CODEC_FLAG_GRAY) break; |
0 | 2212 /* In case of 8X8, we construct a single chroma motion vector |
2213 with a special rounding */ | |
1013 | 2214 mx= ff_h263_round_chroma(mx); |
2215 my= ff_h263_round_chroma(my); | |
0 | 2216 dxy = ((my & 1) << 1) | (mx & 1); |
2217 mx >>= 1; | |
2218 my >>= 1; | |
2219 | |
2220 src_x = mb_x * 8 + mx; | |
2221 src_y = mb_y * 8 + my; | |
2222 src_x = clip(src_x, -8, s->width/2); | |
2223 if (src_x == s->width/2) | |
2224 dxy &= ~1; | |
2225 src_y = clip(src_y, -8, s->height/2); | |
2226 if (src_y == s->height/2) | |
2227 dxy &= ~2; | |
2228 | |
556 | 2229 offset = (src_y * (s->uvlinesize)) + src_x; |
0 | 2230 ptr = ref_picture[1] + offset; |
554 | 2231 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
|
2232 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8 |
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
2233 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2234 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); |
554 | 2235 ptr= s->edge_emu_buffer; |
2236 emu=1; | |
2237 } | |
2238 } | |
651 | 2239 pix_op[1][dxy](dest_cb, ptr, s->uvlinesize, 8); |
554 | 2240 |
0 | 2241 ptr = ref_picture[2] + offset; |
554 | 2242 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2243 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); |
554 | 2244 ptr= s->edge_emu_buffer; |
2245 } | |
651 | 2246 pix_op[1][dxy](dest_cr, ptr, s->uvlinesize, 8); |
0 | 2247 break; |
2248 case MV_TYPE_FIELD: | |
2249 if (s->picture_structure == PICT_FRAME) { | |
671 | 2250 if(s->quarter_sample){ |
2251 /* top field */ | |
2252 qpel_motion(s, dest_y, dest_cb, dest_cr, 0, | |
2253 ref_picture, s->field_select[dir][0] ? s->linesize : 0, | |
2254 1, pix_op, qpix_op, | |
2255 s->mv[dir][0][0], s->mv[dir][0][1], 8); | |
2256 /* bottom field */ | |
2257 qpel_motion(s, dest_y, dest_cb, dest_cr, s->linesize, | |
2258 ref_picture, s->field_select[dir][1] ? s->linesize : 0, | |
2259 1, pix_op, qpix_op, | |
2260 s->mv[dir][1][0], s->mv[dir][1][1], 8); | |
2261 }else{ | |
2262 /* top field */ | |
2263 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, | |
2264 ref_picture, s->field_select[dir][0] ? s->linesize : 0, | |
2265 1, pix_op, | |
2266 s->mv[dir][0][0], s->mv[dir][0][1], 8); | |
2267 /* bottom field */ | |
2268 mpeg_motion(s, dest_y, dest_cb, dest_cr, s->linesize, | |
2269 ref_picture, s->field_select[dir][1] ? s->linesize : 0, | |
2270 1, pix_op, | |
2271 s->mv[dir][1][0], s->mv[dir][1][1], 8); | |
2272 } | |
0 | 2273 } else { |
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
|
2274 int offset; |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
2275 if(s->picture_structure == s->field_select[dir][0] + 1 || s->pict_type == B_TYPE || s->first_field){ |
1138 | 2276 offset= s->field_select[dir][0] ? s->linesize : 0; |
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
|
2277 }else{ |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
2278 ref_picture= s->current_picture.data; |
1138 | 2279 offset= s->field_select[dir][0] ? s->linesize : -s->linesize; |
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
|
2280 } |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
2281 |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
2282 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
2283 ref_picture, offset, |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
2284 0, pix_op, |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
2285 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
0 | 2286 } |
2287 break; | |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2288 case MV_TYPE_16X8:{ |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2289 int offset; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2290 uint8_t ** ref2picture; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2291 |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2292 if(s->picture_structure == s->field_select[dir][0] + 1 || s->pict_type == B_TYPE || s->first_field){ |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2293 ref2picture= ref_picture; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2294 offset= s->field_select[dir][0] ? s->linesize : 0; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2295 }else{ |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2296 ref2picture= s->current_picture.data; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2297 offset= s->field_select[dir][0] ? s->linesize : -s->linesize; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2298 } |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2299 |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2300 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2301 ref2picture, offset, |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2302 0, pix_op, |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2303 s->mv[dir][0][0], s->mv[dir][0][1], 8); |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2304 |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2305 |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2306 if(s->picture_structure == s->field_select[dir][1] + 1 || s->pict_type == B_TYPE || s->first_field){ |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2307 ref2picture= ref_picture; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2308 offset= s->field_select[dir][1] ? s->linesize : 0; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2309 }else{ |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2310 ref2picture= s->current_picture.data; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2311 offset= s->field_select[dir][1] ? s->linesize : -s->linesize; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2312 } |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2313 // I know it is ugly but this is the only way to fool emu_edge without rewrite mpeg_motion |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2314 mpeg_motion(s, dest_y+16*s->linesize, dest_cb+8*s->uvlinesize, dest_cr+8*s->uvlinesize, |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2315 0, |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2316 ref2picture, offset, |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2317 0, pix_op, |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2318 s->mv[dir][1][0], s->mv[dir][1][1]+16, 8); |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2319 } |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2320 |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
2321 break; |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2322 case MV_TYPE_DMV: |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2323 { |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2324 op_pixels_func (*dmv_pix_op)[4]; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2325 int offset; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2326 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2327 dmv_pix_op = s->dsp.put_pixels_tab; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2328 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2329 if(s->picture_structure == PICT_FRAME){ |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2330 //put top field from top field |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2331 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2332 ref_picture, 0, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2333 1, dmv_pix_op, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2334 s->mv[dir][0][0], s->mv[dir][0][1], 8); |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2335 //put bottom field from bottom field |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2336 mpeg_motion(s, dest_y, dest_cb, dest_cr, s->linesize, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2337 ref_picture, s->linesize, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2338 1, dmv_pix_op, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2339 s->mv[dir][0][0], s->mv[dir][0][1], 8); |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2340 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2341 dmv_pix_op = s->dsp.avg_pixels_tab; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2342 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2343 //avg top field from bottom field |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2344 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2345 ref_picture, s->linesize, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2346 1, dmv_pix_op, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2347 s->mv[dir][2][0], s->mv[dir][2][1], 8); |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2348 //avg bottom field from top field |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2349 mpeg_motion(s, dest_y, dest_cb, dest_cr, s->linesize, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2350 ref_picture, 0, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2351 1, dmv_pix_op, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2352 s->mv[dir][3][0], s->mv[dir][3][1], 8); |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2353 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2354 }else{ |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2355 offset=(s->picture_structure == PICT_BOTTOM_FIELD)? |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2356 s->linesize : 0; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2357 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2358 //put field from the same parity |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2359 //same parity is never in the same frame |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2360 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2361 ref_picture,offset, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2362 0,dmv_pix_op, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2363 s->mv[dir][0][0],s->mv[dir][0][1],16); |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2364 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2365 // after put we make avg of the same block |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2366 dmv_pix_op=s->dsp.avg_pixels_tab; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2367 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2368 //opposite parity is always in the same frame if this is second field |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2369 if(!s->first_field){ |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2370 ref_picture = s->current_picture.data; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2371 //top field is one linesize from frame beginig |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2372 offset=(s->picture_structure == PICT_BOTTOM_FIELD)? |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2373 -s->linesize : s->linesize; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2374 }else |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2375 offset=(s->picture_structure == PICT_BOTTOM_FIELD)? |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2376 0 : s->linesize; |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2377 |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2378 //avg field from the opposite parity |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2379 mpeg_motion(s, dest_y, dest_cb, dest_cr,0, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2380 ref_picture, offset, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2381 0,dmv_pix_op, |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2382 s->mv[dir][2][0],s->mv[dir][2][1],16); |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2383 } |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2384 } |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
2385 break; |
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
|
2386 |
0 | 2387 } |
2388 } | |
2389 | |
2390 | |
2391 /* put block[] to dest[] */ | |
2392 static inline void put_dct(MpegEncContext *s, | |
1064 | 2393 DCTELEM *block, int i, uint8_t *dest, int line_size) |
0 | 2394 { |
711 | 2395 s->dct_unquantize(s, block, i, s->qscale); |
1092 | 2396 s->dsp.idct_put (dest, line_size, block); |
0 | 2397 } |
2398 | |
2399 /* add block[] to dest[] */ | |
2400 static inline void add_dct(MpegEncContext *s, | |
1064 | 2401 DCTELEM *block, int i, uint8_t *dest, int line_size) |
0 | 2402 { |
2403 if (s->block_last_index[i] >= 0) { | |
1092 | 2404 s->dsp.idct_add (dest, line_size, block); |
481 | 2405 } |
2406 } | |
2407 | |
2408 static inline void add_dequant_dct(MpegEncContext *s, | |
1064 | 2409 DCTELEM *block, int i, uint8_t *dest, int line_size) |
481 | 2410 { |
2411 if (s->block_last_index[i] >= 0) { | |
2412 s->dct_unquantize(s, block, i, s->qscale); | |
324 | 2413 |
1092 | 2414 s->dsp.idct_add (dest, line_size, block); |
0 | 2415 } |
2416 } | |
2417 | |
456 | 2418 /** |
2419 * cleans dc, ac, coded_block for the current non intra MB | |
2420 */ | |
2421 void ff_clean_intra_table_entries(MpegEncContext *s) | |
2422 { | |
2423 int wrap = s->block_wrap[0]; | |
2424 int xy = s->block_index[0]; | |
2425 | |
2426 s->dc_val[0][xy ] = | |
2427 s->dc_val[0][xy + 1 ] = | |
2428 s->dc_val[0][xy + wrap] = | |
2429 s->dc_val[0][xy + 1 + wrap] = 1024; | |
2430 /* ac pred */ | |
1064 | 2431 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); |
2432 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); | |
456 | 2433 if (s->msmpeg4_version>=3) { |
2434 s->coded_block[xy ] = | |
2435 s->coded_block[xy + 1 ] = | |
2436 s->coded_block[xy + wrap] = | |
2437 s->coded_block[xy + 1 + wrap] = 0; | |
2438 } | |
2439 /* chroma */ | |
2440 wrap = s->block_wrap[4]; | |
2441 xy = s->mb_x + 1 + (s->mb_y + 1) * wrap; | |
2442 s->dc_val[1][xy] = | |
2443 s->dc_val[2][xy] = 1024; | |
2444 /* ac pred */ | |
1064 | 2445 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t)); |
2446 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t)); | |
456 | 2447 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
2448 s->mbintra_table[s->mb_x + s->mb_y*s->mb_stride]= 0; |
456 | 2449 } |
2450 | |
0 | 2451 /* generic function called after a macroblock has been parsed by the |
2452 decoder or after it has been encoded by the encoder. | |
2453 | |
2454 Important variables used: | |
2455 s->mb_intra : true if intra macroblock | |
2456 s->mv_dir : motion vector direction | |
2457 s->mv_type : motion vector type | |
2458 s->mv : motion vector | |
2459 s->interlaced_dct : true if interlaced dct used (mpeg2) | |
2460 */ | |
2461 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) | |
2462 { | |
244 | 2463 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
|
2464 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; |
1381 | 2465 #ifdef HAVE_XVMC |
2466 if(s->avctx->xvmc_acceleration){ | |
2467 XVMC_decode_mb(s,block); | |
2468 return; | |
2469 } | |
2470 #endif | |
0 | 2471 |
2472 mb_x = s->mb_x; | |
2473 mb_y = s->mb_y; | |
2474 | |
903 | 2475 s->current_picture.qscale_table[mb_xy]= s->qscale; |
108
1e4a4af694d1
exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents:
79
diff
changeset
|
2476 |
0 | 2477 /* update DC predictors for P macroblocks */ |
2478 if (!s->mb_intra) { | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2479 if (s->h263_pred || s->h263_aic) { |
481 | 2480 if(s->mbintra_table[mb_xy]) |
456 | 2481 ff_clean_intra_table_entries(s); |
0 | 2482 } else { |
456 | 2483 s->last_dc[0] = |
2484 s->last_dc[1] = | |
0 | 2485 s->last_dc[2] = 128 << s->intra_dc_precision; |
2486 } | |
2487 } | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
2488 else if (s->h263_pred || s->h263_aic) |
481 | 2489 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
|
2490 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2491 if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { //FIXME precalc |
1064 | 2492 uint8_t *dest_y, *dest_cb, *dest_cr; |
481 | 2493 int dct_linesize, dct_offset; |
651 | 2494 op_pixels_func (*op_pix)[4]; |
2495 qpel_mc_func (*op_qpix)[16]; | |
1138 | 2496 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics |
2497 const int uvlinesize= s->current_picture.linesize[1]; | |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
2498 |
903 | 2499 /* avoid copy if macroblock skipped in last frame too */ |
2500 /* skip only during decoding as we might trash the buffers during encoding a bit */ | |
2501 if(!s->encoding){ | |
1064 | 2502 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy]; |
903 | 2503 const int age= s->current_picture.age; |
2504 | |
2505 assert(age); | |
2506 | |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
2507 if (s->mb_skiped) { |
903 | 2508 s->mb_skiped= 0; |
2509 assert(s->pict_type!=I_TYPE); | |
2510 | |
556 | 2511 (*mbskip_ptr) ++; /* indicate that this time we skiped it */ |
2512 if(*mbskip_ptr >99) *mbskip_ptr= 99; | |
2513 | |
903 | 2514 /* 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
|
2515 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
|
2516 return; |
903 | 2517 } |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
2518 } 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
|
2519 (*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
|
2520 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
|
2521 } else{ |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
2522 *mbskip_ptr = 0; /* not skipped */ |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
2523 } |
717 | 2524 } |
0 | 2525 |
2526 if (s->interlaced_dct) { | |
1138 | 2527 dct_linesize = linesize * 2; |
2528 dct_offset = linesize; | |
0 | 2529 } else { |
1138 | 2530 dct_linesize = linesize; |
2531 dct_offset = linesize * 8; | |
0 | 2532 } |
1389 | 2533 |
2534 dest_y= s->dest[0]; | |
2535 dest_cb= s->dest[1]; | |
2536 dest_cr= s->dest[2]; | |
0 | 2537 |
2538 if (!s->mb_intra) { | |
2539 /* motion handling */ | |
456 | 2540 /* decoding or more than one mb_type (MC was allready done otherwise) */ |
1389 | 2541 if(!s->encoding){ |
327 | 2542 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
|
2543 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
|
2544 op_qpix= s->dsp.put_qpel_pixels_tab; |
324 | 2545 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2546 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
|
2547 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; |
324 | 2548 } |
0 | 2549 |
324 | 2550 if (s->mv_dir & MV_DIR_FORWARD) { |
903 | 2551 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
|
2552 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
|
2553 op_qpix= s->dsp.avg_qpel_pixels_tab; |
324 | 2554 } |
2555 if (s->mv_dir & MV_DIR_BACKWARD) { | |
903 | 2556 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); |
324 | 2557 } |
0 | 2558 } |
2559 | |
481 | 2560 /* skip dequant / idct if we are really late ;) */ |
814 | 2561 if(s->hurry_up>1) return; |
481 | 2562 |
0 | 2563 /* add dct residue */ |
1421 | 2564 if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO |
711 | 2565 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){ |
481 | 2566 add_dequant_dct(s, block[0], 0, dest_y, dct_linesize); |
2567 add_dequant_dct(s, block[1], 1, dest_y + 8, dct_linesize); | |
2568 add_dequant_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize); | |
2569 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize); | |
0 | 2570 |
485 | 2571 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1138 | 2572 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize); |
2573 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize); | |
485 | 2574 } |
936 | 2575 } else if(s->codec_id != CODEC_ID_WMV2){ |
481 | 2576 add_dct(s, block[0], 0, dest_y, dct_linesize); |
2577 add_dct(s, block[1], 1, dest_y + 8, dct_linesize); | |
2578 add_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize); | |
2579 add_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize); | |
2580 | |
485 | 2581 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1138 | 2582 add_dct(s, block[4], 4, dest_cb, uvlinesize); |
2583 add_dct(s, block[5], 5, dest_cr, uvlinesize); | |
485 | 2584 } |
1042 | 2585 } |
2586 #ifdef CONFIG_RISKY | |
2587 else{ | |
936 | 2588 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); |
481 | 2589 } |
1042 | 2590 #endif |
0 | 2591 } else { |
2592 /* dct only in intra block */ | |
1421 | 2593 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ |
711 | 2594 put_dct(s, block[0], 0, dest_y, dct_linesize); |
2595 put_dct(s, block[1], 1, dest_y + 8, dct_linesize); | |
2596 put_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize); | |
2597 put_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize); | |
0 | 2598 |
711 | 2599 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1138 | 2600 put_dct(s, block[4], 4, dest_cb, uvlinesize); |
2601 put_dct(s, block[5], 5, dest_cr, uvlinesize); | |
711 | 2602 } |
2603 }else{ | |
1092 | 2604 s->dsp.idct_put(dest_y , dct_linesize, block[0]); |
2605 s->dsp.idct_put(dest_y + 8, dct_linesize, block[1]); | |
2606 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]); | |
2607 s->dsp.idct_put(dest_y + dct_offset + 8, dct_linesize, block[3]); | |
711 | 2608 |
2609 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1138 | 2610 s->dsp.idct_put(dest_cb, uvlinesize, block[4]); |
2611 s->dsp.idct_put(dest_cr, uvlinesize, block[5]); | |
711 | 2612 } |
485 | 2613 } |
0 | 2614 } |
2615 } | |
294 | 2616 } |
2617 | |
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
|
2618 #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
|
2619 |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
2620 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold) |
456 | 2621 { |
2622 static const char tab[64]= | |
2623 {3,2,2,1,1,1,1,1, | |
2624 1,1,1,1,1,1,1,1, | |
2625 1,1,1,1,1,1,1,1, | |
2626 0,0,0,0,0,0,0,0, | |
2627 0,0,0,0,0,0,0,0, | |
2628 0,0,0,0,0,0,0,0, | |
2629 0,0,0,0,0,0,0,0, | |
2630 0,0,0,0,0,0,0,0}; | |
2631 int score=0; | |
2632 int run=0; | |
2633 int i; | |
2634 DCTELEM *block= s->block[n]; | |
2635 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
|
2636 int skip_dc; |
456 | 2637 |
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
|
2638 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
|
2639 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
|
2640 threshold= -threshold; |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
2641 }else |
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
2642 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
|
2643 |
456 | 2644 /* are all which we could set to zero are allready zero? */ |
2645 if(last_index<=skip_dc - 1) return; | |
2646 | |
2647 for(i=0; i<=last_index; i++){ | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2648 const int j = s->intra_scantable.permutated[i]; |
456 | 2649 const int level = ABS(block[j]); |
2650 if(level==1){ | |
2651 if(skip_dc && i==0) continue; | |
2652 score+= tab[run]; | |
2653 run=0; | |
2654 }else if(level>1){ | |
2655 return; | |
2656 }else{ | |
2657 run++; | |
2658 } | |
2659 } | |
2660 if(score >= threshold) return; | |
2661 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
|
2662 const int j = s->intra_scantable.permutated[i]; |
456 | 2663 block[j]=0; |
2664 } | |
2665 if(block[0]) s->block_last_index[n]= 0; | |
2666 else s->block_last_index[n]= -1; | |
2667 } | |
2668 | |
344 | 2669 static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index) |
2670 { | |
2671 int i; | |
2672 const int maxlevel= s->max_qcoeff; | |
2673 const int minlevel= s->min_qcoeff; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2674 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2675 if(s->mb_intra){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2676 i=1; //skip clipping of intra dc |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2677 }else |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2678 i=0; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2679 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2680 for(;i<=last_index; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
2681 const int j= s->intra_scantable.permutated[i]; |
344 | 2682 int level = block[j]; |
2683 | |
2684 if (level>maxlevel) level=maxlevel; | |
2685 else if(level<minlevel) level=minlevel; | |
1099 | 2686 |
344 | 2687 block[j]= level; |
2688 } | |
2689 } | |
324 | 2690 |
697 | 2691 #if 0 |
1064 | 2692 static int pix_vcmp16x8(uint8_t *s, int stride){ //FIXME move to dsputil & optimize |
697 | 2693 int score=0; |
2694 int x,y; | |
2695 | |
2696 for(y=0; y<7; y++){ | |
2697 for(x=0; x<16; x+=4){ | |
2698 score+= ABS(s[x ] - s[x +stride]) + ABS(s[x+1] - s[x+1+stride]) | |
2699 +ABS(s[x+2] - s[x+2+stride]) + ABS(s[x+3] - s[x+3+stride]); | |
2700 } | |
2701 s+= stride; | |
2702 } | |
2703 | |
2704 return score; | |
2705 } | |
2706 | |
1064 | 2707 static int pix_diff_vcmp16x8(uint8_t *s1, uint8_t*s2, int stride){ //FIXME move to dsputil & optimize |
697 | 2708 int score=0; |
2709 int x,y; | |
2710 | |
2711 for(y=0; y<7; y++){ | |
2712 for(x=0; x<16; x++){ | |
2713 score+= ABS(s1[x ] - s2[x ] - s1[x +stride] + s2[x +stride]); | |
2714 } | |
2715 s1+= stride; | |
2716 s2+= stride; | |
2717 } | |
2718 | |
2719 return score; | |
2720 } | |
2721 #else | |
2722 #define SQ(a) ((a)*(a)) | |
2723 | |
1064 | 2724 static int pix_vcmp16x8(uint8_t *s, int stride){ //FIXME move to dsputil & optimize |
697 | 2725 int score=0; |
2726 int x,y; | |
2727 | |
2728 for(y=0; y<7; y++){ | |
2729 for(x=0; x<16; x+=4){ | |
2730 score+= SQ(s[x ] - s[x +stride]) + SQ(s[x+1] - s[x+1+stride]) | |
2731 +SQ(s[x+2] - s[x+2+stride]) + SQ(s[x+3] - s[x+3+stride]); | |
2732 } | |
2733 s+= stride; | |
2734 } | |
2735 | |
2736 return score; | |
2737 } | |
2738 | |
1064 | 2739 static int pix_diff_vcmp16x8(uint8_t *s1, uint8_t*s2, int stride){ //FIXME move to dsputil & optimize |
697 | 2740 int score=0; |
2741 int x,y; | |
2742 | |
2743 for(y=0; y<7; y++){ | |
2744 for(x=0; x<16; x++){ | |
2745 score+= SQ(s1[x ] - s2[x ] - s1[x +stride] + s2[x +stride]); | |
2746 } | |
2747 s1+= stride; | |
2748 s2+= stride; | |
2749 } | |
2750 | |
2751 return score; | |
2752 } | |
2753 | |
2754 #endif | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
2755 |
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
|
2756 #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
|
2757 |
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
2758 /** |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
2759 * |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
2760 * @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
|
2761 */ |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
2762 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){ |
1368 | 2763 if (s->avctx->draw_horiz_band) { |
1370 | 2764 AVFrame *src; |
1368 | 2765 int offset[4]; |
1370 | 2766 |
2767 if(s->picture_structure != PICT_FRAME){ | |
2768 h <<= 1; | |
2769 y <<= 1; | |
2770 if(s->first_field && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return; | |
2771 } | |
2772 | |
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
2773 h= FFMIN(h, s->height - y); |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
2774 |
1370 | 2775 if(s->pict_type==B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER)) |
2776 src= (AVFrame*)s->current_picture_ptr; | |
2777 else if(s->last_picture_ptr) | |
2778 src= (AVFrame*)s->last_picture_ptr; | |
2779 else | |
2780 return; | |
2781 | |
1369 | 2782 if(s->pict_type==B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){ |
1368 | 2783 offset[0]= |
2784 offset[1]= | |
2785 offset[2]= | |
2786 offset[3]= 0; | |
2787 }else{ | |
2788 offset[0]= y * s->linesize;; | |
2789 offset[1]= | |
2790 offset[2]= (y>>1) * s->uvlinesize;; | |
2791 offset[3]= 0; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
2792 } |
1368 | 2793 |
813 | 2794 emms_c(); |
2795 | |
1370 | 2796 s->avctx->draw_horiz_band(s->avctx, src, offset, |
2797 y, s->picture_structure, h); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
2798 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
2799 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
2800 |
1389 | 2801 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename |
2802 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics | |
2803 const int uvlinesize= s->current_picture.linesize[1]; | |
2804 | |
2805 s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1 + s->mb_x*2; | |
2806 s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1) + s->mb_x*2; | |
2807 s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1 + s->mb_x*2; | |
2808 s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2) + s->mb_x*2; | |
2809 s->block_index[4]= s->block_wrap[4]*(s->mb_y + 1) + s->block_wrap[0]*(s->mb_height*2 + 2) + s->mb_x; | |
2810 s->block_index[5]= s->block_wrap[4]*(s->mb_y + 1 + s->mb_height + 2) + s->block_wrap[0]*(s->mb_height*2 + 2) + s->mb_x; | |
2811 | |
2812 if(s->pict_type==B_TYPE && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME){ | |
2813 s->dest[0] = s->current_picture.data[0] + s->mb_x * 16 - 16; | |
2814 s->dest[1] = s->current_picture.data[1] + s->mb_x * 8 - 8; | |
2815 s->dest[2] = s->current_picture.data[2] + s->mb_x * 8 - 8; | |
2816 }else{ | |
2817 s->dest[0] = s->current_picture.data[0] + (s->mb_y * 16* linesize ) + s->mb_x * 16 - 16; | |
2818 s->dest[1] = s->current_picture.data[1] + (s->mb_y * 8 * uvlinesize) + s->mb_x * 8 - 8; | |
2819 s->dest[2] = s->current_picture.data[2] + (s->mb_y * 8 * uvlinesize) + s->mb_x * 8 - 8; | |
2820 } | |
2821 } | |
2822 | |
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
|
2823 #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
|
2824 |
324 | 2825 static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) |
294 | 2826 { |
2827 const int mb_x= s->mb_x; | |
2828 const int mb_y= s->mb_y; | |
2829 int i; | |
456 | 2830 int skip_dct[6]; |
697 | 2831 int dct_offset = s->linesize*8; //default for progressive frames |
2832 | |
456 | 2833 for(i=0; i<6; i++) skip_dct[i]=0; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2834 |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2835 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
|
2836 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
|
2837 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
|
2838 |
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
|
2839 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
|
2840 update_qscale(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
|
2841 s->dquant= s->qscale - last_qp; |
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
|
2842 |
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
|
2843 if(s->out_format==FMT_H263) |
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
|
2844 s->dquant= clip(s->dquant, -2, 2); //FIXME RD |
697 | 2845 |
2846 if(s->codec_id==CODEC_ID_MPEG4){ | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2847 if(!s->mb_intra){ |
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
|
2848 if((s->mv_dir&MV_DIRECT) || s->mv_type==MV_TYPE_8X8) |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2849 s->dquant=0; |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2850 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2851 } |
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
|
2852 s->qscale= last_qp + s->dquant; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2853 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2854 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
2855 } |
294 | 2856 |
324 | 2857 if (s->mb_intra) { |
1064 | 2858 uint8_t *ptr; |
697 | 2859 int wrap_y; |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2860 int emu=0; |
294 | 2861 |
697 | 2862 wrap_y = s->linesize; |
903 | 2863 ptr = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16; |
697 | 2864 |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2865 if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2866 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, wrap_y, 16, 16, mb_x*16, mb_y*16, s->width, s->height); |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2867 ptr= s->edge_emu_buffer; |
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2868 emu=1; |
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2869 } |
697 | 2870 |
2871 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ | |
2872 int progressive_score, interlaced_score; | |
2873 | |
2874 progressive_score= pix_vcmp16x8(ptr, wrap_y ) + pix_vcmp16x8(ptr + wrap_y*8, wrap_y ); | |
2875 interlaced_score = pix_vcmp16x8(ptr, wrap_y*2) + pix_vcmp16x8(ptr + wrap_y , wrap_y*2); | |
2876 | |
2877 if(progressive_score > interlaced_score + 100){ | |
2878 s->interlaced_dct=1; | |
2879 | |
2880 dct_offset= wrap_y; | |
2881 wrap_y<<=1; | |
2882 }else | |
2883 s->interlaced_dct=0; | |
2884 } | |
2885 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2886 s->dsp.get_pixels(s->block[0], ptr , wrap_y); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2887 s->dsp.get_pixels(s->block[1], ptr + 8, wrap_y); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2888 s->dsp.get_pixels(s->block[2], ptr + dct_offset , wrap_y); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2889 s->dsp.get_pixels(s->block[3], ptr + dct_offset + 8, wrap_y); |
294 | 2890 |
487 | 2891 if(s->flags&CODEC_FLAG_GRAY){ |
2892 skip_dct[4]= 1; | |
2893 skip_dct[5]= 1; | |
2894 }else{ | |
697 | 2895 int wrap_c = s->uvlinesize; |
903 | 2896 ptr = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8; |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2897 if(emu){ |
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, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2899 ptr= s->edge_emu_buffer; |
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2900 } |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2901 s->dsp.get_pixels(s->block[4], ptr, wrap_c); |
294 | 2902 |
903 | 2903 ptr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8; |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2904 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2905 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2906 ptr= s->edge_emu_buffer; |
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2907 } |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2908 s->dsp.get_pixels(s->block[5], ptr, wrap_c); |
487 | 2909 } |
324 | 2910 }else{ |
651 | 2911 op_pixels_func (*op_pix)[4]; |
2912 qpel_mc_func (*op_qpix)[16]; | |
1064 | 2913 uint8_t *dest_y, *dest_cb, *dest_cr; |
2914 uint8_t *ptr_y, *ptr_cb, *ptr_cr; | |
456 | 2915 int wrap_y, wrap_c; |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2916 int emu=0; |
294 | 2917 |
1389 | 2918 dest_y = s->dest[0]; |
2919 dest_cb = s->dest[1]; | |
2920 dest_cr = s->dest[2]; | |
456 | 2921 wrap_y = s->linesize; |
697 | 2922 wrap_c = s->uvlinesize; |
903 | 2923 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16; |
2924 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
2925 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
324 | 2926 |
327 | 2927 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
|
2928 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
|
2929 op_qpix= s->dsp.put_qpel_pixels_tab; |
295 | 2930 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2931 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
|
2932 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; |
324 | 2933 } |
295 | 2934 |
324 | 2935 if (s->mv_dir & MV_DIR_FORWARD) { |
903 | 2936 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
|
2937 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
|
2938 op_qpix= s->dsp.avg_qpel_pixels_tab; |
324 | 2939 } |
2940 if (s->mv_dir & MV_DIR_BACKWARD) { | |
903 | 2941 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); |
324 | 2942 } |
295 | 2943 |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2944 if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2945 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, wrap_y, 16, 16, mb_x*16, mb_y*16, s->width, s->height); |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2946 ptr_y= s->edge_emu_buffer; |
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2947 emu=1; |
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2948 } |
697 | 2949 |
2950 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ | |
2951 int progressive_score, interlaced_score; | |
2952 | |
2953 progressive_score= pix_diff_vcmp16x8(ptr_y , dest_y , wrap_y ) | |
2954 + pix_diff_vcmp16x8(ptr_y + wrap_y*8, dest_y + wrap_y*8, wrap_y ); | |
2955 interlaced_score = pix_diff_vcmp16x8(ptr_y , dest_y , wrap_y*2) | |
2956 + pix_diff_vcmp16x8(ptr_y + wrap_y , dest_y + wrap_y , wrap_y*2); | |
2957 | |
2958 if(progressive_score > interlaced_score + 600){ | |
2959 s->interlaced_dct=1; | |
2960 | |
2961 dct_offset= wrap_y; | |
2962 wrap_y<<=1; | |
2963 }else | |
2964 s->interlaced_dct=0; | |
2965 } | |
2966 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2967 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
|
2968 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
|
2969 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
|
2970 s->dsp.diff_pixels(s->block[3], ptr_y + dct_offset + 8, dest_y + dct_offset + 8, wrap_y); |
487 | 2971 |
2972 if(s->flags&CODEC_FLAG_GRAY){ | |
2973 skip_dct[4]= 1; | |
2974 skip_dct[5]= 1; | |
2975 }else{ | |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2976 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2977 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2978 ptr_cb= s->edge_emu_buffer; |
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2979 } |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2980 s->dsp.diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c); |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2981 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2982 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
570
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2983 ptr_cr= s->edge_emu_buffer; |
274d9c5a75ee
use edge emu for encoding of width or height %16!=0 files
michaelni
parents:
569
diff
changeset
|
2984 } |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2985 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c); |
487 | 2986 } |
456 | 2987 /* 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
|
2988 if(s->current_picture.mc_mb_var[s->mb_stride*mb_y+ mb_x]<2*s->qscale*s->qscale){ |
697 | 2989 //FIXME optimize |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2990 if(s->dsp.pix_abs8x8(ptr_y , dest_y , wrap_y) < 20*s->qscale) skip_dct[0]= 1; |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2991 if(s->dsp.pix_abs8x8(ptr_y + 8, dest_y + 8, wrap_y) < 20*s->qscale) skip_dct[1]= 1; |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2992 if(s->dsp.pix_abs8x8(ptr_y +dct_offset , dest_y +dct_offset , wrap_y) < 20*s->qscale) skip_dct[2]= 1; |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2993 if(s->dsp.pix_abs8x8(ptr_y +dct_offset+ 8, dest_y +dct_offset+ 8, wrap_y) < 20*s->qscale) skip_dct[3]= 1; |
899 | 2994 if(s->dsp.pix_abs8x8(ptr_cb , dest_cb , wrap_c) < 20*s->qscale) skip_dct[4]= 1; |
2995 if(s->dsp.pix_abs8x8(ptr_cr , dest_cr , wrap_c) < 20*s->qscale) skip_dct[5]= 1; | |
456 | 2996 #if 0 |
2997 { | |
2998 static int stat[7]; | |
2999 int num=0; | |
3000 for(i=0; i<6; i++) | |
3001 if(skip_dct[i]) num++; | |
3002 stat[num]++; | |
3003 | |
3004 if(s->mb_x==0 && s->mb_y==0){ | |
3005 for(i=0; i<7; i++){ | |
3006 printf("%6d %1d\n", stat[i], i); | |
3007 } | |
3008 } | |
3009 } | |
3010 #endif | |
3011 } | |
324 | 3012 |
294 | 3013 } |
3014 | |
3015 /* DCT & quantize */ | |
344 | 3016 if(s->out_format==FMT_MJPEG){ |
3017 for(i=0;i<6;i++) { | |
3018 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
|
3019 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, 8, &overflow); |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
3020 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); |
344 | 3021 } |
3022 }else{ | |
3023 for(i=0;i<6;i++) { | |
456 | 3024 if(!skip_dct[i]){ |
3025 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
|
3026 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, s->qscale, &overflow); |
344 | 3027 // 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
|
3028 // 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
|
3029 // of improve it. Just INTRADC clipping deserves changes in quantizer |
456 | 3030 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); |
3031 }else | |
3032 s->block_last_index[i]= -1; | |
344 | 3033 } |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
3034 |
456 | 3035 if(s->luma_elim_threshold && !s->mb_intra) |
3036 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
|
3037 dct_single_coeff_elimination(s, i, s->luma_elim_threshold); |
456 | 3038 if(s->chroma_elim_threshold && !s->mb_intra) |
3039 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
|
3040 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold); |
1497 | 3041 |
3042 if(s->flags & CODEC_FLAG_CBP_RD){ | |
3043 for(i=0;i<6;i++) { | |
3044 if(s->block_last_index[i] == -1) | |
3045 s->coded_score[i]= INT_MAX/256; | |
3046 } | |
3047 } | |
294 | 3048 } |
3049 | |
487 | 3050 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ |
3051 s->block_last_index[4]= | |
3052 s->block_last_index[5]= 0; | |
3053 s->block[4][0]= | |
1011 | 3054 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale; |
487 | 3055 } |
3056 | |
294 | 3057 /* huffman encode */ |
936 | 3058 switch(s->codec_id){ //FIXME funct ptr could be slightly faster |
3059 case CODEC_ID_MPEG1VIDEO: | |
1421 | 3060 case CODEC_ID_MPEG2VIDEO: |
936 | 3061 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; |
1042 | 3062 #ifdef CONFIG_RISKY |
936 | 3063 case CODEC_ID_MPEG4: |
3064 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
3065 case CODEC_ID_MSMPEG4V2: | |
3066 case CODEC_ID_MSMPEG4V3: | |
3067 case CODEC_ID_WMV1: | |
3068 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
3069 case CODEC_ID_WMV2: | |
3070 ff_wmv2_encode_mb(s, s->block, motion_x, motion_y); break; | |
3071 case CODEC_ID_H263: | |
3072 case CODEC_ID_H263P: | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3073 case CODEC_ID_FLV1: |
936 | 3074 case CODEC_ID_RV10: |
3075 h263_encode_mb(s, s->block, motion_x, motion_y); break; | |
1042 | 3076 #endif |
3077 case CODEC_ID_MJPEG: | |
3078 mjpeg_encode_mb(s, s->block); break; | |
936 | 3079 default: |
3080 assert(0); | |
294 | 3081 } |
3082 } | |
3083 | |
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
|
3084 #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
|
3085 |
1026 | 3086 /** |
3087 * combines the (truncated) bitstream to a complete frame | |
3088 * @returns -1 if no complete frame could be created | |
3089 */ | |
3090 int ff_combine_frame( MpegEncContext *s, int next, uint8_t **buf, int *buf_size){ | |
3091 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
|
3092 |
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
|
3093 #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
|
3094 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
|
3095 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
|
3096 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
|
3097 } |
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
|
3098 #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
|
3099 |
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
|
3100 /* 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
|
3101 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
|
3102 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
|
3103 } |
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
|
3104 |
1026 | 3105 pc->last_index= pc->index; |
3106 | |
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
|
3107 /* 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
|
3108 if(next == END_NOT_FOUND){ |
1026 | 3109 pc->buffer= av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE); |
3110 | |
3111 memcpy(&pc->buffer[pc->index], *buf, *buf_size); | |
3112 pc->index += *buf_size; | |
3113 return -1; | |
3114 } | |
1288 | 3115 |
3116 *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
|
3117 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
|
3118 |
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
|
3119 /* append to buffer */ |
1026 | 3120 if(pc->index){ |
3121 pc->buffer= av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE); | |
3122 | |
3123 memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE ); | |
3124 pc->index = 0; | |
3125 *buf= pc->buffer; | |
3126 } | |
3127 | |
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
|
3128 /* 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
|
3129 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
|
3130 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
|
3131 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
|
3132 } |
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
|
3133 |
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
|
3134 #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
|
3135 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
|
3136 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
|
3137 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
|
3138 } |
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
|
3139 #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
|
3140 |
1026 | 3141 return 0; |
3142 } | |
3143 | |
1368 | 3144 void ff_mpeg_flush(AVCodecContext *avctx){ |
3145 int i; | |
3146 MpegEncContext *s = avctx->priv_data; | |
3147 | |
3148 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
3149 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL | |
3150 || s->picture[i].type == FF_BUFFER_TYPE_USER)) | |
3151 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); | |
3152 } | |
3153 s->last_picture_ptr = s->next_picture_ptr = NULL; | |
1395 | 3154 |
3155 s->parse_context.state= -1; | |
3156 s->parse_context.frame_start_found= 0; | |
3157 s->parse_context.overread= 0; | |
3158 s->parse_context.overread_index= 0; | |
3159 s->parse_context.index= 0; | |
3160 s->parse_context.last_index= 0; | |
1368 | 3161 } |
3162 | |
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
|
3163 #ifdef CONFIG_ENCODERS |
1064 | 3164 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) |
294 | 3165 { |
326 | 3166 int bytes= length>>4; |
3167 int bits= length&15; | |
3168 int i; | |
3169 | |
456 | 3170 if(length==0) return; |
3171 | |
326 | 3172 for(i=0; i<bytes; i++) put_bits(pb, 16, be2me_16(((uint16_t*)src)[i])); |
3173 put_bits(pb, bits, be2me_16(((uint16_t*)src)[i])>>(16-bits)); | |
0 | 3174 } |
3175 | |
456 | 3176 static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 3177 int i; |
3178 | |
3179 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
3180 | |
3181 /* mpeg1 */ | |
1160 | 3182 d->mb_skip_run= s->mb_skip_run; |
326 | 3183 for(i=0; i<3; i++) |
3184 d->last_dc[i]= s->last_dc[i]; | |
3185 | |
3186 /* statistics */ | |
3187 d->mv_bits= s->mv_bits; | |
3188 d->i_tex_bits= s->i_tex_bits; | |
3189 d->p_tex_bits= s->p_tex_bits; | |
3190 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
|
3191 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
|
3192 d->b_count= s->b_count; |
326 | 3193 d->skip_count= s->skip_count; |
3194 d->misc_bits= s->misc_bits; | |
329 | 3195 d->last_bits= 0; |
327 | 3196 |
1389 | 3197 d->mb_skiped= 0; |
912 | 3198 d->qscale= s->qscale; |
326 | 3199 } |
3200 | |
456 | 3201 static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 3202 int i; |
3203 | |
3204 memcpy(d->mv, s->mv, 2*4*2*sizeof(int)); | |
3205 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
3206 | |
3207 /* mpeg1 */ | |
1160 | 3208 d->mb_skip_run= s->mb_skip_run; |
326 | 3209 for(i=0; i<3; i++) |
3210 d->last_dc[i]= s->last_dc[i]; | |
3211 | |
3212 /* statistics */ | |
3213 d->mv_bits= s->mv_bits; | |
3214 d->i_tex_bits= s->i_tex_bits; | |
3215 d->p_tex_bits= s->p_tex_bits; | |
3216 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
|
3217 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
|
3218 d->b_count= s->b_count; |
326 | 3219 d->skip_count= s->skip_count; |
3220 d->misc_bits= s->misc_bits; | |
3221 | |
3222 d->mb_intra= s->mb_intra; | |
327 | 3223 d->mb_skiped= s->mb_skiped; |
326 | 3224 d->mv_type= s->mv_type; |
3225 d->mv_dir= s->mv_dir; | |
3226 d->pb= s->pb; | |
456 | 3227 if(s->data_partitioning){ |
3228 d->pb2= s->pb2; | |
3229 d->tex_pb= s->tex_pb; | |
3230 } | |
326 | 3231 d->block= s->block; |
3232 for(i=0; i<6; i++) | |
3233 d->block_last_index[i]= s->block_last_index[i]; | |
755 | 3234 d->interlaced_dct= s->interlaced_dct; |
912 | 3235 d->qscale= s->qscale; |
326 | 3236 } |
3237 | |
456 | 3238 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type, |
3239 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2], | |
3240 int *dmin, int *next_block, int motion_x, int motion_y) | |
3241 { | |
1389 | 3242 int score; |
3243 uint8_t *dest_backup[3]; | |
456 | 3244 |
3245 copy_context_before_encode(s, backup, type); | |
3246 | |
3247 s->block= s->blocks[*next_block]; | |
3248 s->pb= pb[*next_block]; | |
3249 if(s->data_partitioning){ | |
3250 s->pb2 = pb2 [*next_block]; | |
3251 s->tex_pb= tex_pb[*next_block]; | |
3252 } | |
1389 | 3253 |
3254 if(*next_block){ | |
3255 memcpy(dest_backup, s->dest, sizeof(s->dest)); | |
3256 s->dest[0] = s->me.scratchpad; | |
3257 s->dest[1] = s->me.scratchpad + 16; | |
3258 s->dest[2] = s->me.scratchpad + 16 + 8; | |
3259 assert(2*s->uvlinesize == s->linesize); //should be no prob for encoding | |
3260 assert(s->linesize >= 64); //FIXME | |
3261 } | |
456 | 3262 |
3263 encode_mb(s, motion_x, motion_y); | |
1389 | 3264 |
3265 score= get_bit_count(&s->pb); | |
456 | 3266 if(s->data_partitioning){ |
1389 | 3267 score+= get_bit_count(&s->pb2); |
3268 score+= get_bit_count(&s->tex_pb); | |
456 | 3269 } |
1389 | 3270 |
3271 if(s->avctx->mb_decision == FF_MB_DECISION_RD){ | |
3272 MPV_decode_mb(s, s->block); | |
3273 | |
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
|
3274 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
|
3275 score += sse_mb(s) << FF_LAMBDA_SHIFT; |
1389 | 3276 } |
3277 | |
3278 if(*next_block){ | |
3279 memcpy(s->dest, dest_backup, sizeof(s->dest)); | |
3280 } | |
3281 | |
3282 if(score<*dmin){ | |
3283 *dmin= score; | |
456 | 3284 *next_block^=1; |
3285 | |
3286 copy_context_after_encode(best, s, type); | |
3287 } | |
3288 } | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3289 |
1389 | 3290 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
|
3291 uint32_t *sq = squareTbl + 256; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3292 int acc=0; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3293 int x,y; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3294 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3295 if(w==16 && h==16) |
936 | 3296 return s->dsp.sse[0](NULL, src1, src2, stride); |
3297 else if(w==8 && h==8) | |
3298 return s->dsp.sse[1](NULL, src1, src2, stride); | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3299 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3300 for(y=0; y<h; y++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3301 for(x=0; x<w; x++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3302 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
|
3303 } |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3304 } |
936 | 3305 |
3306 assert(acc>=0); | |
3307 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3308 return acc; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3309 } |
326 | 3310 |
1389 | 3311 static int sse_mb(MpegEncContext *s){ |
3312 int w= 16; | |
3313 int h= 16; | |
3314 | |
3315 if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; | |
3316 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; | |
3317 | |
3318 if(w==16 && h==16) | |
3319 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) | |
3320 +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) | |
3321 +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); | |
3322 else | |
3323 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) | |
3324 +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) | |
3325 +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); | |
3326 } | |
3327 | |
0 | 3328 static void encode_picture(MpegEncContext *s, int picture_number) |
3329 { | |
766 | 3330 int mb_x, mb_y, pdif = 0; |
294 | 3331 int i; |
286 | 3332 int bits; |
326 | 3333 MpegEncContext best_s, backup_s; |
1064 | 3334 uint8_t bit_buf[2][3000]; |
3335 uint8_t bit_buf2[2][3000]; | |
3336 uint8_t bit_buf_tex[2][3000]; | |
456 | 3337 PutBitContext pb[2], pb2[2], tex_pb[2]; |
3338 | |
3339 for(i=0; i<2; i++){ | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1505
diff
changeset
|
3340 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
|
3341 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
|
3342 init_put_bits(&tex_pb[i], bit_buf_tex[i], 3000); |
456 | 3343 } |
0 | 3344 |
3345 s->picture_number = picture_number; | |
294 | 3346 |
268 | 3347 /* Reset the average MB variance */ |
903 | 3348 s->current_picture.mb_var_sum = 0; |
3349 s->current_picture.mc_mb_var_sum = 0; | |
327 | 3350 |
1042 | 3351 #ifdef CONFIG_RISKY |
327 | 3352 /* we need to initialize some time vars before we can encode b-frames */ |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3353 // RAL: Condition added for MPEG1VIDEO |
1421 | 3354 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4)) |
327 | 3355 ff_set_mpeg4_time(s, s->picture_number); |
1042 | 3356 #endif |
3357 | |
608 | 3358 s->scene_change_score=0; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3359 |
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
|
3360 s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration |
936 | 3361 |
1089 | 3362 if(s->pict_type==I_TYPE){ |
1163 | 3363 if(s->msmpeg4_version >= 3) s->no_rounding=1; |
3364 else s->no_rounding=0; | |
1089 | 3365 }else if(s->pict_type!=B_TYPE){ |
3366 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4) | |
936 | 3367 s->no_rounding ^= 1; |
3368 } | |
1089 | 3369 |
268 | 3370 /* Estimate motion for every MB */ |
1013 | 3371 s->mb_intra=0; //for the rate distoration & bit compare functions |
324 | 3372 if(s->pict_type != I_TYPE){ |
951 | 3373 if(s->pict_type != B_TYPE){ |
3374 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ | |
952 | 3375 s->me.pre_pass=1; |
954 | 3376 s->me.dia_size= s->avctx->pre_dia_size; |
952 | 3377 |
951 | 3378 for(mb_y=s->mb_height-1; mb_y >=0 ; mb_y--) { |
3379 for(mb_x=s->mb_width-1; mb_x >=0 ; mb_x--) { | |
3380 s->mb_x = mb_x; | |
3381 s->mb_y = mb_y; | |
3382 ff_pre_estimate_p_frame_motion(s, mb_x, mb_y); | |
3383 } | |
3384 } | |
952 | 3385 s->me.pre_pass=0; |
951 | 3386 } |
3387 } | |
3388 | |
954 | 3389 s->me.dia_size= s->avctx->dia_size; |
294 | 3390 for(mb_y=0; mb_y < s->mb_height; mb_y++) { |
3391 s->block_index[0]= s->block_wrap[0]*(mb_y*2 + 1) - 1; | |
3392 s->block_index[1]= s->block_wrap[0]*(mb_y*2 + 1); | |
3393 s->block_index[2]= s->block_wrap[0]*(mb_y*2 + 2) - 1; | |
3394 s->block_index[3]= s->block_wrap[0]*(mb_y*2 + 2); | |
3395 for(mb_x=0; mb_x < s->mb_width; mb_x++) { | |
3396 s->mb_x = mb_x; | |
3397 s->mb_y = mb_y; | |
3398 s->block_index[0]+=2; | |
3399 s->block_index[1]+=2; | |
3400 s->block_index[2]+=2; | |
3401 s->block_index[3]+=2; | |
954 | 3402 |
294 | 3403 /* compute motion vector & mb_type and store in context */ |
324 | 3404 if(s->pict_type==B_TYPE) |
3405 ff_estimate_b_frame_motion(s, mb_x, mb_y); | |
3406 else | |
3407 ff_estimate_p_frame_motion(s, mb_x, mb_y); | |
268 | 3408 } |
3409 } | |
456 | 3410 }else /* if(s->pict_type == I_TYPE) */{ |
294 | 3411 /* I-Frame */ |
3412 //FIXME do we need to zero them? | |
1064 | 3413 memset(s->motion_val[0], 0, sizeof(int16_t)*(s->mb_width*2 + 2)*(s->mb_height*2 + 2)*2); |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3414 memset(s->p_mv_table , 0, sizeof(int16_t)*(s->mb_stride)*s->mb_height*2); |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3415 memset(s->mb_type , MB_TYPE_INTRA, sizeof(uint8_t)*s->mb_stride*s->mb_height); |
612 | 3416 |
3417 if(!s->fixed_qscale){ | |
3418 /* finding spatial complexity for I-frame rate control */ | |
3419 for(mb_y=0; mb_y < s->mb_height; mb_y++) { | |
3420 for(mb_x=0; mb_x < s->mb_width; mb_x++) { | |
3421 int xx = mb_x * 16; | |
3422 int yy = mb_y * 16; | |
903 | 3423 uint8_t *pix = s->new_picture.data[0] + (yy * s->linesize) + xx; |
612 | 3424 int varc; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
3425 int sum = s->dsp.pix_sum(pix, s->linesize); |
612 | 3426 |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
3427 varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8; |
612 | 3428 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3429 s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3430 s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; |
903 | 3431 s->current_picture.mb_var_sum += varc; |
612 | 3432 } |
3433 } | |
3434 } | |
268 | 3435 } |
814 | 3436 emms_c(); |
3437 | |
1471 | 3438 if(s->scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){ |
271 | 3439 s->pict_type= I_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
|
3440 memset(s->mb_type , MB_TYPE_INTRA, sizeof(uint8_t)*s->mb_stride*s->mb_height); |
903 | 3441 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); |
271 | 3442 } |
903 | 3443 |
1089 | 3444 if(!s->umvplus){ |
1086 | 3445 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { |
3446 s->f_code= ff_get_best_fcode(s, s->p_mv_table, MB_TYPE_INTER); | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3447 |
1086 | 3448 ff_fix_long_p_mvs(s); |
3449 } | |
3450 | |
3451 if(s->pict_type==B_TYPE){ | |
3452 int a, b; | |
3453 | |
3454 a = ff_get_best_fcode(s, s->b_forw_mv_table, MB_TYPE_FORWARD); | |
3455 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, MB_TYPE_BIDIR); | |
3456 s->f_code = FFMAX(a, b); | |
3457 | |
3458 a = ff_get_best_fcode(s, s->b_back_mv_table, MB_TYPE_BACKWARD); | |
3459 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, MB_TYPE_BIDIR); | |
3460 s->b_code = FFMAX(a, b); | |
3461 | |
3462 ff_fix_long_b_mvs(s, s->b_forw_mv_table, s->f_code, MB_TYPE_FORWARD); | |
3463 ff_fix_long_b_mvs(s, s->b_back_mv_table, s->b_code, MB_TYPE_BACKWARD); | |
3464 ff_fix_long_b_mvs(s, s->b_bidir_forw_mv_table, s->f_code, MB_TYPE_BIDIR); | |
3465 ff_fix_long_b_mvs(s, s->b_bidir_back_mv_table, s->b_code, MB_TYPE_BIDIR); | |
3466 } | |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
3467 } |
324 | 3468 |
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
|
3469 if (!s->fixed_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
|
3470 s->current_picture.quality = ff_rate_estimate_qscale(s); |
277
5cb2978e701f
new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents:
271
diff
changeset
|
3471 |
695 | 3472 if(s->adaptive_quant){ |
1042 | 3473 #ifdef CONFIG_RISKY |
695 | 3474 switch(s->codec_id){ |
3475 case CODEC_ID_MPEG4: | |
3476 ff_clean_mpeg4_qscales(s); | |
3477 break; | |
3478 case CODEC_ID_H263: | |
3479 case CODEC_ID_H263P: | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3480 case CODEC_ID_FLV1: |
695 | 3481 ff_clean_h263_qscales(s); |
3482 break; | |
3483 } | |
1042 | 3484 #endif |
695 | 3485 |
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
|
3486 s->lambda= s->lambda_table[0]; |
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
|
3487 //FIXME broken |
695 | 3488 }else |
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
|
3489 s->lambda= s->current_picture.quality; |
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
|
3490 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); |
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
|
3491 update_qscale(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
|
3492 |
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
|
3493 if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(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
|
3494 s->qscale= 3; //reduce cliping problems |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3495 |
0 | 3496 if (s->out_format == FMT_MJPEG) { |
3497 /* for mjpeg, we do include qscale in the matrix */ | |
533
3c07cf9595de
adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
michaelni
parents:
514
diff
changeset
|
3498 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3499 for(i=1;i<64;i++){ |
1092 | 3500 int j= s->dsp.idct_permutation[i]; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3501 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3502 s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3503 } |
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
|
3504 convert_matrix(s, 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
|
3505 s->q_intra_matrix16_bias, s->intra_matrix, s->intra_quant_bias, 8, 8); |
0 | 3506 } |
903 | 3507 |
3508 //FIXME var duplication | |
3509 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
3510 s->current_picture.pict_type= s->pict_type; | |
3511 | |
3512 if(s->current_picture.key_frame) | |
3513 s->picture_in_gop_number=0; | |
0 | 3514 |
286 | 3515 s->last_bits= get_bit_count(&s->pb); |
0 | 3516 switch(s->out_format) { |
3517 case FMT_MJPEG: | |
3518 mjpeg_picture_header(s); | |
3519 break; | |
1042 | 3520 #ifdef CONFIG_RISKY |
0 | 3521 case FMT_H263: |
936 | 3522 if (s->codec_id == CODEC_ID_WMV2) |
3523 ff_wmv2_encode_picture_header(s, picture_number); | |
3524 else if (s->h263_msmpeg4) | |
0 | 3525 msmpeg4_encode_picture_header(s, picture_number); |
3526 else if (s->h263_pred) | |
3527 mpeg4_encode_picture_header(s, picture_number); | |
3528 else if (s->h263_rv10) | |
3529 rv10_encode_picture_header(s, picture_number); | |
1354 | 3530 else if (s->codec_id == CODEC_ID_FLV1) |
3531 ff_flv_encode_picture_header(s, picture_number); | |
0 | 3532 else |
3533 h263_encode_picture_header(s, picture_number); | |
3534 break; | |
1042 | 3535 #endif |
0 | 3536 case FMT_MPEG1: |
3537 mpeg1_encode_picture_header(s, picture_number); | |
3538 break; | |
1444 | 3539 case FMT_H264: |
3540 break; | |
0 | 3541 } |
286 | 3542 bits= get_bit_count(&s->pb); |
3543 s->header_bits= bits - s->last_bits; | |
3544 s->last_bits= bits; | |
3545 s->mv_bits=0; | |
3546 s->misc_bits=0; | |
3547 s->i_tex_bits=0; | |
3548 s->p_tex_bits=0; | |
3549 s->i_count=0; | |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
3550 s->f_count=0; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
3551 s->b_count=0; |
286 | 3552 s->skip_count=0; |
3553 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3554 for(i=0; i<3; i++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3555 /* init last dc values */ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3556 /* note: quant matrix value (8) is implied here */ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3557 s->last_dc[i] = 128; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3558 |
1148 | 3559 s->current_picture_ptr->error[i] = 0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3560 } |
1160 | 3561 s->mb_skip_run = 0; |
0 | 3562 s->last_mv[0][0][0] = 0; |
3563 s->last_mv[0][0][1] = 0; | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3564 s->last_mv[1][0][0] = 0; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3565 s->last_mv[1][0][1] = 0; |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3566 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3567 s->last_mv_dir = 0; |
0 | 3568 |
1042 | 3569 #ifdef CONFIG_RISKY |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3570 switch(s->codec_id){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3571 case CODEC_ID_H263: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3572 case CODEC_ID_H263P: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3573 case CODEC_ID_FLV1: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3574 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
|
3575 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3576 case CODEC_ID_MPEG4: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3577 if(s->partitioned_frame) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3578 ff_mpeg4_init_partitions(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3579 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
3580 } |
1042 | 3581 #endif |
456 | 3582 |
3583 s->resync_mb_x=0; | |
3584 s->resync_mb_y=0; | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3585 s->first_slice_line = 1; |
766 | 3586 s->ptr_lastgob = s->pb.buf; |
233
3f5b72726118
- More work on preliminary bit rate control, just to be able to get an
pulento
parents:
232
diff
changeset
|
3587 for(mb_y=0; mb_y < s->mb_height; mb_y++) { |
1389 | 3588 s->mb_x=0; |
3589 s->mb_y= mb_y; | |
3590 | |
499 | 3591 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ]; |
3592 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ]; | |
1389 | 3593 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
|
3594 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
3595 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
|
3596 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
|
3597 int mb_type= s->mb_type[xy]; |
456 | 3598 // int d; |
1389 | 3599 int dmin= INT_MAX; |
0 | 3600 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
3601 s->mb_x = mb_x; |
1389 | 3602 ff_update_block_index(s); |
456 | 3603 |
766 | 3604 /* write gob / video packet header */ |
1042 | 3605 #ifdef CONFIG_RISKY |
1421 | 3606 if(s->rtp_mode && mb_y + mb_x>0){ |
766 | 3607 int current_packet_size, is_gob_start; |
3608 | |
3609 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob; | |
3610 is_gob_start=0; | |
3611 | |
3612 if(s->codec_id==CODEC_ID_MPEG4){ | |
1421 | 3613 if(current_packet_size >= s->rtp_payload_size){ |
766 | 3614 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3615 if(s->partitioned_frame){ |
456 | 3616 ff_mpeg4_merge_partitions(s); |
3617 ff_mpeg4_init_partitions(s); | |
3618 } | |
3619 ff_mpeg4_encode_video_packet_header(s); | |
3620 | |
3621 if(s->flags&CODEC_FLAG_PASS1){ | |
3622 int bits= get_bit_count(&s->pb); | |
3623 s->misc_bits+= bits - s->last_bits; | |
3624 s->last_bits= bits; | |
3625 } | |
3626 ff_mpeg4_clean_buffers(s); | |
766 | 3627 is_gob_start=1; |
456 | 3628 } |
1160 | 3629 }else if(s->codec_id==CODEC_ID_MPEG1VIDEO){ |
3630 if( current_packet_size >= s->rtp_payload_size | |
1421 | 3631 && s->mb_skip_run==0){ |
3632 ff_mpeg1_encode_slice_header(s); | |
3633 ff_mpeg1_clean_buffers(s); | |
3634 is_gob_start=1; | |
3635 } | |
3636 }else if(s->codec_id==CODEC_ID_MPEG2VIDEO){ | |
3637 if( ( current_packet_size >= s->rtp_payload_size || mb_x==0) | |
3638 && s->mb_skip_run==0){ | |
1160 | 3639 ff_mpeg1_encode_slice_header(s); |
3640 ff_mpeg1_clean_buffers(s); | |
3641 is_gob_start=1; | |
3642 } | |
766 | 3643 }else{ |
1159
13ea348d4cf2
simplify slice encoding (variance of packet size is practically identical)
michaelni
parents:
1150
diff
changeset
|
3644 if(current_packet_size >= s->rtp_payload_size |
1421 | 3645 && s->mb_x==0 && s->mb_y%s->gob_index==0){ |
766 | 3646 |
3647 h263_encode_gob_header(s, mb_y); | |
3648 is_gob_start=1; | |
3649 } | |
3650 } | |
3651 | |
3652 if(is_gob_start){ | |
456 | 3653 s->ptr_lastgob = pbBufPtr(&s->pb); |
3654 s->first_slice_line=1; | |
3655 s->resync_mb_x=mb_x; | |
3656 s->resync_mb_y=mb_y; | |
3657 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3658 } |
1042 | 3659 #endif |
456 | 3660 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3661 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
|
3662 && 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
|
3663 s->first_slice_line=0; |
456 | 3664 } |
3665 | |
1389 | 3666 s->mb_skiped=0; |
3667 | |
294 | 3668 if(mb_type & (mb_type-1)){ // more than 1 MB type possible |
327 | 3669 int next_block=0; |
456 | 3670 int pb_bits_count, pb2_bits_count, tex_pb_bits_count; |
326 | 3671 |
3672 copy_context_before_encode(&backup_s, s, -1); | |
456 | 3673 backup_s.pb= s->pb; |
3674 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
|
3675 best_s.partitioned_frame= s->partitioned_frame; |
456 | 3676 if(s->data_partitioning){ |
3677 backup_s.pb2= s->pb2; | |
3678 backup_s.tex_pb= s->tex_pb; | |
3679 } | |
326 | 3680 |
294 | 3681 if(mb_type&MB_TYPE_INTER){ |
327 | 3682 s->mv_dir = MV_DIR_FORWARD; |
295 | 3683 s->mv_type = MV_TYPE_16X16; |
294 | 3684 s->mb_intra= 0; |
324 | 3685 s->mv[0][0][0] = s->p_mv_table[xy][0]; |
3686 s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
456 | 3687 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER, pb, pb2, tex_pb, |
3688 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); | |
0 | 3689 } |
1494
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
3690 if(mb_type&MB_TYPE_SKIPED){ |
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
3691 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
|
3692 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
|
3693 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
|
3694 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
|
3695 s->mv[0][0][1] = 0; |
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
3696 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_SKIPED, pb, pb2, tex_pb, |
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
3697 &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
|
3698 } |
326 | 3699 if(mb_type&MB_TYPE_INTER4V){ |
327 | 3700 s->mv_dir = MV_DIR_FORWARD; |
295 | 3701 s->mv_type = MV_TYPE_8X8; |
3702 s->mb_intra= 0; | |
3703 for(i=0; i<4; i++){ | |
3704 s->mv[0][i][0] = s->motion_val[s->block_index[i]][0]; | |
3705 s->mv[0][i][1] = s->motion_val[s->block_index[i]][1]; | |
3706 } | |
456 | 3707 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER4V, pb, pb2, tex_pb, |
3708 &dmin, &next_block, 0, 0); | |
327 | 3709 } |
3710 if(mb_type&MB_TYPE_FORWARD){ | |
3711 s->mv_dir = MV_DIR_FORWARD; | |
3712 s->mv_type = MV_TYPE_16X16; | |
3713 s->mb_intra= 0; | |
3714 s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
3715 s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
456 | 3716 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_FORWARD, pb, pb2, tex_pb, |
3717 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); | |
327 | 3718 } |
3719 if(mb_type&MB_TYPE_BACKWARD){ | |
3720 s->mv_dir = MV_DIR_BACKWARD; | |
3721 s->mv_type = MV_TYPE_16X16; | |
3722 s->mb_intra= 0; | |
3723 s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
3724 s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
456 | 3725 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BACKWARD, pb, pb2, tex_pb, |
3726 &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]); | |
327 | 3727 } |
3728 if(mb_type&MB_TYPE_BIDIR){ | |
3729 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
3730 s->mv_type = MV_TYPE_16X16; | |
3731 s->mb_intra= 0; | |
3732 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
3733 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
3734 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
3735 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
456 | 3736 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BIDIR, pb, pb2, tex_pb, |
3737 &dmin, &next_block, 0, 0); | |
327 | 3738 } |
3739 if(mb_type&MB_TYPE_DIRECT){ | |
936 | 3740 int mx= s->b_direct_mv_table[xy][0]; |
3741 int my= s->b_direct_mv_table[xy][1]; | |
3742 | |
327 | 3743 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
3744 s->mb_intra= 0; | |
1042 | 3745 #ifdef CONFIG_RISKY |
936 | 3746 ff_mpeg4_set_direct_mv(s, mx, my); |
1042 | 3747 #endif |
456 | 3748 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_DIRECT, pb, pb2, tex_pb, |
936 | 3749 &dmin, &next_block, mx, my); |
295 | 3750 } |
294 | 3751 if(mb_type&MB_TYPE_INTRA){ |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3752 s->mv_dir = 0; |
295 | 3753 s->mv_type = MV_TYPE_16X16; |
294 | 3754 s->mb_intra= 1; |
3755 s->mv[0][0][0] = 0; | |
3756 s->mv[0][0][1] = 0; | |
456 | 3757 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTRA, pb, pb2, tex_pb, |
3758 &dmin, &next_block, 0, 0); | |
1389 | 3759 if(s->h263_pred || s->h263_aic){ |
3760 if(best_s.mb_intra) | |
3761 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1; | |
3762 else | |
3763 ff_clean_intra_table_entries(s); //old mode? | |
3764 } | |
295 | 3765 } |
326 | 3766 copy_context_after_encode(s, &best_s, -1); |
456 | 3767 |
3768 pb_bits_count= get_bit_count(&s->pb); | |
3769 flush_put_bits(&s->pb); | |
3770 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count); | |
3771 s->pb= backup_s.pb; | |
3772 | |
3773 if(s->data_partitioning){ | |
3774 pb2_bits_count= get_bit_count(&s->pb2); | |
3775 flush_put_bits(&s->pb2); | |
3776 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count); | |
3777 s->pb2= backup_s.pb2; | |
3778 | |
3779 tex_pb_bits_count= get_bit_count(&s->tex_pb); | |
3780 flush_put_bits(&s->tex_pb); | |
3781 ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count); | |
3782 s->tex_pb= backup_s.tex_pb; | |
3783 } | |
329 | 3784 s->last_bits= get_bit_count(&s->pb); |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
3785 |
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
3786 #ifdef CONFIG_RISKY |
1389 | 3787 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
3788 ff_h263_update_motion_val(s); | |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
3789 #endif |
1389 | 3790 |
3791 if(next_block==0){ | |
3792 s->dsp.put_pixels_tab[0][0](s->dest[0], s->me.scratchpad , s->linesize ,16); | |
3793 s->dsp.put_pixels_tab[1][0](s->dest[1], s->me.scratchpad + 16, s->uvlinesize, 8); | |
3794 s->dsp.put_pixels_tab[1][0](s->dest[2], s->me.scratchpad + 24, s->uvlinesize, 8); | |
3795 } | |
3796 | |
3797 if(s->avctx->mb_decision == FF_MB_DECISION_BITS) | |
3798 MPV_decode_mb(s, s->block); | |
294 | 3799 } else { |
324 | 3800 int motion_x, motion_y; |
1013 | 3801 int intra_score; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3802 int inter_score= s->current_picture.mb_cmp_score[mb_x + mb_y*s->mb_stride]; |
1013 | 3803 |
1389 | 3804 if(s->avctx->mb_decision==FF_MB_DECISION_SIMPLE && s->pict_type==P_TYPE){ //FIXME check if the mess is usefull at all |
1013 | 3805 /* get luma score */ |
3806 if((s->avctx->mb_cmp&0xFF)==FF_CMP_SSE){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3807 intra_score= (s->current_picture.mb_var[mb_x + mb_y*s->mb_stride]<<8) - 500; //FIXME dont scale it down so we dont have to fix it |
1013 | 3808 }else{ |
3809 uint8_t *dest_y; | |
3810 | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3811 int mean= s->current_picture.mb_mean[mb_x + mb_y*s->mb_stride]; //FIXME |
1013 | 3812 mean*= 0x01010101; |
3813 | |
3814 dest_y = s->new_picture.data[0] + (mb_y * 16 * s->linesize ) + mb_x * 16; | |
3815 | |
3816 for(i=0; i<16; i++){ | |
3817 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 0]) = mean; | |
3818 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 4]) = mean; | |
3819 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 8]) = mean; | |
3820 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+12]) = mean; | |
3821 } | |
3822 | |
3823 s->mb_intra=1; | |
3824 intra_score= s->dsp.mb_cmp[0](s, s->me.scratchpad, dest_y, s->linesize); | |
3825 | |
3826 /* printf("intra:%7d inter:%7d var:%7d mc_var.%7d\n", intra_score>>8, inter_score>>8, | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3827 s->current_picture.mb_var[mb_x + mb_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
|
3828 s->current_picture.mc_mb_var[mb_x + mb_y*s->mb_stride]);*/ |
1013 | 3829 } |
3830 | |
3831 /* get chroma score */ | |
3832 if(s->avctx->mb_cmp&FF_CMP_CHROMA){ | |
3833 int i; | |
3834 | |
3835 s->mb_intra=1; | |
3836 for(i=1; i<3; i++){ | |
3837 uint8_t *dest_c; | |
3838 int mean; | |
3839 | |
3840 if(s->out_format == FMT_H263){ | |
3841 mean= (s->dc_val[i][mb_x + (mb_y+1)*(s->mb_width+2)] + 4)>>3; //FIXME not exact but simple ;) | |
3842 }else{ | |
3843 mean= (s->last_dc[i] + 4)>>3; | |
3844 } | |
3845 dest_c = s->new_picture.data[i] + (mb_y * 8 * (s->uvlinesize)) + mb_x * 8; | |
3846 | |
3847 mean*= 0x01010101; | |
3848 for(i=0; i<8; i++){ | |
3849 *(uint32_t*)(&s->me.scratchpad[i*s->uvlinesize+ 0]) = mean; | |
3850 *(uint32_t*)(&s->me.scratchpad[i*s->uvlinesize+ 4]) = mean; | |
3851 } | |
3852 | |
3853 intra_score+= s->dsp.mb_cmp[1](s, s->me.scratchpad, dest_c, s->uvlinesize); | |
3854 } | |
3855 } | |
3856 | |
3857 /* bias */ | |
3858 switch(s->avctx->mb_cmp&0xFF){ | |
3859 default: | |
3860 case FF_CMP_SAD: | |
3861 intra_score+= 32*s->qscale; | |
3862 break; | |
3863 case FF_CMP_SSE: | |
3864 intra_score+= 24*s->qscale*s->qscale; | |
3865 break; | |
3866 case FF_CMP_SATD: | |
3867 intra_score+= 96*s->qscale; | |
3868 break; | |
3869 case FF_CMP_DCT: | |
3870 intra_score+= 48*s->qscale; | |
3871 break; | |
3872 case FF_CMP_BIT: | |
3873 intra_score+= 16; | |
3874 break; | |
3875 case FF_CMP_PSNR: | |
3876 case FF_CMP_RD: | |
3877 intra_score+= (s->qscale*s->qscale*109*8 + 64)>>7; | |
3878 break; | |
3879 } | |
3880 | |
3881 if(intra_score < inter_score) | |
3882 mb_type= MB_TYPE_INTRA; | |
3883 } | |
3884 | |
324 | 3885 s->mv_type=MV_TYPE_16X16; |
294 | 3886 // only one MB-Type possible |
1013 | 3887 |
327 | 3888 switch(mb_type){ |
3889 case MB_TYPE_INTRA: | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3890 s->mv_dir = 0; |
294 | 3891 s->mb_intra= 1; |
324 | 3892 motion_x= s->mv[0][0][0] = 0; |
3893 motion_y= s->mv[0][0][1] = 0; | |
327 | 3894 break; |
3895 case MB_TYPE_INTER: | |
324 | 3896 s->mv_dir = MV_DIR_FORWARD; |
3897 s->mb_intra= 0; | |
3898 motion_x= s->mv[0][0][0] = s->p_mv_table[xy][0]; | |
3899 motion_y= s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
327 | 3900 break; |
456 | 3901 case MB_TYPE_INTER4V: |
3902 s->mv_dir = MV_DIR_FORWARD; | |
3903 s->mv_type = MV_TYPE_8X8; | |
3904 s->mb_intra= 0; | |
3905 for(i=0; i<4; i++){ | |
3906 s->mv[0][i][0] = s->motion_val[s->block_index[i]][0]; | |
3907 s->mv[0][i][1] = s->motion_val[s->block_index[i]][1]; | |
3908 } | |
3909 motion_x= motion_y= 0; | |
3910 break; | |
327 | 3911 case MB_TYPE_DIRECT: |
324 | 3912 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
3913 s->mb_intra= 0; | |
327 | 3914 motion_x=s->b_direct_mv_table[xy][0]; |
3915 motion_y=s->b_direct_mv_table[xy][1]; | |
1042 | 3916 #ifdef CONFIG_RISKY |
936 | 3917 ff_mpeg4_set_direct_mv(s, motion_x, motion_y); |
1042 | 3918 #endif |
327 | 3919 break; |
3920 case MB_TYPE_BIDIR: | |
324 | 3921 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
294 | 3922 s->mb_intra= 0; |
324 | 3923 motion_x=0; |
3924 motion_y=0; | |
3925 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
3926 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
3927 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
3928 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
327 | 3929 break; |
3930 case MB_TYPE_BACKWARD: | |
324 | 3931 s->mv_dir = MV_DIR_BACKWARD; |
3932 s->mb_intra= 0; | |
3933 motion_x= s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
3934 motion_y= s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
327 | 3935 break; |
3936 case MB_TYPE_FORWARD: | |
324 | 3937 s->mv_dir = MV_DIR_FORWARD; |
3938 s->mb_intra= 0; | |
3939 motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
3940 motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
3941 // printf(" %d %d ", motion_x, motion_y); | |
327 | 3942 break; |
3943 default: | |
324 | 3944 motion_x=motion_y=0; //gcc warning fix |
3945 printf("illegal MB type\n"); | |
294 | 3946 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3947 |
324 | 3948 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
|
3949 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3950 // RAL: Update last macrobloc type |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3951 s->last_mv_dir = s->mv_dir; |
1389 | 3952 |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
3953 #ifdef CONFIG_RISKY |
1389 | 3954 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
3955 ff_h263_update_motion_val(s); | |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
3956 #endif |
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
3957 |
1389 | 3958 MPV_decode_mb(s, s->block); |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
244
diff
changeset
|
3959 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
3960 |
327 | 3961 /* clean the MV table in IPS frames for direct mode in B frames */ |
3962 if(s->mb_intra /* && I,P,S_TYPE */){ | |
3963 s->p_mv_table[xy][0]=0; | |
3964 s->p_mv_table[xy][1]=0; | |
3965 } | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3966 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3967 if(s->flags&CODEC_FLAG_PSNR){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3968 int w= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3969 int h= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3970 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3971 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
|
3972 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; |
936 | 3973 |
1148 | 3974 s->current_picture_ptr->error[0] += sse( |
1389 | 3975 s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, |
3976 s->dest[0], w, h, s->linesize); | |
1148 | 3977 s->current_picture_ptr->error[1] += sse( |
1389 | 3978 s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
3979 s->dest[1], w>>1, h>>1, s->uvlinesize); | |
1148 | 3980 s->current_picture_ptr->error[2] += sse( |
1389 | 3981 s, s->new_picture .data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
3982 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
|
3983 } |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
3984 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, get_bit_count(&s->pb)); |
0 | 3985 } |
3986 } | |
294 | 3987 emms_c(); |
286 | 3988 |
1042 | 3989 #ifdef CONFIG_RISKY |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3990 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame) |
456 | 3991 ff_mpeg4_merge_partitions(s); |
3992 | |
3993 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE) | |
208 | 3994 msmpeg4_encode_ext_header(s); |
3995 | |
456 | 3996 if(s->codec_id==CODEC_ID_MPEG4) |
3997 ff_mpeg4_stuffing(&s->pb); | |
1042 | 3998 #endif |
456 | 3999 |
162 | 4000 //if (s->gob_number) |
4001 // fprintf(stderr,"\nNumber of GOB: %d", s->gob_number); | |
231 | 4002 |
4003 /* Send the last GOB if RTP */ | |
4004 if (s->rtp_mode) { | |
4005 flush_put_bits(&s->pb); | |
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
|
4006 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob; |
231 | 4007 /* Call the RTP callback to send the last GOB */ |
4008 if (s->rtp_callback) | |
4009 s->rtp_callback(s->ptr_lastgob, pdif, s->gob_number); | |
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
|
4010 s->ptr_lastgob = pbBufPtr(&s->pb); |
231 | 4011 //fprintf(stderr,"\nGOB: %2d size: %d (last)", s->gob_number, pdif); |
4012 } | |
0 | 4013 } |
4014 | |
945 | 4015 static int dct_quantize_trellis_c(MpegEncContext *s, |
4016 DCTELEM *block, int n, | |
4017 int qscale, int *overflow){ | |
4018 const int *qmat; | |
1064 | 4019 const uint8_t *scantable= s->intra_scantable.scantable; |
945 | 4020 int max=0; |
4021 unsigned int threshold1, threshold2; | |
4022 int bias=0; | |
4023 int run_tab[65]; | |
4024 int level_tab[65]; | |
4025 int score_tab[65]; | |
946 | 4026 int last_run=0; |
4027 int last_level=0; | |
4028 int last_score= 0; | |
4029 int last_i= 0; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4030 int not_coded_score= 0; |
946 | 4031 int coeff[3][64]; |
945 | 4032 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
|
4033 int qmul, qadd, start_i, last_non_zero, i, dc; |
945 | 4034 const int esc_length= s->ac_esc_length; |
4035 uint8_t * length; | |
4036 uint8_t * last_length; | |
946 | 4037 int score_limit=0; |
4038 int left_limit= 0; | |
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
|
4039 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
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
|
4040 const int patch_table= s->out_format == FMT_MPEG1 && !s->mb_intra; |
945 | 4041 |
1092 | 4042 s->dsp.fdct (block); |
945 | 4043 |
4044 qmul= qscale*16; | |
4045 qadd= ((qscale-1)|1)*8; | |
946 | 4046 |
945 | 4047 if (s->mb_intra) { |
4048 int q; | |
4049 if (!s->h263_aic) { | |
4050 if (n < 4) | |
4051 q = s->y_dc_scale; | |
4052 else | |
4053 q = s->c_dc_scale; | |
4054 q = q << 3; | |
4055 } else{ | |
4056 /* For AIC we skip quant/dequant of INTRADC */ | |
4057 q = 1 << 3; | |
4058 qadd=0; | |
4059 } | |
4060 | |
4061 /* note: block[0] is assumed to be positive */ | |
4062 block[0] = (block[0] + (q >> 1)) / q; | |
4063 start_i = 1; | |
4064 last_non_zero = 0; | |
4065 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
|
4066 if(s->mpeg_quant || s->out_format == FMT_MPEG1) |
945 | 4067 bias= 1<<(QMAT_SHIFT-1); |
4068 length = s->intra_ac_vlc_length; | |
4069 last_length= s->intra_ac_vlc_last_length; | |
4070 } else { | |
4071 start_i = 0; | |
4072 last_non_zero = -1; | |
4073 qmat = s->q_inter_matrix[qscale]; | |
4074 length = s->inter_ac_vlc_length; | |
4075 last_length= s->inter_ac_vlc_last_length; | |
4076 } | |
4077 | |
4078 threshold1= (1<<QMAT_SHIFT) - bias - 1; | |
4079 threshold2= (threshold1<<1); | |
946 | 4080 |
945 | 4081 for(i=start_i; i<64; i++) { |
4082 const int j = scantable[i]; | |
4083 const int k= i-start_i; | |
4084 int level = block[j]; | |
4085 level = level * qmat[j]; | |
4086 | |
4087 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
4088 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
4089 if(((unsigned)(level+threshold1))>threshold2){ | |
4090 if(level>0){ | |
4091 level= (bias + level)>>QMAT_SHIFT; | |
4092 coeff[0][k]= level; | |
4093 coeff[1][k]= level-1; | |
946 | 4094 // coeff[2][k]= level-2; |
945 | 4095 }else{ |
4096 level= (bias - level)>>QMAT_SHIFT; | |
4097 coeff[0][k]= -level; | |
4098 coeff[1][k]= -level+1; | |
946 | 4099 // coeff[2][k]= -level+2; |
945 | 4100 } |
946 | 4101 coeff_count[k]= FFMIN(level, 2); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4102 assert(coeff_count[k]); |
945 | 4103 max |=level; |
4104 last_non_zero = i; | |
4105 }else{ | |
946 | 4106 coeff[0][k]= (level>>31)|1; |
945 | 4107 coeff_count[k]= 1; |
4108 } | |
4109 } | |
4110 | |
4111 *overflow= s->max_qcoeff < max; //overflow might have happend | |
4112 | |
4113 if(last_non_zero < start_i){ | |
4114 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); | |
4115 return last_non_zero; | |
4116 } | |
4117 | |
946 | 4118 score_tab[0]= 0; |
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
|
4119 |
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
|
4120 if(patch_table){ |
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
|
4121 // length[UNI_AC_ENC_INDEX(0, 63)]= |
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
|
4122 // length[UNI_AC_ENC_INDEX(0, 65)]= 2; |
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
|
4123 } |
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
|
4124 |
945 | 4125 for(i=0; i<=last_non_zero - start_i; i++){ |
4126 int level_index, run, j; | |
4127 const int dct_coeff= block[ scantable[i + start_i] ]; | |
4128 const int zero_distoration= dct_coeff*dct_coeff; | |
946 | 4129 int best_score=256*256*256*120; |
4130 | |
4131 last_score += zero_distoration; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4132 not_coded_score += zero_distoration; |
945 | 4133 for(level_index=0; level_index < coeff_count[i]; level_index++){ |
4134 int distoration; | |
4135 int level= coeff[level_index][i]; | |
4136 int unquant_coeff; | |
4137 | |
4138 assert(level); | |
4139 | |
4140 if(s->out_format == FMT_H263){ | |
4141 if(level>0){ | |
4142 unquant_coeff= level*qmul + qadd; | |
4143 }else{ | |
4144 unquant_coeff= level*qmul - qadd; | |
4145 } | |
947 | 4146 }else{ //MPEG1 |
1092 | 4147 j= s->dsp.idct_permutation[ scantable[i + start_i] ]; //FIXME optimize |
947 | 4148 if(s->mb_intra){ |
4149 if (level < 0) { | |
4150 unquant_coeff = (int)((-level) * qscale * s->intra_matrix[j]) >> 3; | |
4151 unquant_coeff = -((unquant_coeff - 1) | 1); | |
4152 } else { | |
4153 unquant_coeff = (int)( level * qscale * s->intra_matrix[j]) >> 3; | |
4154 unquant_coeff = (unquant_coeff - 1) | 1; | |
4155 } | |
4156 }else{ | |
4157 if (level < 0) { | |
4158 unquant_coeff = ((((-level) << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4; | |
4159 unquant_coeff = -((unquant_coeff - 1) | 1); | |
4160 } else { | |
4161 unquant_coeff = ((( level << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4; | |
4162 unquant_coeff = (unquant_coeff - 1) | 1; | |
4163 } | |
4164 } | |
4165 unquant_coeff<<= 3; | |
4166 } | |
946 | 4167 |
945 | 4168 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff); |
4169 level+=64; | |
4170 if((level&(~127)) == 0){ | |
946 | 4171 for(run=0; run<=i - left_limit; run++){ |
947 | 4172 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 4173 score += score_tab[i-run]; |
4174 | |
4175 if(score < best_score){ | |
4176 best_score= | |
4177 score_tab[i+1]= score; | |
4178 run_tab[i+1]= run; | |
4179 level_tab[i+1]= level-64; | |
4180 } | |
4181 } | |
4182 | |
4183 if(s->out_format == FMT_H263){ | |
946 | 4184 for(run=0; run<=i - left_limit; run++){ |
947 | 4185 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 4186 score += score_tab[i-run]; |
946 | 4187 if(score < last_score){ |
4188 last_score= score; | |
4189 last_run= run; | |
4190 last_level= level-64; | |
4191 last_i= i+1; | |
945 | 4192 } |
4193 } | |
4194 } | |
4195 }else{ | |
4196 distoration += esc_length*lambda; | |
946 | 4197 for(run=0; run<=i - left_limit; run++){ |
945 | 4198 int score= distoration + score_tab[i-run]; |
4199 | |
4200 if(score < best_score){ | |
4201 best_score= | |
4202 score_tab[i+1]= score; | |
4203 run_tab[i+1]= run; | |
4204 level_tab[i+1]= level-64; | |
4205 } | |
4206 } | |
4207 | |
4208 if(s->out_format == FMT_H263){ | |
946 | 4209 for(run=0; run<=i - left_limit; run++){ |
945 | 4210 int score= distoration + score_tab[i-run]; |
946 | 4211 if(score < last_score){ |
4212 last_score= score; | |
4213 last_run= run; | |
4214 last_level= level-64; | |
4215 last_i= i+1; | |
945 | 4216 } |
4217 } | |
4218 } | |
4219 } | |
4220 } | |
4221 | |
946 | 4222 for(j=left_limit; j<=i; j++){ |
945 | 4223 score_tab[j] += zero_distoration; |
4224 } | |
946 | 4225 score_limit+= zero_distoration; |
4226 if(score_tab[i+1] < score_limit) | |
4227 score_limit= score_tab[i+1]; | |
4228 | |
4229 //Note: there is a vlc code in mpeg4 which is 1 bit shorter then another one with a shorter run and the same level | |
4230 while(score_tab[ left_limit ] > score_limit + lambda) left_limit++; | |
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
|
4231 |
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
|
4232 if(patch_table){ |
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
|
4233 // length[UNI_AC_ENC_INDEX(0, 63)]= |
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
|
4234 // length[UNI_AC_ENC_INDEX(0, 65)]= 3; |
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
|
4235 } |
945 | 4236 } |
946 | 4237 |
945 | 4238 if(s->out_format != FMT_H263){ |
946 | 4239 last_score= 256*256*256*120; |
947 | 4240 for(i= left_limit; i<=last_non_zero - start_i + 1; i++){ |
946 | 4241 int score= score_tab[i]; |
947 | 4242 if(i) score += lambda*2; //FIXME exacter? |
4243 | |
946 | 4244 if(score < last_score){ |
4245 last_score= score; | |
4246 last_i= i; | |
4247 last_level= level_tab[i]; | |
4248 last_run= run_tab[i]; | |
4249 } | |
945 | 4250 } |
4251 } | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4252 |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4253 s->coded_score[n] = last_score - not_coded_score; |
945 | 4254 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4255 dc= block[0]; |
946 | 4256 last_non_zero= last_i - 1 + start_i; |
945 | 4257 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); |
4258 | |
4259 if(last_non_zero < start_i) | |
4260 return last_non_zero; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4261 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4262 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
|
4263 int best_level= 0; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4264 int best_score= dc * dc; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4265 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4266 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
|
4267 int level= coeff[i][0]; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4268 int unquant_coeff, score, distoration; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4269 |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4270 if(s->out_format == FMT_H263){ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4271 if(level>0){ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4272 unquant_coeff= (level*qmul + qadd)>>3; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4273 }else{ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4274 unquant_coeff= (level*qmul - qadd)>>3; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4275 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4276 }else{ //MPEG1 |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4277 if (level < 0) { |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4278 unquant_coeff = ((((-level) << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4279 unquant_coeff = -((unquant_coeff - 1) | 1); |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4280 } else { |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4281 unquant_coeff = ((( level << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4282 unquant_coeff = (unquant_coeff - 1) | 1; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4283 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4284 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4285 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
|
4286 unquant_coeff<<= 3 + 3; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4287 |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4288 distoration= (unquant_coeff - dc) * (unquant_coeff - dc); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4289 level+=64; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4290 if((level&(~127)) == 0) |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4291 score= distoration + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4292 else |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4293 score= distoration + esc_length*lambda; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4294 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4295 if(score < best_score){ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4296 best_score= score; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4297 best_level= level - 64; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4298 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4299 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
4300 block[0]= best_level; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4301 s->coded_score[n] = best_score - dc*dc; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4302 if(best_level == 0) return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4303 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
|
4304 } |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4305 |
946 | 4306 i= last_i; |
4307 assert(last_level); | |
945 | 4308 //FIXME use permutated scantable |
1092 | 4309 block[ s->dsp.idct_permutation[ scantable[last_non_zero] ] ]= last_level; |
946 | 4310 i -= last_run + 1; |
945 | 4311 |
4312 for(;i>0 ; i -= run_tab[i] + 1){ | |
1092 | 4313 const int j= s->dsp.idct_permutation[ scantable[i - 1 + start_i] ]; |
945 | 4314 |
4315 block[j]= level_tab[i]; | |
4316 assert(block[j]); | |
4317 } | |
4318 | |
4319 return last_non_zero; | |
4320 } | |
4321 | |
220 | 4322 static int dct_quantize_c(MpegEncContext *s, |
0 | 4323 DCTELEM *block, int n, |
344 | 4324 int qscale, int *overflow) |
0 | 4325 { |
4326 int i, j, level, last_non_zero, q; | |
4327 const int *qmat; | |
1064 | 4328 const uint8_t *scantable= s->intra_scantable.scantable; |
344 | 4329 int bias; |
4330 int max=0; | |
4331 unsigned int threshold1, threshold2; | |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
4332 |
1092 | 4333 s->dsp.fdct (block); |
0 | 4334 |
4335 if (s->mb_intra) { | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4336 if (!s->h263_aic) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4337 if (n < 4) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4338 q = s->y_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4339 else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4340 q = s->c_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4341 q = q << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4342 } else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4343 /* 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
|
4344 q = 1 << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
4345 |
0 | 4346 /* note: block[0] is assumed to be positive */ |
4347 block[0] = (block[0] + (q >> 1)) / q; | |
4348 i = 1; | |
4349 last_non_zero = 0; | |
344 | 4350 qmat = s->q_intra_matrix[qscale]; |
635 | 4351 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 4352 } else { |
4353 i = 0; | |
4354 last_non_zero = -1; | |
344 | 4355 qmat = s->q_inter_matrix[qscale]; |
635 | 4356 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 4357 } |
635 | 4358 threshold1= (1<<QMAT_SHIFT) - bias - 1; |
4359 threshold2= (threshold1<<1); | |
0 | 4360 |
4361 for(;i<64;i++) { | |
764 | 4362 j = scantable[i]; |
0 | 4363 level = block[j]; |
4364 level = level * qmat[j]; | |
344 | 4365 |
1215 | 4366 // if( bias+level >= (1<<QMAT_SHIFT) |
4367 // || bias-level >= (1<<QMAT_SHIFT)){ | |
344 | 4368 if(((unsigned)(level+threshold1))>threshold2){ |
4369 if(level>0){ | |
635 | 4370 level= (bias + level)>>QMAT_SHIFT; |
344 | 4371 block[j]= level; |
4372 }else{ | |
635 | 4373 level= (bias - level)>>QMAT_SHIFT; |
344 | 4374 block[j]= -level; |
0 | 4375 } |
344 | 4376 max |=level; |
0 | 4377 last_non_zero = i; |
344 | 4378 }else{ |
4379 block[j]=0; | |
0 | 4380 } |
4381 } | |
344 | 4382 *overflow= s->max_qcoeff < max; //overflow might have happend |
4383 | |
764 | 4384 /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */ |
1092 | 4385 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM) |
4386 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero); | |
764 | 4387 |
0 | 4388 return last_non_zero; |
4389 } | |
4390 | |
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
|
4391 #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
|
4392 |
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
|
4393 static void dct_unquantize_mpeg1_c(MpegEncContext *s, |
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
|
4394 DCTELEM *block, int n, int qscale) |
0 | 4395 { |
200 | 4396 int i, level, nCoeffs; |
1064 | 4397 const uint16_t *quant_matrix; |
0 | 4398 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4399 nCoeffs= s->block_last_index[n]; |
200 | 4400 |
0 | 4401 if (s->mb_intra) { |
4402 if (n < 4) | |
4403 block[0] = block[0] * s->y_dc_scale; | |
4404 else | |
4405 block[0] = block[0] * s->c_dc_scale; | |
4406 /* XXX: only mpeg1 */ | |
4407 quant_matrix = s->intra_matrix; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4408 for(i=1;i<=nCoeffs;i++) { |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4409 int j= s->intra_scantable.permutated[i]; |
200 | 4410 level = block[j]; |
0 | 4411 if (level) { |
4412 if (level < 0) { | |
4413 level = -level; | |
200 | 4414 level = (int)(level * qscale * quant_matrix[j]) >> 3; |
0 | 4415 level = (level - 1) | 1; |
4416 level = -level; | |
4417 } else { | |
200 | 4418 level = (int)(level * qscale * quant_matrix[j]) >> 3; |
0 | 4419 level = (level - 1) | 1; |
4420 } | |
4421 #ifdef PARANOID | |
4422 if (level < -2048 || level > 2047) | |
4423 fprintf(stderr, "unquant error %d %d\n", i, level); | |
4424 #endif | |
200 | 4425 block[j] = level; |
0 | 4426 } |
4427 } | |
4428 } else { | |
4429 i = 0; | |
344 | 4430 quant_matrix = s->inter_matrix; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4431 for(;i<=nCoeffs;i++) { |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4432 int j= s->intra_scantable.permutated[i]; |
200 | 4433 level = block[j]; |
0 | 4434 if (level) { |
4435 if (level < 0) { | |
4436 level = -level; | |
4437 level = (((level << 1) + 1) * qscale * | |
200 | 4438 ((int) (quant_matrix[j]))) >> 4; |
0 | 4439 level = (level - 1) | 1; |
4440 level = -level; | |
4441 } else { | |
4442 level = (((level << 1) + 1) * qscale * | |
200 | 4443 ((int) (quant_matrix[j]))) >> 4; |
0 | 4444 level = (level - 1) | 1; |
4445 } | |
4446 #ifdef PARANOID | |
4447 if (level < -2048 || level > 2047) | |
4448 fprintf(stderr, "unquant error %d %d\n", i, level); | |
4449 #endif | |
200 | 4450 block[j] = level; |
0 | 4451 } |
4452 } | |
4453 } | |
4454 } | |
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
|
4455 |
325 | 4456 static void dct_unquantize_mpeg2_c(MpegEncContext *s, |
4457 DCTELEM *block, int n, int qscale) | |
4458 { | |
4459 int i, level, nCoeffs; | |
1064 | 4460 const uint16_t *quant_matrix; |
325 | 4461 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4462 if(s->alternate_scan) nCoeffs= 63; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4463 else nCoeffs= s->block_last_index[n]; |
325 | 4464 |
4465 if (s->mb_intra) { | |
4466 if (n < 4) | |
4467 block[0] = block[0] * s->y_dc_scale; | |
4468 else | |
4469 block[0] = block[0] * s->c_dc_scale; | |
4470 quant_matrix = s->intra_matrix; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4471 for(i=1;i<=nCoeffs;i++) { |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4472 int j= s->intra_scantable.permutated[i]; |
325 | 4473 level = block[j]; |
4474 if (level) { | |
4475 if (level < 0) { | |
4476 level = -level; | |
4477 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
4478 level = -level; | |
4479 } else { | |
4480 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
4481 } | |
4482 #ifdef PARANOID | |
4483 if (level < -2048 || level > 2047) | |
4484 fprintf(stderr, "unquant error %d %d\n", i, level); | |
4485 #endif | |
4486 block[j] = level; | |
4487 } | |
4488 } | |
4489 } else { | |
4490 int sum=-1; | |
4491 i = 0; | |
344 | 4492 quant_matrix = s->inter_matrix; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4493 for(;i<=nCoeffs;i++) { |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4494 int j= s->intra_scantable.permutated[i]; |
325 | 4495 level = block[j]; |
4496 if (level) { | |
4497 if (level < 0) { | |
4498 level = -level; | |
4499 level = (((level << 1) + 1) * qscale * | |
4500 ((int) (quant_matrix[j]))) >> 4; | |
4501 level = -level; | |
4502 } else { | |
4503 level = (((level << 1) + 1) * qscale * | |
4504 ((int) (quant_matrix[j]))) >> 4; | |
4505 } | |
4506 #ifdef PARANOID | |
4507 if (level < -2048 || level > 2047) | |
4508 fprintf(stderr, "unquant error %d %d\n", i, level); | |
4509 #endif | |
4510 block[j] = level; | |
4511 sum+=level; | |
4512 } | |
4513 } | |
4514 block[63]^=sum&1; | |
4515 } | |
4516 } | |
4517 | |
4518 | |
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
|
4519 static void dct_unquantize_h263_c(MpegEncContext *s, |
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
|
4520 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
|
4521 { |
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
|
4522 int i, level, qmul, qadd; |
200 | 4523 int nCoeffs; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
4524 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4525 assert(s->block_last_index[n]>=0); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4526 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4527 qadd = (qscale - 1) | 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4528 qmul = qscale << 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4529 |
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
|
4530 if (s->mb_intra) { |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
4531 if (!s->h263_aic) { |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
4532 if (n < 4) |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
4533 block[0] = block[0] * s->y_dc_scale; |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
4534 else |
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
4535 block[0] = block[0] * s->c_dc_scale; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4536 }else |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4537 qadd = 0; |
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
|
4538 i = 1; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4539 nCoeffs= 63; //does not allways use zigzag table |
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
|
4540 } 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
|
4541 i = 0; |
1094 | 4542 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; |
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
|
4543 } |
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
|
4544 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4545 for(;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
|
4546 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
|
4547 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
|
4548 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
|
4549 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
|
4550 } 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
|
4551 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
|
4552 } |
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
|
4553 #ifdef PARANOID |
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
|
4554 if (level < -2048 || level > 2047) |
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
|
4555 fprintf(stderr, "unquant error %d %d\n", 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
|
4556 #endif |
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
|
4557 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
|
4558 } |
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
|
4559 } |
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
|
4560 } |
0 | 4561 |
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
|
4562 |
1059 | 4563 static const AVOption mpeg4_options[] = |
4564 { | |
4565 AVOPTION_CODEC_INT("bitrate", "desired video bitrate", bit_rate, 4, 240000000, 800000), | |
4566 AVOPTION_CODEC_INT("ratetol", "number of bits the bitstream is allowed to diverge from the reference" | |
4567 "the reference can be CBR (for CBR pass1) or VBR (for pass2)", | |
4568 bit_rate_tolerance, 4, 240000000, 8000), | |
4569 AVOPTION_CODEC_INT("qmin", "minimum quantizer", qmin, 1, 31, 2), | |
4570 AVOPTION_CODEC_INT("qmax", "maximum quantizer", qmax, 1, 31, 31), | |
4571 AVOPTION_CODEC_STRING("rc_eq", "rate control equation", | |
4572 rc_eq, "tex^qComp,option1,options2", 0), | |
4573 AVOPTION_CODEC_INT("rc_minrate", "rate control minimum bitrate", | |
4574 rc_min_rate, 4, 24000000, 0), | |
4575 AVOPTION_CODEC_INT("rc_maxrate", "rate control maximum bitrate", | |
4576 rc_max_rate, 4, 24000000, 0), | |
1130 | 4577 AVOPTION_CODEC_DOUBLE("rc_buf_aggresivity", "rate control buffer aggresivity", |
4578 rc_buffer_aggressivity, 4, 24000000, 0), | |
4579 AVOPTION_CODEC_DOUBLE("rc_initial_cplx", "initial complexity for pass1 ratecontrol", | |
4580 rc_initial_cplx, 0., 9999999., 0), | |
4581 AVOPTION_CODEC_DOUBLE("i_quant_factor", "qscale factor between p and i frames", | |
4582 i_quant_factor, 0., 0., 0), | |
4583 AVOPTION_CODEC_DOUBLE("i_quant_offset", "qscale offset between p and i frames", | |
4584 i_quant_factor, -999999., 999999., 0), | |
4585 AVOPTION_CODEC_INT("dct_algo", "dct alghorithm", | |
4586 dct_algo, 0, 5, 0), // fixme - "Auto,FastInt,Int,MMX,MLib,Altivec" | |
4587 AVOPTION_CODEC_DOUBLE("lumi_masking", "luminance masking", | |
4588 lumi_masking, 0., 999999., 0), | |
4589 AVOPTION_CODEC_DOUBLE("temporal_cplx_masking", "temporary complexity masking", | |
4590 temporal_cplx_masking, 0., 999999., 0), | |
4591 AVOPTION_CODEC_DOUBLE("spatial_cplx_masking", "spatial complexity masking", | |
4592 spatial_cplx_masking, 0., 999999., 0), | |
4593 AVOPTION_CODEC_DOUBLE("p_masking", "p block masking", | |
4594 p_masking, 0., 999999., 0), | |
4595 AVOPTION_CODEC_DOUBLE("dark_masking", "darkness masking", | |
4596 dark_masking, 0., 999999., 0), | |
4597 AVOPTION_CODEC_INT("idct_algo", "idct alghorithm", | |
4598 idct_algo, 0, 8, 0), // fixme - "Auto,Int,Simple,SimpleMMX,LibMPEG2MMX,PS2,MLib,ARM,Altivec" | |
4599 | |
4600 AVOPTION_CODEC_INT("mb_qmin", "minimum MB quantizer", | |
4601 mb_qmin, 0, 8, 0), | |
4602 AVOPTION_CODEC_INT("mb_qmax", "maximum MB quantizer", | |
4603 mb_qmin, 0, 8, 0), | |
4604 | |
4605 AVOPTION_CODEC_INT("me_cmp", "ME compare function", | |
4606 me_cmp, 0, 24000000, 0), | |
4607 AVOPTION_CODEC_INT("me_sub_cmp", "subpixel ME compare function", | |
4608 me_sub_cmp, 0, 24000000, 0), | |
4609 | |
4610 | |
4611 AVOPTION_CODEC_INT("dia_size", "ME diamond size & shape", | |
4612 dia_size, 0, 24000000, 0), | |
4613 AVOPTION_CODEC_INT("last_predictor_count", "amount of previous MV predictors", | |
4614 last_predictor_count, 0, 24000000, 0), | |
4615 | |
4616 AVOPTION_CODEC_INT("pre_me", "pre pass for ME", | |
4617 pre_me, 0, 24000000, 0), | |
4618 AVOPTION_CODEC_INT("me_pre_cmp", "ME pre pass compare function", | |
4619 me_pre_cmp, 0, 24000000, 0), | |
4620 | |
4621 AVOPTION_CODEC_INT("me_range", "maximum ME search range", | |
4622 me_range, 0, 24000000, 0), | |
4623 AVOPTION_CODEC_INT("pre_dia_size", "ME pre pass diamod size & shape", | |
4624 pre_dia_size, 0, 24000000, 0), | |
4625 AVOPTION_CODEC_INT("me_subpel_quality", "subpel ME quality", | |
4626 me_subpel_quality, 0, 24000000, 0), | |
4627 AVOPTION_CODEC_INT("me_range", "maximum ME search range", | |
4628 me_range, 0, 24000000, 0), | |
1059 | 4629 AVOPTION_CODEC_FLAG("psnr", "calculate PSNR of compressed frames", |
4630 flags, CODEC_FLAG_PSNR, 0), | |
4631 AVOPTION_CODEC_RCOVERRIDE("rc_override", "ratecontrol override (=startframe,endframe,qscale,quality_factor)", | |
4632 rc_override), | |
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
4633 AVOPTION_SUB(avoptions_common), |
1059 | 4634 AVOPTION_END() |
4635 }; | |
4636 | |
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
|
4637 #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
|
4638 |
0 | 4639 AVCodec mpeg1video_encoder = { |
4640 "mpeg1video", | |
4641 CODEC_TYPE_VIDEO, | |
4642 CODEC_ID_MPEG1VIDEO, | |
4643 sizeof(MpegEncContext), | |
4644 MPV_encode_init, | |
4645 MPV_encode_picture, | |
4646 MPV_encode_end, | |
4647 }; | |
4648 | |
1042 | 4649 #ifdef CONFIG_RISKY |
4650 | |
1421 | 4651 AVCodec mpeg2video_encoder = { |
4652 "mpeg2video", | |
4653 CODEC_TYPE_VIDEO, | |
4654 CODEC_ID_MPEG2VIDEO, | |
4655 sizeof(MpegEncContext), | |
4656 MPV_encode_init, | |
4657 MPV_encode_picture, | |
4658 MPV_encode_end, | |
4659 }; | |
4660 | |
0 | 4661 AVCodec h263_encoder = { |
4662 "h263", | |
4663 CODEC_TYPE_VIDEO, | |
4664 CODEC_ID_H263, | |
4665 sizeof(MpegEncContext), | |
4666 MPV_encode_init, | |
4667 MPV_encode_picture, | |
4668 MPV_encode_end, | |
4669 }; | |
4670 | |
4671 AVCodec h263p_encoder = { | |
4672 "h263p", | |
4673 CODEC_TYPE_VIDEO, | |
4674 CODEC_ID_H263P, | |
4675 sizeof(MpegEncContext), | |
4676 MPV_encode_init, | |
4677 MPV_encode_picture, | |
4678 MPV_encode_end, | |
4679 }; | |
4680 | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4681 AVCodec flv_encoder = { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4682 "flv", |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4683 CODEC_TYPE_VIDEO, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4684 CODEC_ID_FLV1, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4685 sizeof(MpegEncContext), |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4686 MPV_encode_init, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4687 MPV_encode_picture, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4688 MPV_encode_end, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4689 }; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4690 |
0 | 4691 AVCodec rv10_encoder = { |
4692 "rv10", | |
4693 CODEC_TYPE_VIDEO, | |
4694 CODEC_ID_RV10, | |
4695 sizeof(MpegEncContext), | |
4696 MPV_encode_init, | |
4697 MPV_encode_picture, | |
4698 MPV_encode_end, | |
4699 }; | |
4700 | |
71 | 4701 AVCodec mpeg4_encoder = { |
4702 "mpeg4", | |
0 | 4703 CODEC_TYPE_VIDEO, |
71 | 4704 CODEC_ID_MPEG4, |
0 | 4705 sizeof(MpegEncContext), |
4706 MPV_encode_init, | |
4707 MPV_encode_picture, | |
4708 MPV_encode_end, | |
1059 | 4709 .options = mpeg4_options, |
0 | 4710 }; |
4711 | |
307 | 4712 AVCodec msmpeg4v1_encoder = { |
4713 "msmpeg4v1", | |
0 | 4714 CODEC_TYPE_VIDEO, |
307 | 4715 CODEC_ID_MSMPEG4V1, |
0 | 4716 sizeof(MpegEncContext), |
4717 MPV_encode_init, | |
4718 MPV_encode_picture, | |
4719 MPV_encode_end, | |
1130 | 4720 .options = mpeg4_options, |
0 | 4721 }; |
307 | 4722 |
4723 AVCodec msmpeg4v2_encoder = { | |
4724 "msmpeg4v2", | |
4725 CODEC_TYPE_VIDEO, | |
4726 CODEC_ID_MSMPEG4V2, | |
4727 sizeof(MpegEncContext), | |
4728 MPV_encode_init, | |
4729 MPV_encode_picture, | |
4730 MPV_encode_end, | |
1130 | 4731 .options = mpeg4_options, |
307 | 4732 }; |
4733 | |
4734 AVCodec msmpeg4v3_encoder = { | |
4735 "msmpeg4", | |
4736 CODEC_TYPE_VIDEO, | |
4737 CODEC_ID_MSMPEG4V3, | |
4738 sizeof(MpegEncContext), | |
4739 MPV_encode_init, | |
4740 MPV_encode_picture, | |
4741 MPV_encode_end, | |
1130 | 4742 .options = mpeg4_options, |
307 | 4743 }; |
499 | 4744 |
4745 AVCodec wmv1_encoder = { | |
4746 "wmv1", | |
4747 CODEC_TYPE_VIDEO, | |
4748 CODEC_ID_WMV1, | |
4749 sizeof(MpegEncContext), | |
4750 MPV_encode_init, | |
4751 MPV_encode_picture, | |
4752 MPV_encode_end, | |
1130 | 4753 .options = mpeg4_options, |
499 | 4754 }; |
4755 | |
1042 | 4756 #endif |
4757 | |
4758 AVCodec mjpeg_encoder = { | |
4759 "mjpeg", | |
4760 CODEC_TYPE_VIDEO, | |
4761 CODEC_ID_MJPEG, | |
4762 sizeof(MpegEncContext), | |
4763 MPV_encode_init, | |
4764 MPV_encode_picture, | |
4765 MPV_encode_end, | |
4766 }; | |
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
|
4767 |
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
|
4768 #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
|
4769 |