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