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