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