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