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