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