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