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