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