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