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