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