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