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