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