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