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