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