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