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