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