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