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