Mercurial > libavcodec.hg
annotate mpegvideo.c @ 3069:1363655b443c libavcodec
Add a newline to b_frame_strategy error message.
| author | corey |
|---|---|
| date | Fri, 27 Jan 2006 23:24:24 +0000 |
| parents | 9aa8d8587bea |
| children | 3c32ecc8eefe |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * The simplest mpeg encoder (well, it was the simplest!) | |
| 429 | 3 * Copyright (c) 2000,2001 Fabrice Bellard. |
|
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1729
diff
changeset
|
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
| 0 | 5 * |
| 429 | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Lesser General Public | |
| 8 * License as published by the Free Software Foundation; either | |
| 9 * version 2 of the License, or (at your option) any later version. | |
| 0 | 10 * |
| 429 | 11 * This library is distributed in the hope that it will be useful, |
| 0 | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 14 * Lesser General Public License for more details. | |
| 0 | 15 * |
| 429 | 16 * You should have received a copy of the GNU Lesser General Public |
| 17 * License along with this library; if not, write to the Free Software | |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3011
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 295 | 19 * |
| 325 | 20 * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at> |
| 0 | 21 */ |
| 2967 | 22 |
| 1106 | 23 /** |
| 24 * @file mpegvideo.c | |
| 25 * The simplest mpeg encoder (well, it was the simplest!). | |
| 2967 | 26 */ |
| 27 | |
| 0 | 28 #include "avcodec.h" |
| 29 #include "dsputil.h" | |
| 30 #include "mpegvideo.h" | |
| 1557 | 31 #include "faandct.h" |
|
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
32 #include <limits.h> |
| 0 | 33 |
|
17
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
34 #ifdef USE_FASTMEMCPY |
|
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
35 #include "fastmemcpy.h" |
|
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
36 #endif |
|
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
37 |
|
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
|
38 //#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
|
39 //#include <assert.h> |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
40 |
|
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
41 #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
|
42 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
|
43 #endif //CONFIG_ENCODERS |
| 2967 | 44 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, |
| 1689 | 45 DCTELEM *block, int n, int qscale); |
| 2967 | 46 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, |
| 1689 | 47 DCTELEM *block, int n, int qscale); |
| 48 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
|
49 DCTELEM *block, int n, int qscale); |
| 1689 | 50 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, |
| 325 | 51 DCTELEM *block, int n, int qscale); |
| 2967 | 52 static void dct_unquantize_h263_intra_c(MpegEncContext *s, |
| 1689 | 53 DCTELEM *block, int n, int qscale); |
| 2967 | 54 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
|
55 DCTELEM *block, int n, int qscale); |
| 1064 | 56 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
|
57 #ifdef CONFIG_ENCODERS |
| 344 | 58 static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); |
| 945 | 59 static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); |
| 1777 | 60 static int dct_quantize_refine(MpegEncContext *s, DCTELEM *block, int16_t *weight, DCTELEM *orig, int n, int qscale); |
| 1389 | 61 static int sse_mb(MpegEncContext *s); |
| 1719 | 62 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
|
63 #endif //CONFIG_ENCODERS |
| 206 | 64 |
| 1381 | 65 #ifdef HAVE_XVMC |
| 66 extern int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx); | |
| 67 extern void XVMC_field_end(MpegEncContext *s); | |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1579
diff
changeset
|
68 extern void XVMC_decode_mb(MpegEncContext *s); |
| 1381 | 69 #endif |
| 70 | |
| 1064 | 71 void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, int w)= draw_edges_c; |
| 206 | 72 |
| 0 | 73 |
| 74 /* enable all paranoid tests for rounding, overflows, etc... */ | |
| 75 //#define PARANOID | |
| 76 | |
| 77 //#define DEBUG | |
| 78 | |
| 321 | 79 |
| 0 | 80 /* for jpeg fast DCT */ |
| 81 #define CONST_BITS 14 | |
| 82 | |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
83 static const uint16_t aanscales[64] = { |
| 0 | 84 /* precomputed values scaled up by 14 bits */ |
| 85 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | |
| 86 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270, | |
| 87 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906, | |
| 88 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315, | |
| 89 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | |
| 90 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552, | |
| 936 | 91 8867 , 12299, 11585, 10426, 8867, 6967, 4799, 2446, |
| 92 4520 , 6270, 5906, 5315, 4520, 3552, 2446, 1247 | |
| 0 | 93 }; |
| 94 | |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
95 static const uint8_t h263_chroma_roundtab[16] = { |
| 1013 | 96 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
| 0 | 97 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, |
| 98 }; | |
| 99 | |
| 1644 | 100 static const uint8_t ff_default_chroma_qscale_table[32]={ |
| 101 // 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 | |
| 102 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 | |
| 103 }; | |
| 104 | |
|
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
|
105 #ifdef CONFIG_ENCODERS |
| 1162 | 106 static uint8_t (*default_mv_penalty)[MAX_MV*2+1]=NULL; |
| 1064 | 107 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
|
108 |
| 998 | 109 enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1}; |
| 110 | |
|
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
111 static void convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64], |
|
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
112 const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra) |
| 0 | 113 { |
| 344 | 114 int qscale; |
|
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
115 int shift=0; |
| 0 | 116 |
|
709
afeff6ccb7f5
convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents:
706
diff
changeset
|
117 for(qscale=qmin; qscale<=qmax; qscale++){ |
| 344 | 118 int i; |
| 2967 | 119 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
|
120 #ifdef FAAN_POSTSCALE |
|
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
121 || dsp->fdct == ff_faandct |
|
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
122 #endif |
|
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
123 ) { |
|
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
|
124 for(i=0;i<64;i++) { |
|
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
125 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
|
126 /* 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
|
127 /* 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
|
128 /* (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
|
129 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */ |
| 2967 | 130 |
| 131 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
|
132 (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
|
133 } |
|
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
134 } else if (dsp->fdct == fdct_ifast |
|
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
135 #ifndef FAAN_POSTSCALE |
|
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
136 || dsp->fdct == ff_faandct |
|
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
137 #endif |
|
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
138 ) { |
| 344 | 139 for(i=0;i<64;i++) { |
|
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
140 const int j= dsp->idct_permutation[i]; |
| 344 | 141 /* 16 <= qscale * quant_matrix[i] <= 7905 */ |
| 142 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ | |
| 143 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ | |
| 144 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */ | |
| 2967 | 145 |
| 146 qmat[qscale][i] = (int)((uint64_t_C(1) << (QMAT_SHIFT + 14)) / | |
| 344 | 147 (aanscales[i] * qscale * quant_matrix[j])); |
| 148 } | |
| 149 } else { | |
| 150 for(i=0;i<64;i++) { | |
|
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
151 const int j= dsp->idct_permutation[i]; |
| 344 | 152 /* We can safely suppose that 16 <= quant_matrix[i] <= 255 |
| 153 So 16 <= qscale * quant_matrix[i] <= 7905 | |
| 154 so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 | |
| 155 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 | |
| 156 */ | |
| 1064 | 157 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j])); |
| 945 | 158 // 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
|
159 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
|
160 |
|
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
161 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
|
162 qmat16[qscale][1][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][0][i]); |
| 344 | 163 } |
| 0 | 164 } |
| 2967 | 165 |
|
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
166 for(i=intra; i<64; i++){ |
| 2390 | 167 int64_t max= 8191; |
| 168 if (dsp->fdct == fdct_ifast | |
| 169 #ifndef FAAN_POSTSCALE | |
| 170 || dsp->fdct == ff_faandct | |
| 171 #endif | |
| 172 ) { | |
| 173 max= (8191LL*aanscales[i]) >> 14; | |
| 174 } | |
| 2967 | 175 while(((max * qmat[qscale][i]) >> shift) > INT_MAX){ |
|
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
176 shift++; |
|
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
177 } |
|
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
178 } |
|
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
179 } |
|
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
180 if(shift){ |
|
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
181 av_log(NULL, AV_LOG_INFO, "Warning, QMAT_SHIFT is larger then %d, overflows possible\n", QMAT_SHIFT - shift); |
| 0 | 182 } |
| 183 } | |
|
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
|
184 |
|
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
|
185 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
|
186 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
|
187 s->qscale= clip(s->qscale, s->avctx->qmin, s->avctx->qmax); |
| 2967 | 188 |
|
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
|
189 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
|
190 } |
|
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
|
191 #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
|
192 |
| 1273 | 193 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
|
194 int i; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
195 int end; |
| 2967 | 196 |
| 764 | 197 st->scantable= src_scantable; |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
198 |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
199 for(i=0; i<64; i++){ |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
200 int j; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
201 j = src_scantable[i]; |
| 1273 | 202 st->permutated[i] = permutation[j]; |
|
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
203 #ifdef ARCH_POWERPC |
|
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
204 st->inverse[j] = i; |
|
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
205 #endif |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
206 } |
| 2967 | 207 |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
208 end=-1; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
209 for(i=0; i<64; i++){ |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
210 int j; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
211 j = st->permutated[i]; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
212 if(j>end) end=j; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
213 st->raster_end[i]= end; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
214 } |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
215 } |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
216 |
|
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1523
diff
changeset
|
217 #ifdef CONFIG_ENCODERS |
| 1411 | 218 void ff_write_quant_matrix(PutBitContext *pb, int16_t *matrix){ |
| 219 int i; | |
| 220 | |
| 221 if(matrix){ | |
| 222 put_bits(pb, 1, 1); | |
| 223 for(i=0;i<64;i++) { | |
| 224 put_bits(pb, 8, matrix[ ff_zigzag_direct[i] ]); | |
| 225 } | |
| 226 }else | |
| 227 put_bits(pb, 1, 0); | |
| 228 } | |
|
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1523
diff
changeset
|
229 #endif //CONFIG_ENCODERS |
| 1411 | 230 |
|
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
|
231 /* 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
|
232 int DCT_common_init(MpegEncContext *s) |
| 0 | 233 { |
| 1689 | 234 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; |
| 235 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c; | |
| 236 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c; | |
| 237 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c; | |
| 238 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c; | |
| 239 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; | |
| 1092 | 240 |
|
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
241 #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
|
242 s->dct_quantize= dct_quantize_c; |
| 1719 | 243 s->denoise_dct= denoise_dct_c; |
|
2616
ba6530ae8e34
remove superfluous CONFIG_ENCODERS (entire function is already wrapped)
melanson
parents:
2584
diff
changeset
|
244 #endif //CONFIG_ENCODERS |
| 2967 | 245 |
|
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
|
246 #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
|
247 MPV_common_init_mmx(s); |
| 8 | 248 #endif |
|
514
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M?ns Rullg?rd
mellum
parents:
506
diff
changeset
|
249 #ifdef ARCH_ALPHA |
|
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M?ns Rullg?rd
mellum
parents:
506
diff
changeset
|
250 MPV_common_init_axp(s); |
|
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M?ns Rullg?rd
mellum
parents:
506
diff
changeset
|
251 #endif |
|
628
f596db4aa871
sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents:
625
diff
changeset
|
252 #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
|
253 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
|
254 #endif |
|
721
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
255 #ifdef HAVE_MMI |
|
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
256 MPV_common_init_mmi(s); |
|
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
257 #endif |
| 730 | 258 #ifdef ARCH_ARMV4L |
| 874 | 259 MPV_common_init_armv4l(s); |
| 730 | 260 #endif |
|
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
261 #ifdef ARCH_POWERPC |
|
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
262 MPV_common_init_ppc(s); |
|
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
263 #endif |
| 730 | 264 |
|
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
|
265 #ifdef CONFIG_ENCODERS |
| 1007 | 266 s->fast_dct_quantize= s->dct_quantize; |
| 267 | |
| 945 | 268 if(s->flags&CODEC_FLAG_TRELLIS_QUANT){ |
| 269 s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_* | |
| 270 } | |
| 271 | |
|
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
|
272 #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
|
273 |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
274 /* load & permutate scantables |
| 2967 | 275 note: only wmv uses different ones |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
276 */ |
| 1708 | 277 if(s->alternate_scan){ |
| 278 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); | |
| 279 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
| 280 }else{ | |
| 281 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); | |
| 282 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
| 283 } | |
| 1273 | 284 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); |
| 285 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
| 591 | 286 |
|
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
|
287 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
|
288 } |
|
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
289 |
|
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
|
290 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
|
291 *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
|
292 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
|
293 } |
|
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
|
294 |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
295 static void copy_picture_attributes(MpegEncContext *s, AVFrame *dst, AVFrame *src){ |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
296 int i; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
297 |
| 1702 | 298 dst->pict_type = src->pict_type; |
| 299 dst->quality = src->quality; | |
| 300 dst->coded_picture_number = src->coded_picture_number; | |
| 301 dst->display_picture_number = src->display_picture_number; | |
| 302 // dst->reference = src->reference; | |
| 303 dst->pts = src->pts; | |
| 304 dst->interlaced_frame = src->interlaced_frame; | |
| 305 dst->top_field_first = src->top_field_first; | |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
306 |
|
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
307 if(s->avctx->me_threshold){ |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
308 if(!src->motion_val[0]) |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
309 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_val not set!\n"); |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
310 if(!src->mb_type) |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
311 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.mb_type not set!\n"); |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
312 if(!src->ref_index[0]) |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
313 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.ref_index not set!\n"); |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
314 if(src->motion_subsample_log2 != dst->motion_subsample_log2) |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
315 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_subsample_log2 doesn't match! (%d!=%d)\n", |
|
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
316 src->motion_subsample_log2, dst->motion_subsample_log2); |
|
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
317 |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
318 memcpy(dst->mb_type, src->mb_type, s->mb_stride * s->mb_height * sizeof(dst->mb_type[0])); |
| 2967 | 319 |
|
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
320 for(i=0; i<2; i++){ |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
321 int stride= ((16*s->mb_width )>>src->motion_subsample_log2) + 1; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
322 int height= ((16*s->mb_height)>>src->motion_subsample_log2); |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
323 |
|
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
324 if(src->motion_val[i] && src->motion_val[i] != dst->motion_val[i]){ |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
325 memcpy(dst->motion_val[i], src->motion_val[i], 2*stride*height*sizeof(int16_t)); |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
326 } |
|
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
327 if(src->ref_index[i] && src->ref_index[i] != dst->ref_index[i]){ |
| 1948 | 328 memcpy(dst->ref_index[i], src->ref_index[i], s->b8_stride*2*s->mb_height*sizeof(int8_t)); |
|
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
329 } |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
330 } |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
331 } |
| 1702 | 332 } |
| 333 | |
| 903 | 334 /** |
| 924 | 335 * allocates a Picture |
| 336 * The pixels are allocated/set by calling get_buffer() if shared=0 | |
| 903 | 337 */ |
| 924 | 338 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
|
339 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
|
340 const int mb_array_size= s->mb_stride*s->mb_height; |
| 1655 | 341 const int b8_array_size= s->b8_stride*s->mb_height*2; |
| 342 const int b4_array_size= s->b4_stride*s->mb_height*4; | |
| 1168 | 343 int i; |
| 2967 | 344 |
| 924 | 345 if(shared){ |
| 346 assert(pic->data[0]); | |
| 347 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED); | |
| 348 pic->type= FF_BUFFER_TYPE_SHARED; | |
| 349 }else{ | |
| 350 int r; | |
| 2967 | 351 |
| 924 | 352 assert(!pic->data[0]); |
| 2967 | 353 |
| 925 | 354 r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic); |
| 2967 | 355 |
| 924 | 356 if(r<0 || !pic->age || !pic->type || !pic->data[0]){ |
| 2979 | 357 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n", r, pic->age, pic->type, pic->data[0]); |
| 924 | 358 return -1; |
| 359 } | |
| 360 | |
| 361 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
|
362 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (stride changed)\n"); |
| 924 | 363 return -1; |
| 364 } | |
| 365 | |
| 366 if(pic->linesize[1] != pic->linesize[2]){ | |
| 2764 | 367 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (uv stride mismatch)\n"); |
| 924 | 368 return -1; |
| 369 } | |
| 370 | |
| 371 s->linesize = pic->linesize[0]; | |
| 372 s->uvlinesize= pic->linesize[1]; | |
| 903 | 373 } |
| 2967 | 374 |
| 924 | 375 if(pic->qscale_table==NULL){ |
| 2967 | 376 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
|
377 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
|
378 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
|
379 CHECKED_ALLOCZ(pic->mb_mean , mb_array_size * sizeof(int8_t)) |
| 924 | 380 } |
| 381 | |
|
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
|
382 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
|
383 CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t)) |
| 1742 | 384 CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(uint32_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
|
385 pic->mb_type= pic->mb_type_base + s->mb_stride+1; |
| 1168 | 386 if(s->out_format == FMT_H264){ |
| 387 for(i=0; i<2; i++){ | |
| 2570 | 388 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+4) * sizeof(int16_t)) |
| 389 pic->motion_val[i]= pic->motion_val_base[i]+4; | |
| 1948 | 390 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t)) |
| 1655 | 391 } |
| 1669 | 392 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
|
393 }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){ |
| 1655 | 394 for(i=0; i<2; i++){ |
| 2570 | 395 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+4) * sizeof(int16_t)) |
| 396 pic->motion_val[i]= pic->motion_val_base[i]+4; | |
| 1948 | 397 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t)) |
| 1168 | 398 } |
| 1669 | 399 pic->motion_subsample_log2= 3; |
| 1168 | 400 } |
|
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
401 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
402 CHECKED_ALLOCZ(pic->dct_coeff, 64 * mb_array_size * sizeof(DCTELEM)*6) |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
403 } |
|
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
|
404 pic->qstride= s->mb_stride; |
| 1546 | 405 CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan)) |
| 924 | 406 } |
| 1168 | 407 |
|
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
408 //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
|
409 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
|
410 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
|
411 if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == B_TYPE) |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
412 pic->age= INT_MAX; // skipped MBs in b frames are quite rare in mpeg1/2 and its a bit tricky to skip them anyway |
| 2967 | 413 |
| 903 | 414 return 0; |
| 415 fail: //for the CHECKED_ALLOCZ macro | |
| 416 return -1; | |
| 417 } | |
| 418 | |
| 924 | 419 /** |
| 420 * deallocates a picture | |
| 421 */ | |
| 903 | 422 static void free_picture(MpegEncContext *s, Picture *pic){ |
| 423 int i; | |
| 924 | 424 |
| 425 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){ | |
| 925 | 426 s->avctx->release_buffer(s->avctx, (AVFrame*)pic); |
| 924 | 427 } |
| 428 | |
| 903 | 429 av_freep(&pic->mb_var); |
| 430 av_freep(&pic->mc_mb_var); | |
| 431 av_freep(&pic->mb_mean); | |
| 432 av_freep(&pic->mbskip_table); | |
| 433 av_freep(&pic->qscale_table); | |
| 1168 | 434 av_freep(&pic->mb_type_base); |
|
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
435 av_freep(&pic->dct_coeff); |
| 1546 | 436 av_freep(&pic->pan_scan); |
| 1168 | 437 pic->mb_type= NULL; |
| 438 for(i=0; i<2; i++){ | |
| 1655 | 439 av_freep(&pic->motion_val_base[i]); |
| 1168 | 440 av_freep(&pic->ref_index[i]); |
| 441 } | |
| 2967 | 442 |
| 1214 | 443 if(pic->type == FF_BUFFER_TYPE_SHARED){ |
| 924 | 444 for(i=0; i<4; i++){ |
| 445 pic->base[i]= | |
| 446 pic->data[i]= NULL; | |
| 447 } | |
| 2967 | 448 pic->type= 0; |
| 903 | 449 } |
| 450 } | |
| 451 | |
| 1799 | 452 static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ |
| 453 int i; | |
| 454 | |
| 2967 | 455 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264) |
| 1799 | 456 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance |
| 457 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17; | |
| 458 | |
| 459 //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer() | |
| 2967 | 460 CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t)) |
| 1799 | 461 s->rd_scratchpad= s->me.scratchpad; |
| 462 s->b_scratchpad= s->me.scratchpad; | |
| 463 s->obmc_scratchpad= s->me.scratchpad + 16; | |
| 464 if (s->encoding) { | |
| 465 CHECKED_ALLOCZ(s->me.map , ME_MAP_SIZE*sizeof(uint32_t)) | |
| 466 CHECKED_ALLOCZ(s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t)) | |
| 467 if(s->avctx->noise_reduction){ | |
| 468 CHECKED_ALLOCZ(s->dct_error_sum, 2 * 64 * sizeof(int)) | |
| 469 } | |
| 2967 | 470 } |
|
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1846
diff
changeset
|
471 CHECKED_ALLOCZ(s->blocks, 64*12*2 * sizeof(DCTELEM)) |
| 1799 | 472 s->block= s->blocks[0]; |
| 473 | |
| 474 for(i=0;i<12;i++){ | |
| 475 s->pblocks[i] = (short *)(&s->block[i]); | |
| 476 } | |
| 477 return 0; | |
| 478 fail: | |
| 479 return -1; //free() through MPV_common_end() | |
| 480 } | |
| 481 | |
| 482 static void free_duplicate_context(MpegEncContext *s){ | |
| 483 if(s==NULL) return; | |
| 484 | |
| 485 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL; | |
| 486 av_freep(&s->me.scratchpad); | |
| 2967 | 487 s->rd_scratchpad= |
| 488 s->b_scratchpad= | |
| 1799 | 489 s->obmc_scratchpad= NULL; |
| 2967 | 490 |
| 1799 | 491 av_freep(&s->dct_error_sum); |
| 492 av_freep(&s->me.map); | |
| 493 av_freep(&s->me.score_map); | |
| 494 av_freep(&s->blocks); | |
| 495 s->block= NULL; | |
| 496 } | |
| 497 | |
| 498 static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){ | |
| 499 #define COPY(a) bak->a= src->a | |
| 500 COPY(allocated_edge_emu_buffer); | |
| 501 COPY(edge_emu_buffer); | |
| 502 COPY(me.scratchpad); | |
| 503 COPY(rd_scratchpad); | |
| 504 COPY(b_scratchpad); | |
| 505 COPY(obmc_scratchpad); | |
| 506 COPY(me.map); | |
| 507 COPY(me.score_map); | |
| 508 COPY(blocks); | |
| 509 COPY(block); | |
| 510 COPY(start_mb_y); | |
| 511 COPY(end_mb_y); | |
| 512 COPY(me.map_generation); | |
| 513 COPY(pb); | |
| 514 COPY(dct_error_sum); | |
| 1810 | 515 COPY(dct_count[0]); |
| 516 COPY(dct_count[1]); | |
| 1799 | 517 #undef COPY |
| 518 } | |
| 519 | |
| 1827 | 520 void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){ |
| 1799 | 521 MpegEncContext bak; |
| 1827 | 522 int i; |
| 1799 | 523 //FIXME copy only needed parts |
| 524 //START_TIMER | |
| 525 backup_duplicate_context(&bak, dst); | |
| 526 memcpy(dst, src, sizeof(MpegEncContext)); | |
| 527 backup_duplicate_context(dst, &bak); | |
| 1827 | 528 for(i=0;i<12;i++){ |
| 529 dst->pblocks[i] = (short *)(&dst->block[i]); | |
| 530 } | |
| 1799 | 531 //STOP_TIMER("update_duplicate_context") //about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads |
| 532 } | |
| 533 | |
| 534 static void update_duplicate_context_after_me(MpegEncContext *dst, MpegEncContext *src){ | |
| 535 #define COPY(a) dst->a= src->a | |
| 536 COPY(pict_type); | |
| 537 COPY(current_picture); | |
| 538 COPY(f_code); | |
| 539 COPY(b_code); | |
| 540 COPY(qscale); | |
| 541 COPY(lambda); | |
| 542 COPY(lambda2); | |
| 543 COPY(picture_in_gop_number); | |
| 544 COPY(gop_picture_number); | |
| 2764 | 545 COPY(frame_pred_frame_dct); //FIXME don't set in encode_header |
| 546 COPY(progressive_frame); //FIXME don't set in encode_header | |
| 547 COPY(partitioned_frame); //FIXME don't set in encode_header | |
| 1799 | 548 #undef COPY |
| 549 } | |
| 550 | |
| 1892 | 551 /** |
| 552 * sets the given MpegEncContext to common defaults (same for encoding and decoding). | |
| 553 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
| 554 */ | |
| 555 static void MPV_common_defaults(MpegEncContext *s){ | |
| 556 s->y_dc_scale_table= | |
| 557 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
| 558 s->chroma_qscale_table= ff_default_chroma_qscale_table; | |
| 559 s->progressive_frame= 1; | |
| 560 s->progressive_sequence= 1; | |
| 561 s->picture_structure= PICT_FRAME; | |
| 562 | |
| 563 s->coded_picture_number = 0; | |
| 564 s->picture_number = 0; | |
| 565 s->input_picture_number = 0; | |
| 566 | |
| 567 s->picture_in_gop_number = 0; | |
| 1894 | 568 |
| 569 s->f_code = 1; | |
| 570 s->b_code = 1; | |
| 1892 | 571 } |
| 572 | |
| 573 /** | |
| 574 * sets the given MpegEncContext to defaults for decoding. | |
| 575 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
| 576 */ | |
| 577 void MPV_decode_defaults(MpegEncContext *s){ | |
| 578 MPV_common_defaults(s); | |
| 579 } | |
| 580 | |
| 581 /** | |
| 582 * sets the given MpegEncContext to defaults for encoding. | |
| 583 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
| 584 */ | |
|
1902
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
585 |
|
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
586 #ifdef CONFIG_ENCODERS |
|
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
587 static void MPV_encode_defaults(MpegEncContext *s){ |
| 1892 | 588 static int done=0; |
| 2967 | 589 |
| 1892 | 590 MPV_common_defaults(s); |
| 2967 | 591 |
| 1892 | 592 if(!done){ |
| 593 int i; | |
| 594 done=1; | |
| 595 | |
| 596 default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); | |
| 597 memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1)); | |
| 598 | |
| 599 for(i=-16; i<16; i++){ | |
| 600 default_fcode_tab[i + MAX_MV]= 1; | |
| 601 } | |
| 602 } | |
| 603 s->me.mv_penalty= default_mv_penalty; | |
| 604 s->fcode_tab= default_fcode_tab; | |
| 605 } | |
|
1902
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
606 #endif //CONFIG_ENCODERS |
| 1892 | 607 |
| 2967 | 608 /** |
| 1892 | 609 * init common structure for both encoder and decoder. |
| 610 * this assumes that some variables like width/height are already set | |
| 611 */ | |
|
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
|
612 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
|
613 { |
| 1708 | 614 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
|
615 |
| 1991 | 616 if(s->avctx->thread_count > MAX_THREADS || (16*s->avctx->thread_count > s->height && s->height)){ |
| 1989 | 617 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n"); |
| 618 return -1; | |
| 619 } | |
| 620 | |
| 2422 | 621 if((s->width || s->height) && avcodec_check_dimensions(s->avctx, s->width, s->height)) |
| 622 return -1; | |
| 623 | |
| 1092 | 624 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
|
625 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
|
626 |
| 754 | 627 s->flags= s->avctx->flags; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
628 s->flags2= s->avctx->flags2; |
|
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
|
629 |
| 903 | 630 s->mb_width = (s->width + 15) / 16; |
| 0 | 631 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
|
632 s->mb_stride = s->mb_width + 1; |
| 1655 | 633 s->b8_stride = s->mb_width*2 + 1; |
| 634 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
|
635 mb_array_size= s->mb_height * s->mb_stride; |
| 1708 | 636 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
|
637 |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
638 /* set chroma shifts */ |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
639 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt,&(s->chroma_x_shift), |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
640 &(s->chroma_y_shift) ); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
641 |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
642 /* 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
|
643 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
|
644 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
|
645 |
|
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
646 s->mb_num = s->mb_width * s->mb_height; |
| 2967 | 647 |
|
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
|
648 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
|
649 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
|
650 s->block_wrap[2]= |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
651 s->block_wrap[3]= s->b8_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
|
652 s->block_wrap[4]= |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
653 s->block_wrap[5]= s->mb_stride; |
| 2967 | 654 |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
655 y_size = s->b8_stride * (2 * s->mb_height + 1); |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
656 c_size = s->mb_stride * (s->mb_height + 1); |
| 756 | 657 yc_size = y_size + 2 * c_size; |
| 2967 | 658 |
| 701 | 659 /* convert fourcc to upper case */ |
| 2967 | 660 s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF) |
| 1116 | 661 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 ) |
| 2967 | 662 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16) |
| 1116 | 663 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24); |
|
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
664 |
| 2967 | 665 s->avctx->stream_codec_tag= toupper( s->avctx->stream_codec_tag &0xFF) |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
666 + (toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 ) |
| 2967 | 667 + (toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16) |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
668 + (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
|
669 |
| 925 | 670 s->avctx->coded_frame= (AVFrame*)&s->current_picture; |
| 903 | 671 |
|
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
|
672 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
|
673 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
|
674 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
|
675 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
|
676 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
677 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
678 s->mb_index2xy[ s->mb_height*s->mb_width ] = (s->mb_height-1)*s->mb_stride + s->mb_width; //FIXME really needed? |
| 2967 | 679 |
|
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
680 if (s->encoding) { |
| 324 | 681 /* 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
|
682 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
|
683 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
|
684 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
|
685 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
|
686 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
|
687 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
|
688 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
|
689 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
|
690 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
|
691 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
|
692 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
|
693 s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1; |
| 324 | 694 |
|
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
695 if(s->msmpeg4_version){ |
|
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
696 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
|
697 } |
| 612 | 698 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
|
699 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
700 /* Allocate MB type table */ |
| 1708 | 701 CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint16_t)) //needed for encoding |
| 2967 | 702 |
|
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
|
703 CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int)) |
| 2967 | 704 |
|
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
|
705 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
|
706 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
|
707 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
|
708 CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t)) |
| 1556 | 709 CHECKED_ALLOCZ(s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) |
| 710 CHECKED_ALLOCZ(s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) | |
| 2967 | 711 |
| 1597 | 712 if(s->avctx->noise_reduction){ |
| 713 CHECKED_ALLOCZ(s->dct_offset, 2 * 64 * sizeof(uint16_t)) | |
| 714 } | |
|
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
715 } |
|
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
716 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
|
717 |
|
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
|
718 CHECKED_ALLOCZ(s->error_status_table, mb_array_size*sizeof(uint8_t)) |
| 2967 | 719 |
| 1708 | 720 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
|
721 /* interlaced direct mode decoding tables */ |
| 1708 | 722 for(i=0; i<2; i++){ |
| 723 int j, k; | |
| 724 for(j=0; j<2; j++){ | |
| 725 for(k=0; k<2; k++){ | |
| 726 CHECKED_ALLOCZ(s->b_field_mv_table_base[i][j][k] , mv_table_size * 2 * sizeof(int16_t)) | |
| 727 s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1; | |
| 728 } | |
| 729 CHECKED_ALLOCZ(s->b_field_select_table[i][j] , mb_array_size * 2 * sizeof(uint8_t)) | |
| 730 CHECKED_ALLOCZ(s->p_field_mv_table_base[i][j] , mv_table_size * 2 * sizeof(int16_t)) | |
| 731 s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1; | |
| 732 } | |
| 733 CHECKED_ALLOCZ(s->p_field_select_table[i] , mb_array_size * 2 * sizeof(uint8_t)) | |
| 734 } | |
| 0 | 735 } |
| 767 | 736 if (s->out_format == FMT_H263) { |
| 0 | 737 /* ac values */ |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
738 CHECKED_ALLOCZ(s->ac_val_base, yc_size * sizeof(int16_t) * 16); |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
739 s->ac_val[0] = s->ac_val_base + s->b8_stride + 1; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
740 s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1; |
| 0 | 741 s->ac_val[2] = s->ac_val[1] + c_size; |
| 2967 | 742 |
| 0 | 743 /* cbp values */ |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
744 CHECKED_ALLOCZ(s->coded_block_base, y_size); |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
745 s->coded_block= s->coded_block_base + s->b8_stride + 1; |
| 2967 | 746 |
| 456 | 747 /* 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
|
748 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
|
749 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
|
750 } |
| 2967 | 751 |
| 756 | 752 if (s->h263_pred || s->h263_plus || !s->encoding) { |
| 753 /* dc values */ | |
| 754 //MN: we need these for error resilience of intra-frames | |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
755 CHECKED_ALLOCZ(s->dc_val_base, yc_size * sizeof(int16_t)); |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
756 s->dc_val[0] = s->dc_val_base + s->b8_stride + 1; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
757 s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1; |
| 756 | 758 s->dc_val[2] = s->dc_val[1] + c_size; |
| 759 for(i=0;i<yc_size;i++) | |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
760 s->dc_val_base[i] = 1024; |
| 756 | 761 } |
| 762 | |
|
611
3214d3f4519e
error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents:
608
diff
changeset
|
763 /* 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
|
764 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
|
765 memset(s->mbintra_table, 1, mb_array_size); |
| 2967 | 766 |
|
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
767 /* 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
|
768 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
|
769 //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
|
770 CHECKED_ALLOCZ(s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE); |
| 2967 | 771 |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
772 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
|
773 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
|
774 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
|
775 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
|
776 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
|
777 } |
|
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
778 |
| 0 | 779 s->context_initialized = 1; |
| 1799 | 780 |
| 781 s->thread_context[0]= s; | |
| 782 for(i=1; i<s->avctx->thread_count; i++){ | |
| 783 s->thread_context[i]= av_malloc(sizeof(MpegEncContext)); | |
| 784 memcpy(s->thread_context[i], s, sizeof(MpegEncContext)); | |
| 785 } | |
| 786 | |
| 787 for(i=0; i<s->avctx->thread_count; i++){ | |
| 788 if(init_duplicate_context(s->thread_context[i], s) < 0) | |
| 789 goto fail; | |
| 790 s->thread_context[i]->start_mb_y= (s->mb_height*(i ) + s->avctx->thread_count/2) / s->avctx->thread_count; | |
| 791 s->thread_context[i]->end_mb_y = (s->mb_height*(i+1) + s->avctx->thread_count/2) / s->avctx->thread_count; | |
| 792 } | |
| 793 | |
| 0 | 794 return 0; |
| 795 fail: | |
| 244 | 796 MPV_common_end(s); |
| 797 return -1; | |
| 798 } | |
| 799 | |
| 800 /* init common structure for both encoder and decoder */ | |
| 801 void MPV_common_end(MpegEncContext *s) | |
| 802 { | |
| 1708 | 803 int i, j, k; |
| 244 | 804 |
| 1799 | 805 for(i=0; i<s->avctx->thread_count; i++){ |
| 806 free_duplicate_context(s->thread_context[i]); | |
| 807 } | |
| 808 for(i=1; i<s->avctx->thread_count; i++){ | |
| 809 av_freep(&s->thread_context[i]); | |
| 810 } | |
| 811 | |
|
1344
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
812 av_freep(&s->parse_context.buffer); |
|
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
813 s->parse_context.buffer_size=0; |
|
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
814 |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
815 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
|
816 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
|
817 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
|
818 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
|
819 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
|
820 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
|
821 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
|
822 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
|
823 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
|
824 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
|
825 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
|
826 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
|
827 s->b_direct_mv_table= NULL; |
| 1708 | 828 for(i=0; i<2; i++){ |
| 829 for(j=0; j<2; j++){ | |
| 830 for(k=0; k<2; k++){ | |
| 831 av_freep(&s->b_field_mv_table_base[i][j][k]); | |
| 832 s->b_field_mv_table[i][j][k]=NULL; | |
| 833 } | |
| 834 av_freep(&s->b_field_select_table[i][j]); | |
| 835 av_freep(&s->p_field_mv_table_base[i][j]); | |
| 836 s->p_field_mv_table[i][j]=NULL; | |
| 837 } | |
| 838 av_freep(&s->p_field_select_table[i]); | |
| 839 } | |
| 2967 | 840 |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
841 av_freep(&s->dc_val_base); |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
842 av_freep(&s->ac_val_base); |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
843 av_freep(&s->coded_block_base); |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
844 av_freep(&s->mbintra_table); |
| 456 | 845 av_freep(&s->cbp_table); |
| 846 av_freep(&s->pred_dir_table); | |
| 2967 | 847 |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
848 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
|
849 av_freep(&s->prev_pict_types); |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
850 av_freep(&s->bitstream_buffer); |
| 2422 | 851 s->allocated_bitstream_buffer_size=0; |
| 852 | |
| 612 | 853 av_freep(&s->avctx->stats_out); |
|
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
854 av_freep(&s->ac_stats); |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
855 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
|
856 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
|
857 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
|
858 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
|
859 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
|
860 av_freep(&s->q_intra_matrix16); |
|
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
861 av_freep(&s->q_inter_matrix16); |
| 1556 | 862 av_freep(&s->input_picture); |
| 863 av_freep(&s->reordered_input_picture); | |
| 1597 | 864 av_freep(&s->dct_offset); |
| 903 | 865 |
| 1573 | 866 if(s->picture){ |
| 867 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
| 868 free_picture(s, &s->picture[i]); | |
| 869 } | |
| 0 | 870 } |
|
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
871 av_freep(&s->picture); |
| 0 | 872 s->context_initialized = 0; |
| 1523 | 873 s->last_picture_ptr= |
| 874 s->next_picture_ptr= | |
| 875 s->current_picture_ptr= NULL; | |
| 2231 | 876 s->linesize= s->uvlinesize= 0; |
|
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
877 |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
878 for(i=0; i<3; i++) |
|
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
879 av_freep(&s->visualization_buffer[i]); |
| 2231 | 880 |
| 881 avcodec_default_free_buffers(s->avctx); | |
| 0 | 882 } |
| 883 | |
|
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
|
884 #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
|
885 |
| 0 | 886 /* init video encoder */ |
| 887 int MPV_encode_init(AVCodecContext *avctx) | |
| 888 { | |
| 889 MpegEncContext *s = avctx->priv_data; | |
| 2834 | 890 int i; |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
891 int chroma_h_shift, chroma_v_shift; |
| 2967 | 892 |
| 1892 | 893 MPV_encode_defaults(s); |
| 315 | 894 |
| 2442 | 895 if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUV420P){ |
| 896 av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n"); | |
| 897 return -1; | |
| 898 } | |
| 899 | |
| 900 if(avctx->codec_id == CODEC_ID_MJPEG || avctx->codec_id == CODEC_ID_LJPEG){ | |
|
2658
d1609cfeb1d0
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents:
2654
diff
changeset
|
901 if(avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL && avctx->pix_fmt != PIX_FMT_YUVJ420P){ |
| 2442 | 902 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n"); |
| 903 return -1; | |
| 904 } | |
| 905 }else{ | |
|
2658
d1609cfeb1d0
#defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents:
2654
diff
changeset
|
906 if(avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL && avctx->pix_fmt != PIX_FMT_YUV420P){ |
| 2442 | 907 av_log(avctx, AV_LOG_ERROR, "colorspace not supported\n"); |
| 908 return -1; | |
| 909 } | |
| 910 } | |
|
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1397
diff
changeset
|
911 |
| 0 | 912 s->bit_rate = avctx->bit_rate; |
| 913 s->width = avctx->width; | |
| 914 s->height = avctx->height; | |
| 456 | 915 if(avctx->gop_size > 600){ |
| 2979 | 916 av_log(avctx, AV_LOG_ERROR, "Warning keyframe interval too large! reducing it ...\n"); |
| 456 | 917 avctx->gop_size=600; |
| 918 } | |
| 0 | 919 s->gop_size = avctx->gop_size; |
|
194
27d1773552c9
mpeg4 encoder fix by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
191
diff
changeset
|
920 s->avctx = avctx; |
| 294 | 921 s->flags= avctx->flags; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
922 s->flags2= avctx->flags2; |
| 324 | 923 s->max_b_frames= avctx->max_b_frames; |
| 344 | 924 s->codec_id= avctx->codec->id; |
| 456 | 925 s->luma_elim_threshold = avctx->luma_elim_threshold; |
| 926 s->chroma_elim_threshold= avctx->chroma_elim_threshold; | |
| 927 s->strict_std_compliance= avctx->strict_std_compliance; | |
| 928 s->data_partitioning= avctx->flags & CODEC_FLAG_PART; | |
| 936 | 929 s->quarter_sample= (avctx->flags & CODEC_FLAG_QPEL)!=0; |
| 599 | 930 s->mpeg_quant= avctx->mpeg_quant; |
| 1661 | 931 s->rtp_mode= !!avctx->rtp_payload_size; |
| 1992 | 932 s->intra_dc_precision= avctx->intra_dc_precision; |
|
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
933 s->user_specified_pts = AV_NOPTS_VALUE; |
|
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
|
934 |
| 0 | 935 if (s->gop_size <= 1) { |
| 936 s->intra_only = 1; | |
| 937 s->gop_size = 12; | |
| 938 } else { | |
| 939 s->intra_only = 0; | |
| 940 } | |
|
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
941 |
| 936 | 942 s->me_method = avctx->me_method; |
|
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
943 |
|
320
cda7d0857baf
- ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents:
315
diff
changeset
|
944 /* Fixed QSCALE */ |
| 1708 | 945 s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE); |
| 2967 | 946 |
|
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
947 s->adaptive_quant= ( s->avctx->lumi_masking |
|
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
948 || s->avctx->dark_masking |
| 2967 | 949 || s->avctx->temporal_cplx_masking |
|
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
950 || s->avctx->spatial_cplx_masking |
| 1616 | 951 || s->avctx->p_masking |
|
2493
258120c61eea
Border processing adaptive quant patch by (Christophe Massiot |cmassiot freebox fr)
michael
parents:
2492
diff
changeset
|
952 || s->avctx->border_masking |
| 1616 | 953 || (s->flags&CODEC_FLAG_QP_RD)) |
|
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
954 && !s->fixed_qscale; |
| 2967 | 955 |
| 1708 | 956 s->obmc= !!(s->flags & CODEC_FLAG_OBMC); |
| 957 s->loop_filter= !!(s->flags & CODEC_FLAG_LOOP_FILTER); | |
| 958 s->alternate_scan= !!(s->flags & CODEC_FLAG_ALT_SCAN); | |
| 1633 | 959 |
| 1711 | 960 if(avctx->rc_max_rate && !avctx->rc_buffer_size){ |
| 961 av_log(avctx, AV_LOG_ERROR, "a vbv buffer size is needed, for encoding with a maximum bitrate\n"); | |
| 962 return -1; | |
| 2967 | 963 } |
| 1711 | 964 |
| 965 if(avctx->rc_min_rate && avctx->rc_max_rate != avctx->rc_min_rate){ | |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
966 av_log(avctx, AV_LOG_INFO, "Warning min_rate > 0 but min_rate != max_rate isn't recommended!\n"); |
| 1907 | 967 } |
| 2967 | 968 |
| 2063 | 969 if(avctx->rc_min_rate && avctx->rc_min_rate > avctx->bit_rate){ |
| 970 av_log(avctx, AV_LOG_INFO, "bitrate below min bitrate\n"); | |
| 971 return -1; | |
| 972 } | |
| 2967 | 973 |
| 2063 | 974 if(avctx->rc_max_rate && avctx->rc_max_rate < avctx->bit_rate){ |
| 975 av_log(avctx, AV_LOG_INFO, "bitrate above max bitrate\n"); | |
| 976 return -1; | |
| 977 } | |
| 2967 | 978 |
| 979 if( s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate | |
| 1907 | 980 && (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO) |
| 981 && 90000LL * (avctx->rc_buffer_size-1) > s->avctx->rc_max_rate*0xFFFFLL){ | |
| 2967 | 982 |
| 1907 | 983 av_log(avctx, AV_LOG_INFO, "Warning vbv_delay will be set to 0xFFFF (=VBR) as the specified vbv buffer is too large for the given bitrate!\n"); |
| 984 } | |
| 2967 | 985 |
| 986 if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4 | |
| 1790 | 987 && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P && s->codec_id != CODEC_ID_FLV1){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
988 av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n"); |
| 1188 | 989 return -1; |
| 990 } | |
| 2967 | 991 |
| 1633 | 992 if(s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE){ |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
993 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with simple mb decision\n"); |
| 1633 | 994 return -1; |
| 995 } | |
| 2967 | 996 |
| 1644 | 997 if(s->obmc && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P){ |
| 998 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with H263(+)\n"); | |
| 999 return -1; | |
| 1000 } | |
| 2967 | 1001 |
| 1188 | 1002 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
|
1003 av_log(avctx, AV_LOG_ERROR, "qpel not supported by codec\n"); |
| 1188 | 1004 return -1; |
| 1005 } | |
| 1006 | |
| 1007 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
|
1008 av_log(avctx, AV_LOG_ERROR, "data partitioning not supported by codec\n"); |
| 1188 | 1009 return -1; |
| 1010 } | |
| 2967 | 1011 |
| 1421 | 1012 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
|
1013 av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n"); |
| 1188 | 1014 return -1; |
| 1015 } | |
| 1958 | 1016 |
| 2967 | 1017 if((s->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN)) |
| 1958 | 1018 && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO){ |
| 1019 av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n"); | |
| 1020 return -1; | |
| 1021 } | |
| 2967 | 1022 |
| 1188 | 1023 if(s->mpeg_quant && s->codec_id != CODEC_ID_MPEG4){ //FIXME mpeg2 uses that too |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
1024 av_log(avctx, AV_LOG_ERROR, "mpeg2 style quantization not supported by codec\n"); |
| 1188 | 1025 return -1; |
| 1026 } | |
| 2967 | 1027 |
|
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1028 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
|
1029 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
|
1030 return -1; |
|
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1031 } |
|
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
1032 |
| 1622 | 1033 if((s->flags & CODEC_FLAG_QP_RD) && s->avctx->mb_decision != FF_MB_DECISION_RD){ |
| 1034 av_log(avctx, AV_LOG_ERROR, "QP RD needs mbd=2\n"); | |
| 1035 return -1; | |
| 1036 } | |
| 2967 | 1037 |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1038 if(s->avctx->scenechange_threshold < 1000000000 && (s->flags & CODEC_FLAG_CLOSED_GOP)){ |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1039 av_log(avctx, AV_LOG_ERROR, "closed gop with scene change detection arent supported yet\n"); |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1040 return -1; |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1041 } |
| 2967 | 1042 |
| 1043 if(s->avctx->thread_count > 1 && s->codec_id != CODEC_ID_MPEG4 | |
| 1044 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO | |
| 1799 | 1045 && (s->codec_id != CODEC_ID_H263P || !(s->flags & CODEC_FLAG_H263P_SLICE_STRUCT))){ |
| 1046 av_log(avctx, AV_LOG_ERROR, "multi threaded encoding not supported by codec\n"); | |
| 1047 return -1; | |
| 1048 } | |
| 2967 | 1049 |
| 1799 | 1050 if(s->avctx->thread_count > 1) |
| 1051 s->rtp_mode= 1; | |
| 1760 | 1052 |
| 2637 | 1053 if(!avctx->time_base.den || !avctx->time_base.num){ |
| 2450 | 1054 av_log(avctx, AV_LOG_ERROR, "framerate not set\n"); |
| 1055 return -1; | |
| 1056 } | |
| 2967 | 1057 |
|
2576
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1058 i= (INT_MAX/2+128)>>8; |
|
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1059 if(avctx->me_threshold >= i){ |
|
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1060 av_log(avctx, AV_LOG_ERROR, "me_threshold too large, max is %d\n", i - 1); |
|
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1061 return -1; |
|
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1062 } |
|
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1063 if(avctx->mb_threshold >= i){ |
|
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1064 av_log(avctx, AV_LOG_ERROR, "mb_threshold too large, max is %d\n", i - 1); |
|
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1065 return -1; |
|
e237d9bd0f8c
check mb/me_threshold range, fixes assertion failure
michael
parents:
2570
diff
changeset
|
1066 } |
| 2967 | 1067 |
| 2668 | 1068 if(avctx->b_frame_strategy && (avctx->flags&CODEC_FLAG_PASS2)){ |
| 3069 | 1069 av_log(avctx, AV_LOG_ERROR, "b_frame_strategy must be 0 on the second pass\n"); |
| 2668 | 1070 return -1; |
| 1071 } | |
| 1072 | |
| 2637 | 1073 i= ff_gcd(avctx->time_base.den, avctx->time_base.num); |
| 1760 | 1074 if(i > 1){ |
| 1075 av_log(avctx, AV_LOG_INFO, "removing common factors from framerate\n"); | |
| 2637 | 1076 avctx->time_base.den /= i; |
| 1077 avctx->time_base.num /= i; | |
| 1760 | 1078 // return -1; |
| 1079 } | |
| 2967 | 1080 |
| 1150 | 1081 if(s->codec_id==CODEC_ID_MJPEG){ |
| 1082 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x | |
| 1083 s->inter_quant_bias= 0; | |
| 1421 | 1084 }else if(s->mpeg_quant || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO){ |
| 1150 | 1085 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x |
| 1086 s->inter_quant_bias= 0; | |
| 1087 }else{ | |
| 1088 s->intra_quant_bias=0; | |
| 1089 s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x | |
| 1090 } | |
| 2967 | 1091 |
| 1150 | 1092 if(avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) |
| 1093 s->intra_quant_bias= avctx->intra_quant_bias; | |
| 1094 if(avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS) | |
| 1095 s->inter_quant_bias= avctx->inter_quant_bias; | |
| 2967 | 1096 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1097 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
|
1098 |
|
2653
2515af7d3238
complain about mpeg4 limits only if codec_id == MPEG4
michael
parents:
2639
diff
changeset
|
1099 if(avctx->codec_id == CODEC_ID_MPEG4 && s->avctx->time_base.den > (1<<16)-1){ |
| 2637 | 1100 av_log(avctx, AV_LOG_ERROR, "timebase not supported by mpeg 4 standard\n"); |
| 2967 | 1101 return -1; |
| 2637 | 1102 } |
| 1103 s->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1; | |
| 1424 | 1104 |
| 0 | 1105 switch(avctx->codec->id) { |
| 1106 case CODEC_ID_MPEG1VIDEO: | |
| 1107 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
|
1108 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
|
1109 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
| 0 | 1110 break; |
| 1421 | 1111 case CODEC_ID_MPEG2VIDEO: |
| 1112 s->out_format = FMT_MPEG1; | |
| 1113 s->low_delay= 0; //s->max_b_frames ? 0 : 1; | |
| 1114 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); | |
| 1661 | 1115 s->rtp_mode= 1; |
| 1421 | 1116 break; |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1117 case CODEC_ID_LJPEG: |
| 2973 | 1118 case CODEC_ID_JPEGLS: |
| 0 | 1119 case CODEC_ID_MJPEG: |
| 1120 s->out_format = FMT_MJPEG; | |
| 1121 s->intra_only = 1; /* force intra only for jpeg */ | |
| 2973 | 1122 s->mjpeg_write_tables = avctx->codec->id != CODEC_ID_JPEGLS; |
| 2979 | 1123 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
|
1124 s->mjpeg_vsample[0] = 1<<chroma_v_shift; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1125 s->mjpeg_vsample[1] = 1; |
| 2967 | 1126 s->mjpeg_vsample[2] = 1; |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1127 s->mjpeg_hsample[0] = 1<<chroma_h_shift; |
| 2967 | 1128 s->mjpeg_hsample[1] = 1; |
| 1129 s->mjpeg_hsample[2] = 1; | |
| 0 | 1130 if (mjpeg_init(s) < 0) |
| 1131 return -1; | |
| 336 | 1132 avctx->delay=0; |
| 924 | 1133 s->low_delay=1; |
| 0 | 1134 break; |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1135 case CODEC_ID_H261: |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1136 s->out_format = FMT_H261; |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1137 avctx->delay=0; |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1138 s->low_delay=1; |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1139 break; |
| 0 | 1140 case CODEC_ID_H263: |
|
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1141 if (h263_get_picture_format(s->width, s->height) == 7) { |
| 3011 | 1142 av_log(avctx, AV_LOG_INFO, "The specified picture size of %dx%d is not valid for the H.263 codec.\nValid sizes are 128x96, 176x144, 352x288, 704x576, and 1408x1152. Try H.263+.\n", s->width, s->height); |
| 0 | 1143 return -1; |
|
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1144 } |
| 0 | 1145 s->out_format = FMT_H263; |
| 2979 | 1146 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; |
| 336 | 1147 avctx->delay=0; |
| 924 | 1148 s->low_delay=1; |
| 0 | 1149 break; |
| 1150 case CODEC_ID_H263P: | |
| 1151 s->out_format = FMT_H263; | |
| 1152 s->h263_plus = 1; | |
| 2979 | 1153 /* Fx */ |
| 1644 | 1154 s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0; |
| 2979 | 1155 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0; |
| 1156 s->modified_quant= s->h263_aic; | |
| 1157 s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0; | |
| 1158 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; | |
| 1159 s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0; | |
| 1160 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; | |
| 1661 | 1161 s->h263_slice_structured= (s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) ? 1:0; |
| 1644 | 1162 |
| 2979 | 1163 /* /Fx */ |
|
79
82e579c37bc3
Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents:
78
diff
changeset
|
1164 /* These are just to be sure */ |
| 336 | 1165 avctx->delay=0; |
| 924 | 1166 s->low_delay=1; |
| 0 | 1167 break; |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1168 case CODEC_ID_FLV1: |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1169 s->out_format = FMT_H263; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1170 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
|
1171 s->unrestricted_mv = 1; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1172 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
|
1173 avctx->delay=0; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1174 s->low_delay=1; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1175 break; |
| 0 | 1176 case CODEC_ID_RV10: |
| 1177 s->out_format = FMT_H263; | |
| 336 | 1178 avctx->delay=0; |
| 924 | 1179 s->low_delay=1; |
| 0 | 1180 break; |
| 2380 | 1181 case CODEC_ID_RV20: |
| 1182 s->out_format = FMT_H263; | |
| 1183 avctx->delay=0; | |
| 1184 s->low_delay=1; | |
| 1185 s->modified_quant=1; | |
| 1186 s->h263_aic=1; | |
| 1187 s->h263_plus=1; | |
| 1188 s->loop_filter=1; | |
| 1189 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; | |
| 1190 break; | |
| 71 | 1191 case CODEC_ID_MPEG4: |
| 0 | 1192 s->out_format = FMT_H263; |
| 1193 s->h263_pred = 1; | |
| 1194 s->unrestricted_mv = 1; | |
| 924 | 1195 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
|
1196 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
| 0 | 1197 break; |
| 307 | 1198 case CODEC_ID_MSMPEG4V1: |
| 0 | 1199 s->out_format = FMT_H263; |
| 1200 s->h263_msmpeg4 = 1; | |
| 1201 s->h263_pred = 1; | |
| 1202 s->unrestricted_mv = 1; | |
| 307 | 1203 s->msmpeg4_version= 1; |
| 336 | 1204 avctx->delay=0; |
| 924 | 1205 s->low_delay=1; |
| 307 | 1206 break; |
| 1207 case CODEC_ID_MSMPEG4V2: | |
| 1208 s->out_format = FMT_H263; | |
| 1209 s->h263_msmpeg4 = 1; | |
| 1210 s->h263_pred = 1; | |
| 1211 s->unrestricted_mv = 1; | |
| 1212 s->msmpeg4_version= 2; | |
| 336 | 1213 avctx->delay=0; |
| 924 | 1214 s->low_delay=1; |
| 307 | 1215 break; |
| 1216 case CODEC_ID_MSMPEG4V3: | |
| 1217 s->out_format = FMT_H263; | |
| 1218 s->h263_msmpeg4 = 1; | |
| 1219 s->h263_pred = 1; | |
| 1220 s->unrestricted_mv = 1; | |
| 1221 s->msmpeg4_version= 3; | |
| 1163 | 1222 s->flipflop_rounding=1; |
| 336 | 1223 avctx->delay=0; |
| 924 | 1224 s->low_delay=1; |
| 0 | 1225 break; |
| 499 | 1226 case CODEC_ID_WMV1: |
| 1227 s->out_format = FMT_H263; | |
| 1228 s->h263_msmpeg4 = 1; | |
| 1229 s->h263_pred = 1; | |
| 1230 s->unrestricted_mv = 1; | |
| 1231 s->msmpeg4_version= 4; | |
| 1163 | 1232 s->flipflop_rounding=1; |
| 499 | 1233 avctx->delay=0; |
| 924 | 1234 s->low_delay=1; |
| 499 | 1235 break; |
| 1236 case CODEC_ID_WMV2: | |
| 1237 s->out_format = FMT_H263; | |
| 1238 s->h263_msmpeg4 = 1; | |
| 1239 s->h263_pred = 1; | |
| 1240 s->unrestricted_mv = 1; | |
| 1241 s->msmpeg4_version= 5; | |
| 1163 | 1242 s->flipflop_rounding=1; |
| 499 | 1243 avctx->delay=0; |
| 924 | 1244 s->low_delay=1; |
| 499 | 1245 break; |
| 0 | 1246 default: |
| 1247 return -1; | |
| 1248 } | |
| 2967 | 1249 |
| 2042 | 1250 avctx->has_b_frames= !s->low_delay; |
|
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1742
diff
changeset
|
1251 |
|
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1252 s->encoding = 1; |
|
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1253 |
| 0 | 1254 /* init */ |
| 1255 if (MPV_common_init(s) < 0) | |
| 1256 return -1; | |
| 1678 | 1257 |
| 1258 if(s->modified_quant) | |
| 1259 s->chroma_qscale_table= ff_h263_chroma_qscale_table; | |
| 2967 | 1260 s->progressive_frame= |
| 1708 | 1261 s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)); |
| 1799 | 1262 s->quant_precision=5; |
| 2967 | 1263 |
| 1729 | 1264 ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp); |
| 2382 | 1265 ff_set_cmp(&s->dsp, s->dsp.frame_skip_cmp, s->avctx->frame_skip_cmp); |
| 2967 | 1266 |
| 2639 | 1267 #ifdef CONFIG_H261_ENCODER |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1268 if (s->out_format == FMT_H261) |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1269 ff_h261_encode_init(s); |
| 2639 | 1270 #endif |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1271 if (s->out_format == FMT_H263) |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1272 h263_encode_init(s); |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1273 if(s->msmpeg4_version) |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1274 ff_msmpeg4_encode_init(s); |
| 1042 | 1275 if (s->out_format == FMT_MPEG1) |
| 1276 ff_mpeg1_encode_init(s); | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1277 |
| 1892 | 1278 /* init q matrix */ |
| 60 | 1279 for(i=0;i<64;i++) { |
| 1092 | 1280 int j= s->dsp.idct_permutation[i]; |
| 599 | 1281 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
|
1282 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
|
1283 s->inter_matrix[j] = ff_mpeg4_default_non_intra_matrix[i]; |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1284 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1285 s->intra_matrix[j] = |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1286 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
| 1042 | 1287 }else |
| 1421 | 1288 { /* mpeg1/2 */ |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1289 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
|
1290 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
| 599 | 1291 } |
| 1411 | 1292 if(s->avctx->intra_matrix) |
| 1293 s->intra_matrix[j] = s->avctx->intra_matrix[i]; | |
| 1294 if(s->avctx->inter_matrix) | |
| 1295 s->inter_matrix[j] = s->avctx->inter_matrix[i]; | |
| 344 | 1296 } |
| 1297 | |
| 1298 /* precompute matrix */ | |
|
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
1299 /* for mjpeg, we do include qscale in the matrix */ |
| 344 | 1300 if (s->out_format != FMT_MJPEG) { |
| 2967 | 1301 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, |
|
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
1302 s->intra_matrix, s->intra_quant_bias, avctx->qmin, 31, 1); |
| 2967 | 1303 convert_matrix(&s->dsp, s->q_inter_matrix, s->q_inter_matrix16, |
|
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
1304 s->inter_matrix, s->inter_quant_bias, avctx->qmin, 31, 0); |
| 60 | 1305 } |
| 1306 | |
| 329 | 1307 if(ff_rate_control_init(s) < 0) |
| 1308 return -1; | |
| 2967 | 1309 |
| 0 | 1310 return 0; |
| 1311 } | |
| 1312 | |
| 1313 int MPV_encode_end(AVCodecContext *avctx) | |
| 1314 { | |
| 1315 MpegEncContext *s = avctx->priv_data; | |
| 1316 | |
| 1317 #ifdef STATS | |
| 1318 print_stats(); | |
| 1319 #endif | |
| 329 | 1320 |
| 1321 ff_rate_control_uninit(s); | |
| 1322 | |
| 0 | 1323 MPV_common_end(s); |
| 1324 if (s->out_format == FMT_MJPEG) | |
| 1325 mjpeg_close(s); | |
|
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
1326 |
| 1424 | 1327 av_freep(&avctx->extradata); |
| 2967 | 1328 |
| 0 | 1329 return 0; |
| 1330 } | |
| 1331 | |
|
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
|
1332 #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
|
1333 |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1334 void init_rl(RLTable *rl, int use_static) |
| 1042 | 1335 { |
| 1064 | 1336 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1]; |
| 1337 uint8_t index_run[MAX_RUN+1]; | |
| 1042 | 1338 int last, run, level, start, end, i; |
| 1339 | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1340 /* If table is static, we can quit if rl->max_level[0] is not NULL */ |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1341 if(use_static && rl->max_level[0]) |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1342 return; |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1343 |
| 1042 | 1344 /* compute max_level[], max_run[] and index_run[] */ |
| 1345 for(last=0;last<2;last++) { | |
| 1346 if (last == 0) { | |
| 1347 start = 0; | |
| 1348 end = rl->last; | |
| 1349 } else { | |
| 1350 start = rl->last; | |
| 1351 end = rl->n; | |
| 1352 } | |
| 1353 | |
| 1354 memset(max_level, 0, MAX_RUN + 1); | |
| 1355 memset(max_run, 0, MAX_LEVEL + 1); | |
| 1356 memset(index_run, rl->n, MAX_RUN + 1); | |
| 1357 for(i=start;i<end;i++) { | |
| 1358 run = rl->table_run[i]; | |
| 1359 level = rl->table_level[i]; | |
| 1360 if (index_run[run] == rl->n) | |
| 1361 index_run[run] = i; | |
| 1362 if (level > max_level[run]) | |
| 1363 max_level[run] = level; | |
| 1364 if (run > max_run[level]) | |
| 1365 max_run[level] = run; | |
| 1366 } | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1367 if(use_static) |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1368 rl->max_level[last] = av_mallocz_static(MAX_RUN + 1); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1369 else |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1370 rl->max_level[last] = av_malloc(MAX_RUN + 1); |
| 1042 | 1371 memcpy(rl->max_level[last], max_level, MAX_RUN + 1); |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1372 if(use_static) |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1373 rl->max_run[last] = av_mallocz_static(MAX_LEVEL + 1); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1374 else |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1375 rl->max_run[last] = av_malloc(MAX_LEVEL + 1); |
| 1042 | 1376 memcpy(rl->max_run[last], max_run, MAX_LEVEL + 1); |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1377 if(use_static) |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1378 rl->index_run[last] = av_mallocz_static(MAX_RUN + 1); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1379 else |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2364
diff
changeset
|
1380 rl->index_run[last] = av_malloc(MAX_RUN + 1); |
| 1042 | 1381 memcpy(rl->index_run[last], index_run, MAX_RUN + 1); |
| 1382 } | |
| 1383 } | |
| 1384 | |
| 0 | 1385 /* 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
|
1386 //FIXME check that this is ok for mpeg4 interlaced |
| 1064 | 1387 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w) |
| 0 | 1388 { |
| 1064 | 1389 uint8_t *ptr, *last_line; |
| 0 | 1390 int i; |
| 1391 | |
| 1392 last_line = buf + (height - 1) * wrap; | |
| 1393 for(i=0;i<w;i++) { | |
| 1394 /* top and bottom */ | |
| 1395 memcpy(buf - (i + 1) * wrap, buf, width); | |
| 1396 memcpy(last_line + (i + 1) * wrap, last_line, width); | |
| 1397 } | |
| 1398 /* left and right */ | |
| 1399 ptr = buf; | |
| 1400 for(i=0;i<height;i++) { | |
| 1401 memset(ptr - w, ptr[0], w); | |
| 1402 memset(ptr + width, ptr[width-1], w); | |
| 1403 ptr += wrap; | |
| 1404 } | |
| 1405 /* corners */ | |
| 1406 for(i=0;i<w;i++) { | |
| 1407 memset(buf - (i + 1) * wrap - w, buf[0], w); /* top left */ | |
| 1408 memset(buf - (i + 1) * wrap + width, buf[width-1], w); /* top right */ | |
| 1409 memset(last_line + (i + 1) * wrap - w, last_line[0], w); /* top left */ | |
| 1410 memset(last_line + (i + 1) * wrap + width, last_line[width-1], w); /* top right */ | |
| 1411 } | |
| 1412 } | |
| 1413 | |
| 1586 | 1414 int ff_find_unused_picture(MpegEncContext *s, int shared){ |
| 924 | 1415 int i; |
| 2967 | 1416 |
| 924 | 1417 if(shared){ |
| 1418 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
| 1586 | 1419 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) return i; |
| 924 | 1420 } |
| 1421 }else{ | |
| 1422 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
| 1586 | 1423 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) return i; //FIXME |
| 924 | 1424 } |
| 1425 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
| 1586 | 1426 if(s->picture[i].data[0]==NULL) return i; |
| 924 | 1427 } |
| 1428 } | |
| 1429 | |
| 1586 | 1430 assert(0); |
| 1431 return -1; | |
| 924 | 1432 } |
| 1433 | |
| 1597 | 1434 static void update_noise_reduction(MpegEncContext *s){ |
| 1435 int intra, i; | |
| 1436 | |
| 1437 for(intra=0; intra<2; intra++){ | |
| 1438 if(s->dct_count[intra] > (1<<16)){ | |
| 1439 for(i=0; i<64; i++){ | |
| 1440 s->dct_error_sum[intra][i] >>=1; | |
| 1441 } | |
| 1442 s->dct_count[intra] >>= 1; | |
| 1443 } | |
| 2967 | 1444 |
| 1597 | 1445 for(i=0; i<64; i++){ |
| 1446 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); | |
| 1447 } | |
| 1448 } | |
| 1449 } | |
| 1450 | |
| 1586 | 1451 /** |
| 1452 * generic function for encode/decode called after coding/decoding the header and before a frame is coded/decoded | |
| 1453 */ | |
|
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1454 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) |
| 0 | 1455 { |
| 924 | 1456 int i; |
| 925 | 1457 AVFrame *pic; |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
1458 s->mb_skipped = 0; |
| 1168 | 1459 |
| 1234 | 1460 assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3); |
| 1228 | 1461 |
| 903 | 1462 /* mark&release old frames */ |
| 1944 | 1463 if (s->pict_type != B_TYPE && s->last_picture_ptr && s->last_picture_ptr != s->next_picture_ptr && s->last_picture_ptr->data[0]) { |
| 1138 | 1464 avctx->release_buffer(avctx, (AVFrame*)s->last_picture_ptr); |
| 903 | 1465 |
| 1466 /* release forgotten pictures */ | |
| 1467 /* if(mpeg124/h263) */ | |
| 1468 if(!s->encoding){ | |
| 1469 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
| 1138 | 1470 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
|
1471 av_log(avctx, AV_LOG_ERROR, "releasing zombie picture\n"); |
| 2967 | 1472 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); |
| 903 | 1473 } |
| 1474 } | |
| 1475 } | |
| 1476 } | |
|
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1477 alloc: |
|
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1478 if(!s->encoding){ |
| 2764 | 1479 /* release non reference frames */ |
| 1228 | 1480 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
| 1481 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
| 1482 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
| 1483 } | |
| 1484 } | |
| 1485 | |
| 1586 | 1486 if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL) |
| 1487 pic= (AVFrame*)s->current_picture_ptr; //we allready have a unused image (maybe it was set before reading the header) | |
| 1488 else{ | |
| 1489 i= ff_find_unused_picture(s, 0); | |
| 1490 pic= (AVFrame*)&s->picture[i]; | |
| 1491 } | |
| 1492 | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2534
diff
changeset
|
1493 pic->reference= (s->pict_type != B_TYPE || s->codec_id == CODEC_ID_H264) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2534
diff
changeset
|
1494 && !s->dropable ? 3 : 0; |
| 1138 | 1495 |
| 1705 | 1496 pic->coded_picture_number= s->coded_picture_number++; |
| 2967 | 1497 |
| 1384 | 1498 if( alloc_picture(s, (Picture*)pic, 0) < 0) |
| 1499 return -1; | |
| 903 | 1500 |
| 1586 | 1501 s->current_picture_ptr= (Picture*)pic; |
| 1658 | 1502 s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic |
| 1659 | 1503 s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence; |
| 903 | 1504 } |
| 456 | 1505 |
| 1173 | 1506 s->current_picture_ptr->pict_type= s->pict_type; |
| 2967 | 1507 // if(s->flags && CODEC_FLAG_QSCALE) |
|
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
|
1508 // 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
|
1509 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE; |
| 1173 | 1510 |
|
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
|
1511 copy_picture(&s->current_picture, s->current_picture_ptr); |
| 2967 | 1512 |
| 1234 | 1513 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){ |
| 903 | 1514 if (s->pict_type != B_TYPE) { |
| 1138 | 1515 s->last_picture_ptr= s->next_picture_ptr; |
| 1944 | 1516 if(!s->dropable) |
| 1517 s->next_picture_ptr= s->current_picture_ptr; | |
| 1518 } | |
| 1519 /* av_log(s->avctx, AV_LOG_DEBUG, "L%p N%p C%p L%p N%p C%p type:%d drop:%d\n", s->last_picture_ptr, s->next_picture_ptr,s->current_picture_ptr, | |
| 2967 | 1520 s->last_picture_ptr ? s->last_picture_ptr->data[0] : NULL, |
| 1521 s->next_picture_ptr ? s->next_picture_ptr->data[0] : NULL, | |
| 1944 | 1522 s->current_picture_ptr ? s->current_picture_ptr->data[0] : NULL, |
| 1523 s->pict_type, s->dropable);*/ | |
| 2967 | 1524 |
|
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
|
1525 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
|
1526 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); |
| 2967 | 1527 |
|
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
|
1528 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
|
1529 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); |
| 2764 | 1530 assert(s->pict_type != B_TYPE); //these should have been dropped if we don't have a reference |
| 1393 | 1531 goto alloc; |
| 1532 } | |
| 1533 | |
| 1534 assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0])); | |
| 1535 | |
| 1138 | 1536 if(s->picture_structure!=PICT_FRAME){ |
| 1537 int i; | |
| 1538 for(i=0; i<4; i++){ | |
| 1539 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
| 1540 s->current_picture.data[i] += s->current_picture.linesize[i]; | |
| 2967 | 1541 } |
| 1138 | 1542 s->current_picture.linesize[i] *= 2; |
| 1543 s->last_picture.linesize[i] *=2; | |
| 1544 s->next_picture.linesize[i] *=2; | |
| 1545 } | |
| 553 | 1546 } |
| 1168 | 1547 } |
| 2967 | 1548 |
|
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1549 s->hurry_up= s->avctx->hurry_up; |
|
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1550 s->error_resilience= avctx->error_resilience; |
|
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1551 |
| 2764 | 1552 /* set dequantizer, we can't do it during init as it might change for mpeg4 |
| 1553 and we can't do it in the header decode as init isnt called for mpeg4 there yet */ | |
| 1689 | 1554 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){ |
| 1555 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; | |
| 1556 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; | |
| 2345 | 1557 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ |
| 1689 | 1558 s->dct_unquantize_intra = s->dct_unquantize_h263_intra; |
| 1559 s->dct_unquantize_inter = s->dct_unquantize_h263_inter; | |
| 1560 }else{ | |
| 1561 s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra; | |
| 1562 s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter; | |
| 1563 } | |
|
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1564 |
| 1597 | 1565 if(s->dct_error_sum){ |
| 1566 assert(s->avctx->noise_reduction && s->encoding); | |
| 1567 | |
| 1568 update_noise_reduction(s); | |
| 1569 } | |
| 2967 | 1570 |
| 1381 | 1571 #ifdef HAVE_XVMC |
| 1572 if(s->avctx->xvmc_acceleration) | |
| 1573 return XVMC_field_start(s, avctx); | |
| 1574 #endif | |
|
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1575 return 0; |
| 0 | 1576 } |
|
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
|
1577 |
| 0 | 1578 /* generic function for encode/decode called after a frame has been coded/decoded */ |
| 1579 void MPV_frame_end(MpegEncContext *s) | |
| 1580 { | |
| 903 | 1581 int i; |
| 0 | 1582 /* draw edge for correct motion prediction if outside */ |
| 1381 | 1583 #ifdef HAVE_XVMC |
| 1584 //just to make sure that all data is rendered. | |
| 1585 if(s->avctx->xvmc_acceleration){ | |
| 1586 XVMC_field_end(s); | |
| 1587 }else | |
| 1588 #endif | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2534
diff
changeset
|
1589 if(s->unrestricted_mv && s->current_picture.reference && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) { |
| 903 | 1590 draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH ); |
| 1591 draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
| 1592 draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
| 0 | 1593 } |
| 207 | 1594 emms_c(); |
| 2967 | 1595 |
| 612 | 1596 s->last_pict_type = s->pict_type; |
|
2997
188f4ef688f2
second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2990
diff
changeset
|
1597 s->last_lambda_for[s->pict_type]= s->current_picture_ptr->quality; |
| 329 | 1598 if(s->pict_type!=B_TYPE){ |
| 1599 s->last_non_b_pict_type= s->pict_type; | |
| 1600 } | |
| 1138 | 1601 #if 0 |
| 1602 /* copy back current_picture variables */ | |
| 903 | 1603 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
| 1604 if(s->picture[i].data[0] == s->current_picture.data[0]){ | |
| 1605 s->picture[i]= s->current_picture; | |
| 1606 break; | |
| 2967 | 1607 } |
| 903 | 1608 } |
| 1609 assert(i<MAX_PICTURE_COUNT); | |
| 2967 | 1610 #endif |
| 903 | 1611 |
| 1228 | 1612 if(s->encoding){ |
| 2764 | 1613 /* release non-reference frames */ |
| 1228 | 1614 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
| 1615 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
| 1616 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
| 1617 } | |
| 1618 } | |
| 324 | 1619 } |
| 1138 | 1620 // clear copies, to avoid confusion |
| 1621 #if 0 | |
| 1622 memset(&s->last_picture, 0, sizeof(Picture)); | |
| 1623 memset(&s->next_picture, 0, sizeof(Picture)); | |
| 1624 memset(&s->current_picture, 0, sizeof(Picture)); | |
| 1625 #endif | |
| 2213 | 1626 s->avctx->coded_frame= (AVFrame*)s->current_picture_ptr; |
| 903 | 1627 } |
| 1628 | |
|
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
|
1629 /** |
| 1285 | 1630 * draws an line from (ex, ey) -> (sx, sy). |
| 1631 * @param w width of the image | |
| 1632 * @param h height of the image | |
| 1633 * @param stride stride/linesize of the image | |
| 1634 * @param color color of the arrow | |
| 1635 */ | |
| 1636 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ | |
|
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1637 int t, x, y, fr, f; |
| 2967 | 1638 |
| 1285 | 1639 sx= clip(sx, 0, w-1); |
| 1640 sy= clip(sy, 0, h-1); | |
| 1641 ex= clip(ex, 0, w-1); | |
| 1642 ey= clip(ey, 0, h-1); | |
| 2967 | 1643 |
| 1285 | 1644 buf[sy*stride + sx]+= color; |
| 2967 | 1645 |
| 1285 | 1646 if(ABS(ex - sx) > ABS(ey - sy)){ |
| 1647 if(sx > ex){ | |
| 1648 t=sx; sx=ex; ex=t; | |
| 1649 t=sy; sy=ey; ey=t; | |
| 1650 } | |
| 1651 buf+= sx + sy*stride; | |
| 1652 ex-= sx; | |
| 1653 f= ((ey-sy)<<16)/ex; | |
| 1654 for(x= 0; x <= ex; x++){ | |
|
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1655 y = (x*f)>>16; |
|
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1656 fr= (x*f)&0xFFFF; |
|
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1657 buf[ y *stride + x]+= (color*(0x10000-fr))>>16; |
|
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1658 buf[(y+1)*stride + x]+= (color* fr )>>16; |
| 1285 | 1659 } |
| 1660 }else{ | |
| 1661 if(sy > ey){ | |
| 1662 t=sx; sx=ex; ex=t; | |
| 1663 t=sy; sy=ey; ey=t; | |
| 1664 } | |
| 1665 buf+= sx + sy*stride; | |
| 1666 ey-= sy; | |
| 1667 if(ey) f= ((ex-sx)<<16)/ey; | |
| 1668 else f= 0; | |
| 1669 for(y= 0; y <= ey; y++){ | |
|
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1670 x = (y*f)>>16; |
|
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1671 fr= (y*f)&0xFFFF; |
|
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1672 buf[y*stride + x ]+= (color*(0x10000-fr))>>16;; |
|
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1673 buf[y*stride + x+1]+= (color* fr )>>16;; |
| 1285 | 1674 } |
| 1675 } | |
| 1676 } | |
| 1677 | |
| 1678 /** | |
| 1679 * draws an arrow from (ex, ey) -> (sx, sy). | |
| 1680 * @param w width of the image | |
| 1681 * @param h height of the image | |
| 1682 * @param stride stride/linesize of the image | |
| 1683 * @param color color of the arrow | |
| 1684 */ | |
| 2967 | 1685 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ |
| 1285 | 1686 int dx,dy; |
| 1687 | |
| 1688 sx= clip(sx, -100, w+100); | |
| 1689 sy= clip(sy, -100, h+100); | |
| 1690 ex= clip(ex, -100, w+100); | |
| 1691 ey= clip(ey, -100, h+100); | |
| 2967 | 1692 |
| 1285 | 1693 dx= ex - sx; |
| 1694 dy= ey - sy; | |
| 2967 | 1695 |
| 1285 | 1696 if(dx*dx + dy*dy > 3*3){ |
| 1697 int rx= dx + dy; | |
| 1698 int ry= -dx + dy; | |
| 1699 int length= ff_sqrt((rx*rx + ry*ry)<<8); | |
| 2967 | 1700 |
| 1285 | 1701 //FIXME subpixel accuracy |
| 1702 rx= ROUNDED_DIV(rx*3<<4, length); | |
| 1703 ry= ROUNDED_DIV(ry*3<<4, length); | |
| 2967 | 1704 |
| 1285 | 1705 draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color); |
| 1706 draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color); | |
| 1707 } | |
| 1708 draw_line(buf, sx, sy, ex, ey, w, h, stride, color); | |
| 1709 } | |
| 1710 | |
| 1711 /** | |
|
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
|
1712 * 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
|
1713 */ |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1714 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
|
1715 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1716 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
|
1717 |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1718 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
|
1719 int x,y; |
| 2967 | 1720 |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1721 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
|
1722 switch (pict->pict_type) { |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1723 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
|
1724 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
|
1725 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
|
1726 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
|
1727 case FF_SI_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SI\n"); break; |
| 2967 | 1728 case FF_SP_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SP\n"); break; |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1729 } |
|
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
|
1730 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
|
1731 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
|
1732 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
|
1733 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
|
1734 if(count>9) count=9; |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1735 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
|
1736 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1737 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
|
1738 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
|
1739 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1740 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
|
1741 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
|
1742 //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
|
1743 if(IS_PCM(mb_type)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1744 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
|
1745 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
|
1746 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
|
1747 else if(IS_INTRA4x4(mb_type)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1748 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
|
1749 else if(IS_INTRA16x16(mb_type)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1750 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
|
1751 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
|
1752 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
|
1753 else if(IS_DIRECT(mb_type)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1754 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
|
1755 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
|
1756 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
|
1757 else if(IS_GMC(mb_type)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1758 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
|
1759 else if(IS_SKIP(mb_type)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1760 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
|
1761 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
|
1762 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
|
1763 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
|
1764 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
|
1765 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
|
1766 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
|
1767 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
|
1768 } |
| 2967 | 1769 |
|
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
|
1770 //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
|
1771 if(IS_8X8(mb_type)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1772 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
|
1773 else if(IS_16X8(mb_type)) |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1774 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
|
1775 else if(IS_8X16(mb_type)) |
| 2677 | 1776 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
|
1777 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
|
1778 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
|
1779 else |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1780 av_log(s->avctx, AV_LOG_DEBUG, "?"); |
| 2967 | 1781 |
| 1782 | |
|
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
|
1783 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
|
1784 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
|
1785 else |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1786 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
|
1787 } |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1788 // 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
|
1789 } |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1790 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
|
1791 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1792 } |
|
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
1793 |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1794 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){ |
| 1285 | 1795 const int shift= 1 + s->quarter_sample; |
| 1796 int mb_y; | |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1797 uint8_t *ptr; |
| 1707 | 1798 int i; |
|
1723
033d889d7c2c
non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1722
diff
changeset
|
1799 int h_chroma_shift, v_chroma_shift; |
|
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1800 const int width = s->avctx->width; |
|
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1801 const int height= s->avctx->height; |
| 2395 | 1802 const int mv_sample_log2= 4 - pict->motion_subsample_log2; |
| 1803 const int mv_stride= (s->mb_width << mv_sample_log2) + 1; | |
| 1285 | 1804 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
|
1805 |
|
1723
033d889d7c2c
non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1722
diff
changeset
|
1806 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
|
1807 for(i=0; i<3; i++){ |
|
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1808 memcpy(s->visualization_buffer[i], pict->data[i], (i==0) ? pict->linesize[i]*height:pict->linesize[i]*height >> v_chroma_shift); |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1809 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
|
1810 } |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1811 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
|
1812 ptr= pict->data[0]; |
| 1285 | 1813 |
| 1814 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
| 1815 int mb_x; | |
| 1816 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
| 1817 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
|
1818 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
|
1819 int type; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1820 for(type=0; type<3; type++){ |
|
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
1821 int direction = 0; |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1822 switch (type) { |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1823 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
|
1824 continue; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1825 direction = 0; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1826 break; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1827 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
|
1828 continue; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1829 direction = 0; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1830 break; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1831 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
|
1832 continue; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1833 direction = 1; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1834 break; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1835 } |
| 1712 | 1836 if(!USES_LIST(pict->mb_type[mb_index], direction)) |
| 1837 continue; | |
| 1838 | |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1839 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
|
1840 int i; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1841 for(i=0; i<4; i++){ |
| 1285 | 1842 int sx= mb_x*16 + 4 + 8*(i&1); |
| 1843 int sy= mb_y*16 + 4 + 8*(i>>1); | |
|
2522
e25782262d7d
kill warnings patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2514
diff
changeset
|
1844 int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << (mv_sample_log2-1); |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1845 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
|
1846 int my= (pict->motion_val[direction][xy][1]>>shift) + sy; |
|
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1847 draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100); |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1848 } |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1849 }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
|
1850 int i; |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1851 for(i=0; i<2; i++){ |
|
1629
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1852 int sx=mb_x*16 + 8; |
|
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1853 int sy=mb_y*16 + 4 + 8*i; |
|
2522
e25782262d7d
kill warnings patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2514
diff
changeset
|
1854 int xy= (mb_x*2 + (mb_y*2 + i)*mv_stride) << (mv_sample_log2-1); |
| 2395 | 1855 int mx=(pict->motion_val[direction][xy][0]>>shift); |
| 1856 int my=(pict->motion_val[direction][xy][1]>>shift); | |
| 2967 | 1857 |
| 2395 | 1858 if(IS_INTERLACED(pict->mb_type[mb_index])) |
| 1859 my*=2; | |
| 2967 | 1860 |
| 2395 | 1861 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100); |
| 1862 } | |
| 1863 }else if(IS_8X16(pict->mb_type[mb_index])){ | |
| 1864 int i; | |
| 1865 for(i=0; i<2; i++){ | |
| 1866 int sx=mb_x*16 + 4 + 8*i; | |
| 1867 int sy=mb_y*16 + 8; | |
|
2522
e25782262d7d
kill warnings patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2514
diff
changeset
|
1868 int xy= (mb_x*2 + i + mb_y*2*mv_stride) << (mv_sample_log2-1); |
|
1947
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1869 int mx=(pict->motion_val[direction][xy][0]>>shift); |
|
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1870 int my=(pict->motion_val[direction][xy][1]>>shift); |
| 2967 | 1871 |
|
1947
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1872 if(IS_INTERLACED(pict->mb_type[mb_index])) |
|
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1873 my*=2; |
| 2967 | 1874 |
|
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1875 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100); |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1876 } |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1877 }else{ |
|
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1878 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
|
1879 int sy= mb_y*16 + 8; |
| 2395 | 1880 int xy= (mb_x + mb_y*mv_stride) << mv_sample_log2; |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1881 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
|
1882 int my= (pict->motion_val[direction][xy][1]>>shift) + sy; |
|
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1883 draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100); |
|
1629
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1884 } |
| 2967 | 1885 } |
| 1685 | 1886 } |
| 1887 if((s->avctx->debug&FF_DEBUG_VIS_QP) && pict->motion_val){ | |
| 1888 uint64_t c= (pict->qscale_table[mb_index]*128/31) * 0x0101010101010101ULL; | |
| 1889 int y; | |
| 1890 for(y=0; y<8; y++){ | |
| 1891 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= c; | |
| 1892 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= c; | |
| 1893 } | |
| 1894 } | |
| 1895 if((s->avctx->debug&FF_DEBUG_VIS_MB_TYPE) && pict->motion_val){ | |
| 1896 int mb_type= pict->mb_type[mb_index]; | |
| 1897 uint64_t u,v; | |
| 1898 int y; | |
| 1899 #define COLOR(theta, r)\ | |
| 1900 u= (int)(128 + r*cos(theta*3.141592/180));\ | |
| 1901 v= (int)(128 + r*sin(theta*3.141592/180)); | |
| 1902 | |
| 2967 | 1903 |
| 1685 | 1904 u=v=128; |
| 1905 if(IS_PCM(mb_type)){ | |
| 1906 COLOR(120,48) | |
| 1907 }else if((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) || IS_INTRA16x16(mb_type)){ | |
| 1908 COLOR(30,48) | |
| 1909 }else if(IS_INTRA4x4(mb_type)){ | |
| 1910 COLOR(90,48) | |
| 1911 }else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type)){ | |
| 1912 // COLOR(120,48) | |
| 1913 }else if(IS_DIRECT(mb_type)){ | |
| 1914 COLOR(150,48) | |
| 1915 }else if(IS_GMC(mb_type) && IS_SKIP(mb_type)){ | |
| 1916 COLOR(170,48) | |
| 1917 }else if(IS_GMC(mb_type)){ | |
| 1918 COLOR(190,48) | |
| 1919 }else if(IS_SKIP(mb_type)){ | |
| 1920 // COLOR(180,48) | |
| 1921 }else if(!USES_LIST(mb_type, 1)){ | |
| 1922 COLOR(240,48) | |
| 1923 }else if(!USES_LIST(mb_type, 0)){ | |
| 1924 COLOR(0,48) | |
| 1925 }else{ | |
| 1926 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); | |
| 1927 COLOR(300,48) | |
| 1928 } | |
| 1929 | |
| 1930 u*= 0x0101010101010101ULL; | |
| 1931 v*= 0x0101010101010101ULL; | |
| 1932 for(y=0; y<8; y++){ | |
| 1933 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= u; | |
| 1934 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= v; | |
| 1935 } | |
| 1936 | |
| 1937 //segmentation | |
| 1938 if(IS_8X8(mb_type) || IS_16X8(mb_type)){ | |
| 1939 *(uint64_t*)(pict->data[0] + 16*mb_x + 0 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL; | |
| 1940 *(uint64_t*)(pict->data[0] + 16*mb_x + 8 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL; | |
| 1941 } | |
| 1942 if(IS_8X8(mb_type) || IS_8X16(mb_type)){ | |
| 1943 for(y=0; y<16; y++) | |
| 1944 pict->data[0][16*mb_x + 8 + (16*mb_y + y)*pict->linesize[0]]^= 0x80; | |
| 1945 } | |
| 2534 | 1946 if(IS_8X8(mb_type) && mv_sample_log2 >= 2){ |
| 1947 int dm= 1 << (mv_sample_log2-2); | |
| 1948 for(i=0; i<4; i++){ | |
| 1949 int sx= mb_x*16 + 8*(i&1); | |
| 1950 int sy= mb_y*16 + 8*(i>>1); | |
| 1951 int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << (mv_sample_log2-1); | |
| 1952 //FIXME bidir | |
| 1953 int32_t *mv = (int32_t*)&pict->motion_val[0][xy]; | |
| 1954 if(mv[0] != mv[dm] || mv[dm*mv_stride] != mv[dm*(mv_stride+1)]) | |
| 1955 for(y=0; y<8; y++) | |
| 1956 pict->data[0][sx + 4 + (sy + y)*pict->linesize[0]]^= 0x80; | |
| 1957 if(mv[0] != mv[dm*mv_stride] || mv[dm] != mv[dm*(mv_stride+1)]) | |
| 1958 *(uint64_t*)(pict->data[0] + sx + (sy + 4)*pict->linesize[0])^= 0x8080808080808080ULL; | |
| 1959 } | |
| 1960 } | |
| 2967 | 1961 |
| 1685 | 1962 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264){ |
| 1963 // hmm | |
| 1964 } | |
| 1285 | 1965 } |
| 1966 s->mbskip_table[mb_index]=0; | |
| 1967 } | |
| 1968 } | |
| 1969 } | |
|
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
|
1970 } |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1971 |
|
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
|
1972 #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
|
1973 |
| 915 | 1974 static int get_sae(uint8_t *src, int ref, int stride){ |
| 1975 int x,y; | |
| 1976 int acc=0; | |
| 2967 | 1977 |
| 915 | 1978 for(y=0; y<16; y++){ |
| 1979 for(x=0; x<16; x++){ | |
| 1980 acc+= ABS(src[x+y*stride] - ref); | |
| 1981 } | |
| 1982 } | |
| 2967 | 1983 |
| 915 | 1984 return acc; |
| 1985 } | |
| 1986 | |
| 1987 static int get_intra_count(MpegEncContext *s, uint8_t *src, uint8_t *ref, int stride){ | |
| 1988 int x, y, w, h; | |
| 1989 int acc=0; | |
| 2967 | 1990 |
| 915 | 1991 w= s->width &~15; |
| 1992 h= s->height&~15; | |
| 2967 | 1993 |
| 915 | 1994 for(y=0; y<h; y+=16){ |
| 1995 for(x=0; x<w; x+=16){ | |
| 1996 int offset= x + y*stride; | |
| 1708 | 1997 int sad = s->dsp.sad[0](NULL, src + offset, ref + offset, stride, 16); |
| 915 | 1998 int mean= (s->dsp.pix_sum(src + offset, stride) + 128)>>8; |
| 1999 int sae = get_sae(src + offset, mean, stride); | |
| 2967 | 2000 |
| 915 | 2001 acc+= sae + 500 < sad; |
| 2002 } | |
| 2003 } | |
| 2004 return acc; | |
| 2005 } | |
| 2006 | |
| 924 | 2007 |
| 925 | 2008 static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){ |
| 1373 | 2009 AVFrame *pic=NULL; |
| 2427 | 2010 int64_t pts; |
| 924 | 2011 int i; |
| 903 | 2012 const int encoding_delay= s->max_b_frames; |
| 924 | 2013 int direct=1; |
| 2967 | 2014 |
| 2419 | 2015 if(pic_arg){ |
| 2427 | 2016 pts= pic_arg->pts; |
| 2017 pic_arg->display_picture_number= s->input_picture_number++; | |
| 2018 | |
| 2967 | 2019 if(pts != AV_NOPTS_VALUE){ |
| 2419 | 2020 if(s->user_specified_pts != AV_NOPTS_VALUE){ |
| 2637 | 2021 int64_t time= pts; |
| 2022 int64_t last= s->user_specified_pts; | |
| 2967 | 2023 |
| 2024 if(time <= last){ | |
| 2962 | 2025 av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%"PRId64", last=%"PRId64"\n", pts, s->user_specified_pts); |
| 2419 | 2026 return -1; |
| 2027 } | |
| 2028 } | |
| 2427 | 2029 s->user_specified_pts= pts; |
| 2419 | 2030 }else{ |
| 2031 if(s->user_specified_pts != AV_NOPTS_VALUE){ | |
| 2967 | 2032 s->user_specified_pts= |
| 2637 | 2033 pts= s->user_specified_pts + 1; |
| 2962 | 2034 av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%"PRId64")\n", pts); |
| 2419 | 2035 }else{ |
| 2637 | 2036 pts= pic_arg->display_picture_number; |
| 2419 | 2037 } |
| 2038 } | |
| 2039 } | |
| 2040 | |
| 1373 | 2041 if(pic_arg){ |
| 924 | 2042 if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0; |
| 2043 if(pic_arg->linesize[0] != s->linesize) direct=0; | |
| 2044 if(pic_arg->linesize[1] != s->uvlinesize) direct=0; | |
| 2045 if(pic_arg->linesize[2] != s->uvlinesize) direct=0; | |
| 2967 | 2046 |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2047 // av_log(AV_LOG_DEBUG, "%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize); |
| 2967 | 2048 |
| 924 | 2049 if(direct){ |
| 1586 | 2050 i= ff_find_unused_picture(s, 1); |
| 924 | 2051 |
| 925 | 2052 pic= (AVFrame*)&s->picture[i]; |
| 1168 | 2053 pic->reference= 3; |
| 2967 | 2054 |
| 924 | 2055 for(i=0; i<4; i++){ |
| 2056 pic->data[i]= pic_arg->data[i]; | |
| 2057 pic->linesize[i]= pic_arg->linesize[i]; | |
| 2058 } | |
| 2059 alloc_picture(s, (Picture*)pic, 1); | |
| 2060 }else{ | |
| 1586 | 2061 i= ff_find_unused_picture(s, 0); |
| 924 | 2062 |
| 925 | 2063 pic= (AVFrame*)&s->picture[i]; |
| 1168 | 2064 pic->reference= 3; |
| 924 | 2065 |
| 2066 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
|
2067 |
| 3068 | 2068 if( pic->data[0] + INPLACE_OFFSET == pic_arg->data[0] |
| 2069 && pic->data[1] + INPLACE_OFFSET == pic_arg->data[1] | |
| 2070 && pic->data[2] + INPLACE_OFFSET == pic_arg->data[2]){ | |
| 924 | 2071 // empty |
| 2072 }else{ | |
| 2073 int h_chroma_shift, v_chroma_shift; | |
| 2074 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); | |
| 2967 | 2075 |
| 924 | 2076 for(i=0; i<3; i++){ |
| 2077 int src_stride= pic_arg->linesize[i]; | |
| 2078 int dst_stride= i ? s->uvlinesize : s->linesize; | |
| 2079 int h_shift= i ? h_chroma_shift : 0; | |
| 2080 int v_shift= i ? v_chroma_shift : 0; | |
| 2081 int w= s->width >>h_shift; | |
| 2082 int h= s->height>>v_shift; | |
| 2083 uint8_t *src= pic_arg->data[i]; | |
| 3068 | 2084 uint8_t *dst= pic->data[i] + INPLACE_OFFSET; |
| 2967 | 2085 |
| 924 | 2086 if(src_stride==dst_stride) |
| 2087 memcpy(dst, src, src_stride*h); | |
| 2088 else{ | |
| 2089 while(h--){ | |
| 2090 memcpy(dst, src, w); | |
| 2091 dst += dst_stride; | |
| 2092 src += src_stride; | |
| 2093 } | |
| 2094 } | |
| 2095 } | |
| 2096 } | |
| 324 | 2097 } |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
2098 copy_picture_attributes(s, pic, pic_arg); |
| 2427 | 2099 pic->pts= pts; //we set this here to avoid modifiying pic_arg |
| 1373 | 2100 } |
| 2967 | 2101 |
| 903 | 2102 /* shift buffer entries */ |
| 2103 for(i=1; i<MAX_PICTURE_COUNT /*s->encoding_delay+1*/; i++) | |
| 2104 s->input_picture[i-1]= s->input_picture[i]; | |
| 2967 | 2105 |
| 903 | 2106 s->input_picture[encoding_delay]= (Picture*)pic; |
| 2107 | |
| 2108 return 0; | |
| 2109 } | |
| 2110 | |
| 2381 | 2111 static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){ |
| 2112 int x, y, plane; | |
| 2113 int score=0; | |
| 2382 | 2114 int64_t score64=0; |
| 2381 | 2115 |
| 2116 for(plane=0; plane<3; plane++){ | |
| 2117 const int stride= p->linesize[plane]; | |
| 2118 const int bw= plane ? 1 : 2; | |
| 2119 for(y=0; y<s->mb_height*bw; y++){ | |
| 2120 for(x=0; x<s->mb_width*bw; x++){ | |
| 2931 | 2121 int off= p->type == FF_BUFFER_TYPE_SHARED ? 0: 16; |
| 2122 int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride)+off, ref->data[plane] + 8*(x + y*stride), stride, 8); | |
| 2967 | 2123 |
| 2382 | 2124 switch(s->avctx->frame_skip_exp){ |
| 2125 case 0: score= FFMAX(score, v); break; | |
| 2126 case 1: score+= ABS(v);break; | |
| 2127 case 2: score+= v*v;break; | |
| 2128 case 3: score64+= ABS(v*v*(int64_t)v);break; | |
| 2129 case 4: score64+= v*v*(int64_t)(v*v);break; | |
| 2130 } | |
| 2381 | 2131 } |
| 2132 } | |
| 2133 } | |
| 2967 | 2134 |
| 2382 | 2135 if(score) score64= score; |
| 2136 | |
| 2137 if(score64 < s->avctx->frame_skip_threshold) | |
| 2381 | 2138 return 1; |
| 2382 | 2139 if(score64 < ((s->avctx->frame_skip_factor * (int64_t)s->lambda)>>8)) |
| 2381 | 2140 return 1; |
| 2141 return 0; | |
| 2142 } | |
| 2143 | |
| 2988 | 2144 static int estimate_best_b_count(MpegEncContext *s){ |
| 2145 AVCodec *codec= avcodec_find_encoder(s->avctx->codec_id); | |
| 2146 AVCodecContext *c= avcodec_alloc_context(); | |
| 2147 AVFrame input[FF_MAX_B_FRAMES+2]; | |
|
2990
0300c2647bc3
support downscaling frames for dynamic b frame decission
michael
parents:
2988
diff
changeset
|
2148 const int scale= s->avctx->brd_scale; |
| 3068 | 2149 int i, j, out_size, p_lambda, b_lambda, lambda2; |
|
2990
0300c2647bc3
support downscaling frames for dynamic b frame decission
michael
parents:
2988
diff
changeset
|
2150 int outbuf_size= s->width * s->height; //FIXME |
| 2988 | 2151 uint8_t *outbuf= av_malloc(outbuf_size); |
| 2152 ImgReSampleContext *resample; | |
| 2153 int64_t best_rd= INT64_MAX; | |
| 2154 int best_b_count= -1; | |
| 3068 | 2155 |
| 2156 // emms_c(); | |
| 2157 p_lambda= s->last_lambda_for[P_TYPE]; //s->next_picture_ptr->quality; | |
| 2158 b_lambda= s->last_lambda_for[B_TYPE]; //p_lambda *ABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset; | |
| 2159 if(!b_lambda) b_lambda= p_lambda; //FIXME we should do this somewhere else | |
| 2160 lambda2= (b_lambda*b_lambda + (1<<FF_LAMBDA_SHIFT)/2 ) >> FF_LAMBDA_SHIFT; | |
| 2988 | 2161 |
| 2162 c->width = s->width >> scale; | |
| 2163 c->height= s->height>> scale; | |
| 2164 c->flags= CODEC_FLAG_QSCALE | CODEC_FLAG_PSNR | CODEC_FLAG_INPUT_PRESERVED /*| CODEC_FLAG_EMU_EDGE*/; | |
| 2165 c->flags|= s->avctx->flags & CODEC_FLAG_QPEL; | |
| 2166 c->mb_decision= s->avctx->mb_decision; | |
| 2167 c->me_cmp= s->avctx->me_cmp; | |
| 2168 c->mb_cmp= s->avctx->mb_cmp; | |
| 2169 c->me_sub_cmp= s->avctx->me_sub_cmp; | |
| 2170 c->pix_fmt = PIX_FMT_YUV420P; | |
| 2171 c->time_base= s->avctx->time_base; | |
| 2172 c->max_b_frames= s->max_b_frames; | |
| 2173 | |
| 2174 if (avcodec_open(c, codec) < 0) | |
| 2175 return -1; | |
| 2176 | |
| 2177 resample= img_resample_init(c->width, c->height, s->width, s->height); //FIXME use sws | |
| 2178 | |
| 2179 for(i=0; i<s->max_b_frames+2; i++){ | |
| 2180 int ysize= c->width*c->height; | |
| 2181 int csize= (c->width/2)*(c->height/2); | |
| 3068 | 2182 Picture pre_input, *pre_input_ptr= i ? s->input_picture[i-1] : s->next_picture_ptr; |
| 2183 | |
| 2184 if(pre_input_ptr) | |
| 2185 pre_input= *pre_input_ptr; | |
| 2186 | |
| 2187 if(pre_input.type != FF_BUFFER_TYPE_SHARED && i){ | |
| 2188 pre_input.data[0]+=INPLACE_OFFSET; | |
| 2189 pre_input.data[1]+=INPLACE_OFFSET; | |
| 2190 pre_input.data[2]+=INPLACE_OFFSET; | |
| 2191 } | |
| 2988 | 2192 |
| 2193 avcodec_get_frame_defaults(&input[i]); | |
| 2194 input[i].data[0]= av_malloc(ysize + 2*csize); | |
| 2195 input[i].data[1]= input[i].data[0] + ysize; | |
| 2196 input[i].data[2]= input[i].data[1] + csize; | |
| 2197 input[i].linesize[0]= c->width; | |
| 2198 input[i].linesize[1]= | |
| 2199 input[i].linesize[2]= c->width/2; | |
| 2200 | |
| 2201 if(!i || s->input_picture[i-1]) | |
| 3068 | 2202 img_resample(resample, &input[i], &pre_input); |
| 2988 | 2203 } |
| 2204 | |
| 2205 for(j=0; j<s->max_b_frames+1; j++){ | |
| 2206 int64_t rd=0; | |
| 2207 | |
| 2208 if(!s->input_picture[j]) | |
| 2209 break; | |
| 2210 | |
| 2211 c->error[0]= c->error[1]= c->error[2]= 0; | |
| 2212 | |
| 2213 input[0].pict_type= I_TYPE; | |
| 3068 | 2214 input[0].quality= 1 * FF_QP2LAMBDA; |
| 2988 | 2215 out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[0]); |
| 3068 | 2216 // rd += (out_size * lambda2) >> FF_LAMBDA_SHIFT; |
| 2988 | 2217 |
| 2218 for(i=0; i<s->max_b_frames+1; i++){ | |
| 2219 int is_p= i % (j+1) == j || i==s->max_b_frames; | |
| 2220 | |
| 2221 input[i+1].pict_type= is_p ? P_TYPE : B_TYPE; | |
| 3068 | 2222 input[i+1].quality= is_p ? p_lambda : b_lambda; |
| 2988 | 2223 out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[i+1]); |
| 3068 | 2224 rd += (out_size * lambda2) >> (FF_LAMBDA_SHIFT - 3); |
| 2988 | 2225 } |
| 2226 | |
| 2227 /* get the delayed frames */ | |
| 2228 while(out_size){ | |
| 2229 out_size = avcodec_encode_video(c, outbuf, outbuf_size, NULL); | |
| 3068 | 2230 rd += (out_size * lambda2) >> (FF_LAMBDA_SHIFT - 3); |
| 2988 | 2231 } |
| 2232 | |
| 2233 rd += c->error[0] + c->error[1] + c->error[2]; | |
| 2234 | |
| 2235 if(rd < best_rd){ | |
| 2236 best_rd= rd; | |
| 2237 best_b_count= j; | |
| 2238 } | |
| 2239 } | |
| 2240 | |
| 2241 av_freep(&outbuf); | |
| 2242 avcodec_close(c); | |
| 2243 av_freep(&c); | |
| 2244 img_resample_close(resample); | |
| 2245 | |
| 2246 for(i=0; i<s->max_b_frames+2; i++){ | |
| 2247 av_freep(&input[i].data[0]); | |
| 2248 } | |
| 2249 | |
| 2250 return best_b_count; | |
| 2251 } | |
| 2252 | |
| 903 | 2253 static void select_input_picture(MpegEncContext *s){ |
| 2254 int i; | |
| 924 | 2255 |
| 903 | 2256 for(i=1; i<MAX_PICTURE_COUNT; i++) |
| 2257 s->reordered_input_picture[i-1]= s->reordered_input_picture[i]; | |
| 2258 s->reordered_input_picture[MAX_PICTURE_COUNT-1]= NULL; | |
| 2259 | |
| 2764 | 2260 /* set next picture type & ordering */ |
| 903 | 2261 if(s->reordered_input_picture[0]==NULL && s->input_picture[0]){ |
| 1138 | 2262 if(/*s->picture_in_gop_number >= s->gop_size ||*/ s->next_picture_ptr==NULL || s->intra_only){ |
| 915 | 2263 s->reordered_input_picture[0]= s->input_picture[0]; |
| 2264 s->reordered_input_picture[0]->pict_type= I_TYPE; | |
| 1705 | 2265 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
| 915 | 2266 }else{ |
| 2267 int b_frames; | |
| 2381 | 2268 |
| 2269 if(s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor){ | |
| 2931 | 2270 if(s->picture_in_gop_number < s->gop_size && skip_check(s, s->input_picture[0], s->next_picture_ptr)){ |
| 2271 //FIXME check that te gop check above is +-1 correct | |
| 2381 | 2272 //av_log(NULL, AV_LOG_DEBUG, "skip %p %Ld\n", s->input_picture[0]->data[0], s->input_picture[0]->pts); |
| 2967 | 2273 |
| 2381 | 2274 if(s->input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ |
| 2275 for(i=0; i<4; i++) | |
| 2276 s->input_picture[0]->data[i]= NULL; | |
| 2967 | 2277 s->input_picture[0]->type= 0; |
| 2381 | 2278 }else{ |
| 2967 | 2279 assert( s->input_picture[0]->type==FF_BUFFER_TYPE_USER |
| 2381 | 2280 || s->input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); |
| 2967 | 2281 |
| 2381 | 2282 s->avctx->release_buffer(s->avctx, (AVFrame*)s->input_picture[0]); |
| 2283 } | |
| 2967 | 2284 |
| 2931 | 2285 emms_c(); |
| 2286 ff_vbv_update(s, 0); | |
| 2381 | 2287 |
| 2288 goto no_output_pic; | |
| 2289 } | |
| 2290 } | |
| 2291 | |
| 915 | 2292 if(s->flags&CODEC_FLAG_PASS2){ |
| 2293 for(i=0; i<s->max_b_frames+1; i++){ | |
| 2294 int pict_num= s->input_picture[0]->display_picture_number + i; | |
|
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2295 |
| 2967 | 2296 if(pict_num >= s->rc_context.num_entries) |
|
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2297 break; |
|
2363
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2298 if(!s->input_picture[i]){ |
|
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2299 s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE; |
|
2363
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2300 break; |
|
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2301 } |
|
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2302 |
| 2967 | 2303 s->input_picture[i]->pict_type= |
|
2364
f8a229dfa2e8
check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there
michael
parents:
2363
diff
changeset
|
2304 s->rc_context.entry[pict_num].new_pict_type; |
| 915 | 2305 } |
| 2306 } | |
| 924 | 2307 |
| 2297 | 2308 if(s->avctx->b_frame_strategy==0){ |
| 915 | 2309 b_frames= s->max_b_frames; |
| 1373 | 2310 while(b_frames && !s->input_picture[b_frames]) b_frames--; |
| 1687 | 2311 }else if(s->avctx->b_frame_strategy==1){ |
| 915 | 2312 for(i=1; i<s->max_b_frames+1; i++){ |
| 1373 | 2313 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){ |
| 2967 | 2314 s->input_picture[i]->b_frame_score= |
| 2315 get_intra_count(s, s->input_picture[i ]->data[0], | |
| 924 | 2316 s->input_picture[i-1]->data[0], s->linesize) + 1; |
| 915 | 2317 } |
| 2318 } | |
| 2728 | 2319 for(i=0; i<s->max_b_frames+1; i++){ |
| 1373 | 2320 if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/40) break; |
| 915 | 2321 } |
| 2967 | 2322 |
| 915 | 2323 b_frames= FFMAX(0, i-1); |
| 2967 | 2324 |
| 915 | 2325 /* reset scores */ |
| 2326 for(i=0; i<b_frames+1; i++){ | |
| 2327 s->input_picture[i]->b_frame_score=0; | |
| 2328 } | |
| 2988 | 2329 }else if(s->avctx->b_frame_strategy==2){ |
| 2330 b_frames= estimate_best_b_count(s); | |
| 915 | 2331 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2332 av_log(s->avctx, AV_LOG_ERROR, "illegal b frame strategy\n"); |
| 915 | 2333 b_frames=0; |
|
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2334 } |
| 915 | 2335 |
| 2336 emms_c(); | |
| 2337 //static int b_count=0; | |
| 2338 //b_count+= b_frames; | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2339 //av_log(s->avctx, AV_LOG_DEBUG, "b_frames: %d\n", b_count); |
| 2297 | 2340 |
| 2341 for(i= b_frames - 1; i>=0; i--){ | |
| 2342 int type= s->input_picture[i]->pict_type; | |
| 2343 if(type && type != B_TYPE) | |
| 2344 b_frames= i; | |
| 2345 } | |
| 2346 if(s->input_picture[b_frames]->pict_type == B_TYPE && b_frames == s->max_b_frames){ | |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
2347 av_log(s->avctx, AV_LOG_ERROR, "warning, too many b frames in a row\n"); |
| 2297 | 2348 } |
| 2349 | |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2350 if(s->picture_in_gop_number + b_frames >= s->gop_size){ |
| 2298 | 2351 if((s->flags2 & CODEC_FLAG2_STRICT_GOP) && s->gop_size > s->picture_in_gop_number){ |
| 2352 b_frames= s->gop_size - s->picture_in_gop_number - 1; | |
| 2353 }else{ | |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2354 if(s->flags & CODEC_FLAG_CLOSED_GOP) |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2355 b_frames=0; |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2356 s->input_picture[b_frames]->pict_type= I_TYPE; |
| 2298 | 2357 } |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2358 } |
| 2967 | 2359 |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2360 if( (s->flags & CODEC_FLAG_CLOSED_GOP) |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2361 && b_frames |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2362 && s->input_picture[b_frames]->pict_type== I_TYPE) |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2363 b_frames--; |
|
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2364 |
| 915 | 2365 s->reordered_input_picture[0]= s->input_picture[b_frames]; |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2366 if(s->reordered_input_picture[0]->pict_type != I_TYPE) |
| 915 | 2367 s->reordered_input_picture[0]->pict_type= P_TYPE; |
| 1705 | 2368 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
| 915 | 2369 for(i=0; i<b_frames; i++){ |
| 2370 s->reordered_input_picture[i+1]= s->input_picture[i]; | |
| 2371 s->reordered_input_picture[i+1]->pict_type= B_TYPE; | |
| 1705 | 2372 s->reordered_input_picture[i+1]->coded_picture_number= s->coded_picture_number++; |
| 903 | 2373 } |
| 324 | 2374 } |
| 2375 } | |
| 2381 | 2376 no_output_pic: |
| 903 | 2377 if(s->reordered_input_picture[0]){ |
| 1168 | 2378 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=B_TYPE ? 3 : 0; |
| 1138 | 2379 |
|
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
|
2380 copy_picture(&s->new_picture, s->reordered_input_picture[0]); |
| 924 | 2381 |
| 2382 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ | |
| 2764 | 2383 // input is a shared pix, so we can't modifiy it -> alloc a new one & ensure that the shared one is reuseable |
| 2967 | 2384 |
| 1586 | 2385 int i= ff_find_unused_picture(s, 0); |
| 924 | 2386 Picture *pic= &s->picture[i]; |
| 2387 | |
| 2388 /* mark us unused / free shared pic */ | |
| 2389 for(i=0; i<4; i++) | |
| 2390 s->reordered_input_picture[0]->data[i]= NULL; | |
| 2391 s->reordered_input_picture[0]->type= 0; | |
| 2967 | 2392 |
| 1702 | 2393 pic->reference = s->reordered_input_picture[0]->reference; |
| 2967 | 2394 |
| 924 | 2395 alloc_picture(s, pic, 0); |
| 2396 | |
|
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
2397 copy_picture_attributes(s, (AVFrame*)pic, (AVFrame*)s->reordered_input_picture[0]); |
|
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
2398 |
| 1138 | 2399 s->current_picture_ptr= pic; |
| 924 | 2400 }else{ |
| 1138 | 2401 // input is not a shared pix -> reuse buffer for current_pix |
| 2402 | |
| 2967 | 2403 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER |
| 924 | 2404 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); |
| 2967 | 2405 |
| 1138 | 2406 s->current_picture_ptr= s->reordered_input_picture[0]; |
| 924 | 2407 for(i=0; i<4; i++){ |
| 3068 | 2408 s->new_picture.data[i]+= INPLACE_OFFSET; |
| 924 | 2409 } |
| 903 | 2410 } |
|
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
|
2411 copy_picture(&s->current_picture, s->current_picture_ptr); |
| 2967 | 2412 |
| 903 | 2413 s->picture_number= s->new_picture.display_picture_number; |
| 2414 //printf("dpn:%d\n", s->picture_number); | |
| 2415 }else{ | |
| 2416 memset(&s->new_picture, 0, sizeof(Picture)); | |
| 324 | 2417 } |
| 2418 } | |
| 2419 | |
| 0 | 2420 int MPV_encode_picture(AVCodecContext *avctx, |
| 2421 unsigned char *buf, int buf_size, void *data) | |
| 2422 { | |
| 2423 MpegEncContext *s = avctx->priv_data; | |
| 925 | 2424 AVFrame *pic_arg = data; |
| 1684 | 2425 int i, stuffing_count; |
| 0 | 2426 |
| 2442 | 2427 if(avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUVJ420P){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2428 av_log(avctx, AV_LOG_ERROR, "this codec supports only YUV420P\n"); |
| 1397 | 2429 return -1; |
| 2430 } | |
| 2967 | 2431 |
| 1799 | 2432 for(i=0; i<avctx->thread_count; i++){ |
| 1838 | 2433 int start_y= s->thread_context[i]->start_mb_y; |
| 2434 int end_y= s->thread_context[i]-> end_mb_y; | |
| 1799 | 2435 int h= s->mb_height; |
|
2807
3137aae854c9
Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de)
michael
parents:
2792
diff
changeset
|
2436 uint8_t *start= buf + (size_t)(((int64_t) buf_size)*start_y/h); |
|
3137aae854c9
Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de)
michael
parents:
2792
diff
changeset
|
2437 uint8_t *end = buf + (size_t)(((int64_t) buf_size)* end_y/h); |
| 1799 | 2438 |
| 2439 init_put_bits(&s->thread_context[i]->pb, start, end - start); | |
| 2440 } | |
| 0 | 2441 |
| 903 | 2442 s->picture_in_gop_number++; |
| 2443 | |
|
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2444 if(load_input_picture(s, pic_arg) < 0) |
|
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2445 return -1; |
| 2967 | 2446 |
| 903 | 2447 select_input_picture(s); |
| 2967 | 2448 |
| 324 | 2449 /* output? */ |
| 903 | 2450 if(s->new_picture.data[0]){ |
| 2451 s->pict_type= s->new_picture.pict_type; | |
| 2452 //emms_c(); | |
| 2453 //printf("qs:%f %f %d\n", s->new_picture.quality, s->current_picture.quality, s->qscale); | |
| 553 | 2454 MPV_frame_start(s, avctx); |
| 286 | 2455 |
| 324 | 2456 encode_picture(s, s->picture_number); |
| 2967 | 2457 |
| 376 | 2458 avctx->real_pict_num = s->picture_number; |
| 324 | 2459 avctx->header_bits = s->header_bits; |
| 2460 avctx->mv_bits = s->mv_bits; | |
| 2461 avctx->misc_bits = s->misc_bits; | |
| 2462 avctx->i_tex_bits = s->i_tex_bits; | |
| 2463 avctx->p_tex_bits = s->p_tex_bits; | |
| 2464 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
|
2465 avctx->p_count = s->mb_num - s->i_count - s->skip_count; //FIXME f/b_count in avctx |
| 324 | 2466 avctx->skip_count = s->skip_count; |
| 0 | 2467 |
| 324 | 2468 MPV_frame_end(s); |
| 2469 | |
| 2470 if (s->out_format == FMT_MJPEG) | |
| 2471 mjpeg_picture_trailer(s); | |
| 2967 | 2472 |
| 329 | 2473 if(s->flags&CODEC_FLAG_PASS1) |
| 2474 ff_write_pass1_stats(s); | |
| 1138 | 2475 |
| 2476 for(i=0; i<4; i++){ | |
| 2955 | 2477 s->current_picture_ptr->error[i]= s->current_picture.error[i]; |
| 1138 | 2478 avctx->error[i] += s->current_picture_ptr->error[i]; |
| 2479 } | |
| 1766 | 2480 |
|
2428
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
2481 if(s->flags&CODEC_FLAG_PASS1) |
|
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
2482 assert(avctx->header_bits + avctx->mv_bits + avctx->misc_bits + avctx->i_tex_bits + avctx->p_tex_bits == put_bits_count(&s->pb)); |
| 1684 | 2483 flush_put_bits(&s->pb); |
|
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
2484 s->frame_bits = put_bits_count(&s->pb); |
| 1766 | 2485 |
| 2486 stuffing_count= ff_vbv_update(s, s->frame_bits); | |
| 2487 if(stuffing_count){ | |
| 2422 | 2488 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < stuffing_count + 50){ |
| 2489 av_log(s->avctx, AV_LOG_ERROR, "stuffing too large\n"); | |
| 2490 return -1; | |
| 2491 } | |
| 2492 | |
| 1766 | 2493 switch(s->codec_id){ |
| 2494 case CODEC_ID_MPEG1VIDEO: | |
| 2495 case CODEC_ID_MPEG2VIDEO: | |
| 2496 while(stuffing_count--){ | |
| 2497 put_bits(&s->pb, 8, 0); | |
| 2498 } | |
| 2499 break; | |
| 2500 case CODEC_ID_MPEG4: | |
| 2501 put_bits(&s->pb, 16, 0); | |
| 2502 put_bits(&s->pb, 16, 0x1C3); | |
| 2503 stuffing_count -= 4; | |
| 2504 while(stuffing_count--){ | |
| 2505 put_bits(&s->pb, 8, 0xFF); | |
| 2506 } | |
| 2507 break; | |
| 2508 default: | |
| 2509 av_log(s->avctx, AV_LOG_ERROR, "vbv buffer overflow\n"); | |
| 2510 } | |
| 2511 flush_put_bits(&s->pb); | |
|
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
2512 s->frame_bits = put_bits_count(&s->pb); |
| 1766 | 2513 } |
| 2514 | |
| 2967 | 2515 /* update mpeg1/2 vbv_delay for CBR */ |
| 1907 | 2516 if(s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate && s->out_format == FMT_MPEG1 |
| 2517 && 90000LL * (avctx->rc_buffer_size-1) <= s->avctx->rc_max_rate*0xFFFFLL){ | |
| 1766 | 2518 int vbv_delay; |
| 2519 | |
| 2520 assert(s->repeat_first_field==0); | |
| 2967 | 2521 |
| 1766 | 2522 vbv_delay= lrintf(90000 * s->rc_context.buffer_index / s->avctx->rc_max_rate); |
| 2523 assert(vbv_delay < 0xFFFF); | |
| 2524 | |
| 2525 s->vbv_delay_ptr[0] &= 0xF8; | |
| 2526 s->vbv_delay_ptr[0] |= vbv_delay>>13; | |
| 2527 s->vbv_delay_ptr[1] = vbv_delay>>5; | |
| 2528 s->vbv_delay_ptr[2] &= 0x07; | |
| 2529 s->vbv_delay_ptr[2] |= vbv_delay<<3; | |
| 2530 } | |
| 2531 s->total_bits += s->frame_bits; | |
| 2532 avctx->frame_bits = s->frame_bits; | |
| 2533 }else{ | |
| 2534 assert((pbBufPtr(&s->pb) == s->pb.buf)); | |
| 2535 s->frame_bits=0; | |
| 1684 | 2536 } |
| 1766 | 2537 assert((s->frame_bits&7)==0); |
| 2967 | 2538 |
| 1684 | 2539 return s->frame_bits/8; |
| 0 | 2540 } |
| 2541 | |
|
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
|
2542 #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
|
2543 |
| 255 | 2544 static inline void gmc1_motion(MpegEncContext *s, |
| 1064 | 2545 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2546 uint8_t **ref_picture) |
| 255 | 2547 { |
| 1064 | 2548 uint8_t *ptr; |
| 556 | 2549 int offset, src_x, src_y, linesize, uvlinesize; |
| 255 | 2550 int motion_x, motion_y; |
| 566 | 2551 int emu=0; |
| 255 | 2552 |
| 2553 motion_x= s->sprite_offset[0][0]; | |
| 2554 motion_y= s->sprite_offset[0][1]; | |
| 2555 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
| 2556 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
| 2557 motion_x<<=(3-s->sprite_warping_accuracy); | |
| 2558 motion_y<<=(3-s->sprite_warping_accuracy); | |
| 2559 src_x = clip(src_x, -16, s->width); | |
| 2560 if (src_x == s->width) | |
| 2561 motion_x =0; | |
| 2562 src_y = clip(src_y, -16, s->height); | |
| 2563 if (src_y == s->height) | |
| 2564 motion_y =0; | |
| 753 | 2565 |
| 255 | 2566 linesize = s->linesize; |
| 556 | 2567 uvlinesize = s->uvlinesize; |
| 2967 | 2568 |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2569 ptr = ref_picture[0] + (src_y * linesize) + src_x; |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2570 |
| 566 | 2571 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
|
2572 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
|
2573 || (unsigned)src_y >= s->v_edge_pos - 17){ |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2574 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 | 2575 ptr= s->edge_emu_buffer; |
| 2576 } | |
| 2577 } | |
| 2967 | 2578 |
| 753 | 2579 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
|
2580 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
|
2581 s->dsp.gmc1(dest_y+8, ptr+8, linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding); |
| 753 | 2582 }else{ |
| 2583 int dxy; | |
| 2967 | 2584 |
| 753 | 2585 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2); |
| 2586 if (s->no_rounding){ | |
| 2979 | 2587 s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16); |
| 753 | 2588 }else{ |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2589 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
|
2590 } |
| 753 | 2591 } |
| 2967 | 2592 |
| 753 | 2593 if(s->flags&CODEC_FLAG_GRAY) return; |
| 255 | 2594 |
| 2595 motion_x= s->sprite_offset[1][0]; | |
| 2596 motion_y= s->sprite_offset[1][1]; | |
| 2597 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
| 2598 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
| 2599 motion_x<<=(3-s->sprite_warping_accuracy); | |
| 2600 motion_y<<=(3-s->sprite_warping_accuracy); | |
| 2601 src_x = clip(src_x, -8, s->width>>1); | |
| 2602 if (src_x == s->width>>1) | |
| 2603 motion_x =0; | |
| 2604 src_y = clip(src_y, -8, s->height>>1); | |
| 2605 if (src_y == s->height>>1) | |
| 2606 motion_y =0; | |
| 2607 | |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2608 offset = (src_y * uvlinesize) + src_x; |
| 255 | 2609 ptr = ref_picture[1] + offset; |
| 1002 | 2610 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
|
2611 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
|
2612 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){ |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2613 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 | 2614 ptr= s->edge_emu_buffer; |
| 2615 emu=1; | |
| 2616 } | |
| 566 | 2617 } |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2618 s->dsp.gmc1(dest_cb, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
| 2967 | 2619 |
| 255 | 2620 ptr = ref_picture[2] + offset; |
| 566 | 2621 if(emu){ |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2622 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 | 2623 ptr= s->edge_emu_buffer; |
| 2624 } | |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2625 s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
| 2967 | 2626 |
| 255 | 2627 return; |
| 2628 } | |
| 2629 | |
| 753 | 2630 static inline void gmc_motion(MpegEncContext *s, |
| 1064 | 2631 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2632 uint8_t **ref_picture) |
| 753 | 2633 { |
| 1064 | 2634 uint8_t *ptr; |
| 753 | 2635 int linesize, uvlinesize; |
| 2636 const int a= s->sprite_warping_accuracy; | |
| 2637 int ox, oy; | |
| 2638 | |
| 2639 linesize = s->linesize; | |
| 2640 uvlinesize = s->uvlinesize; | |
| 2641 | |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2642 ptr = ref_picture[0]; |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2643 |
| 753 | 2644 ox= s->sprite_offset[0][0] + s->sprite_delta[0][0]*s->mb_x*16 + s->sprite_delta[0][1]*s->mb_y*16; |
| 2645 oy= s->sprite_offset[0][1] + s->sprite_delta[1][0]*s->mb_x*16 + s->sprite_delta[1][1]*s->mb_y*16; | |
| 2646 | |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2647 s->dsp.gmc(dest_y, ptr, linesize, 16, |
| 2967 | 2648 ox, |
| 2649 oy, | |
| 753 | 2650 s->sprite_delta[0][0], s->sprite_delta[0][1], |
| 2967 | 2651 s->sprite_delta[1][0], s->sprite_delta[1][1], |
| 753 | 2652 a+1, (1<<(2*a+1)) - s->no_rounding, |
| 2653 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
|
2654 s->dsp.gmc(dest_y+8, ptr, linesize, 16, |
| 2967 | 2655 ox + s->sprite_delta[0][0]*8, |
| 2656 oy + s->sprite_delta[1][0]*8, | |
| 753 | 2657 s->sprite_delta[0][0], s->sprite_delta[0][1], |
| 2967 | 2658 s->sprite_delta[1][0], s->sprite_delta[1][1], |
| 753 | 2659 a+1, (1<<(2*a+1)) - s->no_rounding, |
| 2660 s->h_edge_pos, s->v_edge_pos); | |
| 2661 | |
| 2662 if(s->flags&CODEC_FLAG_GRAY) return; | |
| 2663 | |
| 2664 ox= s->sprite_offset[1][0] + s->sprite_delta[0][0]*s->mb_x*8 + s->sprite_delta[0][1]*s->mb_y*8; | |
| 2665 oy= s->sprite_offset[1][1] + s->sprite_delta[1][0]*s->mb_x*8 + s->sprite_delta[1][1]*s->mb_y*8; | |
| 2666 | |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2667 ptr = ref_picture[1]; |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2668 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8, |
| 2967 | 2669 ox, |
| 2670 oy, | |
| 753 | 2671 s->sprite_delta[0][0], s->sprite_delta[0][1], |
| 2967 | 2672 s->sprite_delta[1][0], s->sprite_delta[1][1], |
| 753 | 2673 a+1, (1<<(2*a+1)) - s->no_rounding, |
| 2674 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
| 2967 | 2675 |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2676 ptr = ref_picture[2]; |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2677 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8, |
| 2967 | 2678 ox, |
| 2679 oy, | |
| 753 | 2680 s->sprite_delta[0][0], s->sprite_delta[0][1], |
| 2967 | 2681 s->sprite_delta[1][0], s->sprite_delta[1][1], |
| 753 | 2682 a+1, (1<<(2*a+1)) - s->no_rounding, |
| 2683 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
| 2684 } | |
| 2685 | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2686 /** |
|
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2687 * 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
|
2688 * @param buf destination buffer |
|
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2689 * @param src source buffer |
|
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2690 * @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
|
2691 * @param block_w width of block |
|
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2692 * @param block_h height of block |
|
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2693 * @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
|
2694 * @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
|
2695 * @param w width of the source buffer |
|
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2696 * @param h height of the source buffer |
|
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2697 */ |
| 2967 | 2698 void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h, |
| 553 | 2699 int src_x, int src_y, int w, int h){ |
| 2700 int x, y; | |
| 2701 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
|
2702 |
| 553 | 2703 if(src_y>= h){ |
| 2704 src+= (h-1-src_y)*linesize; | |
| 2705 src_y=h-1; | |
| 554 | 2706 }else if(src_y<=-block_h){ |
| 2707 src+= (1-block_h-src_y)*linesize; | |
| 2708 src_y=1-block_h; | |
| 553 | 2709 } |
| 2710 if(src_x>= w){ | |
| 2711 src+= (w-1-src_x); | |
| 2712 src_x=w-1; | |
| 554 | 2713 }else if(src_x<=-block_w){ |
| 2714 src+= (1-block_w-src_x); | |
| 2715 src_x=1-block_w; | |
| 553 | 2716 } |
| 2717 | |
| 847 | 2718 start_y= FFMAX(0, -src_y); |
| 2719 start_x= FFMAX(0, -src_x); | |
| 2720 end_y= FFMIN(block_h, h-src_y); | |
| 2721 end_x= FFMIN(block_w, w-src_x); | |
| 566 | 2722 |
| 553 | 2723 // copy existing part |
| 2724 for(y=start_y; y<end_y; y++){ | |
| 2725 for(x=start_x; x<end_x; x++){ | |
| 2726 buf[x + y*linesize]= src[x + y*linesize]; | |
| 2727 } | |
| 2728 } | |
| 2729 | |
| 2730 //top | |
| 2731 for(y=0; y<start_y; y++){ | |
| 2732 for(x=start_x; x<end_x; x++){ | |
| 2733 buf[x + y*linesize]= buf[x + start_y*linesize]; | |
| 2734 } | |
| 2735 } | |
| 2736 | |
| 2737 //bottom | |
| 2738 for(y=end_y; y<block_h; y++){ | |
| 2739 for(x=start_x; x<end_x; x++){ | |
| 2740 buf[x + y*linesize]= buf[x + (end_y-1)*linesize]; | |
| 2741 } | |
| 2742 } | |
| 2967 | 2743 |
| 553 | 2744 for(y=0; y<block_h; y++){ |
| 2745 //left | |
| 2746 for(x=0; x<start_x; x++){ | |
| 2747 buf[x + y*linesize]= buf[start_x + y*linesize]; | |
| 2748 } | |
| 2967 | 2749 |
| 553 | 2750 //right |
| 2751 for(x=end_x; x<block_w; x++){ | |
| 2752 buf[x + y*linesize]= buf[end_x - 1 + y*linesize]; | |
| 2753 } | |
| 2754 } | |
| 2755 } | |
| 2756 | |
| 2967 | 2757 static inline int hpel_motion(MpegEncContext *s, |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2758 uint8_t *dest, uint8_t *src, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2759 int field_based, int field_select, |
| 1633 | 2760 int src_x, int src_y, |
| 2761 int width, int height, int stride, | |
| 2762 int h_edge_pos, int v_edge_pos, | |
| 2763 int w, int h, op_pixels_func *pix_op, | |
| 2764 int motion_x, int motion_y) | |
| 2765 { | |
| 2766 int dxy; | |
| 2767 int emu=0; | |
| 2768 | |
| 2769 dxy = ((motion_y & 1) << 1) | (motion_x & 1); | |
| 2770 src_x += motion_x >> 1; | |
| 2771 src_y += motion_y >> 1; | |
| 2967 | 2772 |
| 1633 | 2773 /* WARNING: do no forget half pels */ |
| 2774 src_x = clip(src_x, -16, width); //FIXME unneeded for emu? | |
| 2775 if (src_x == width) | |
| 2776 dxy &= ~1; | |
| 2777 src_y = clip(src_y, -16, height); | |
| 2778 if (src_y == height) | |
| 2779 dxy &= ~2; | |
| 2780 src += src_y * stride + src_x; | |
| 2781 | |
| 2782 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){ | |
| 2783 if( (unsigned)src_x > h_edge_pos - (motion_x&1) - w | |
| 2784 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ | |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2785 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2786 src_x, src_y<<field_based, h_edge_pos, s->v_edge_pos); |
| 1633 | 2787 src= s->edge_emu_buffer; |
| 2788 emu=1; | |
| 2789 } | |
| 2790 } | |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2791 if(field_select) |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2792 src += s->linesize; |
| 1633 | 2793 pix_op[dxy](dest, src, stride, h); |
| 2794 return emu; | |
| 2795 } | |
| 553 | 2796 |
| 2967 | 2797 static inline int hpel_motion_lowres(MpegEncContext *s, |
| 2292 | 2798 uint8_t *dest, uint8_t *src, |
| 2799 int field_based, int field_select, | |
| 2800 int src_x, int src_y, | |
| 2801 int width, int height, int stride, | |
| 2802 int h_edge_pos, int v_edge_pos, | |
| 2803 int w, int h, h264_chroma_mc_func *pix_op, | |
| 2804 int motion_x, int motion_y) | |
| 2805 { | |
| 2806 const int lowres= s->avctx->lowres; | |
| 2807 const int s_mask= (2<<lowres)-1; | |
| 2808 int emu=0; | |
| 2809 int sx, sy; | |
| 2810 | |
| 2811 if(s->quarter_sample){ | |
| 2812 motion_x/=2; | |
| 2813 motion_y/=2; | |
| 2814 } | |
| 2815 | |
| 2816 sx= motion_x & s_mask; | |
| 2817 sy= motion_y & s_mask; | |
| 2818 src_x += motion_x >> (lowres+1); | |
| 2819 src_y += motion_y >> (lowres+1); | |
| 2967 | 2820 |
| 2292 | 2821 src += src_y * stride + src_x; |
| 2822 | |
| 2823 if( (unsigned)src_x > h_edge_pos - (!!sx) - w | |
| 2824 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
| 2825 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based, | |
| 2826 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
| 2827 src= s->edge_emu_buffer; | |
| 2828 emu=1; | |
| 2829 } | |
| 2830 | |
| 2831 sx <<= 2 - lowres; | |
| 2832 sy <<= 2 - lowres; | |
| 2833 if(field_select) | |
| 2834 src += s->linesize; | |
| 2835 pix_op[lowres](dest, src, stride, h, sx, sy); | |
| 2836 return emu; | |
| 2837 } | |
| 2838 | |
| 0 | 2839 /* apply one mpeg motion vector to the three components */ |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2840 static always_inline void mpeg_motion(MpegEncContext *s, |
| 1064 | 2841 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2842 int field_based, int bottom_field, int field_select, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2843 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
| 0 | 2844 int motion_x, int motion_y, int h) |
| 2845 { | |
| 1846 | 2846 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
| 2847 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize; | |
| 2967 | 2848 |
| 2849 #if 0 | |
| 255 | 2850 if(s->quarter_sample) |
| 2851 { | |
| 2852 motion_x>>=1; | |
| 2853 motion_y>>=1; | |
| 2854 } | |
| 651 | 2855 #endif |
| 1633 | 2856 |
|
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
2857 v_edge_pos = s->v_edge_pos >> field_based; |
| 1846 | 2858 linesize = s->current_picture.linesize[0] << field_based; |
| 1138 | 2859 uvlinesize = s->current_picture.linesize[1] << field_based; |
| 1633 | 2860 |
| 1846 | 2861 dxy = ((motion_y & 1) << 1) | (motion_x & 1); |
| 2862 src_x = s->mb_x* 16 + (motion_x >> 1); | |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2863 src_y =(s->mb_y<<(4-field_based)) + (motion_y >> 1); |
| 485 | 2864 |
| 0 | 2865 if (s->out_format == FMT_H263) { |
| 1916 | 2866 if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){ |
| 2867 mx = (motion_x>>1)|(motion_x&1); | |
| 2868 my = motion_y >>1; | |
| 2869 uvdxy = ((my & 1) << 1) | (mx & 1); | |
| 2870 uvsrc_x = s->mb_x* 8 + (mx >> 1); | |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2871 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1); |
| 1916 | 2872 }else{ |
| 2873 uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1); | |
| 2874 uvsrc_x = src_x>>1; | |
| 2875 uvsrc_y = src_y>>1; | |
| 2876 } | |
|
2044
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2877 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261 |
|
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2878 mx = motion_x / 4; |
|
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2879 my = motion_y / 4; |
|
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2880 uvdxy = 0; |
|
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2881 uvsrc_x = s->mb_x*8 + mx; |
|
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2882 uvsrc_y = s->mb_y*8 + my; |
| 0 | 2883 } else { |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2884 if(s->chroma_y_shift){ |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2885 mx = motion_x / 2; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2886 my = motion_y / 2; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2887 uvdxy = ((my & 1) << 1) | (mx & 1); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2888 uvsrc_x = s->mb_x* 8 + (mx >> 1); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2889 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2890 } else { |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2891 if(s->chroma_x_shift){ |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2892 //Chroma422 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2893 mx = motion_x / 2; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2894 uvdxy = ((motion_y & 1) << 1) | (mx & 1); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2895 uvsrc_x = s->mb_x* 8 + (mx >> 1); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2896 uvsrc_y = src_y; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2897 } else { |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2898 //Chroma444 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2899 uvdxy = dxy; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2900 uvsrc_x = src_x; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2901 uvsrc_y = src_y; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2902 } |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2903 } |
| 1846 | 2904 } |
| 2905 | |
| 2906 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
| 2907 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
| 2908 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
| 2909 | |
| 2910 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16 | |
| 2911 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ | |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2912 if(s->codec_id == CODEC_ID_MPEG2VIDEO || |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2913 s->codec_id == CODEC_ID_MPEG1VIDEO){ |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2914 av_log(s->avctx,AV_LOG_DEBUG,"MPEG motion vector out of boundary\n"); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2915 return ; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2916 } |
| 1846 | 2917 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, |
| 2918 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); | |
| 2919 ptr_y = s->edge_emu_buffer; | |
| 2920 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
| 1874 | 2921 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; |
| 2967 | 2922 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, |
| 1846 | 2923 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
| 2967 | 2924 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, |
| 1846 | 2925 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
| 2926 ptr_cb= uvbuf; | |
| 2927 ptr_cr= uvbuf+16; | |
| 2928 } | |
| 2929 } | |
| 2930 | |
| 2931 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data | |
| 2932 dest_y += s->linesize; | |
| 2933 dest_cb+= s->uvlinesize; | |
| 2934 dest_cr+= s->uvlinesize; | |
| 2935 } | |
| 2936 | |
| 2937 if(field_select){ | |
| 2938 ptr_y += s->linesize; | |
| 2939 ptr_cb+= s->uvlinesize; | |
| 2940 ptr_cr+= s->uvlinesize; | |
| 2941 } | |
| 2942 | |
| 2943 pix_op[0][dxy](dest_y, ptr_y, linesize, h); | |
| 2967 | 2944 |
| 1846 | 2945 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2946 pix_op[s->chroma_x_shift][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2947 pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift); |
| 1846 | 2948 } |
| 2639 | 2949 #if defined(CONFIG_H261_ENCODER) || defined(CONFIG_H261_DECODER) |
| 2291 | 2950 if(s->out_format == FMT_H261){ |
| 2951 ff_h261_loop_filter(s); | |
| 2952 } | |
| 2639 | 2953 #endif |
| 0 | 2954 } |
| 2256 | 2955 |
| 2956 /* apply one mpeg motion vector to the three components */ | |
| 2957 static always_inline void mpeg_motion_lowres(MpegEncContext *s, | |
| 2958 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2959 int field_based, int bottom_field, int field_select, | |
| 2960 uint8_t **ref_picture, h264_chroma_mc_func *pix_op, | |
| 2961 int motion_x, int motion_y, int h) | |
| 2962 { | |
| 2963 uint8_t *ptr_y, *ptr_cb, *ptr_cr; | |
| 2964 int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, uvlinesize, linesize, sx, sy, uvsx, uvsy; | |
| 2965 const int lowres= s->avctx->lowres; | |
| 2966 const int block_s= 8>>lowres; | |
| 2967 const int s_mask= (2<<lowres)-1; | |
| 2968 const int h_edge_pos = s->h_edge_pos >> lowres; | |
| 2969 const int v_edge_pos = s->v_edge_pos >> lowres; | |
| 2970 linesize = s->current_picture.linesize[0] << field_based; | |
| 2971 uvlinesize = s->current_picture.linesize[1] << field_based; | |
| 2972 | |
| 2260 | 2973 if(s->quarter_sample){ //FIXME obviously not perfect but qpel wont work in lowres anyway |
| 2974 motion_x/=2; | |
| 2975 motion_y/=2; | |
| 2976 } | |
| 2967 | 2977 |
| 2260 | 2978 if(field_based){ |
| 2979 motion_y += (bottom_field - field_select)*((1<<lowres)-1); | |
| 2980 } | |
| 2981 | |
| 2256 | 2982 sx= motion_x & s_mask; |
| 2983 sy= motion_y & s_mask; | |
| 2984 src_x = s->mb_x*2*block_s + (motion_x >> (lowres+1)); | |
| 2260 | 2985 src_y =(s->mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1)); |
| 2967 | 2986 |
| 2256 | 2987 if (s->out_format == FMT_H263) { |
| 2265 | 2988 uvsx = ((motion_x>>1) & s_mask) | (sx&1); |
| 2989 uvsy = ((motion_y>>1) & s_mask) | (sy&1); | |
| 2256 | 2990 uvsrc_x = src_x>>1; |
| 2991 uvsrc_y = src_y>>1; | |
| 2992 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261 | |
| 2993 mx = motion_x / 4; | |
| 2994 my = motion_y / 4; | |
| 2995 uvsx = (2*mx) & s_mask; | |
| 2996 uvsy = (2*my) & s_mask; | |
| 2997 uvsrc_x = s->mb_x*block_s + (mx >> lowres); | |
| 2998 uvsrc_y = s->mb_y*block_s + (my >> lowres); | |
| 2999 } else { | |
| 3000 mx = motion_x / 2; | |
| 3001 my = motion_y / 2; | |
| 3002 uvsx = mx & s_mask; | |
| 3003 uvsy = my & s_mask; | |
| 3004 uvsrc_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
| 2260 | 3005 uvsrc_y =(s->mb_y*block_s>>field_based) + (my >> (lowres+1)); |
| 2256 | 3006 } |
| 3007 | |
| 3008 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
| 3009 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
| 3010 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
| 3011 | |
| 3012 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s | |
| 3013 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
| 3014 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, | |
| 3015 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
| 3016 ptr_y = s->edge_emu_buffer; | |
| 3017 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
| 3018 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; | |
| 2967 | 3019 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, |
| 2256 | 3020 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); |
| 2967 | 3021 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, |
| 2256 | 3022 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); |
| 3023 ptr_cb= uvbuf; | |
| 3024 ptr_cr= uvbuf+16; | |
| 3025 } | |
| 3026 } | |
| 3027 | |
| 2260 | 3028 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data |
| 3029 dest_y += s->linesize; | |
| 3030 dest_cb+= s->uvlinesize; | |
| 3031 dest_cr+= s->uvlinesize; | |
| 3032 } | |
| 3033 | |
| 3034 if(field_select){ | |
| 3035 ptr_y += s->linesize; | |
| 3036 ptr_cb+= s->uvlinesize; | |
| 3037 ptr_cr+= s->uvlinesize; | |
| 3038 } | |
| 3039 | |
| 2256 | 3040 sx <<= 2 - lowres; |
| 3041 sy <<= 2 - lowres; | |
| 3042 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy); | |
| 2967 | 3043 |
| 2256 | 3044 if(!(s->flags&CODEC_FLAG_GRAY)){ |
| 3045 uvsx <<= 2 - lowres; | |
| 3046 uvsy <<= 2 - lowres; | |
| 3047 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
| 3048 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
| 3049 } | |
| 2291 | 3050 //FIXME h261 lowres loop filter |
| 2256 | 3051 } |
| 3052 | |
| 1633 | 3053 //FIXME move to dsputil, avg variant, 16x16 version |
| 3054 static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride){ | |
| 3055 int x; | |
| 3056 uint8_t * const top = src[1]; | |
| 3057 uint8_t * const left = src[2]; | |
| 3058 uint8_t * const mid = src[0]; | |
| 3059 uint8_t * const right = src[3]; | |
| 3060 uint8_t * const bottom= src[4]; | |
| 3061 #define OBMC_FILTER(x, t, l, m, r, b)\ | |
| 3062 dst[x]= (t*top[x] + l*left[x] + m*mid[x] + r*right[x] + b*bottom[x] + 4)>>3 | |
| 3063 #define OBMC_FILTER4(x, t, l, m, r, b)\ | |
| 3064 OBMC_FILTER(x , t, l, m, r, b);\ | |
| 3065 OBMC_FILTER(x+1 , t, l, m, r, b);\ | |
| 3066 OBMC_FILTER(x +stride, t, l, m, r, b);\ | |
| 3067 OBMC_FILTER(x+1+stride, t, l, m, r, b); | |
| 2967 | 3068 |
| 1633 | 3069 x=0; |
| 3070 OBMC_FILTER (x , 2, 2, 4, 0, 0); | |
| 3071 OBMC_FILTER (x+1, 2, 1, 5, 0, 0); | |
| 3072 OBMC_FILTER4(x+2, 2, 1, 5, 0, 0); | |
| 3073 OBMC_FILTER4(x+4, 2, 0, 5, 1, 0); | |
| 3074 OBMC_FILTER (x+6, 2, 0, 5, 1, 0); | |
| 3075 OBMC_FILTER (x+7, 2, 0, 4, 2, 0); | |
| 3076 x+= stride; | |
| 3077 OBMC_FILTER (x , 1, 2, 5, 0, 0); | |
| 3078 OBMC_FILTER (x+1, 1, 2, 5, 0, 0); | |
| 3079 OBMC_FILTER (x+6, 1, 0, 5, 2, 0); | |
| 3080 OBMC_FILTER (x+7, 1, 0, 5, 2, 0); | |
| 3081 x+= stride; | |
| 3082 OBMC_FILTER4(x , 1, 2, 5, 0, 0); | |
| 3083 OBMC_FILTER4(x+2, 1, 1, 6, 0, 0); | |
| 3084 OBMC_FILTER4(x+4, 1, 0, 6, 1, 0); | |
| 3085 OBMC_FILTER4(x+6, 1, 0, 5, 2, 0); | |
| 3086 x+= 2*stride; | |
| 3087 OBMC_FILTER4(x , 0, 2, 5, 0, 1); | |
| 3088 OBMC_FILTER4(x+2, 0, 1, 6, 0, 1); | |
| 3089 OBMC_FILTER4(x+4, 0, 0, 6, 1, 1); | |
| 3090 OBMC_FILTER4(x+6, 0, 0, 5, 2, 1); | |
| 3091 x+= 2*stride; | |
| 3092 OBMC_FILTER (x , 0, 2, 5, 0, 1); | |
| 3093 OBMC_FILTER (x+1, 0, 2, 5, 0, 1); | |
| 3094 OBMC_FILTER4(x+2, 0, 1, 5, 0, 2); | |
| 3095 OBMC_FILTER4(x+4, 0, 0, 5, 1, 2); | |
| 3096 OBMC_FILTER (x+6, 0, 0, 5, 2, 1); | |
| 3097 OBMC_FILTER (x+7, 0, 0, 5, 2, 1); | |
| 3098 x+= stride; | |
| 3099 OBMC_FILTER (x , 0, 2, 4, 0, 2); | |
| 3100 OBMC_FILTER (x+1, 0, 1, 5, 0, 2); | |
| 3101 OBMC_FILTER (x+6, 0, 0, 5, 1, 2); | |
| 3102 OBMC_FILTER (x+7, 0, 0, 4, 2, 2); | |
| 3103 } | |
| 3104 | |
| 3105 /* obmc for 1 8x8 luma block */ | |
| 3106 static inline void obmc_motion(MpegEncContext *s, | |
| 3107 uint8_t *dest, uint8_t *src, | |
| 3108 int src_x, int src_y, | |
| 3109 op_pixels_func *pix_op, | |
| 3110 int16_t mv[5][2]/* mid top left right bottom*/) | |
| 3111 #define MID 0 | |
| 3112 { | |
| 3113 int i; | |
| 3114 uint8_t *ptr[5]; | |
| 2967 | 3115 |
| 1633 | 3116 assert(s->quarter_sample==0); |
| 2967 | 3117 |
| 1633 | 3118 for(i=0; i<5; i++){ |
| 3119 if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){ | |
| 3120 ptr[i]= ptr[MID]; | |
| 3121 }else{ | |
| 1799 | 3122 ptr[i]= s->obmc_scratchpad + 8*(i&1) + s->linesize*8*(i>>1); |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3123 hpel_motion(s, ptr[i], src, 0, 0, |
| 1633 | 3124 src_x, src_y, |
| 3125 s->width, s->height, s->linesize, | |
| 3126 s->h_edge_pos, s->v_edge_pos, | |
| 3127 8, 8, pix_op, | |
| 3128 mv[i][0], mv[i][1]); | |
| 3129 } | |
| 3130 } | |
| 3131 | |
| 2967 | 3132 put_obmc(dest, ptr, s->linesize); |
| 1633 | 3133 } |
| 0 | 3134 |
| 255 | 3135 static inline void qpel_motion(MpegEncContext *s, |
| 1064 | 3136 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3137 int field_based, int bottom_field, int field_select, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3138 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
| 651 | 3139 qpel_mc_func (*qpix_op)[16], |
| 255 | 3140 int motion_x, int motion_y, int h) |
| 3141 { | |
| 1846 | 3142 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
| 3143 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, linesize, uvlinesize; | |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3144 |
| 255 | 3145 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
| 1846 | 3146 src_x = s->mb_x * 16 + (motion_x >> 2); |
| 255 | 3147 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2); |
| 3148 | |
|
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
3149 v_edge_pos = s->v_edge_pos >> field_based; |
| 255 | 3150 linesize = s->linesize << field_based; |
| 671 | 3151 uvlinesize = s->uvlinesize << field_based; |
| 2967 | 3152 |
| 671 | 3153 if(field_based){ |
| 3154 mx= motion_x/2; | |
| 3155 my= motion_y>>1; | |
| 1048 | 3156 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){ |
| 3157 static const int rtab[8]= {0,0,1,1,0,0,0,1}; | |
| 3158 mx= (motion_x>>1) + rtab[motion_x&7]; | |
| 3159 my= (motion_y>>1) + rtab[motion_y&7]; | |
| 760 | 3160 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){ |
| 671 | 3161 mx= (motion_x>>1)|(motion_x&1); |
| 3162 my= (motion_y>>1)|(motion_y&1); | |
| 3163 }else{ | |
| 3164 mx= motion_x/2; | |
| 3165 my= motion_y/2; | |
| 3166 } | |
| 3167 mx= (mx>>1)|(mx&1); | |
| 3168 my= (my>>1)|(my&1); | |
| 1048 | 3169 |
| 1846 | 3170 uvdxy= (mx&1) | ((my&1)<<1); |
| 671 | 3171 mx>>=1; |
| 3172 my>>=1; | |
| 255 | 3173 |
| 1846 | 3174 uvsrc_x = s->mb_x * 8 + mx; |
| 3175 uvsrc_y = s->mb_y * (8 >> field_based) + my; | |
| 3176 | |
| 3177 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
| 3178 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
| 3179 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
| 3180 | |
| 2967 | 3181 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16 |
| 1846 | 3182 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){ |
| 2967 | 3183 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, |
| 1846 | 3184 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); |
| 3185 ptr_y= s->edge_emu_buffer; | |
| 3186 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
| 1874 | 3187 uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize; |
| 2967 | 3188 ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based, |
| 1846 | 3189 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
| 2967 | 3190 ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based, |
| 1846 | 3191 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); |
| 3192 ptr_cb= uvbuf; | |
| 3193 ptr_cr= uvbuf + 16; | |
| 3194 } | |
| 3195 } | |
| 3196 | |
| 3197 if(!field_based) | |
| 3198 qpix_op[0][dxy](dest_y, ptr_y, linesize); | |
| 3199 else{ | |
| 3200 if(bottom_field){ | |
| 3201 dest_y += s->linesize; | |
| 3202 dest_cb+= s->uvlinesize; | |
| 3203 dest_cr+= s->uvlinesize; | |
| 3204 } | |
| 3205 | |
| 3206 if(field_select){ | |
| 3207 ptr_y += s->linesize; | |
| 3208 ptr_cb += s->uvlinesize; | |
| 3209 ptr_cr += s->uvlinesize; | |
| 3210 } | |
| 3211 //damn interlaced mode | |
| 3212 //FIXME boundary mirroring is not exactly correct here | |
| 3213 qpix_op[1][dxy](dest_y , ptr_y , linesize); | |
| 3214 qpix_op[1][dxy](dest_y+8, ptr_y+8, linesize); | |
| 3215 } | |
| 3216 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
| 3217 pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1); | |
| 3218 pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1); | |
| 3219 } | |
| 255 | 3220 } |
| 3221 | |
| 1013 | 3222 inline int ff_h263_round_chroma(int x){ |
| 3223 if (x >= 0) | |
| 3224 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
| 3225 else { | |
| 3226 x = -x; | |
| 3227 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
| 3228 } | |
| 3229 } | |
| 255 | 3230 |
| 1225 | 3231 /** |
| 1633 | 3232 * h263 chorma 4mv motion compensation. |
| 3233 */ | |
| 3234 static inline void chroma_4mv_motion(MpegEncContext *s, | |
| 3235 uint8_t *dest_cb, uint8_t *dest_cr, | |
| 3236 uint8_t **ref_picture, | |
| 3237 op_pixels_func *pix_op, | |
| 3238 int mx, int my){ | |
| 3239 int dxy, emu=0, src_x, src_y, offset; | |
| 3240 uint8_t *ptr; | |
| 2967 | 3241 |
| 1633 | 3242 /* In case of 8X8, we construct a single chroma motion vector |
| 3243 with a special rounding */ | |
| 3244 mx= ff_h263_round_chroma(mx); | |
| 3245 my= ff_h263_round_chroma(my); | |
| 2967 | 3246 |
| 1633 | 3247 dxy = ((my & 1) << 1) | (mx & 1); |
| 3248 mx >>= 1; | |
| 3249 my >>= 1; | |
| 3250 | |
| 3251 src_x = s->mb_x * 8 + mx; | |
| 3252 src_y = s->mb_y * 8 + my; | |
| 3253 src_x = clip(src_x, -8, s->width/2); | |
| 3254 if (src_x == s->width/2) | |
| 3255 dxy &= ~1; | |
| 3256 src_y = clip(src_y, -8, s->height/2); | |
| 3257 if (src_y == s->height/2) | |
| 3258 dxy &= ~2; | |
| 2967 | 3259 |
| 1633 | 3260 offset = (src_y * (s->uvlinesize)) + src_x; |
| 3261 ptr = ref_picture[1] + offset; | |
| 3262 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
| 3263 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8 | |
| 3264 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){ | |
| 3265 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); | |
| 3266 ptr= s->edge_emu_buffer; | |
| 3267 emu=1; | |
| 3268 } | |
| 3269 } | |
| 3270 pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8); | |
| 3271 | |
| 3272 ptr = ref_picture[2] + offset; | |
| 3273 if(emu){ | |
| 3274 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); | |
| 3275 ptr= s->edge_emu_buffer; | |
| 3276 } | |
| 3277 pix_op[dxy](dest_cr, ptr, s->uvlinesize, 8); | |
| 3278 } | |
| 3279 | |
| 2292 | 3280 static inline void chroma_4mv_motion_lowres(MpegEncContext *s, |
| 3281 uint8_t *dest_cb, uint8_t *dest_cr, | |
| 3282 uint8_t **ref_picture, | |
| 3283 h264_chroma_mc_func *pix_op, | |
| 3284 int mx, int my){ | |
| 3285 const int lowres= s->avctx->lowres; | |
| 3286 const int block_s= 8>>lowres; | |
| 3287 const int s_mask= (2<<lowres)-1; | |
| 3288 const int h_edge_pos = s->h_edge_pos >> (lowres+1); | |
| 3289 const int v_edge_pos = s->v_edge_pos >> (lowres+1); | |
| 3290 int emu=0, src_x, src_y, offset, sx, sy; | |
| 3291 uint8_t *ptr; | |
| 2967 | 3292 |
| 2292 | 3293 if(s->quarter_sample){ |
| 3294 mx/=2; | |
| 3295 my/=2; | |
| 3296 } | |
| 3297 | |
| 3298 /* In case of 8X8, we construct a single chroma motion vector | |
| 3299 with a special rounding */ | |
| 3300 mx= ff_h263_round_chroma(mx); | |
| 3301 my= ff_h263_round_chroma(my); | |
| 2967 | 3302 |
| 2292 | 3303 sx= mx & s_mask; |
| 3304 sy= my & s_mask; | |
| 3305 src_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
| 3306 src_y = s->mb_y*block_s + (my >> (lowres+1)); | |
| 2967 | 3307 |
| 2292 | 3308 offset = src_y * s->uvlinesize + src_x; |
| 3309 ptr = ref_picture[1] + offset; | |
| 3310 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
| 3311 if( (unsigned)src_x > h_edge_pos - (!!sx) - block_s | |
| 3312 || (unsigned)src_y > v_edge_pos - (!!sy) - block_s){ | |
| 3313 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
| 3314 ptr= s->edge_emu_buffer; | |
| 3315 emu=1; | |
| 3316 } | |
| 2967 | 3317 } |
| 2292 | 3318 sx <<= 2 - lowres; |
| 3319 sy <<= 2 - lowres; | |
| 3320 pix_op[lowres](dest_cb, ptr, s->uvlinesize, block_s, sx, sy); | |
| 2967 | 3321 |
| 2292 | 3322 ptr = ref_picture[2] + offset; |
| 3323 if(emu){ | |
| 3324 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
| 3325 ptr= s->edge_emu_buffer; | |
| 3326 } | |
| 3327 pix_op[lowres](dest_cr, ptr, s->uvlinesize, block_s, sx, sy); | |
| 3328 } | |
| 3329 | |
| 1633 | 3330 /** |
| 2764 | 3331 * motion compensation of a single macroblock |
| 1225 | 3332 * @param s context |
| 3333 * @param dest_y luma destination pointer | |
| 3334 * @param dest_cb chroma cb/u destination pointer | |
| 3335 * @param dest_cr chroma cr/v destination pointer | |
| 3336 * @param dir direction (0->forward, 1->backward) | |
| 3337 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
| 3338 * @param pic_op halfpel motion compensation function (average or put normally) | |
| 3339 * @param pic_op qpel motion compensation function (average or put normally) | |
| 3340 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
| 3341 */ | |
| 2967 | 3342 static inline void MPV_motion(MpegEncContext *s, |
| 1064 | 3343 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2967 | 3344 int dir, uint8_t **ref_picture, |
| 651 | 3345 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]) |
| 0 | 3346 { |
| 1633 | 3347 int dxy, mx, my, src_x, src_y, motion_x, motion_y; |
| 0 | 3348 int mb_x, mb_y, i; |
| 1064 | 3349 uint8_t *ptr, *dest; |
| 0 | 3350 |
| 3351 mb_x = s->mb_x; | |
| 3352 mb_y = s->mb_y; | |
| 3353 | |
| 1655 | 3354 if(s->obmc && s->pict_type != B_TYPE){ |
| 1633 | 3355 int16_t mv_cache[4][4][2]; |
| 3356 const int xy= s->mb_x + s->mb_y*s->mb_stride; | |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3357 const int mot_stride= s->b8_stride; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3358 const int mot_xy= mb_x*2 + mb_y*2*mot_stride; |
| 1633 | 3359 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
3360 assert(!s->mb_skipped); |
| 2967 | 3361 |
|
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3362 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
|
3363 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
|
3364 memcpy(mv_cache[3][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4); |
| 1633 | 3365 |
| 3366 if(mb_y==0 || IS_INTRA(s->current_picture.mb_type[xy-s->mb_stride])){ | |
| 3367 memcpy(mv_cache[0][1], mv_cache[1][1], sizeof(int16_t)*4); | |
| 3368 }else{ | |
|
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3369 memcpy(mv_cache[0][1], s->current_picture.motion_val[0][mot_xy-mot_stride], sizeof(int16_t)*4); |
| 1633 | 3370 } |
| 3371 | |
| 3372 if(mb_x==0 || IS_INTRA(s->current_picture.mb_type[xy-1])){ | |
| 3373 *(int32_t*)mv_cache[1][0]= *(int32_t*)mv_cache[1][1]; | |
| 3374 *(int32_t*)mv_cache[2][0]= *(int32_t*)mv_cache[2][1]; | |
| 3375 }else{ | |
|
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3376 *(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
|
3377 *(int32_t*)mv_cache[2][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1+mot_stride]; |
| 1633 | 3378 } |
| 3379 | |
| 3380 if(mb_x+1>=s->mb_width || IS_INTRA(s->current_picture.mb_type[xy+1])){ | |
| 3381 *(int32_t*)mv_cache[1][3]= *(int32_t*)mv_cache[1][2]; | |
| 3382 *(int32_t*)mv_cache[2][3]= *(int32_t*)mv_cache[2][2]; | |
| 3383 }else{ | |
|
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3384 *(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
|
3385 *(int32_t*)mv_cache[2][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2+mot_stride]; |
| 1633 | 3386 } |
| 2967 | 3387 |
| 1633 | 3388 mx = 0; |
| 3389 my = 0; | |
| 3390 for(i=0;i<4;i++) { | |
| 3391 const int x= (i&1)+1; | |
| 3392 const int y= (i>>1)+1; | |
| 3393 int16_t mv[5][2]= { | |
| 3394 {mv_cache[y][x ][0], mv_cache[y][x ][1]}, | |
| 3395 {mv_cache[y-1][x][0], mv_cache[y-1][x][1]}, | |
| 3396 {mv_cache[y][x-1][0], mv_cache[y][x-1][1]}, | |
| 3397 {mv_cache[y][x+1][0], mv_cache[y][x+1][1]}, | |
| 3398 {mv_cache[y+1][x][0], mv_cache[y+1][x][1]}}; | |
| 3399 //FIXME cleanup | |
| 3400 obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize, | |
| 3401 ref_picture[0], | |
| 3402 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, | |
| 3403 pix_op[1], | |
| 3404 mv); | |
| 3405 | |
| 3406 mx += mv[0][0]; | |
| 3407 my += mv[0][1]; | |
| 3408 } | |
| 3409 if(!(s->flags&CODEC_FLAG_GRAY)) | |
| 3410 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
| 3411 | |
| 3412 return; | |
| 3413 } | |
| 2967 | 3414 |
| 0 | 3415 switch(s->mv_type) { |
| 3416 case MV_TYPE_16X16: | |
| 255 | 3417 if(s->mcsel){ |
| 753 | 3418 if(s->real_sprite_warping_points==1){ |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3419 gmc1_motion(s, dest_y, dest_cb, dest_cr, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3420 ref_picture); |
| 753 | 3421 }else{ |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3422 gmc_motion(s, dest_y, dest_cb, dest_cr, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3423 ref_picture); |
| 753 | 3424 } |
| 651 | 3425 }else if(s->quarter_sample){ |
| 2967 | 3426 qpel_motion(s, dest_y, dest_cb, dest_cr, |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3427 0, 0, 0, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3428 ref_picture, pix_op, qpix_op, |
| 255 | 3429 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
| 936 | 3430 }else if(s->mspel){ |
| 3431 ff_mspel_motion(s, dest_y, dest_cb, dest_cr, | |
| 3432 ref_picture, pix_op, | |
| 3433 s->mv[dir][0][0], s->mv[dir][0][1], 16); | |
| 1042 | 3434 }else |
| 3435 { | |
| 2967 | 3436 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3437 0, 0, 0, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3438 ref_picture, pix_op, |
| 255 | 3439 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
| 2967 | 3440 } |
| 0 | 3441 break; |
| 3442 case MV_TYPE_8X8: | |
| 673 | 3443 mx = 0; |
| 3444 my = 0; | |
| 3445 if(s->quarter_sample){ | |
| 3446 for(i=0;i<4;i++) { | |
| 3447 motion_x = s->mv[dir][i][0]; | |
| 3448 motion_y = s->mv[dir][i][1]; | |
| 0 | 3449 |
| 673 | 3450 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
| 3451 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8; | |
| 3452 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8; | |
| 2967 | 3453 |
| 673 | 3454 /* WARNING: do no forget half pels */ |
| 3455 src_x = clip(src_x, -16, s->width); | |
| 3456 if (src_x == s->width) | |
| 3457 dxy &= ~3; | |
| 3458 src_y = clip(src_y, -16, s->height); | |
| 3459 if (src_y == s->height) | |
| 3460 dxy &= ~12; | |
| 2967 | 3461 |
| 673 | 3462 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x); |
| 3463 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
| 2967 | 3464 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 8 |
|
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
3465 || (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
|
3466 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 | 3467 ptr= s->edge_emu_buffer; |
| 3468 } | |
| 3469 } | |
| 3470 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize; | |
| 3471 qpix_op[1][dxy](dest, ptr, s->linesize); | |
| 3472 | |
| 3473 mx += s->mv[dir][i][0]/2; | |
| 3474 my += s->mv[dir][i][1]/2; | |
| 3475 } | |
| 3476 }else{ | |
| 3477 for(i=0;i<4;i++) { | |
| 1633 | 3478 hpel_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize, |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3479 ref_picture[0], 0, 0, |
| 1633 | 3480 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, |
| 3481 s->width, s->height, s->linesize, | |
| 3482 s->h_edge_pos, s->v_edge_pos, | |
| 3483 8, 8, pix_op[1], | |
| 3484 s->mv[dir][i][0], s->mv[dir][i][1]); | |
| 673 | 3485 |
| 3486 mx += s->mv[dir][i][0]; | |
| 3487 my += s->mv[dir][i][1]; | |
| 554 | 3488 } |
| 0 | 3489 } |
| 673 | 3490 |
| 1633 | 3491 if(!(s->flags&CODEC_FLAG_GRAY)) |
| 3492 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
| 0 | 3493 break; |
| 3494 case MV_TYPE_FIELD: | |
| 3495 if (s->picture_structure == PICT_FRAME) { | |
| 671 | 3496 if(s->quarter_sample){ |
| 1843 | 3497 for(i=0; i<2; i++){ |
| 3498 qpel_motion(s, dest_y, dest_cb, dest_cr, | |
| 3499 1, i, s->field_select[dir][i], | |
| 3500 ref_picture, pix_op, qpix_op, | |
| 3501 s->mv[dir][i][0], s->mv[dir][i][1], 8); | |
| 3502 } | |
| 671 | 3503 }else{ |
| 2967 | 3504 /* top field */ |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3505 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3506 1, 0, s->field_select[dir][0], |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3507 ref_picture, pix_op, |
| 671 | 3508 s->mv[dir][0][0], s->mv[dir][0][1], 8); |
| 3509 /* bottom field */ | |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3510 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3511 1, 1, s->field_select[dir][1], |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3512 ref_picture, pix_op, |
| 671 | 3513 s->mv[dir][1][0], s->mv[dir][1][1], 8); |
| 3514 } | |
| 0 | 3515 } else { |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3516 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3517 ref_picture= s->current_picture_ptr->data; |
| 2967 | 3518 } |
|
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
|
3519 |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3520 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3521 0, 0, s->field_select[dir][0], |
|
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3522 ref_picture, pix_op, |
|
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
|
3523 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
| 0 | 3524 } |
| 3525 break; | |
| 1843 | 3526 case MV_TYPE_16X8: |
| 3527 for(i=0; i<2; i++){ | |
| 3528 uint8_t ** ref2picture; | |
| 3529 | |
| 3530 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ | |
|
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3531 ref2picture= ref_picture; |
|
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3532 }else{ |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3533 ref2picture= s->current_picture_ptr->data; |
| 2967 | 3534 } |
| 3535 | |
| 3536 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
| 1843 | 3537 0, 0, s->field_select[dir][i], |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3538 ref2picture, pix_op, |
| 1843 | 3539 s->mv[dir][i][0], s->mv[dir][i][1] + 16*i, 8); |
| 2967 | 3540 |
| 1843 | 3541 dest_y += 16*s->linesize; |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3542 dest_cb+= (16>>s->chroma_y_shift)*s->uvlinesize; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3543 dest_cr+= (16>>s->chroma_y_shift)*s->uvlinesize; |
| 2967 | 3544 } |
|
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3545 break; |
|
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3546 case MV_TYPE_DMV: |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3547 if(s->picture_structure == PICT_FRAME){ |
| 1843 | 3548 for(i=0; i<2; i++){ |
| 3549 int j; | |
| 3550 for(j=0; j<2; j++){ | |
| 3551 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
| 3552 1, j, j^i, | |
| 3553 ref_picture, pix_op, | |
| 3554 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], 8); | |
| 3555 } | |
| 2967 | 3556 pix_op = s->dsp.avg_pixels_tab; |
| 1843 | 3557 } |
|
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3558 }else{ |
| 1843 | 3559 for(i=0; i<2; i++){ |
| 2967 | 3560 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
| 1843 | 3561 0, 0, s->picture_structure != i+1, |
| 3562 ref_picture, pix_op, | |
| 3563 s->mv[dir][2*i][0],s->mv[dir][2*i][1],16); | |
| 3564 | |
| 3565 // after put we make avg of the same block | |
| 2967 | 3566 pix_op=s->dsp.avg_pixels_tab; |
| 1843 | 3567 |
| 3568 //opposite parity is always in the same frame if this is second field | |
| 3569 if(!s->first_field){ | |
| 2967 | 3570 ref_picture = s->current_picture_ptr->data; |
| 1843 | 3571 } |
|
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3572 } |
|
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3573 } |
|
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3574 break; |
| 1633 | 3575 default: assert(0); |
| 0 | 3576 } |
| 3577 } | |
| 3578 | |
| 2256 | 3579 /** |
| 2764 | 3580 * motion compensation of a single macroblock |
| 2256 | 3581 * @param s context |
| 3582 * @param dest_y luma destination pointer | |
| 3583 * @param dest_cb chroma cb/u destination pointer | |
| 3584 * @param dest_cr chroma cr/v destination pointer | |
| 3585 * @param dir direction (0->forward, 1->backward) | |
| 3586 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
| 3587 * @param pic_op halfpel motion compensation function (average or put normally) | |
| 3588 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
| 3589 */ | |
| 2967 | 3590 static inline void MPV_motion_lowres(MpegEncContext *s, |
| 2256 | 3591 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2967 | 3592 int dir, uint8_t **ref_picture, |
| 2256 | 3593 h264_chroma_mc_func *pix_op) |
| 3594 { | |
| 2292 | 3595 int mx, my; |
| 2260 | 3596 int mb_x, mb_y, i; |
| 3597 const int lowres= s->avctx->lowres; | |
| 2967 | 3598 const int block_s= 8>>lowres; |
| 2260 | 3599 |
| 3600 mb_x = s->mb_x; | |
| 3601 mb_y = s->mb_y; | |
| 3602 | |
| 3603 switch(s->mv_type) { | |
| 3604 case MV_TYPE_16X16: | |
| 2967 | 3605 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, |
| 2260 | 3606 0, 0, 0, |
| 3607 ref_picture, pix_op, | |
| 3608 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
| 3609 break; | |
| 2292 | 3610 case MV_TYPE_8X8: |
| 2260 | 3611 mx = 0; |
| 3612 my = 0; | |
| 3613 for(i=0;i<4;i++) { | |
| 2292 | 3614 hpel_motion_lowres(s, dest_y + ((i & 1) + (i >> 1) * s->linesize)*block_s, |
| 2260 | 3615 ref_picture[0], 0, 0, |
| 2292 | 3616 (2*mb_x + (i & 1))*block_s, (2*mb_y + (i >>1))*block_s, |
| 2260 | 3617 s->width, s->height, s->linesize, |
| 2292 | 3618 s->h_edge_pos >> lowres, s->v_edge_pos >> lowres, |
| 3619 block_s, block_s, pix_op, | |
| 2260 | 3620 s->mv[dir][i][0], s->mv[dir][i][1]); |
| 3621 | |
| 3622 mx += s->mv[dir][i][0]; | |
| 3623 my += s->mv[dir][i][1]; | |
| 3624 } | |
| 3625 | |
| 3626 if(!(s->flags&CODEC_FLAG_GRAY)) | |
| 2292 | 3627 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my); |
| 3628 break; | |
| 2260 | 3629 case MV_TYPE_FIELD: |
| 3630 if (s->picture_structure == PICT_FRAME) { | |
| 2967 | 3631 /* top field */ |
| 2260 | 3632 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, |
| 3633 1, 0, s->field_select[dir][0], | |
| 3634 ref_picture, pix_op, | |
| 3635 s->mv[dir][0][0], s->mv[dir][0][1], block_s); | |
| 3636 /* bottom field */ | |
| 3637 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
| 3638 1, 1, s->field_select[dir][1], | |
| 3639 ref_picture, pix_op, | |
| 3640 s->mv[dir][1][0], s->mv[dir][1][1], block_s); | |
| 3641 } else { | |
| 3642 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ | |
| 3643 ref_picture= s->current_picture_ptr->data; | |
| 2967 | 3644 } |
| 2260 | 3645 |
| 3646 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
| 3647 0, 0, s->field_select[dir][0], | |
| 3648 ref_picture, pix_op, | |
| 3649 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
| 3650 } | |
| 3651 break; | |
| 3652 case MV_TYPE_16X8: | |
| 3653 for(i=0; i<2; i++){ | |
| 3654 uint8_t ** ref2picture; | |
| 3655 | |
| 3656 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ | |
| 3657 ref2picture= ref_picture; | |
| 3658 }else{ | |
| 3659 ref2picture= s->current_picture_ptr->data; | |
| 2967 | 3660 } |
| 3661 | |
| 3662 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
| 2260 | 3663 0, 0, s->field_select[dir][i], |
| 3664 ref2picture, pix_op, | |
| 3665 s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s); | |
| 2967 | 3666 |
| 2260 | 3667 dest_y += 2*block_s*s->linesize; |
| 3668 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
| 3669 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
| 2967 | 3670 } |
| 2260 | 3671 break; |
| 3672 case MV_TYPE_DMV: | |
| 3673 if(s->picture_structure == PICT_FRAME){ | |
| 3674 for(i=0; i<2; i++){ | |
| 3675 int j; | |
| 3676 for(j=0; j<2; j++){ | |
| 3677 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
| 3678 1, j, j^i, | |
| 3679 ref_picture, pix_op, | |
| 3680 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s); | |
| 3681 } | |
| 3682 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
| 3683 } | |
| 3684 }else{ | |
| 3685 for(i=0; i<2; i++){ | |
| 2967 | 3686 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, |
| 2260 | 3687 0, 0, s->picture_structure != i+1, |
| 3688 ref_picture, pix_op, | |
| 3689 s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s); | |
| 3690 | |
| 3691 // after put we make avg of the same block | |
| 3692 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
| 3693 | |
| 3694 //opposite parity is always in the same frame if this is second field | |
| 3695 if(!s->first_field){ | |
| 2967 | 3696 ref_picture = s->current_picture_ptr->data; |
| 2260 | 3697 } |
| 3698 } | |
| 3699 } | |
| 3700 break; | |
| 3701 default: assert(0); | |
| 3702 } | |
| 2256 | 3703 } |
| 0 | 3704 |
| 3705 /* put block[] to dest[] */ | |
| 2967 | 3706 static inline void put_dct(MpegEncContext *s, |
| 1651 | 3707 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
| 0 | 3708 { |
| 1689 | 3709 s->dct_unquantize_intra(s, block, i, qscale); |
| 1092 | 3710 s->dsp.idct_put (dest, line_size, block); |
| 0 | 3711 } |
| 3712 | |
| 3713 /* add block[] to dest[] */ | |
| 2967 | 3714 static inline void add_dct(MpegEncContext *s, |
| 1064 | 3715 DCTELEM *block, int i, uint8_t *dest, int line_size) |
| 0 | 3716 { |
| 3717 if (s->block_last_index[i] >= 0) { | |
| 1092 | 3718 s->dsp.idct_add (dest, line_size, block); |
| 481 | 3719 } |
| 3720 } | |
| 3721 | |
| 2967 | 3722 static inline void add_dequant_dct(MpegEncContext *s, |
| 1644 | 3723 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
| 481 | 3724 { |
| 3725 if (s->block_last_index[i] >= 0) { | |
| 1689 | 3726 s->dct_unquantize_inter(s, block, i, qscale); |
| 324 | 3727 |
| 1092 | 3728 s->dsp.idct_add (dest, line_size, block); |
| 0 | 3729 } |
| 3730 } | |
| 3731 | |
| 456 | 3732 /** |
| 3733 * cleans dc, ac, coded_block for the current non intra MB | |
| 3734 */ | |
| 3735 void ff_clean_intra_table_entries(MpegEncContext *s) | |
| 3736 { | |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3737 int wrap = s->b8_stride; |
| 456 | 3738 int xy = s->block_index[0]; |
| 2967 | 3739 |
| 3740 s->dc_val[0][xy ] = | |
| 3741 s->dc_val[0][xy + 1 ] = | |
| 456 | 3742 s->dc_val[0][xy + wrap] = |
| 3743 s->dc_val[0][xy + 1 + wrap] = 1024; | |
| 3744 /* ac pred */ | |
| 1064 | 3745 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); |
| 3746 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); | |
| 456 | 3747 if (s->msmpeg4_version>=3) { |
| 3748 s->coded_block[xy ] = | |
| 3749 s->coded_block[xy + 1 ] = | |
| 3750 s->coded_block[xy + wrap] = | |
| 3751 s->coded_block[xy + 1 + wrap] = 0; | |
| 3752 } | |
| 3753 /* chroma */ | |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3754 wrap = s->mb_stride; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3755 xy = s->mb_x + s->mb_y * wrap; |
| 456 | 3756 s->dc_val[1][xy] = |
| 3757 s->dc_val[2][xy] = 1024; | |
| 3758 /* ac pred */ | |
| 1064 | 3759 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t)); |
| 3760 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t)); | |
| 2967 | 3761 |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3762 s->mbintra_table[xy]= 0; |
| 456 | 3763 } |
| 3764 | |
| 0 | 3765 /* generic function called after a macroblock has been parsed by the |
| 3766 decoder or after it has been encoded by the encoder. | |
| 3767 | |
| 3768 Important variables used: | |
| 3769 s->mb_intra : true if intra macroblock | |
| 3770 s->mv_dir : motion vector direction | |
| 3771 s->mv_type : motion vector type | |
| 3772 s->mv : motion vector | |
| 3773 s->interlaced_dct : true if interlaced dct used (mpeg2) | |
| 3774 */ | |
| 2256 | 3775 static always_inline void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], int lowres_flag) |
| 0 | 3776 { |
| 244 | 3777 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
|
3778 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; |
| 1381 | 3779 #ifdef HAVE_XVMC |
| 3780 if(s->avctx->xvmc_acceleration){ | |
|
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1579
diff
changeset
|
3781 XVMC_decode_mb(s);//xvmc uses pblocks |
| 1381 | 3782 return; |
| 3783 } | |
| 3784 #endif | |
| 0 | 3785 |
| 3786 mb_x = s->mb_x; | |
| 3787 mb_y = s->mb_y; | |
| 3788 | |
|
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3789 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3790 /* save DCT coefficients */ |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3791 int i,j; |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3792 DCTELEM *dct = &s->current_picture.dct_coeff[mb_xy*64*6]; |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3793 for(i=0; i<6; i++) |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3794 for(j=0; j<64; j++) |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3795 *dct++ = block[i][s->dsp.idct_permutation[j]]; |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3796 } |
|
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3797 |
| 903 | 3798 s->current_picture.qscale_table[mb_xy]= s->qscale; |
|
108
1e4a4af694d1
exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents:
79
diff
changeset
|
3799 |
| 0 | 3800 /* update DC predictors for P macroblocks */ |
| 3801 if (!s->mb_intra) { | |
|
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3802 if (s->h263_pred || s->h263_aic) { |
| 481 | 3803 if(s->mbintra_table[mb_xy]) |
| 456 | 3804 ff_clean_intra_table_entries(s); |
| 0 | 3805 } else { |
| 456 | 3806 s->last_dc[0] = |
| 3807 s->last_dc[1] = | |
| 0 | 3808 s->last_dc[2] = 128 << s->intra_dc_precision; |
| 3809 } | |
| 3810 } | |
|
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3811 else if (s->h263_pred || s->h263_aic) |
| 481 | 3812 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
|
3813 |
|
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3814 if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { //FIXME precalc |
| 1064 | 3815 uint8_t *dest_y, *dest_cb, *dest_cr; |
| 481 | 3816 int dct_linesize, dct_offset; |
| 651 | 3817 op_pixels_func (*op_pix)[4]; |
| 3818 qpel_mc_func (*op_qpix)[16]; | |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
3819 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this would be wrong for field pics |
| 1138 | 3820 const int uvlinesize= s->current_picture.linesize[1]; |
| 2256 | 3821 const int readable= s->pict_type != B_TYPE || s->encoding || s->avctx->draw_horiz_band || lowres_flag; |
| 3822 const int block_size= lowres_flag ? 8>>s->avctx->lowres : 8; | |
|
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3823 |
| 903 | 3824 /* avoid copy if macroblock skipped in last frame too */ |
| 3825 /* skip only during decoding as we might trash the buffers during encoding a bit */ | |
| 3826 if(!s->encoding){ | |
| 1064 | 3827 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy]; |
| 903 | 3828 const int age= s->current_picture.age; |
| 3829 | |
| 3830 assert(age); | |
| 3831 | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
3832 if (s->mb_skipped) { |
|
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
3833 s->mb_skipped= 0; |
| 903 | 3834 assert(s->pict_type!=I_TYPE); |
| 2967 | 3835 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
3836 (*mbskip_ptr) ++; /* indicate that this time we skipped it */ |
| 556 | 3837 if(*mbskip_ptr >99) *mbskip_ptr= 99; |
| 3838 | |
| 903 | 3839 /* 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
|
3840 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
|
3841 return; |
| 903 | 3842 } |
|
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3843 } 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
|
3844 (*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
|
3845 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
|
3846 } else{ |
|
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3847 *mbskip_ptr = 0; /* not skipped */ |
|
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3848 } |
| 717 | 3849 } |
| 2967 | 3850 |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3851 dct_linesize = linesize << s->interlaced_dct; |
| 2256 | 3852 dct_offset =(s->interlaced_dct)? linesize : linesize*block_size; |
| 2967 | 3853 |
| 1632 | 3854 if(readable){ |
| 3855 dest_y= s->dest[0]; | |
| 3856 dest_cb= s->dest[1]; | |
| 3857 dest_cr= s->dest[2]; | |
| 3858 }else{ | |
| 1799 | 3859 dest_y = s->b_scratchpad; |
| 1834 | 3860 dest_cb= s->b_scratchpad+16*linesize; |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3861 dest_cr= s->b_scratchpad+32*linesize; |
| 1632 | 3862 } |
| 2256 | 3863 |
| 0 | 3864 if (!s->mb_intra) { |
| 3865 /* motion handling */ | |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
3866 /* decoding or more than one mb_type (MC was already done otherwise) */ |
| 1389 | 3867 if(!s->encoding){ |
| 2256 | 3868 if(lowres_flag){ |
| 3869 h264_chroma_mc_func *op_pix = s->dsp.put_h264_chroma_pixels_tab; | |
| 3870 | |
| 3871 if (s->mv_dir & MV_DIR_FORWARD) { | |
| 3872 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix); | |
| 3873 op_pix = s->dsp.avg_h264_chroma_pixels_tab; | |
| 3874 } | |
| 3875 if (s->mv_dir & MV_DIR_BACKWARD) { | |
| 3876 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix); | |
| 3877 } | |
| 324 | 3878 }else{ |
| 2967 | 3879 if ((!s->no_rounding) || s->pict_type==B_TYPE){ |
| 2256 | 3880 op_pix = s->dsp.put_pixels_tab; |
| 3881 op_qpix= s->dsp.put_qpel_pixels_tab; | |
| 3882 }else{ | |
| 3883 op_pix = s->dsp.put_no_rnd_pixels_tab; | |
| 3884 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; | |
| 3885 } | |
| 3886 if (s->mv_dir & MV_DIR_FORWARD) { | |
| 3887 MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix); | |
| 3888 op_pix = s->dsp.avg_pixels_tab; | |
| 3889 op_qpix= s->dsp.avg_qpel_pixels_tab; | |
| 3890 } | |
| 3891 if (s->mv_dir & MV_DIR_BACKWARD) { | |
| 3892 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); | |
| 3893 } | |
| 324 | 3894 } |
| 0 | 3895 } |
| 3896 | |
| 481 | 3897 /* skip dequant / idct if we are really late ;) */ |
| 2792 | 3898 if(s->hurry_up>1) goto skip_idct; |
| 3899 if(s->avctx->skip_idct){ | |
| 3900 if( (s->avctx->skip_idct >= AVDISCARD_NONREF && s->pict_type == B_TYPE) | |
| 3901 ||(s->avctx->skip_idct >= AVDISCARD_NONKEY && s->pict_type != I_TYPE) | |
| 3902 || s->avctx->skip_idct >= AVDISCARD_ALL) | |
| 3903 goto skip_idct; | |
| 3904 } | |
| 481 | 3905 |
| 0 | 3906 /* add dct residue */ |
| 1421 | 3907 if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO |
| 711 | 3908 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){ |
| 2256 | 3909 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
| 3910 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
| 3911 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
| 3912 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
| 0 | 3913 |
| 485 | 3914 if(!(s->flags&CODEC_FLAG_GRAY)){ |
| 1644 | 3915 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
| 3916 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
| 485 | 3917 } |
| 936 | 3918 } else if(s->codec_id != CODEC_ID_WMV2){ |
| 2256 | 3919 add_dct(s, block[0], 0, dest_y , dct_linesize); |
| 3920 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize); | |
| 3921 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize); | |
| 3922 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize); | |
| 481 | 3923 |
| 485 | 3924 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3925 if(s->chroma_y_shift){//Chroma420 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3926 add_dct(s, block[4], 4, dest_cb, uvlinesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3927 add_dct(s, block[5], 5, dest_cr, uvlinesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3928 }else{ |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3929 //chroma422 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3930 dct_linesize = uvlinesize << s->interlaced_dct; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3931 dct_offset =(s->interlaced_dct)? uvlinesize : uvlinesize*8; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3932 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3933 add_dct(s, block[4], 4, dest_cb, dct_linesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3934 add_dct(s, block[5], 5, dest_cr, dct_linesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3935 add_dct(s, block[6], 6, dest_cb+dct_offset, dct_linesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3936 add_dct(s, block[7], 7, dest_cr+dct_offset, dct_linesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3937 if(!s->chroma_x_shift){//Chroma444 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3938 add_dct(s, block[8], 8, dest_cb+8, dct_linesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3939 add_dct(s, block[9], 9, dest_cr+8, dct_linesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3940 add_dct(s, block[10], 10, dest_cb+8+dct_offset, dct_linesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3941 add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3942 } |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3943 } |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3944 }//fi gray |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3945 } |
| 1042 | 3946 else{ |
| 936 | 3947 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); |
| 481 | 3948 } |
| 0 | 3949 } else { |
| 3950 /* dct only in intra block */ | |
| 1421 | 3951 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ |
| 2256 | 3952 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
| 3953 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
| 3954 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
| 3955 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
| 0 | 3956 |
| 711 | 3957 if(!(s->flags&CODEC_FLAG_GRAY)){ |
| 1651 | 3958 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
| 3959 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
| 711 | 3960 } |
| 3961 }else{ | |
| 2256 | 3962 s->dsp.idct_put(dest_y , dct_linesize, block[0]); |
| 3963 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]); | |
| 3964 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]); | |
| 3965 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]); | |
| 711 | 3966 |
| 3967 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3968 if(s->chroma_y_shift){ |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3969 s->dsp.idct_put(dest_cb, uvlinesize, block[4]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3970 s->dsp.idct_put(dest_cr, uvlinesize, block[5]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3971 }else{ |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3972 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3973 dct_linesize = uvlinesize << s->interlaced_dct; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3974 dct_offset =(s->interlaced_dct)? uvlinesize : uvlinesize*8; |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3975 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3976 s->dsp.idct_put(dest_cb, dct_linesize, block[4]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3977 s->dsp.idct_put(dest_cr, dct_linesize, block[5]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3978 s->dsp.idct_put(dest_cb + dct_offset, dct_linesize, block[6]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3979 s->dsp.idct_put(dest_cr + dct_offset, dct_linesize, block[7]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3980 if(!s->chroma_x_shift){//Chroma444 |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3981 s->dsp.idct_put(dest_cb + 8, dct_linesize, block[8]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3982 s->dsp.idct_put(dest_cr + 8, dct_linesize, block[9]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3983 s->dsp.idct_put(dest_cb + 8 + dct_offset, dct_linesize, block[10]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3984 s->dsp.idct_put(dest_cr + 8 + dct_offset, dct_linesize, block[11]); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3985 } |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3986 } |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3987 }//gray |
| 485 | 3988 } |
| 0 | 3989 } |
| 2792 | 3990 skip_idct: |
| 1632 | 3991 if(!readable){ |
| 3992 s->dsp.put_pixels_tab[0][0](s->dest[0], dest_y , linesize,16); | |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3993 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift); |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3994 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift); |
| 1632 | 3995 } |
| 0 | 3996 } |
| 294 | 3997 } |
| 3998 | |
| 2256 | 3999 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){ |
| 4000 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1); | |
| 4001 else MPV_decode_mb_internal(s, block, 0); | |
| 4002 } | |
| 4003 | |
|
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
|
4004 #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
|
4005 |
|
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4006 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold) |
| 456 | 4007 { |
| 4008 static const char tab[64]= | |
| 4009 {3,2,2,1,1,1,1,1, | |
| 4010 1,1,1,1,1,1,1,1, | |
| 4011 1,1,1,1,1,1,1,1, | |
| 4012 0,0,0,0,0,0,0,0, | |
| 4013 0,0,0,0,0,0,0,0, | |
| 4014 0,0,0,0,0,0,0,0, | |
| 4015 0,0,0,0,0,0,0,0, | |
| 4016 0,0,0,0,0,0,0,0}; | |
| 4017 int score=0; | |
| 4018 int run=0; | |
| 4019 int i; | |
| 4020 DCTELEM *block= s->block[n]; | |
| 4021 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
|
4022 int skip_dc; |
| 456 | 4023 |
|
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
|
4024 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
|
4025 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
|
4026 threshold= -threshold; |
|
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4027 }else |
|
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
4028 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
|
4029 |
| 456 | 4030 /* are all which we could set to zero are allready zero? */ |
| 4031 if(last_index<=skip_dc - 1) return; | |
| 4032 | |
| 4033 for(i=0; i<=last_index; i++){ | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4034 const int j = s->intra_scantable.permutated[i]; |
| 456 | 4035 const int level = ABS(block[j]); |
| 4036 if(level==1){ | |
| 4037 if(skip_dc && i==0) continue; | |
| 4038 score+= tab[run]; | |
| 4039 run=0; | |
| 4040 }else if(level>1){ | |
| 4041 return; | |
| 4042 }else{ | |
| 4043 run++; | |
| 4044 } | |
| 4045 } | |
| 4046 if(score >= threshold) return; | |
| 4047 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
|
4048 const int j = s->intra_scantable.permutated[i]; |
| 456 | 4049 block[j]=0; |
| 4050 } | |
| 4051 if(block[0]) s->block_last_index[n]= 0; | |
| 4052 else s->block_last_index[n]= -1; | |
| 4053 } | |
| 4054 | |
| 344 | 4055 static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index) |
| 4056 { | |
| 4057 int i; | |
| 4058 const int maxlevel= s->max_qcoeff; | |
| 4059 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
|
4060 int overflow=0; |
| 2967 | 4061 |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4062 if(s->mb_intra){ |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4063 i=1; //skip clipping of intra dc |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4064 }else |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4065 i=0; |
| 2967 | 4066 |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4067 for(;i<=last_index; i++){ |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
4068 const int j= s->intra_scantable.permutated[i]; |
| 344 | 4069 int level = block[j]; |
| 2967 | 4070 |
|
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
|
4071 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
|
4072 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
|
4073 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
|
4074 }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
|
4075 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
|
4076 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
|
4077 } |
| 2967 | 4078 |
| 344 | 4079 block[j]= level; |
| 4080 } | |
| 2967 | 4081 |
|
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
|
4082 if(overflow && s->avctx->mb_decision == FF_MB_DECISION_SIMPLE) |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
4083 av_log(s->avctx, AV_LOG_INFO, "warning, clipping %d dct coefficients to %d..%d\n", overflow, minlevel, maxlevel); |
| 344 | 4084 } |
| 324 | 4085 |
|
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
|
4086 #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
|
4087 |
|
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4088 /** |
|
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4089 * |
|
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4090 * @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
|
4091 */ |
|
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4092 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){ |
| 1368 | 4093 if (s->avctx->draw_horiz_band) { |
| 1370 | 4094 AVFrame *src; |
| 1368 | 4095 int offset[4]; |
| 2967 | 4096 |
| 1370 | 4097 if(s->picture_structure != PICT_FRAME){ |
| 4098 h <<= 1; | |
| 4099 y <<= 1; | |
| 4100 if(s->first_field && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return; | |
| 4101 } | |
| 4102 | |
|
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
4103 h= FFMIN(h, s->avctx->height - y); |
|
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
4104 |
| 2967 | 4105 if(s->pict_type==B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER)) |
| 1370 | 4106 src= (AVFrame*)s->current_picture_ptr; |
| 4107 else if(s->last_picture_ptr) | |
| 4108 src= (AVFrame*)s->last_picture_ptr; | |
| 4109 else | |
| 4110 return; | |
| 2967 | 4111 |
| 1369 | 4112 if(s->pict_type==B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){ |
| 1368 | 4113 offset[0]= |
| 4114 offset[1]= | |
| 4115 offset[2]= | |
| 4116 offset[3]= 0; | |
| 4117 }else{ | |
| 4118 offset[0]= y * s->linesize;; | |
| 2967 | 4119 offset[1]= |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4120 offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize; |
| 1368 | 4121 offset[3]= 0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4122 } |
| 1368 | 4123 |
| 813 | 4124 emms_c(); |
| 4125 | |
| 1370 | 4126 s->avctx->draw_horiz_band(s->avctx, src, offset, |
| 4127 y, s->picture_structure, h); | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4128 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4129 } |
|
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4130 |
| 1389 | 4131 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename |
| 2764 | 4132 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this would be wrong for field pics |
| 1389 | 4133 const int uvlinesize= s->current_picture.linesize[1]; |
| 2256 | 4134 const int mb_size= 4 - s->avctx->lowres; |
| 2967 | 4135 |
|
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4136 s->block_index[0]= s->b8_stride*(s->mb_y*2 ) - 2 + s->mb_x*2; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4137 s->block_index[1]= s->b8_stride*(s->mb_y*2 ) - 1 + s->mb_x*2; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4138 s->block_index[2]= s->b8_stride*(s->mb_y*2 + 1) - 2 + s->mb_x*2; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4139 s->block_index[3]= s->b8_stride*(s->mb_y*2 + 1) - 1 + s->mb_x*2; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4140 s->block_index[4]= s->mb_stride*(s->mb_y + 1) + s->b8_stride*s->mb_height*2 + s->mb_x - 1; |
|
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
4141 s->block_index[5]= s->mb_stride*(s->mb_y + s->mb_height + 2) + s->b8_stride*s->mb_height*2 + s->mb_x - 1; |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4142 //block_index is not used by mpeg2, so it is not affected by chroma_format |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4143 |
| 2256 | 4144 s->dest[0] = s->current_picture.data[0] + ((s->mb_x - 1) << mb_size); |
| 4145 s->dest[1] = s->current_picture.data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
| 4146 s->dest[2] = s->current_picture.data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
| 2168 | 4147 |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4148 if(!(s->pict_type==B_TYPE && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME)) |
|
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4149 { |
| 2256 | 4150 s->dest[0] += s->mb_y * linesize << mb_size; |
| 4151 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift); | |
| 4152 s->dest[2] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift); | |
|
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
4153 } |
| 1389 | 4154 } |
| 4155 | |
|
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
|
4156 #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
|
4157 |
| 1777 | 4158 static void get_vissual_weight(int16_t *weight, uint8_t *ptr, int stride){ |
| 4159 int x, y; | |
| 4160 //FIXME optimize | |
| 4161 for(y=0; y<8; y++){ | |
| 4162 for(x=0; x<8; x++){ | |
| 4163 int x2, y2; | |
| 4164 int sum=0; | |
| 4165 int sqr=0; | |
| 4166 int count=0; | |
| 4167 | |
| 4168 for(y2= FFMAX(y-1, 0); y2 < FFMIN(8, y+2); y2++){ | |
| 4169 for(x2= FFMAX(x-1, 0); x2 < FFMIN(8, x+2); x2++){ | |
| 4170 int v= ptr[x2 + y2*stride]; | |
| 4171 sum += v; | |
| 4172 sqr += v*v; | |
| 4173 count++; | |
| 4174 } | |
| 4175 } | |
| 4176 weight[x + 8*y]= (36*ff_sqrt(count*sqr - sum*sum)) / count; | |
| 4177 } | |
| 4178 } | |
| 4179 } | |
| 4180 | |
| 324 | 4181 static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) |
| 294 | 4182 { |
| 1777 | 4183 int16_t weight[6][64]; |
| 4184 DCTELEM orig[6][64]; | |
| 294 | 4185 const int mb_x= s->mb_x; |
| 4186 const int mb_y= s->mb_y; | |
| 4187 int i; | |
| 456 | 4188 int skip_dct[6]; |
| 697 | 4189 int dct_offset = s->linesize*8; //default for progressive frames |
| 1778 | 4190 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
| 4191 int wrap_y, wrap_c; | |
| 2967 | 4192 |
| 456 | 4193 for(i=0; i<6; i++) skip_dct[i]=0; |
| 2967 | 4194 |
|
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4195 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
|
4196 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
|
4197 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
|
4198 |
|
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
|
4199 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
|
4200 update_qscale(s); |
| 2967 | 4201 |
| 1616 | 4202 if(!(s->flags&CODEC_FLAG_QP_RD)){ |
| 4203 s->dquant= s->qscale - last_qp; | |
| 4204 | |
|
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4205 if(s->out_format==FMT_H263){ |
| 1616 | 4206 s->dquant= clip(s->dquant, -2, 2); //FIXME RD |
| 2967 | 4207 |
| 4208 if(s->codec_id==CODEC_ID_MPEG4){ | |
|
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4209 if(!s->mb_intra){ |
|
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4210 if(s->pict_type == B_TYPE){ |
| 2967 | 4211 if(s->dquant&1) |
|
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4212 s->dquant= (s->dquant/2)*2; |
|
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4213 if(s->mv_dir&MV_DIRECT) |
|
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4214 s->dquant= 0; |
|
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4215 } |
|
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4216 if(s->mv_type==MV_TYPE_8X8) |
|
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4217 s->dquant=0; |
|
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4218 } |
| 1616 | 4219 } |
|
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4220 } |
|
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
4221 } |
| 1652 | 4222 ff_set_qscale(s, last_qp + s->dquant); |
| 2054 | 4223 }else if(s->flags&CODEC_FLAG_QP_RD) |
| 4224 ff_set_qscale(s, s->qscale + s->dquant); | |
| 294 | 4225 |
| 1778 | 4226 wrap_y = s->linesize; |
| 4227 wrap_c = s->uvlinesize; | |
| 4228 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16; | |
| 4229 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
| 4230 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
| 4231 | |
| 4232 if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){ | |
|
2165
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4233 uint8_t *ebuf= s->edge_emu_buffer + 32; |
|
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4234 ff_emulated_edge_mc(ebuf , ptr_y , wrap_y,16,16,mb_x*16,mb_y*16, s->width , s->height); |
|
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4235 ptr_y= ebuf; |
|
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4236 ff_emulated_edge_mc(ebuf+18*wrap_y , ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
|
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4237 ptr_cb= ebuf+18*wrap_y; |
|
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4238 ff_emulated_edge_mc(ebuf+18*wrap_y+8, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
|
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
4239 ptr_cr= ebuf+18*wrap_y+8; |
| 1778 | 4240 } |
| 4241 | |
| 324 | 4242 if (s->mb_intra) { |
| 697 | 4243 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
| 4244 int progressive_score, interlaced_score; | |
| 1708 | 4245 |
| 1729 | 4246 s->interlaced_dct=0; |
| 2967 | 4247 progressive_score= s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y, 8) |
| 1777 | 4248 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y*8, NULL, wrap_y, 8) - 400; |
| 1729 | 4249 |
| 4250 if(progressive_score > 0){ | |
| 2967 | 4251 interlaced_score = s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y*2, 8) |
| 1777 | 4252 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y , NULL, wrap_y*2, 8); |
| 1729 | 4253 if(progressive_score > interlaced_score){ |
| 4254 s->interlaced_dct=1; | |
| 2967 | 4255 |
| 1729 | 4256 dct_offset= wrap_y; |
| 4257 wrap_y<<=1; | |
| 4258 } | |
| 4259 } | |
| 697 | 4260 } |
| 2967 | 4261 |
| 2979 | 4262 s->dsp.get_pixels(s->block[0], ptr_y , wrap_y); |
| 1777 | 4263 s->dsp.get_pixels(s->block[1], ptr_y + 8, wrap_y); |
| 4264 s->dsp.get_pixels(s->block[2], ptr_y + dct_offset , wrap_y); | |
| 4265 s->dsp.get_pixels(s->block[3], ptr_y + dct_offset + 8, wrap_y); | |
| 294 | 4266 |
| 487 | 4267 if(s->flags&CODEC_FLAG_GRAY){ |
| 4268 skip_dct[4]= 1; | |
| 4269 skip_dct[5]= 1; | |
| 4270 }else{ | |
| 2979 | 4271 s->dsp.get_pixels(s->block[4], ptr_cb, wrap_c); |
| 1777 | 4272 s->dsp.get_pixels(s->block[5], ptr_cr, wrap_c); |
| 4273 } | |
| 324 | 4274 }else{ |
| 651 | 4275 op_pixels_func (*op_pix)[4]; |
| 4276 qpel_mc_func (*op_qpix)[16]; | |
| 1064 | 4277 uint8_t *dest_y, *dest_cb, *dest_cr; |
| 294 | 4278 |
| 1389 | 4279 dest_y = s->dest[0]; |
| 4280 dest_cb = s->dest[1]; | |
| 4281 dest_cr = s->dest[2]; | |
| 324 | 4282 |
| 327 | 4283 if ((!s->no_rounding) || s->pict_type==B_TYPE){ |
| 2979 | 4284 op_pix = s->dsp.put_pixels_tab; |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4285 op_qpix= s->dsp.put_qpel_pixels_tab; |
| 295 | 4286 }else{ |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4287 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
|
4288 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; |
| 324 | 4289 } |
| 295 | 4290 |
| 324 | 4291 if (s->mv_dir & MV_DIR_FORWARD) { |
| 903 | 4292 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
|
4293 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
|
4294 op_qpix= s->dsp.avg_qpel_pixels_tab; |
| 324 | 4295 } |
| 4296 if (s->mv_dir & MV_DIR_BACKWARD) { | |
| 903 | 4297 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); |
| 324 | 4298 } |
| 295 | 4299 |
| 697 | 4300 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
| 4301 int progressive_score, interlaced_score; | |
| 1729 | 4302 |
| 4303 s->interlaced_dct=0; | |
| 2967 | 4304 progressive_score= s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y, 8) |
| 1729 | 4305 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y*8, ptr_y + wrap_y*8, wrap_y, 8) - 400; |
| 2967 | 4306 |
| 1729 | 4307 if(s->avctx->ildct_cmp == FF_CMP_VSSE) progressive_score -= 400; |
| 4308 | |
| 4309 if(progressive_score>0){ | |
| 2967 | 4310 interlaced_score = s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y*2, 8) |
| 1729 | 4311 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y , ptr_y + wrap_y , wrap_y*2, 8); |
| 2967 | 4312 |
| 1729 | 4313 if(progressive_score > interlaced_score){ |
| 4314 s->interlaced_dct=1; | |
| 2967 | 4315 |
| 1729 | 4316 dct_offset= wrap_y; |
| 4317 wrap_y<<=1; | |
| 4318 } | |
| 4319 } | |
| 697 | 4320 } |
| 2967 | 4321 |
| 2979 | 4322 s->dsp.diff_pixels(s->block[0], ptr_y , dest_y , wrap_y); |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4323 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
|
4324 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
|
4325 s->dsp.diff_pixels(s->block[3], ptr_y + dct_offset + 8, dest_y + dct_offset + 8, wrap_y); |
| 2967 | 4326 |
| 487 | 4327 if(s->flags&CODEC_FLAG_GRAY){ |
| 4328 skip_dct[4]= 1; | |
| 4329 skip_dct[5]= 1; | |
| 4330 }else{ | |
|
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4331 s->dsp.diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c); |
|
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4332 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c); |
| 487 | 4333 } |
| 2967 | 4334 /* 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
|
4335 if(s->current_picture.mc_mb_var[s->mb_stride*mb_y+ mb_x]<2*s->qscale*s->qscale){ |
| 697 | 4336 //FIXME optimize |
| 2979 | 4337 if(s->dsp.sad[1](NULL, ptr_y , dest_y , wrap_y, 8) < 20*s->qscale) skip_dct[0]= 1; |
| 1708 | 4338 if(s->dsp.sad[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20*s->qscale) skip_dct[1]= 1; |
| 4339 if(s->dsp.sad[1](NULL, ptr_y +dct_offset , dest_y +dct_offset , wrap_y, 8) < 20*s->qscale) skip_dct[2]= 1; | |
| 4340 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; | |
| 4341 if(s->dsp.sad[1](NULL, ptr_cb , dest_cb , wrap_c, 8) < 20*s->qscale) skip_dct[4]= 1; | |
| 4342 if(s->dsp.sad[1](NULL, ptr_cr , dest_cr , wrap_c, 8) < 20*s->qscale) skip_dct[5]= 1; | |
| 456 | 4343 } |
| 1778 | 4344 } |
| 4345 | |
| 4346 if(s->avctx->quantizer_noise_shaping){ | |
| 4347 if(!skip_dct[0]) get_vissual_weight(weight[0], ptr_y , wrap_y); | |
| 4348 if(!skip_dct[1]) get_vissual_weight(weight[1], ptr_y + 8, wrap_y); | |
| 4349 if(!skip_dct[2]) get_vissual_weight(weight[2], ptr_y + dct_offset , wrap_y); | |
| 4350 if(!skip_dct[3]) get_vissual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y); | |
| 4351 if(!skip_dct[4]) get_vissual_weight(weight[4], ptr_cb , wrap_c); | |
| 4352 if(!skip_dct[5]) get_vissual_weight(weight[5], ptr_cr , wrap_c); | |
| 4353 memcpy(orig[0], s->block[0], sizeof(DCTELEM)*64*6); | |
| 294 | 4354 } |
| 2967 | 4355 |
| 294 | 4356 /* DCT & quantize */ |
| 1778 | 4357 assert(s->out_format!=FMT_MJPEG || s->qscale==8); |
| 4358 { | |
| 344 | 4359 for(i=0;i<6;i++) { |
| 456 | 4360 if(!skip_dct[i]){ |
| 4361 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
|
4362 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, s->qscale, &overflow); |
| 344 | 4363 // 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
|
4364 // 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
|
4365 // of improve it. Just INTRADC clipping deserves changes in quantizer |
| 456 | 4366 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); |
| 4367 }else | |
| 4368 s->block_last_index[i]= -1; | |
| 344 | 4369 } |
| 1777 | 4370 if(s->avctx->quantizer_noise_shaping){ |
| 4371 for(i=0;i<6;i++) { | |
| 4372 if(!skip_dct[i]){ | |
| 4373 s->block_last_index[i] = dct_quantize_refine(s, s->block[i], weight[i], orig[i], i, s->qscale); | |
| 4374 } | |
| 4375 } | |
| 4376 } | |
| 2967 | 4377 |
| 456 | 4378 if(s->luma_elim_threshold && !s->mb_intra) |
| 4379 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
|
4380 dct_single_coeff_elimination(s, i, s->luma_elim_threshold); |
| 456 | 4381 if(s->chroma_elim_threshold && !s->mb_intra) |
| 4382 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
|
4383 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold); |
| 1497 | 4384 |
| 4385 if(s->flags & CODEC_FLAG_CBP_RD){ | |
| 4386 for(i=0;i<6;i++) { | |
| 4387 if(s->block_last_index[i] == -1) | |
| 4388 s->coded_score[i]= INT_MAX/256; | |
| 4389 } | |
| 4390 } | |
| 294 | 4391 } |
| 4392 | |
| 487 | 4393 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ |
| 4394 s->block_last_index[4]= | |
| 4395 s->block_last_index[5]= 0; | |
| 4396 s->block[4][0]= | |
| 1011 | 4397 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale; |
| 487 | 4398 } |
| 4399 | |
| 1708 | 4400 //non c quantize code returns incorrect block_last_index FIXME |
| 4401 if(s->alternate_scan && s->dct_quantize != dct_quantize_c){ | |
| 4402 for(i=0; i<6; i++){ | |
| 4403 int j; | |
| 4404 if(s->block_last_index[i]>0){ | |
| 4405 for(j=63; j>0; j--){ | |
| 4406 if(s->block[i][ s->intra_scantable.permutated[j] ]) break; | |
| 4407 } | |
| 4408 s->block_last_index[i]= j; | |
| 4409 } | |
| 4410 } | |
| 4411 } | |
| 4412 | |
| 294 | 4413 /* huffman encode */ |
| 936 | 4414 switch(s->codec_id){ //FIXME funct ptr could be slightly faster |
| 4415 case CODEC_ID_MPEG1VIDEO: | |
| 1421 | 4416 case CODEC_ID_MPEG2VIDEO: |
| 936 | 4417 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; |
| 4418 case CODEC_ID_MPEG4: | |
| 4419 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
| 4420 case CODEC_ID_MSMPEG4V2: | |
| 4421 case CODEC_ID_MSMPEG4V3: | |
| 4422 case CODEC_ID_WMV1: | |
| 4423 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
| 4424 case CODEC_ID_WMV2: | |
| 4425 ff_wmv2_encode_mb(s, s->block, motion_x, motion_y); break; | |
| 2639 | 4426 #ifdef CONFIG_H261_ENCODER |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4427 case CODEC_ID_H261: |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4428 ff_h261_encode_mb(s, s->block, motion_x, motion_y); break; |
| 2639 | 4429 #endif |
| 936 | 4430 case CODEC_ID_H263: |
| 4431 case CODEC_ID_H263P: | |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4432 case CODEC_ID_FLV1: |
| 936 | 4433 case CODEC_ID_RV10: |
| 2380 | 4434 case CODEC_ID_RV20: |
| 936 | 4435 h263_encode_mb(s, s->block, motion_x, motion_y); break; |
| 1042 | 4436 case CODEC_ID_MJPEG: |
| 4437 mjpeg_encode_mb(s, s->block); break; | |
| 936 | 4438 default: |
| 4439 assert(0); | |
| 294 | 4440 } |
| 4441 } | |
| 4442 | |
|
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
|
4443 #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
|
4444 |
| 1368 | 4445 void ff_mpeg_flush(AVCodecContext *avctx){ |
| 4446 int i; | |
| 4447 MpegEncContext *s = avctx->priv_data; | |
| 2967 | 4448 |
| 4449 if(s==NULL || s->picture==NULL) | |
| 1751 | 4450 return; |
| 2967 | 4451 |
| 1368 | 4452 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
| 4453 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL | |
| 4454 || s->picture[i].type == FF_BUFFER_TYPE_USER)) | |
| 4455 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); | |
| 4456 } | |
| 1601 | 4457 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL; |
| 2967 | 4458 |
| 2380 | 4459 s->mb_x= s->mb_y= 0; |
| 2967 | 4460 |
| 1395 | 4461 s->parse_context.state= -1; |
| 4462 s->parse_context.frame_start_found= 0; | |
| 4463 s->parse_context.overread= 0; | |
| 4464 s->parse_context.overread_index= 0; | |
| 4465 s->parse_context.index= 0; | |
| 4466 s->parse_context.last_index= 0; | |
| 1851 | 4467 s->bitstream_buffer_size=0; |
| 1368 | 4468 } |
| 4469 | |
|
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
|
4470 #ifdef CONFIG_ENCODERS |
| 1064 | 4471 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) |
| 294 | 4472 { |
| 1810 | 4473 const uint16_t *srcw= (uint16_t*)src; |
| 1799 | 4474 int words= length>>4; |
| 326 | 4475 int bits= length&15; |
| 4476 int i; | |
| 4477 | |
| 456 | 4478 if(length==0) return; |
| 2967 | 4479 |
| 1803 | 4480 if(words < 16){ |
| 4481 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); | |
| 4482 }else if(put_bits_count(pb)&7){ | |
| 4483 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); | |
|
1802
e91dbb5b1a8d
activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
michael
parents:
1801
diff
changeset
|
4484 }else{ |
| 1803 | 4485 for(i=0; put_bits_count(pb)&31; i++) |
| 4486 put_bits(pb, 8, src[i]); | |
| 1799 | 4487 flush_put_bits(pb); |
| 1803 | 4488 memcpy(pbBufPtr(pb), src+i, 2*words-i); |
| 4489 skip_put_bytes(pb, 2*words-i); | |
|
1802
e91dbb5b1a8d
activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
michael
parents:
1801
diff
changeset
|
4490 } |
| 2967 | 4491 |
| 1803 | 4492 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits)); |
| 0 | 4493 } |
| 4494 | |
| 456 | 4495 static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
| 326 | 4496 int i; |
| 4497 | |
| 4498 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
| 4499 | |
| 4500 /* mpeg1 */ | |
| 1160 | 4501 d->mb_skip_run= s->mb_skip_run; |
| 326 | 4502 for(i=0; i<3; i++) |
| 4503 d->last_dc[i]= s->last_dc[i]; | |
| 2967 | 4504 |
| 326 | 4505 /* statistics */ |
| 4506 d->mv_bits= s->mv_bits; | |
| 4507 d->i_tex_bits= s->i_tex_bits; | |
| 4508 d->p_tex_bits= s->p_tex_bits; | |
| 4509 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
|
4510 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
|
4511 d->b_count= s->b_count; |
| 326 | 4512 d->skip_count= s->skip_count; |
| 4513 d->misc_bits= s->misc_bits; | |
| 329 | 4514 d->last_bits= 0; |
| 327 | 4515 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
4516 d->mb_skipped= 0; |
| 912 | 4517 d->qscale= s->qscale; |
| 1616 | 4518 d->dquant= s->dquant; |
| 326 | 4519 } |
| 4520 | |
| 456 | 4521 static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
| 326 | 4522 int i; |
| 4523 | |
| 2967 | 4524 memcpy(d->mv, s->mv, 2*4*2*sizeof(int)); |
| 326 | 4525 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? |
| 2967 | 4526 |
| 326 | 4527 /* mpeg1 */ |
| 1160 | 4528 d->mb_skip_run= s->mb_skip_run; |
| 326 | 4529 for(i=0; i<3; i++) |
| 4530 d->last_dc[i]= s->last_dc[i]; | |
| 2967 | 4531 |
| 326 | 4532 /* statistics */ |
| 4533 d->mv_bits= s->mv_bits; | |
| 4534 d->i_tex_bits= s->i_tex_bits; | |
| 4535 d->p_tex_bits= s->p_tex_bits; | |
| 4536 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
|
4537 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
|
4538 d->b_count= s->b_count; |
| 326 | 4539 d->skip_count= s->skip_count; |
| 4540 d->misc_bits= s->misc_bits; | |
| 4541 | |
| 4542 d->mb_intra= s->mb_intra; | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
4543 d->mb_skipped= s->mb_skipped; |
| 326 | 4544 d->mv_type= s->mv_type; |
| 4545 d->mv_dir= s->mv_dir; | |
| 4546 d->pb= s->pb; | |
| 456 | 4547 if(s->data_partitioning){ |
| 4548 d->pb2= s->pb2; | |
| 4549 d->tex_pb= s->tex_pb; | |
| 4550 } | |
| 326 | 4551 d->block= s->block; |
| 4552 for(i=0; i<6; i++) | |
| 4553 d->block_last_index[i]= s->block_last_index[i]; | |
| 755 | 4554 d->interlaced_dct= s->interlaced_dct; |
| 912 | 4555 d->qscale= s->qscale; |
| 326 | 4556 } |
| 4557 | |
| 2967 | 4558 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type, |
| 456 | 4559 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2], |
| 4560 int *dmin, int *next_block, int motion_x, int motion_y) | |
| 4561 { | |
| 1389 | 4562 int score; |
| 4563 uint8_t *dest_backup[3]; | |
| 2967 | 4564 |
| 456 | 4565 copy_context_before_encode(s, backup, type); |
| 4566 | |
| 4567 s->block= s->blocks[*next_block]; | |
| 4568 s->pb= pb[*next_block]; | |
| 4569 if(s->data_partitioning){ | |
| 4570 s->pb2 = pb2 [*next_block]; | |
| 4571 s->tex_pb= tex_pb[*next_block]; | |
| 4572 } | |
| 2967 | 4573 |
| 1389 | 4574 if(*next_block){ |
| 4575 memcpy(dest_backup, s->dest, sizeof(s->dest)); | |
| 1799 | 4576 s->dest[0] = s->rd_scratchpad; |
| 4577 s->dest[1] = s->rd_scratchpad + 16*s->linesize; | |
| 4578 s->dest[2] = s->rd_scratchpad + 16*s->linesize + 8; | |
| 4579 assert(s->linesize >= 32); //FIXME | |
| 1389 | 4580 } |
| 456 | 4581 |
| 4582 encode_mb(s, motion_x, motion_y); | |
| 2967 | 4583 |
| 1786 | 4584 score= put_bits_count(&s->pb); |
| 456 | 4585 if(s->data_partitioning){ |
| 1786 | 4586 score+= put_bits_count(&s->pb2); |
| 4587 score+= put_bits_count(&s->tex_pb); | |
| 456 | 4588 } |
| 2967 | 4589 |
| 1389 | 4590 if(s->avctx->mb_decision == FF_MB_DECISION_RD){ |
| 4591 MPV_decode_mb(s, s->block); | |
| 4592 | |
|
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
|
4593 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
|
4594 score += sse_mb(s) << FF_LAMBDA_SHIFT; |
| 1389 | 4595 } |
| 2967 | 4596 |
| 1389 | 4597 if(*next_block){ |
| 4598 memcpy(s->dest, dest_backup, sizeof(s->dest)); | |
| 4599 } | |
| 4600 | |
| 4601 if(score<*dmin){ | |
| 4602 *dmin= score; | |
| 456 | 4603 *next_block^=1; |
| 4604 | |
| 4605 copy_context_after_encode(best, s, type); | |
| 4606 } | |
| 4607 } | |
| 2967 | 4608 |
| 1389 | 4609 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
|
4610 uint32_t *sq = squareTbl + 256; |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4611 int acc=0; |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4612 int x,y; |
| 2967 | 4613 |
| 4614 if(w==16 && h==16) | |
| 1708 | 4615 return s->dsp.sse[0](NULL, src1, src2, stride, 16); |
| 936 | 4616 else if(w==8 && h==8) |
| 1708 | 4617 return s->dsp.sse[1](NULL, src1, src2, stride, 8); |
| 2967 | 4618 |
|
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4619 for(y=0; y<h; y++){ |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4620 for(x=0; x<w; x++){ |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4621 acc+= sq[src1[x + y*stride] - src2[x + y*stride]]; |
| 2967 | 4622 } |
| 4623 } | |
| 4624 | |
| 936 | 4625 assert(acc>=0); |
| 2967 | 4626 |
|
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4627 return acc; |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4628 } |
| 326 | 4629 |
| 1389 | 4630 static int sse_mb(MpegEncContext *s){ |
| 4631 int w= 16; | |
| 4632 int h= 16; | |
| 4633 | |
| 4634 if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; | |
| 4635 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; | |
| 4636 | |
| 4637 if(w==16 && h==16) | |
|
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4638 if(s->avctx->mb_cmp == FF_CMP_NSSE){ |
| 2066 | 4639 return s->dsp.nsse[0](s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], s->linesize, 16) |
| 4640 +s->dsp.nsse[1](s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], s->uvlinesize, 8) | |
| 4641 +s->dsp.nsse[1](s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], s->uvlinesize, 8); | |
|
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4642 }else{ |
| 1708 | 4643 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) |
| 4644 +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) | |
| 4645 +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); | |
|
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4646 } |
| 1389 | 4647 else |
| 4648 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) | |
| 4649 +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) | |
| 4650 +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); | |
| 4651 } | |
| 4652 | |
| 1799 | 4653 static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){ |
| 4654 MpegEncContext *s= arg; | |
| 4655 | |
| 2967 | 4656 |
| 1799 | 4657 s->me.pre_pass=1; |
| 4658 s->me.dia_size= s->avctx->pre_dia_size; | |
| 4659 s->first_slice_line=1; | |
| 4660 for(s->mb_y= s->end_mb_y-1; s->mb_y >= s->start_mb_y; s->mb_y--) { | |
| 4661 for(s->mb_x=s->mb_width-1; s->mb_x >=0 ;s->mb_x--) { | |
| 4662 ff_pre_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
| 4663 } | |
| 4664 s->first_slice_line=0; | |
| 4665 } | |
| 2967 | 4666 |
| 1799 | 4667 s->me.pre_pass=0; |
| 2967 | 4668 |
| 1799 | 4669 return 0; |
| 4670 } | |
| 4671 | |
| 4672 static int estimate_motion_thread(AVCodecContext *c, void *arg){ | |
| 4673 MpegEncContext *s= arg; | |
| 4674 | |
| 4675 s->me.dia_size= s->avctx->dia_size; | |
| 4676 s->first_slice_line=1; | |
| 4677 for(s->mb_y= s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) { | |
| 4678 s->mb_x=0; //for block init below | |
| 4679 ff_init_block_index(s); | |
| 4680 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { | |
| 4681 s->block_index[0]+=2; | |
| 4682 s->block_index[1]+=2; | |
| 4683 s->block_index[2]+=2; | |
| 4684 s->block_index[3]+=2; | |
| 2967 | 4685 |
| 1799 | 4686 /* compute motion vector & mb_type and store in context */ |
| 4687 if(s->pict_type==B_TYPE) | |
| 4688 ff_estimate_b_frame_motion(s, s->mb_x, s->mb_y); | |
| 4689 else | |
| 4690 ff_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
| 4691 } | |
| 4692 s->first_slice_line=0; | |
| 4693 } | |
| 4694 return 0; | |
| 4695 } | |
| 4696 | |
|
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4697 static int mb_var_thread(AVCodecContext *c, void *arg){ |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4698 MpegEncContext *s= arg; |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4699 int mb_x, mb_y; |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4700 |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4701 for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4702 for(mb_x=0; mb_x < s->mb_width; mb_x++) { |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4703 int xx = mb_x * 16; |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4704 int yy = mb_y * 16; |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4705 uint8_t *pix = s->new_picture.data[0] + (yy * s->linesize) + xx; |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4706 int varc; |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4707 int sum = s->dsp.pix_sum(pix, s->linesize); |
| 2967 | 4708 |
|
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4709 varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8; |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4710 |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4711 s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc; |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4712 s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; |
|
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
4713 s->me.mb_var_sum_temp += varc; |
|
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4714 } |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4715 } |
|
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4716 return 0; |
|
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4717 } |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4718 |
| 1799 | 4719 static void write_slice_end(MpegEncContext *s){ |
| 4720 if(s->codec_id==CODEC_ID_MPEG4){ | |
| 4721 if(s->partitioned_frame){ | |
| 4722 ff_mpeg4_merge_partitions(s); | |
| 4723 } | |
| 2967 | 4724 |
| 1799 | 4725 ff_mpeg4_stuffing(&s->pb); |
| 4726 }else if(s->out_format == FMT_MJPEG){ | |
| 4727 ff_mjpeg_stuffing(&s->pb); | |
| 4728 } | |
| 4729 | |
| 4730 align_put_bits(&s->pb); | |
| 4731 flush_put_bits(&s->pb); | |
| 2967 | 4732 |
|
2428
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
4733 if((s->flags&CODEC_FLAG_PASS1) && !s->partitioned_frame) |
|
548c87c06dbb
assertion about bits statistic and minor bits stat fix
michael
parents:
2427
diff
changeset
|
4734 s->misc_bits+= get_bits_diff(s); |
| 1799 | 4735 } |
| 4736 | |
| 4737 static int encode_thread(AVCodecContext *c, void *arg){ | |
| 4738 MpegEncContext *s= arg; | |
| 766 | 4739 int mb_x, mb_y, pdif = 0; |
| 1708 | 4740 int i, j; |
| 326 | 4741 MpegEncContext best_s, backup_s; |
| 2422 | 4742 uint8_t bit_buf[2][MAX_MB_BYTES]; |
| 4743 uint8_t bit_buf2[2][MAX_MB_BYTES]; | |
| 4744 uint8_t bit_buf_tex[2][MAX_MB_BYTES]; | |
| 456 | 4745 PutBitContext pb[2], pb2[2], tex_pb[2]; |
| 1799 | 4746 //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y); |
| 456 | 4747 |
| 4748 for(i=0; i<2; i++){ | |
| 2422 | 4749 init_put_bits(&pb [i], bit_buf [i], MAX_MB_BYTES); |
| 4750 init_put_bits(&pb2 [i], bit_buf2 [i], MAX_MB_BYTES); | |
| 4751 init_put_bits(&tex_pb[i], bit_buf_tex[i], MAX_MB_BYTES); | |
| 456 | 4752 } |
| 0 | 4753 |
| 1786 | 4754 s->last_bits= put_bits_count(&s->pb); |
| 286 | 4755 s->mv_bits=0; |
| 4756 s->misc_bits=0; | |
| 4757 s->i_tex_bits=0; | |
| 4758 s->p_tex_bits=0; | |
| 4759 s->i_count=0; | |
|
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4760 s->f_count=0; |
|
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4761 s->b_count=0; |
| 286 | 4762 s->skip_count=0; |
| 4763 | |
|
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4764 for(i=0; i<3; i++){ |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4765 /* init last dc values */ |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4766 /* note: quant matrix value (8) is implied here */ |
| 1992 | 4767 s->last_dc[i] = 128 << s->intra_dc_precision; |
| 2967 | 4768 |
| 2955 | 4769 s->current_picture.error[i] = 0; |
|
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4770 } |
| 1160 | 4771 s->mb_skip_run = 0; |
| 1708 | 4772 memset(s->last_mv, 0, sizeof(s->last_mv)); |
| 2967 | 4773 |
|
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha?l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4774 s->last_mv_dir = 0; |
| 0 | 4775 |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4776 switch(s->codec_id){ |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4777 case CODEC_ID_H263: |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4778 case CODEC_ID_H263P: |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4779 case CODEC_ID_FLV1: |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4780 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
|
4781 break; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4782 case CODEC_ID_MPEG4: |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4783 if(s->partitioned_frame) |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4784 ff_mpeg4_init_partitions(s); |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4785 break; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4786 } |
| 456 | 4787 |
| 4788 s->resync_mb_x=0; | |
| 2967 | 4789 s->resync_mb_y=0; |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4790 s->first_slice_line = 1; |
| 766 | 4791 s->ptr_lastgob = s->pb.buf; |
| 1799 | 4792 for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { |
| 4793 // printf("row %d at %X\n", s->mb_y, (int)s); | |
| 1389 | 4794 s->mb_x=0; |
| 4795 s->mb_y= mb_y; | |
| 4796 | |
| 1652 | 4797 ff_set_qscale(s, s->qscale); |
| 1389 | 4798 ff_init_block_index(s); |
| 2967 | 4799 |
|
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4800 for(mb_x=0; mb_x < s->mb_width; mb_x++) { |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4801 int xy= mb_y*s->mb_stride + mb_x; // removed const, H261 needs to adjust this |
|
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
|
4802 int mb_type= s->mb_type[xy]; |
| 456 | 4803 // int d; |
| 1389 | 4804 int dmin= INT_MAX; |
| 1708 | 4805 int dir; |
| 0 | 4806 |
| 2422 | 4807 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < MAX_MB_BYTES){ |
| 4808 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
| 4809 return -1; | |
| 4810 } | |
| 4811 if(s->data_partitioning){ | |
| 4812 if( s->pb2 .buf_end - s->pb2 .buf - (put_bits_count(&s-> pb2)>>3) < MAX_MB_BYTES | |
| 4813 || s->tex_pb.buf_end - s->tex_pb.buf - (put_bits_count(&s->tex_pb )>>3) < MAX_MB_BYTES){ | |
| 4814 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
| 4815 return -1; | |
| 4816 } | |
| 4817 } | |
| 4818 | |
|
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4819 s->mb_x = mb_x; |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4820 s->mb_y = mb_y; // moved into loop, can get changed by H.261 |
| 1389 | 4821 ff_update_block_index(s); |
| 456 | 4822 |
| 2639 | 4823 #ifdef CONFIG_H261_ENCODER |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4824 if(s->codec_id == CODEC_ID_H261){ |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4825 ff_h261_reorder_mb_index(s); |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4826 xy= s->mb_y*s->mb_stride + s->mb_x; |
| 2345 | 4827 mb_type= s->mb_type[xy]; |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4828 } |
| 2639 | 4829 #endif |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4830 |
| 766 | 4831 /* write gob / video packet header */ |
| 1661 | 4832 if(s->rtp_mode){ |
| 766 | 4833 int current_packet_size, is_gob_start; |
| 2967 | 4834 |
|
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
4835 current_packet_size= ((put_bits_count(&s->pb)+7)>>3) - (s->ptr_lastgob - s->pb.buf); |
| 2967 | 4836 |
| 4837 is_gob_start= s->avctx->rtp_payload_size && current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x>0; | |
| 4838 | |
| 1799 | 4839 if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0) is_gob_start=1; |
| 2967 | 4840 |
| 1661 | 4841 switch(s->codec_id){ |
| 4842 case CODEC_ID_H263: | |
| 4843 case CODEC_ID_H263P: | |
| 4844 if(!s->h263_slice_structured) | |
| 4845 if(s->mb_x || s->mb_y%s->gob_index) is_gob_start=0; | |
| 4846 break; | |
| 4847 case CODEC_ID_MPEG2VIDEO: | |
| 4848 if(s->mb_x==0 && s->mb_y!=0) is_gob_start=1; | |
| 4849 case CODEC_ID_MPEG1VIDEO: | |
| 4850 if(s->mb_skip_run) is_gob_start=0; | |
| 4851 break; | |
| 4852 } | |
| 1799 | 4853 |
| 1661 | 4854 if(is_gob_start){ |
| 1799 | 4855 if(s->start_mb_y != mb_y || mb_x!=0){ |
| 4856 write_slice_end(s); | |
| 4857 | |
| 4858 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame){ | |
| 4859 ff_mpeg4_init_partitions(s); | |
| 4860 } | |
| 1661 | 4861 } |
| 2967 | 4862 |
| 1786 | 4863 assert((put_bits_count(&s->pb)&7) == 0); |
| 1661 | 4864 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob; |
| 2967 | 4865 |
| 1688 | 4866 if(s->avctx->error_rate && s->resync_mb_x + s->resync_mb_y > 0){ |
| 2371 | 4867 int r= put_bits_count(&s->pb)/8 + s->picture_number + 16 + s->mb_x + s->mb_y; |
| 1688 | 4868 int d= 100 / s->avctx->error_rate; |
| 4869 if(r % d == 0){ | |
| 4870 current_packet_size=0; | |
| 4871 #ifndef ALT_BITSTREAM_WRITER | |
| 4872 s->pb.buf_ptr= s->ptr_lastgob; | |
| 4873 #endif | |
| 4874 assert(pbBufPtr(&s->pb) == s->ptr_lastgob); | |
| 4875 } | |
| 4876 } | |
|
2492
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4877 |
|
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4878 if (s->avctx->rtp_callback){ |
|
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4879 int number_mb = (mb_y - s->resync_mb_y)*s->mb_width + mb_x - s->resync_mb_x; |
|
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4880 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, number_mb); |
|
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
4881 } |
| 2967 | 4882 |
| 1661 | 4883 switch(s->codec_id){ |
| 4884 case CODEC_ID_MPEG4: | |
| 456 | 4885 ff_mpeg4_encode_video_packet_header(s); |
| 4886 ff_mpeg4_clean_buffers(s); | |
| 1661 | 4887 break; |
| 4888 case CODEC_ID_MPEG1VIDEO: | |
| 4889 case CODEC_ID_MPEG2VIDEO: | |
| 1421 | 4890 ff_mpeg1_encode_slice_header(s); |
| 4891 ff_mpeg1_clean_buffers(s); | |
| 1661 | 4892 break; |
| 4893 case CODEC_ID_H263: | |
| 4894 case CODEC_ID_H263P: | |
| 2967 | 4895 h263_encode_gob_header(s, mb_y); |
| 1661 | 4896 break; |
| 1160 | 4897 } |
| 1661 | 4898 |
| 4899 if(s->flags&CODEC_FLAG_PASS1){ | |
| 1786 | 4900 int bits= put_bits_count(&s->pb); |
| 1661 | 4901 s->misc_bits+= bits - s->last_bits; |
| 4902 s->last_bits= bits; | |
| 766 | 4903 } |
| 2967 | 4904 |
| 1662 | 4905 s->ptr_lastgob += current_packet_size; |
| 456 | 4906 s->first_slice_line=1; |
| 4907 s->resync_mb_x=mb_x; | |
| 4908 s->resync_mb_y=mb_y; | |
| 4909 } | |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4910 } |
| 456 | 4911 |
|
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4912 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
|
4913 && s->resync_mb_y+1 == s->mb_y){ |
| 2967 | 4914 s->first_slice_line=0; |
| 456 | 4915 } |
| 4916 | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
4917 s->mb_skipped=0; |
| 1616 | 4918 s->dquant=0; //only for QP_RD |
| 4919 | |
| 2230 | 4920 if(mb_type & (mb_type-1) || (s->flags & CODEC_FLAG_QP_RD)){ // more than 1 MB type possible or CODEC_FLAG_QP_RD |
| 327 | 4921 int next_block=0; |
| 456 | 4922 int pb_bits_count, pb2_bits_count, tex_pb_bits_count; |
| 326 | 4923 |
| 4924 copy_context_before_encode(&backup_s, s, -1); | |
| 456 | 4925 backup_s.pb= s->pb; |
| 4926 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
|
4927 best_s.partitioned_frame= s->partitioned_frame; |
| 456 | 4928 if(s->data_partitioning){ |
| 4929 backup_s.pb2= s->pb2; | |
| 4930 backup_s.tex_pb= s->tex_pb; | |
| 4931 } | |
| 326 | 4932 |
| 1708 | 4933 if(mb_type&CANDIDATE_MB_TYPE_INTER){ |
| 327 | 4934 s->mv_dir = MV_DIR_FORWARD; |
| 295 | 4935 s->mv_type = MV_TYPE_16X16; |
| 294 | 4936 s->mb_intra= 0; |
| 324 | 4937 s->mv[0][0][0] = s->p_mv_table[xy][0]; |
| 4938 s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
| 2967 | 4939 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb, |
| 456 | 4940 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
| 0 | 4941 } |
| 2967 | 4942 if(mb_type&CANDIDATE_MB_TYPE_INTER_I){ |
| 1708 | 4943 s->mv_dir = MV_DIR_FORWARD; |
| 4944 s->mv_type = MV_TYPE_FIELD; | |
| 4945 s->mb_intra= 0; | |
| 4946 for(i=0; i<2; i++){ | |
| 4947 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
| 4948 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
| 4949 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
| 4950 } | |
| 2967 | 4951 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb, |
| 1708 | 4952 &dmin, &next_block, 0, 0); |
| 4953 } | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2627
diff
changeset
|
4954 if(mb_type&CANDIDATE_MB_TYPE_SKIPPED){ |
|
1494
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
4955 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
|
4956 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
|
4957 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
|
4958 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
|
4959 s->mv[0][0][1] = 0; |
| 2967 | 4960 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_SKIPPED, 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
|
4961 &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
|
4962 } |
| 2967 | 4963 if(mb_type&CANDIDATE_MB_TYPE_INTER4V){ |
| 327 | 4964 s->mv_dir = MV_DIR_FORWARD; |
| 295 | 4965 s->mv_type = MV_TYPE_8X8; |
| 4966 s->mb_intra= 0; | |
| 4967 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
|
4968 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
|
4969 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
| 295 | 4970 } |
| 2967 | 4971 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb, |
| 456 | 4972 &dmin, &next_block, 0, 0); |
| 327 | 4973 } |
| 1708 | 4974 if(mb_type&CANDIDATE_MB_TYPE_FORWARD){ |
| 327 | 4975 s->mv_dir = MV_DIR_FORWARD; |
| 4976 s->mv_type = MV_TYPE_16X16; | |
| 4977 s->mb_intra= 0; | |
| 4978 s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
| 4979 s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
| 2967 | 4980 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb, |
| 456 | 4981 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
| 327 | 4982 } |
| 1708 | 4983 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD){ |
| 327 | 4984 s->mv_dir = MV_DIR_BACKWARD; |
| 4985 s->mv_type = MV_TYPE_16X16; | |
| 4986 s->mb_intra= 0; | |
| 4987 s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
| 4988 s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
| 2967 | 4989 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb, |
| 456 | 4990 &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]); |
| 327 | 4991 } |
| 1708 | 4992 if(mb_type&CANDIDATE_MB_TYPE_BIDIR){ |
| 327 | 4993 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
| 4994 s->mv_type = MV_TYPE_16X16; | |
| 4995 s->mb_intra= 0; | |
| 4996 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
| 4997 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
| 4998 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
| 4999 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
| 2967 | 5000 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb, |
| 456 | 5001 &dmin, &next_block, 0, 0); |
| 327 | 5002 } |
| 1708 | 5003 if(mb_type&CANDIDATE_MB_TYPE_DIRECT){ |
| 936 | 5004 int mx= s->b_direct_mv_table[xy][0]; |
| 5005 int my= s->b_direct_mv_table[xy][1]; | |
| 2967 | 5006 |
| 327 | 5007 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
| 5008 s->mb_intra= 0; | |
| 936 | 5009 ff_mpeg4_set_direct_mv(s, mx, my); |
| 2967 | 5010 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb, |
| 936 | 5011 &dmin, &next_block, mx, my); |
| 295 | 5012 } |
| 2967 | 5013 if(mb_type&CANDIDATE_MB_TYPE_FORWARD_I){ |
| 1708 | 5014 s->mv_dir = MV_DIR_FORWARD; |
| 5015 s->mv_type = MV_TYPE_FIELD; | |
| 5016 s->mb_intra= 0; | |
| 5017 for(i=0; i<2; i++){ | |
| 5018 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
| 5019 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
| 5020 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
| 5021 } | |
| 2967 | 5022 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb, |
| 1708 | 5023 &dmin, &next_block, 0, 0); |
| 5024 } | |
| 2967 | 5025 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD_I){ |
| 1708 | 5026 s->mv_dir = MV_DIR_BACKWARD; |
| 5027 s->mv_type = MV_TYPE_FIELD; | |
| 5028 s->mb_intra= 0; | |
| 5029 for(i=0; i<2; i++){ | |
| 5030 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
| 5031 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
| 5032 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
| 5033 } | |
| 2967 | 5034 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb, |
| 1708 | 5035 &dmin, &next_block, 0, 0); |
| 5036 } | |
| 2967 | 5037 if(mb_type&CANDIDATE_MB_TYPE_BIDIR_I){ |
| 1708 | 5038 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
| 5039 s->mv_type = MV_TYPE_FIELD; | |
| 5040 s->mb_intra= 0; | |
| 5041 for(dir=0; dir<2; dir++){ | |
| 5042 for(i=0; i<2; i++){ | |
| 5043 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
| 5044 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
| 5045 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
| 5046 } | |
| 5047 } | |
| 2967 | 5048 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb, |
| 1708 | 5049 &dmin, &next_block, 0, 0); |
| 5050 } | |
| 5051 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
|
5052 s->mv_dir = 0; |
| 295 | 5053 s->mv_type = MV_TYPE_16X16; |
| 294 | 5054 s->mb_intra= 1; |
| 5055 s->mv[0][0][0] = 0; | |
| 5056 s->mv[0][0][1] = 0; | |
| 2967 | 5057 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb, |
| 456 | 5058 &dmin, &next_block, 0, 0); |
| 1389 | 5059 if(s->h263_pred || s->h263_aic){ |
| 5060 if(best_s.mb_intra) | |
| 5061 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1; | |
| 5062 else | |
| 5063 ff_clean_intra_table_entries(s); //old mode? | |
| 5064 } | |
| 295 | 5065 } |
| 1616 | 5066 |
| 5067 if(s->flags & CODEC_FLAG_QP_RD){ | |
| 5068 if(best_s.mv_type==MV_TYPE_16X16 && !(best_s.mv_dir&MV_DIRECT)){ | |
| 5069 const int last_qp= backup_s.qscale; | |
| 5070 int dquant, dir, qp, dc[6]; | |
| 1617 | 5071 DCTELEM ac[6][16]; |
| 1623 | 5072 const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0; |
| 2967 | 5073 |
| 1616 | 5074 assert(backup_s.dquant == 0); |
| 5075 | |
| 5076 //FIXME intra | |
| 5077 s->mv_dir= best_s.mv_dir; | |
| 5078 s->mv_type = MV_TYPE_16X16; | |
| 5079 s->mb_intra= best_s.mb_intra; | |
| 5080 s->mv[0][0][0] = best_s.mv[0][0][0]; | |
| 5081 s->mv[0][0][1] = best_s.mv[0][0][1]; | |
| 5082 s->mv[1][0][0] = best_s.mv[1][0][0]; | |
| 5083 s->mv[1][0][1] = best_s.mv[1][0][1]; | |
| 2967 | 5084 |
| 1616 | 5085 dir= s->pict_type == B_TYPE ? 2 : 1; |
| 1623 | 5086 if(last_qp + dir > s->avctx->qmax) dir= -dir; |
| 1616 | 5087 for(dquant= dir; dquant<=2 && dquant>=-2; dquant += dir){ |
| 5088 qp= last_qp + dquant; | |
| 5089 if(qp < s->avctx->qmin || qp > s->avctx->qmax) | |
| 5090 break; | |
| 5091 backup_s.dquant= dquant; | |
| 2229 | 5092 if(s->mb_intra && s->dc_val[0]){ |
| 1617 | 5093 for(i=0; i<6; i++){ |
| 5094 dc[i]= s->dc_val[0][ s->block_index[i] ]; | |
| 5095 memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(DCTELEM)*16); | |
| 5096 } | |
| 1616 | 5097 } |
| 1617 | 5098 |
| 2967 | 5099 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb, |
| 1623 | 5100 &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]); |
| 1616 | 5101 if(best_s.qscale != qp){ |
| 2229 | 5102 if(s->mb_intra && s->dc_val[0]){ |
| 1617 | 5103 for(i=0; i<6; i++){ |
| 5104 s->dc_val[0][ s->block_index[i] ]= dc[i]; | |
| 5105 memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM)*16); | |
| 5106 } | |
| 1616 | 5107 } |
| 5108 if(dir > 0 && dquant==dir){ | |
| 5109 dquant= 0; | |
| 5110 dir= -dir; | |
| 5111 }else | |
| 5112 break; | |
| 5113 } | |
| 5114 } | |
| 5115 qp= best_s.qscale; | |
| 5116 s->current_picture.qscale_table[xy]= qp; | |
| 5117 } | |
| 5118 } | |
| 5119 | |
| 326 | 5120 copy_context_after_encode(s, &best_s, -1); |
| 2967 | 5121 |
| 1786 | 5122 pb_bits_count= put_bits_count(&s->pb); |
| 456 | 5123 flush_put_bits(&s->pb); |
| 5124 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count); | |
| 5125 s->pb= backup_s.pb; | |
| 2967 | 5126 |
| 456 | 5127 if(s->data_partitioning){ |
| 1786 | 5128 pb2_bits_count= put_bits_count(&s->pb2); |
| 456 | 5129 flush_put_bits(&s->pb2); |
| 5130 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count); | |
| 5131 s->pb2= backup_s.pb2; | |
| 2967 | 5132 |
| 1786 | 5133 tex_pb_bits_count= put_bits_count(&s->tex_pb); |
| 456 | 5134 flush_put_bits(&s->tex_pb); |
| 5135 ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count); | |
| 5136 s->tex_pb= backup_s.tex_pb; | |
| 5137 } | |
| 1786 | 5138 s->last_bits= put_bits_count(&s->pb); |
| 2967 | 5139 |
| 1389 | 5140 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
| 5141 ff_h263_update_motion_val(s); | |
| 2967 | 5142 |
| 1799 | 5143 if(next_block==0){ //FIXME 16 vs linesize16 |
| 5144 s->dsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16); | |
| 5145 s->dsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8); | |
| 5146 s->dsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8); | |
| 1389 | 5147 } |
| 5148 | |
| 5149 if(s->avctx->mb_decision == FF_MB_DECISION_BITS) | |
| 5150 MPV_decode_mb(s, s->block); | |
| 294 | 5151 } else { |
| 324 | 5152 int motion_x, motion_y; |
| 5153 s->mv_type=MV_TYPE_16X16; | |
| 294 | 5154 // only one MB-Type possible |
| 2967 | 5155 |
| 327 | 5156 switch(mb_type){ |
| 1708 | 5157 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
|
5158 s->mv_dir = 0; |
| 294 | 5159 s->mb_intra= 1; |
| 324 | 5160 motion_x= s->mv[0][0][0] = 0; |
| 5161 motion_y= s->mv[0][0][1] = 0; | |
| 327 | 5162 break; |
| 1708 | 5163 case CANDIDATE_MB_TYPE_INTER: |
| 324 | 5164 s->mv_dir = MV_DIR_FORWARD; |
| 5165 s->mb_intra= 0; | |
| 5166 motion_x= s->mv[0][0][0] = s->p_mv_table[xy][0]; | |
| 5167 motion_y= s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
| 327 | 5168 break; |
| 1708 | 5169 case CANDIDATE_MB_TYPE_INTER_I: |
| 5170 s->mv_dir = MV_DIR_FORWARD; | |
| 5171 s->mv_type = MV_TYPE_FIELD; | |
| 5172 s->mb_intra= 0; | |
| 5173 for(i=0; i<2; i++){ | |
| 5174 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
| 5175 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
| 5176 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
| 5177 } | |
| 5178 motion_x = motion_y = 0; | |
| 5179 break; | |
| 5180 case CANDIDATE_MB_TYPE_INTER4V: | |
| 456 | 5181 s->mv_dir = MV_DIR_FORWARD; |
| 5182 s->mv_type = MV_TYPE_8X8; | |
| 5183 s->mb_intra= 0; | |
| 5184 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
|
5185 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
|
5186 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
| 456 | 5187 } |
| 5188 motion_x= motion_y= 0; | |
| 5189 break; | |
| 1708 | 5190 case CANDIDATE_MB_TYPE_DIRECT: |
| 324 | 5191 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
| 5192 s->mb_intra= 0; | |
| 327 | 5193 motion_x=s->b_direct_mv_table[xy][0]; |
| 5194 motion_y=s->b_direct_mv_table[xy][1]; | |
| 936 | 5195 ff_mpeg4_set_direct_mv(s, motion_x, motion_y); |
| 327 | 5196 break; |
| 1708 | 5197 case CANDIDATE_MB_TYPE_BIDIR: |
| 324 | 5198 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
| 294 | 5199 s->mb_intra= 0; |
| 324 | 5200 motion_x=0; |
| 5201 motion_y=0; | |
| 5202 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
| 5203 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
| 5204 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
| 5205 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
| 327 | 5206 break; |
| 1708 | 5207 case CANDIDATE_MB_TYPE_BACKWARD: |
| 324 | 5208 s->mv_dir = MV_DIR_BACKWARD; |
| 5209 s->mb_intra= 0; | |
| 5210 motion_x= s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
| 5211 motion_y= s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
| 327 | 5212 break; |
| 1708 | 5213 case CANDIDATE_MB_TYPE_FORWARD: |
| 324 | 5214 s->mv_dir = MV_DIR_FORWARD; |
| 5215 s->mb_intra= 0; | |
| 5216 motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
| 5217 motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
| 5218 // printf(" %d %d ", motion_x, motion_y); | |
| 327 | 5219 break; |
| 1708 | 5220 case CANDIDATE_MB_TYPE_FORWARD_I: |
| 5221 s->mv_dir = MV_DIR_FORWARD; | |
| 5222 s->mv_type = MV_TYPE_FIELD; | |
| 5223 s->mb_intra= 0; | |
| 5224 for(i=0; i<2; i++){ | |
| 5225 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
| 5226 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
| 5227 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
| 5228 } | |
| 5229 motion_x=motion_y=0; | |
| 5230 break; | |
| 5231 case CANDIDATE_MB_TYPE_BACKWARD_I: | |
| 5232 s->mv_dir = MV_DIR_BACKWARD; | |
| 5233 s->mv_type = MV_TYPE_FIELD; | |
| 5234 s->mb_intra= 0; | |
| 5235 for(i=0; i<2; i++){ | |
| 5236 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
| 5237 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
| 5238 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
| 5239 } | |
| 5240 motion_x=motion_y=0; | |
| 5241 break; | |
| 5242 case CANDIDATE_MB_TYPE_BIDIR_I: | |
| 5243 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
| 5244 s->mv_type = MV_TYPE_FIELD; | |
| 5245 s->mb_intra= 0; | |
| 5246 for(dir=0; dir<2; dir++){ | |
| 5247 for(i=0; i<2; i++){ | |
| 5248 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
| 5249 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
| 5250 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
| 5251 } | |
| 5252 } | |
| 5253 motion_x=motion_y=0; | |
| 5254 break; | |
| 327 | 5255 default: |
| 324 | 5256 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
|
5257 av_log(s->avctx, AV_LOG_ERROR, "illegal MB type\n"); |
| 294 | 5258 } |
|
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha?l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5259 |
| 324 | 5260 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
|
5261 |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5262 // RAL: Update last macroblock type |
|
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha?l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5263 s->last_mv_dir = s->mv_dir; |
| 2967 | 5264 |
| 1389 | 5265 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
| 5266 ff_h263_update_motion_val(s); | |
| 2967 | 5267 |
| 1389 | 5268 MPV_decode_mb(s, s->block); |
|
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
244
diff
changeset
|
5269 } |
|
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha?l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
5270 |
| 327 | 5271 /* clean the MV table in IPS frames for direct mode in B frames */ |
| 5272 if(s->mb_intra /* && I,P,S_TYPE */){ | |
| 5273 s->p_mv_table[xy][0]=0; | |
| 5274 s->p_mv_table[xy][1]=0; | |
| 5275 } | |
| 2967 | 5276 |
|
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5277 if(s->flags&CODEC_FLAG_PSNR){ |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5278 int w= 16; |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5279 int h= 16; |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5280 |
|
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
5281 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
|
5282 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; |
| 936 | 5283 |
| 2955 | 5284 s->current_picture.error[0] += sse( |
| 1389 | 5285 s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, |
| 5286 s->dest[0], w, h, s->linesize); | |
| 2955 | 5287 s->current_picture.error[1] += sse( |
| 1389 | 5288 s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
| 5289 s->dest[1], w>>1, h>>1, s->uvlinesize); | |
| 2955 | 5290 s->current_picture.error[2] += sse( |
| 1389 | 5291 s, s->new_picture .data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
| 5292 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
|
5293 } |
| 2345 | 5294 if(s->loop_filter){ |
| 5295 if(s->out_format == FMT_H263) | |
| 5296 ff_h263_loop_filter(s); | |
| 5297 } | |
| 1786 | 5298 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb)); |
| 0 | 5299 } |
| 5300 } | |
| 286 | 5301 |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5302 //not beautiful here but we must write it before flushing so it has to be here |
| 456 | 5303 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE) |
| 208 | 5304 msmpeg4_encode_ext_header(s); |
| 456 | 5305 |
| 1799 | 5306 write_slice_end(s); |
| 5307 | |
| 2967 | 5308 /* Send the last GOB if RTP */ |
| 1661 | 5309 if (s->avctx->rtp_callback) { |
|
2492
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
5310 int number_mb = (mb_y - s->resync_mb_y)*s->mb_width - s->resync_mb_x; |
|
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
|
5311 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob; |
| 231 | 5312 /* Call the RTP callback to send the last GOB */ |
| 1799 | 5313 emms_c(); |
|
2492
57ba17bd3924
rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents:
2450
diff
changeset
|
5314 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb); |
| 231 | 5315 } |
| 1799 | 5316 |
| 5317 return 0; | |
| 5318 } | |
| 5319 | |
| 5320 #define MERGE(field) dst->field += src->field; src->field=0 | |
| 5321 static void merge_context_after_me(MpegEncContext *dst, MpegEncContext *src){ | |
|
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5322 MERGE(me.scene_change_score); |
|
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5323 MERGE(me.mc_mb_var_sum_temp); |
|
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5324 MERGE(me.mb_var_sum_temp); |
| 1799 | 5325 } |
| 5326 | |
| 5327 static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src){ | |
| 5328 int i; | |
| 5329 | |
| 5330 MERGE(dct_count[0]); //note, the other dct vars are not part of the context | |
| 5331 MERGE(dct_count[1]); | |
| 5332 MERGE(mv_bits); | |
| 5333 MERGE(i_tex_bits); | |
| 5334 MERGE(p_tex_bits); | |
| 5335 MERGE(i_count); | |
| 5336 MERGE(f_count); | |
| 5337 MERGE(b_count); | |
| 5338 MERGE(skip_count); | |
| 5339 MERGE(misc_bits); | |
| 5340 MERGE(error_count); | |
| 5341 MERGE(padding_bug_score); | |
| 2955 | 5342 MERGE(current_picture.error[0]); |
| 5343 MERGE(current_picture.error[1]); | |
| 5344 MERGE(current_picture.error[2]); | |
| 1799 | 5345 |
| 5346 if(dst->avctx->noise_reduction){ | |
| 5347 for(i=0; i<64; i++){ | |
| 5348 MERGE(dct_error_sum[0][i]); | |
| 5349 MERGE(dct_error_sum[1][i]); | |
| 5350 } | |
| 5351 } | |
| 2967 | 5352 |
| 1799 | 5353 assert(put_bits_count(&src->pb) % 8 ==0); |
| 5354 assert(put_bits_count(&dst->pb) % 8 ==0); | |
| 5355 ff_copy_bits(&dst->pb, src->pb.buf, put_bits_count(&src->pb)); | |
| 5356 flush_put_bits(&dst->pb); | |
| 5357 } | |
| 5358 | |
| 2974 | 5359 static void estimate_qp(MpegEncContext *s, int dry_run){ |
| 5360 if (!s->fixed_qscale) | |
| 5361 s->current_picture_ptr->quality= | |
| 5362 s->current_picture.quality = ff_rate_estimate_qscale(s, dry_run); | |
| 5363 | |
| 5364 if(s->adaptive_quant){ | |
| 5365 switch(s->codec_id){ | |
| 5366 case CODEC_ID_MPEG4: | |
| 5367 ff_clean_mpeg4_qscales(s); | |
| 5368 break; | |
| 5369 case CODEC_ID_H263: | |
| 5370 case CODEC_ID_H263P: | |
| 5371 case CODEC_ID_FLV1: | |
| 5372 ff_clean_h263_qscales(s); | |
| 5373 break; | |
| 5374 } | |
| 5375 | |
| 5376 s->lambda= s->lambda_table[0]; | |
| 5377 //FIXME broken | |
| 5378 }else | |
| 5379 s->lambda= s->current_picture.quality; | |
| 5380 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); | |
| 5381 update_qscale(s); | |
| 5382 } | |
| 5383 | |
| 1799 | 5384 static void encode_picture(MpegEncContext *s, int picture_number) |
| 5385 { | |
|
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5386 int i; |
| 1799 | 5387 int bits; |
| 5388 | |
| 5389 s->picture_number = picture_number; | |
| 2967 | 5390 |
| 1799 | 5391 /* Reset the average MB variance */ |
|
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5392 s->me.mb_var_sum_temp = |
|
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5393 s->me.mc_mb_var_sum_temp = 0; |
| 1799 | 5394 |
| 5395 /* we need to initialize some time vars before we can encode b-frames */ | |
| 5396 // RAL: Condition added for MPEG1VIDEO | |
| 5397 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4)) | |
| 1834 | 5398 ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar |
| 2967 | 5399 |
|
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5400 s->me.scene_change_score=0; |
| 2967 | 5401 |
| 2053 | 5402 // s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration |
| 2967 | 5403 |
| 1799 | 5404 if(s->pict_type==I_TYPE){ |
| 5405 if(s->msmpeg4_version >= 3) s->no_rounding=1; | |
| 5406 else s->no_rounding=0; | |
| 5407 }else if(s->pict_type!=B_TYPE){ | |
| 5408 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4) | |
| 2967 | 5409 s->no_rounding ^= 1; |
| 5410 } | |
| 5411 | |
| 2981 | 5412 if(s->flags & CODEC_FLAG_PASS2){ |
| 2974 | 5413 estimate_qp(s, 1); |
| 2981 | 5414 ff_get_2pass_fcode(s); |
| 5415 }else if(!(s->flags & CODEC_FLAG_QSCALE)){ | |
|
2980
529163f99474
improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2979
diff
changeset
|
5416 if(s->pict_type==B_TYPE) |
|
2997
188f4ef688f2
second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2990
diff
changeset
|
5417 s->lambda= s->last_lambda_for[s->pict_type]; |
|
2980
529163f99474
improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2979
diff
changeset
|
5418 else |
|
2997
188f4ef688f2
second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2990
diff
changeset
|
5419 s->lambda= s->last_lambda_for[s->last_non_b_pict_type]; |
|
2980
529163f99474
improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2979
diff
changeset
|
5420 update_qscale(s); |
|
529163f99474
improved lambda/qp guessing for motion estimation RD in first pass
michael
parents:
2979
diff
changeset
|
5421 } |
| 2974 | 5422 |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5423 s->mb_intra=0; //for the rate distortion & bit compare functions |
| 1799 | 5424 for(i=1; i<s->avctx->thread_count; i++){ |
| 1827 | 5425 ff_update_duplicate_context(s->thread_context[i], s); |
| 1799 | 5426 } |
| 1962 | 5427 |
| 5428 ff_init_me(s); | |
| 5429 | |
| 1799 | 5430 /* Estimate motion for every MB */ |
| 5431 if(s->pict_type != I_TYPE){ | |
| 2584 | 5432 s->lambda = (s->lambda * s->avctx->me_penalty_compensation + 128)>>8; |
| 5433 s->lambda2= (s->lambda2* s->avctx->me_penalty_compensation + 128)>>8; | |
|
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
5434 if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){ |
| 1799 | 5435 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ |
| 5436 s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
| 5437 } | |
| 5438 } | |
| 5439 | |
| 5440 s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
| 5441 }else /* if(s->pict_type == I_TYPE) */{ | |
| 5442 /* I-Frame */ | |
| 5443 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
| 5444 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
| 2967 | 5445 |
| 1799 | 5446 if(!s->fixed_qscale){ |
| 5447 /* finding spatial complexity for I-frame rate control */ | |
|
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5448 s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); |
| 1799 | 5449 } |
| 5450 } | |
|
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5451 for(i=1; i<s->avctx->thread_count; i++){ |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5452 merge_context_after_me(s, s->thread_context[i]); |
|
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5453 } |
|
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5454 s->current_picture.mc_mb_var_sum= s->current_picture_ptr->mc_mb_var_sum= s->me.mc_mb_var_sum_temp; |
|
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5455 s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp; |
| 1799 | 5456 emms_c(); |
| 5457 | |
|
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5458 if(s->me.scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){ |
| 1799 | 5459 s->pict_type= I_TYPE; |
| 5460 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
| 5461 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
| 5462 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); | |
| 5463 } | |
| 5464 | |
| 5465 if(!s->umvplus){ | |
| 5466 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { | |
| 5467 s->f_code= ff_get_best_fcode(s, s->p_mv_table, CANDIDATE_MB_TYPE_INTER); | |
| 5468 | |
| 5469 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
| 5470 int a,b; | |
| 5471 a= ff_get_best_fcode(s, s->p_field_mv_table[0][0], CANDIDATE_MB_TYPE_INTER_I); //FIXME field_select | |
| 5472 b= ff_get_best_fcode(s, s->p_field_mv_table[1][1], CANDIDATE_MB_TYPE_INTER_I); | |
| 5473 s->f_code= FFMAX(s->f_code, FFMAX(a,b)); | |
| 5474 } | |
| 2967 | 5475 |
| 1799 | 5476 ff_fix_long_p_mvs(s); |
| 5477 ff_fix_long_mvs(s, NULL, 0, s->p_mv_table, s->f_code, CANDIDATE_MB_TYPE_INTER, 0); | |
| 5478 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
|
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5479 int j; |
| 1799 | 5480 for(i=0; i<2; i++){ |
| 5481 for(j=0; j<2; j++) | |
| 2967 | 5482 ff_fix_long_mvs(s, s->p_field_select_table[i], j, |
| 1799 | 5483 s->p_field_mv_table[i][j], s->f_code, CANDIDATE_MB_TYPE_INTER_I, 0); |
| 5484 } | |
| 5485 } | |
| 5486 } | |
| 5487 | |
| 5488 if(s->pict_type==B_TYPE){ | |
| 5489 int a, b; | |
| 5490 | |
| 5491 a = ff_get_best_fcode(s, s->b_forw_mv_table, CANDIDATE_MB_TYPE_FORWARD); | |
| 5492 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
| 5493 s->f_code = FFMAX(a, b); | |
| 5494 | |
| 5495 a = ff_get_best_fcode(s, s->b_back_mv_table, CANDIDATE_MB_TYPE_BACKWARD); | |
| 5496 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
| 5497 s->b_code = FFMAX(a, b); | |
| 5498 | |
| 5499 ff_fix_long_mvs(s, NULL, 0, s->b_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_FORWARD, 1); | |
| 5500 ff_fix_long_mvs(s, NULL, 0, s->b_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BACKWARD, 1); | |
| 5501 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
| 5502 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
| 5503 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
|
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5504 int dir, j; |
| 1799 | 5505 for(dir=0; dir<2; dir++){ |
| 5506 for(i=0; i<2; i++){ | |
| 5507 for(j=0; j<2; j++){ | |
| 2967 | 5508 int type= dir ? (CANDIDATE_MB_TYPE_BACKWARD_I|CANDIDATE_MB_TYPE_BIDIR_I) |
| 1799 | 5509 : (CANDIDATE_MB_TYPE_FORWARD_I |CANDIDATE_MB_TYPE_BIDIR_I); |
| 2967 | 5510 ff_fix_long_mvs(s, s->b_field_select_table[dir][i], j, |
| 1799 | 5511 s->b_field_mv_table[dir][i][j], dir ? s->b_code : s->f_code, type, 1); |
| 5512 } | |
| 5513 } | |
| 5514 } | |
| 5515 } | |
| 5516 } | |
| 5517 } | |
| 5518 | |
| 2974 | 5519 estimate_qp(s, 0); |
| 2967 | 5520 |
| 5521 if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(s->flags & CODEC_FLAG_QSCALE)) | |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5522 s->qscale= 3; //reduce clipping problems |
| 2967 | 5523 |
| 1799 | 5524 if (s->out_format == FMT_MJPEG) { |
| 5525 /* for mjpeg, we do include qscale in the matrix */ | |
| 5526 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; | |
| 5527 for(i=1;i<64;i++){ | |
| 5528 int j= s->dsp.idct_permutation[i]; | |
| 5529 | |
| 2654 | 5530 s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3) & 0xFF; |
| 1799 | 5531 } |
| 2967 | 5532 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, |
|
2385
4605a8b188c3
warn the user if the quantization code could overflow with the selected custom matrix and qp limits
michael
parents:
2382
diff
changeset
|
5533 s->intra_matrix, s->intra_quant_bias, 8, 8, 1); |
| 1799 | 5534 s->qscale= 8; |
| 5535 } | |
| 2967 | 5536 |
| 1799 | 5537 //FIXME var duplication |
|
2235
0c04463f79d8
10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2231
diff
changeset
|
5538 s->current_picture_ptr->key_frame= |
| 1799 | 5539 s->current_picture.key_frame= s->pict_type == I_TYPE; //FIXME pic_ptr |
|
2235
0c04463f79d8
10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2231
diff
changeset
|
5540 s->current_picture_ptr->pict_type= |
| 1799 | 5541 s->current_picture.pict_type= s->pict_type; |
| 5542 | |
| 5543 if(s->current_picture.key_frame) | |
| 5544 s->picture_in_gop_number=0; | |
| 5545 | |
| 5546 s->last_bits= put_bits_count(&s->pb); | |
| 5547 switch(s->out_format) { | |
| 5548 case FMT_MJPEG: | |
| 5549 mjpeg_picture_header(s); | |
| 5550 break; | |
| 2639 | 5551 #ifdef CONFIG_H261_ENCODER |
|
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5552 case FMT_H261: |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5553 ff_h261_encode_picture_header(s, picture_number); |
|
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5554 break; |
| 2639 | 5555 #endif |
| 1799 | 5556 case FMT_H263: |
| 2967 | 5557 if (s->codec_id == CODEC_ID_WMV2) |
| 1799 | 5558 ff_wmv2_encode_picture_header(s, picture_number); |
| 2967 | 5559 else if (s->h263_msmpeg4) |
| 1799 | 5560 msmpeg4_encode_picture_header(s, picture_number); |
| 5561 else if (s->h263_pred) | |
| 5562 mpeg4_encode_picture_header(s, picture_number); | |
| 2639 | 5563 #ifdef CONFIG_RV10_ENCODER |
| 2967 | 5564 else if (s->codec_id == CODEC_ID_RV10) |
| 1799 | 5565 rv10_encode_picture_header(s, picture_number); |
| 2639 | 5566 #endif |
| 5567 #ifdef CONFIG_RV20_ENCODER | |
| 2967 | 5568 else if (s->codec_id == CODEC_ID_RV20) |
| 2380 | 5569 rv20_encode_picture_header(s, picture_number); |
| 2639 | 5570 #endif |
| 1799 | 5571 else if (s->codec_id == CODEC_ID_FLV1) |
| 5572 ff_flv_encode_picture_header(s, picture_number); | |
| 5573 else | |
| 5574 h263_encode_picture_header(s, picture_number); | |
| 5575 break; | |
| 5576 case FMT_MPEG1: | |
| 5577 mpeg1_encode_picture_header(s, picture_number); | |
| 5578 break; | |
| 5579 case FMT_H264: | |
| 5580 break; | |
| 5581 default: | |
| 5582 assert(0); | |
| 5583 } | |
| 5584 bits= put_bits_count(&s->pb); | |
| 5585 s->header_bits= bits - s->last_bits; | |
| 2967 | 5586 |
| 1799 | 5587 for(i=1; i<s->avctx->thread_count; i++){ |
| 5588 update_duplicate_context_after_me(s->thread_context[i], s); | |
| 5589 } | |
| 5590 s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
| 5591 for(i=1; i<s->avctx->thread_count; i++){ | |
| 5592 merge_context_after_encode(s, s->thread_context[i]); | |
| 5593 } | |
| 5594 emms_c(); | |
| 0 | 5595 } |
| 5596 | |
|
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5597 #endif //CONFIG_ENCODERS |
|
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5598 |
| 1719 | 5599 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block){ |
| 1597 | 5600 const int intra= s->mb_intra; |
| 5601 int i; | |
| 5602 | |
| 1599 | 5603 s->dct_count[intra]++; |
| 5604 | |
| 1597 | 5605 for(i=0; i<64; i++){ |
| 5606 int level= block[i]; | |
| 5607 | |
| 5608 if(level){ | |
| 5609 if(level>0){ | |
| 5610 s->dct_error_sum[intra][i] += level; | |
| 5611 level -= s->dct_offset[intra][i]; | |
| 5612 if(level<0) level=0; | |
| 5613 }else{ | |
| 5614 s->dct_error_sum[intra][i] -= level; | |
| 5615 level += s->dct_offset[intra][i]; | |
| 5616 if(level>0) level=0; | |
| 5617 } | |
| 5618 block[i]= level; | |
| 5619 } | |
| 5620 } | |
| 5621 } | |
| 5622 | |
|
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5623 #ifdef CONFIG_ENCODERS |
|
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5624 |
| 2967 | 5625 static int dct_quantize_trellis_c(MpegEncContext *s, |
| 945 | 5626 DCTELEM *block, int n, |
| 5627 int qscale, int *overflow){ | |
| 5628 const int *qmat; | |
| 1064 | 5629 const uint8_t *scantable= s->intra_scantable.scantable; |
| 1718 | 5630 const uint8_t *perm_scantable= s->intra_scantable.permutated; |
| 945 | 5631 int max=0; |
| 5632 unsigned int threshold1, threshold2; | |
| 5633 int bias=0; | |
| 5634 int run_tab[65]; | |
| 5635 int level_tab[65]; | |
| 5636 int score_tab[65]; | |
| 1718 | 5637 int survivor[65]; |
| 5638 int survivor_count; | |
| 946 | 5639 int last_run=0; |
| 5640 int last_level=0; | |
| 5641 int last_score= 0; | |
| 1718 | 5642 int last_i; |
| 1715 | 5643 int coeff[2][64]; |
| 945 | 5644 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
|
5645 int qmul, qadd, start_i, last_non_zero, i, dc; |
| 945 | 5646 const int esc_length= s->ac_esc_length; |
| 5647 uint8_t * length; | |
| 5648 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
|
5649 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
| 2967 | 5650 |
| 1092 | 5651 s->dsp.fdct (block); |
| 2967 | 5652 |
| 1597 | 5653 if(s->dct_error_sum) |
| 1719 | 5654 s->denoise_dct(s, block); |
| 945 | 5655 qmul= qscale*16; |
| 5656 qadd= ((qscale-1)|1)*8; | |
| 946 | 5657 |
| 945 | 5658 if (s->mb_intra) { |
| 5659 int q; | |
| 5660 if (!s->h263_aic) { | |
| 5661 if (n < 4) | |
| 5662 q = s->y_dc_scale; | |
| 5663 else | |
| 5664 q = s->c_dc_scale; | |
| 5665 q = q << 3; | |
| 5666 } else{ | |
| 5667 /* For AIC we skip quant/dequant of INTRADC */ | |
| 5668 q = 1 << 3; | |
| 5669 qadd=0; | |
| 5670 } | |
| 2967 | 5671 |
| 945 | 5672 /* note: block[0] is assumed to be positive */ |
| 5673 block[0] = (block[0] + (q >> 1)) / q; | |
| 5674 start_i = 1; | |
| 5675 last_non_zero = 0; | |
| 5676 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
|
5677 if(s->mpeg_quant || s->out_format == FMT_MPEG1) |
| 945 | 5678 bias= 1<<(QMAT_SHIFT-1); |
| 5679 length = s->intra_ac_vlc_length; | |
| 5680 last_length= s->intra_ac_vlc_last_length; | |
| 5681 } else { | |
| 5682 start_i = 0; | |
| 5683 last_non_zero = -1; | |
| 5684 qmat = s->q_inter_matrix[qscale]; | |
| 5685 length = s->inter_ac_vlc_length; | |
| 5686 last_length= s->inter_ac_vlc_last_length; | |
| 5687 } | |
| 1718 | 5688 last_i= start_i; |
| 945 | 5689 |
| 5690 threshold1= (1<<QMAT_SHIFT) - bias - 1; | |
| 5691 threshold2= (threshold1<<1); | |
| 946 | 5692 |
| 1715 | 5693 for(i=63; i>=start_i; i--) { |
| 5694 const int j = scantable[i]; | |
| 5695 int level = block[j] * qmat[j]; | |
| 5696 | |
| 5697 if(((unsigned)(level+threshold1))>threshold2){ | |
| 5698 last_non_zero = i; | |
| 5699 break; | |
| 5700 } | |
| 5701 } | |
| 5702 | |
| 5703 for(i=start_i; i<=last_non_zero; i++) { | |
| 945 | 5704 const int j = scantable[i]; |
| 1715 | 5705 int level = block[j] * qmat[j]; |
| 945 | 5706 |
| 5707 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
| 5708 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
| 5709 if(((unsigned)(level+threshold1))>threshold2){ | |
| 5710 if(level>0){ | |
| 5711 level= (bias + level)>>QMAT_SHIFT; | |
| 1718 | 5712 coeff[0][i]= level; |
| 5713 coeff[1][i]= level-1; | |
| 946 | 5714 // coeff[2][k]= level-2; |
| 945 | 5715 }else{ |
| 5716 level= (bias - level)>>QMAT_SHIFT; | |
| 1718 | 5717 coeff[0][i]= -level; |
| 5718 coeff[1][i]= -level+1; | |
| 946 | 5719 // coeff[2][k]= -level+2; |
| 945 | 5720 } |
| 1718 | 5721 coeff_count[i]= FFMIN(level, 2); |
| 5722 assert(coeff_count[i]); | |
| 945 | 5723 max |=level; |
| 5724 }else{ | |
| 1718 | 5725 coeff[0][i]= (level>>31)|1; |
| 5726 coeff_count[i]= 1; | |
| 945 | 5727 } |
| 5728 } | |
| 2967 | 5729 |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
5730 *overflow= s->max_qcoeff < max; //overflow might have happened |
| 2967 | 5731 |
| 945 | 5732 if(last_non_zero < start_i){ |
| 5733 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); | |
| 5734 return last_non_zero; | |
| 5735 } | |
| 5736 | |
| 1718 | 5737 score_tab[start_i]= 0; |
| 5738 survivor[0]= start_i; | |
| 5739 survivor_count= 1; | |
| 2967 | 5740 |
| 1718 | 5741 for(i=start_i; i<=last_non_zero; i++){ |
| 5742 int level_index, j; | |
| 5743 const int dct_coeff= ABS(block[ scantable[i] ]); | |
| 945 | 5744 const int zero_distoration= dct_coeff*dct_coeff; |
| 946 | 5745 int best_score=256*256*256*120; |
| 945 | 5746 for(level_index=0; level_index < coeff_count[i]; level_index++){ |
| 5747 int distoration; | |
| 5748 int level= coeff[level_index][i]; | |
| 1716 | 5749 const int alevel= ABS(level); |
| 945 | 5750 int unquant_coeff; |
| 2967 | 5751 |
| 945 | 5752 assert(level); |
| 5753 | |
| 5754 if(s->out_format == FMT_H263){ | |
| 1716 | 5755 unquant_coeff= alevel*qmul + qadd; |
| 947 | 5756 }else{ //MPEG1 |
| 1718 | 5757 j= s->dsp.idct_permutation[ scantable[i] ]; //FIXME optimize |
| 947 | 5758 if(s->mb_intra){ |
| 1716 | 5759 unquant_coeff = (int)( alevel * qscale * s->intra_matrix[j]) >> 3; |
| 947 | 5760 unquant_coeff = (unquant_coeff - 1) | 1; |
| 5761 }else{ | |
| 1716 | 5762 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4; |
| 947 | 5763 unquant_coeff = (unquant_coeff - 1) | 1; |
| 5764 } | |
| 5765 unquant_coeff<<= 3; | |
| 5766 } | |
| 946 | 5767 |
| 1715 | 5768 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration; |
| 945 | 5769 level+=64; |
| 5770 if((level&(~127)) == 0){ | |
| 1718 | 5771 for(j=survivor_count-1; j>=0; j--){ |
| 5772 int run= i - survivor[j]; | |
| 947 | 5773 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
| 945 | 5774 score += score_tab[i-run]; |
| 2967 | 5775 |
| 945 | 5776 if(score < best_score){ |
| 1718 | 5777 best_score= score; |
| 945 | 5778 run_tab[i+1]= run; |
| 5779 level_tab[i+1]= level-64; | |
| 5780 } | |
| 5781 } | |
| 5782 | |
| 5783 if(s->out_format == FMT_H263){ | |
| 1718 | 5784 for(j=survivor_count-1; j>=0; j--){ |
| 5785 int run= i - survivor[j]; | |
| 947 | 5786 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
| 945 | 5787 score += score_tab[i-run]; |
| 946 | 5788 if(score < last_score){ |
| 5789 last_score= score; | |
| 5790 last_run= run; | |
| 5791 last_level= level-64; | |
| 5792 last_i= i+1; | |
| 945 | 5793 } |
| 5794 } | |
| 5795 } | |
| 5796 }else{ | |
| 5797 distoration += esc_length*lambda; | |
| 1718 | 5798 for(j=survivor_count-1; j>=0; j--){ |
| 5799 int run= i - survivor[j]; | |
| 945 | 5800 int score= distoration + score_tab[i-run]; |
| 2967 | 5801 |
| 945 | 5802 if(score < best_score){ |
| 1718 | 5803 best_score= score; |
| 945 | 5804 run_tab[i+1]= run; |
| 5805 level_tab[i+1]= level-64; | |
| 5806 } | |
| 5807 } | |
| 5808 | |
| 5809 if(s->out_format == FMT_H263){ | |
| 1718 | 5810 for(j=survivor_count-1; j>=0; j--){ |
| 5811 int run= i - survivor[j]; | |
| 945 | 5812 int score= distoration + score_tab[i-run]; |
| 946 | 5813 if(score < last_score){ |
| 5814 last_score= score; | |
| 5815 last_run= run; | |
| 5816 last_level= level-64; | |
| 5817 last_i= i+1; | |
| 945 | 5818 } |
| 5819 } | |
| 5820 } | |
| 5821 } | |
| 5822 } | |
| 2967 | 5823 |
| 1718 | 5824 score_tab[i+1]= best_score; |
| 5825 | |
| 946 | 5826 //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 | 5827 if(last_non_zero <= 27){ |
| 5828 for(; survivor_count; survivor_count--){ | |
| 5829 if(score_tab[ survivor[survivor_count-1] ] <= best_score) | |
| 5830 break; | |
| 5831 } | |
| 5832 }else{ | |
| 5833 for(; survivor_count; survivor_count--){ | |
| 5834 if(score_tab[ survivor[survivor_count-1] ] <= best_score + lambda) | |
| 5835 break; | |
| 5836 } | |
|
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
|
5837 } |
| 1718 | 5838 |
| 5839 survivor[ survivor_count++ ]= i+1; | |
| 945 | 5840 } |
| 946 | 5841 |
| 945 | 5842 if(s->out_format != FMT_H263){ |
| 946 | 5843 last_score= 256*256*256*120; |
| 1718 | 5844 for(i= survivor[0]; i<=last_non_zero + 1; i++){ |
| 946 | 5845 int score= score_tab[i]; |
| 947 | 5846 if(i) score += lambda*2; //FIXME exacter? |
| 5847 | |
| 946 | 5848 if(score < last_score){ |
| 5849 last_score= score; | |
| 5850 last_i= i; | |
| 5851 last_level= level_tab[i]; | |
| 5852 last_run= run_tab[i]; | |
| 5853 } | |
| 945 | 5854 } |
| 5855 } | |
|
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5856 |
| 1715 | 5857 s->coded_score[n] = last_score; |
| 2967 | 5858 |
| 1716 | 5859 dc= ABS(block[0]); |
| 1718 | 5860 last_non_zero= last_i - 1; |
| 945 | 5861 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); |
| 2967 | 5862 |
| 945 | 5863 if(last_non_zero < start_i) |
| 5864 return last_non_zero; | |
|
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5865 |
|
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5866 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
|
5867 int best_level= 0; |
|
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5868 int best_score= dc * dc; |
| 2967 | 5869 |
|
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5870 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
|
5871 int level= coeff[i][0]; |
| 1716 | 5872 int alevel= ABS(level); |
| 5873 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
|
5874 |
|
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5875 if(s->out_format == FMT_H263){ |
| 1716 | 5876 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
|
5877 }else{ //MPEG1 |
| 1716 | 5878 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4; |
| 5879 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
|
5880 } |
|
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5881 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
|
5882 unquant_coeff<<= 3 + 3; |
|
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5883 |
| 1716 | 5884 distortion= (unquant_coeff - dc) * (unquant_coeff - dc); |
|
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5885 level+=64; |
| 1716 | 5886 if((level&(~127)) == 0) score= distortion + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda; |
| 5887 else score= distortion + esc_length*lambda; | |
|
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5888 |
|
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5889 if(score < best_score){ |
|
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5890 best_score= score; |
|
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5891 best_level= level - 64; |
|
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5892 } |
|
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5893 } |
|
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5894 block[0]= best_level; |
|
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5895 s->coded_score[n] = best_score - dc*dc; |
|
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5896 if(best_level == 0) return -1; |
|
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5897 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
|
5898 } |
|
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5899 |
| 946 | 5900 i= last_i; |
| 5901 assert(last_level); | |
| 1718 | 5902 |
| 5903 block[ perm_scantable[last_non_zero] ]= last_level; | |
| 946 | 5904 i -= last_run + 1; |
| 2967 | 5905 |
| 1718 | 5906 for(; i>start_i; i -= run_tab[i] + 1){ |
| 5907 block[ perm_scantable[i-1] ]= level_tab[i]; | |
| 945 | 5908 } |
| 5909 | |
| 5910 return last_non_zero; | |
| 5911 } | |
| 5912 | |
| 1777 | 5913 //#define REFINE_STATS 1 |
| 5914 static int16_t basis[64][64]; | |
| 5915 | |
| 5916 static void build_basis(uint8_t *perm){ | |
| 5917 int i, j, x, y; | |
| 5918 emms_c(); | |
| 5919 for(i=0; i<8; i++){ | |
| 5920 for(j=0; j<8; j++){ | |
| 5921 for(y=0; y<8; y++){ | |
| 5922 for(x=0; x<8; x++){ | |
| 5923 double s= 0.25*(1<<BASIS_SHIFT); | |
| 5924 int index= 8*i + j; | |
| 5925 int perm_index= perm[index]; | |
| 5926 if(i==0) s*= sqrt(0.5); | |
| 5927 if(j==0) s*= sqrt(0.5); | |
| 5928 basis[perm_index][8*x + y]= lrintf(s * cos((M_PI/8.0)*i*(x+0.5)) * cos((M_PI/8.0)*j*(y+0.5))); | |
| 5929 } | |
| 5930 } | |
| 5931 } | |
| 5932 } | |
| 5933 } | |
| 5934 | |
| 5935 static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? | |
| 5936 DCTELEM *block, int16_t *weight, DCTELEM *orig, | |
| 5937 int n, int qscale){ | |
| 5938 int16_t rem[64]; | |
|
2289
5443c3fc2448
Quantizer noise shaping crashes on SSE2 machines patch by (Milan Cutka <cutka at szm dot sk>)
michael
parents:
2266
diff
changeset
|
5939 DCTELEM d1[64] __align16; |
| 1777 | 5940 const int *qmat; |
| 5941 const uint8_t *scantable= s->intra_scantable.scantable; | |
| 5942 const uint8_t *perm_scantable= s->intra_scantable.permutated; | |
| 5943 // unsigned int threshold1, threshold2; | |
| 5944 // int bias=0; | |
| 5945 int run_tab[65]; | |
| 5946 int prev_run=0; | |
| 5947 int prev_level=0; | |
| 5948 int qmul, qadd, start_i, last_non_zero, i, dc; | |
| 5949 uint8_t * length; | |
| 5950 uint8_t * last_length; | |
| 5951 int lambda; | |
| 5952 int rle_index, run, q, sum; | |
| 5953 #ifdef REFINE_STATS | |
| 5954 static int count=0; | |
| 5955 static int after_last=0; | |
| 5956 static int to_zero=0; | |
| 5957 static int from_zero=0; | |
| 5958 static int raise=0; | |
| 5959 static int lower=0; | |
| 5960 static int messed_sign=0; | |
| 5961 #endif | |
| 5962 | |
| 5963 if(basis[0][0] == 0) | |
| 5964 build_basis(s->dsp.idct_permutation); | |
| 2967 | 5965 |
| 1777 | 5966 qmul= qscale*2; |
| 5967 qadd= (qscale-1)|1; | |
| 5968 if (s->mb_intra) { | |
| 5969 if (!s->h263_aic) { | |
| 5970 if (n < 4) | |
| 5971 q = s->y_dc_scale; | |
| 5972 else | |
| 5973 q = s->c_dc_scale; | |
| 5974 } else{ | |
| 5975 /* For AIC we skip quant/dequant of INTRADC */ | |
| 5976 q = 1; | |
| 5977 qadd=0; | |
| 5978 } | |
| 5979 q <<= RECON_SHIFT-3; | |
| 5980 /* note: block[0] is assumed to be positive */ | |
| 5981 dc= block[0]*q; | |
| 5982 // block[0] = (block[0] + (q >> 1)) / q; | |
| 5983 start_i = 1; | |
| 5984 qmat = s->q_intra_matrix[qscale]; | |
| 5985 // if(s->mpeg_quant || s->out_format == FMT_MPEG1) | |
| 5986 // bias= 1<<(QMAT_SHIFT-1); | |
| 5987 length = s->intra_ac_vlc_length; | |
| 5988 last_length= s->intra_ac_vlc_last_length; | |
| 5989 } else { | |
| 5990 dc= 0; | |
| 5991 start_i = 0; | |
| 5992 qmat = s->q_inter_matrix[qscale]; | |
| 5993 length = s->inter_ac_vlc_length; | |
| 5994 last_length= s->inter_ac_vlc_last_length; | |
| 5995 } | |
| 5996 last_non_zero = s->block_last_index[n]; | |
| 5997 | |
| 5998 #ifdef REFINE_STATS | |
| 5999 {START_TIMER | |
| 6000 #endif | |
| 1784 | 6001 dc += (1<<(RECON_SHIFT-1)); |
| 6002 for(i=0; i<64; i++){ | |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
6003 rem[i]= dc - (orig[i]<<RECON_SHIFT); //FIXME use orig dirrectly instead of copying to rem[] |
| 1777 | 6004 } |
| 6005 #ifdef REFINE_STATS | |
| 6006 STOP_TIMER("memset rem[]")} | |
| 6007 #endif | |
| 6008 sum=0; | |
| 6009 for(i=0; i<64; i++){ | |
| 6010 int one= 36; | |
| 6011 int qns=4; | |
| 6012 int w; | |
| 6013 | |
| 6014 w= ABS(weight[i]) + qns*one; | |
| 6015 w= 15 + (48*qns*one + w/2)/w; // 16 .. 63 | |
| 6016 | |
| 6017 weight[i] = w; | |
| 6018 // w=weight[i] = (63*qns + (w/2)) / w; | |
| 2967 | 6019 |
| 1777 | 6020 assert(w>0); |
| 6021 assert(w<(1<<6)); | |
| 6022 sum += w*w; | |
| 6023 } | |
| 6024 lambda= sum*(uint64_t)s->lambda2 >> (FF_LAMBDA_SHIFT - 6 + 6 + 6 + 6); | |
| 6025 #ifdef REFINE_STATS | |
| 6026 {START_TIMER | |
| 6027 #endif | |
| 6028 run=0; | |
| 6029 rle_index=0; | |
| 6030 for(i=start_i; i<=last_non_zero; i++){ | |
| 6031 int j= perm_scantable[i]; | |
| 6032 const int level= block[j]; | |
| 6033 int coeff; | |
| 2967 | 6034 |
| 1777 | 6035 if(level){ |
| 6036 if(level<0) coeff= qmul*level - qadd; | |
| 6037 else coeff= qmul*level + qadd; | |
| 6038 run_tab[rle_index++]=run; | |
| 6039 run=0; | |
| 6040 | |
| 1784 | 6041 s->dsp.add_8x8basis(rem, basis[j], coeff); |
| 1777 | 6042 }else{ |
| 6043 run++; | |
| 6044 } | |
| 6045 } | |
| 6046 #ifdef REFINE_STATS | |
| 6047 if(last_non_zero>0){ | |
| 6048 STOP_TIMER("init rem[]") | |
| 6049 } | |
| 6050 } | |
| 6051 | |
| 6052 {START_TIMER | |
| 6053 #endif | |
| 6054 for(;;){ | |
| 1784 | 6055 int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0); |
| 1777 | 6056 int best_coeff=0; |
| 6057 int best_change=0; | |
|
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
6058 int run2, best_unquant_change=0, analyze_gradient; |
|
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6059 #ifdef REFINE_STATS |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6060 {START_TIMER |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6061 #endif |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6062 analyze_gradient = last_non_zero > 2 || s->avctx->quantizer_noise_shaping >= 3; |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6063 |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6064 if(analyze_gradient){ |
| 1777 | 6065 #ifdef REFINE_STATS |
| 6066 {START_TIMER | |
| 6067 #endif | |
|
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6068 for(i=0; i<64; i++){ |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6069 int w= weight[i]; |
| 2967 | 6070 |
|
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6071 d1[i] = (rem[i]*w*w + (1<<(RECON_SHIFT+12-1)))>>(RECON_SHIFT+12); |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6072 } |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6073 #ifdef REFINE_STATS |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6074 STOP_TIMER("rem*w*w")} |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6075 {START_TIMER |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6076 #endif |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6077 s->dsp.fdct(d1); |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6078 #ifdef REFINE_STATS |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6079 STOP_TIMER("dct")} |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6080 #endif |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6081 } |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6082 |
| 1777 | 6083 if(start_i){ |
| 6084 const int level= block[0]; | |
| 6085 int change, old_coeff; | |
| 6086 | |
| 6087 assert(s->mb_intra); | |
| 2967 | 6088 |
| 1777 | 6089 old_coeff= q*level; |
| 2967 | 6090 |
| 1777 | 6091 for(change=-1; change<=1; change+=2){ |
| 6092 int new_level= level + change; | |
| 6093 int score, new_coeff; | |
| 2967 | 6094 |
| 1777 | 6095 new_coeff= q*new_level; |
| 6096 if(new_coeff >= 2048 || new_coeff < 0) | |
| 6097 continue; | |
| 6098 | |
| 1784 | 6099 score= s->dsp.try_8x8basis(rem, weight, basis[0], new_coeff - old_coeff); |
| 1777 | 6100 if(score<best_score){ |
| 6101 best_score= score; | |
| 6102 best_coeff= 0; | |
| 6103 best_change= change; | |
| 6104 best_unquant_change= new_coeff - old_coeff; | |
| 6105 } | |
| 6106 } | |
| 6107 } | |
| 2967 | 6108 |
| 1777 | 6109 run=0; |
| 6110 rle_index=0; | |
| 6111 run2= run_tab[rle_index++]; | |
| 6112 prev_level=0; | |
| 6113 prev_run=0; | |
| 6114 | |
| 6115 for(i=start_i; i<64; i++){ | |
| 6116 int j= perm_scantable[i]; | |
| 6117 const int level= block[j]; | |
| 6118 int change, old_coeff; | |
| 6119 | |
| 6120 if(s->avctx->quantizer_noise_shaping < 3 && i > last_non_zero + 1) | |
| 6121 break; | |
| 6122 | |
| 6123 if(level){ | |
| 6124 if(level<0) old_coeff= qmul*level - qadd; | |
| 6125 else old_coeff= qmul*level + qadd; | |
| 6126 run2= run_tab[rle_index++]; //FIXME ! maybe after last | |
| 6127 }else{ | |
| 6128 old_coeff=0; | |
| 6129 run2--; | |
| 6130 assert(run2>=0 || i >= last_non_zero ); | |
| 6131 } | |
| 2967 | 6132 |
| 1777 | 6133 for(change=-1; change<=1; change+=2){ |
| 6134 int new_level= level + change; | |
| 6135 int score, new_coeff, unquant_change; | |
| 2967 | 6136 |
| 1777 | 6137 score=0; |
| 6138 if(s->avctx->quantizer_noise_shaping < 2 && ABS(new_level) > ABS(level)) | |
| 6139 continue; | |
| 6140 | |
| 6141 if(new_level){ | |
| 6142 if(new_level<0) new_coeff= qmul*new_level - qadd; | |
| 6143 else new_coeff= qmul*new_level + qadd; | |
| 6144 if(new_coeff >= 2048 || new_coeff <= -2048) | |
| 6145 continue; | |
| 6146 //FIXME check for overflow | |
| 2967 | 6147 |
| 1777 | 6148 if(level){ |
| 6149 if(level < 63 && level > -63){ | |
| 6150 if(i < last_non_zero) | |
| 6151 score += length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
| 6152 - length[UNI_AC_ENC_INDEX(run, level+64)]; | |
| 6153 else | |
| 6154 score += last_length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
| 6155 - last_length[UNI_AC_ENC_INDEX(run, level+64)]; | |
| 6156 } | |
| 6157 }else{ | |
| 6158 assert(ABS(new_level)==1); | |
| 2967 | 6159 |
|
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6160 if(analyze_gradient){ |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6161 int g= d1[ scantable[i] ]; |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6162 if(g && (g^new_level) >= 0) |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6163 continue; |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6164 } |
|
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
6165 |
| 1777 | 6166 if(i < last_non_zero){ |
| 6167 int next_i= i + run2 + 1; | |
| 6168 int next_level= block[ perm_scantable[next_i] ] + 64; | |
| 2967 | 6169 |
| 1777 | 6170 if(next_level&(~127)) |
| 6171 next_level= 0; | |
| 6172 | |
| 6173 if(next_i < last_non_zero) | |
| 6174 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
| 6175 + length[UNI_AC_ENC_INDEX(run2, next_level)] | |
| 6176 - length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
| 6177 else | |
| 6178 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
| 6179 + last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
| 6180 - last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
| 6181 }else{ | |
| 6182 score += last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
| 6183 if(prev_level){ | |
| 6184 score += length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
| 6185 - last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
| 6186 } | |
| 6187 } | |
| 6188 } | |
| 6189 }else{ | |
| 6190 new_coeff=0; | |
| 6191 assert(ABS(level)==1); | |
| 6192 | |
| 6193 if(i < last_non_zero){ | |
| 6194 int next_i= i + run2 + 1; | |
| 6195 int next_level= block[ perm_scantable[next_i] ] + 64; | |
| 2967 | 6196 |
| 1777 | 6197 if(next_level&(~127)) |
| 6198 next_level= 0; | |
| 6199 | |
| 6200 if(next_i < last_non_zero) | |
| 6201 score += length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
| 6202 - length[UNI_AC_ENC_INDEX(run2, next_level)] | |
| 6203 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
| 6204 else | |
| 6205 score += last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
| 6206 - last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
| 6207 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
| 6208 }else{ | |
| 6209 score += -last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
| 6210 if(prev_level){ | |
| 6211 score += last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
| 6212 - length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
| 6213 } | |
| 6214 } | |
| 6215 } | |
| 2967 | 6216 |
| 1777 | 6217 score *= lambda; |
| 6218 | |
| 6219 unquant_change= new_coeff - old_coeff; | |
| 6220 assert((score < 100*lambda && score > -100*lambda) || lambda==0); | |
| 2967 | 6221 |
| 1784 | 6222 score+= s->dsp.try_8x8basis(rem, weight, basis[j], unquant_change); |
| 1777 | 6223 if(score<best_score){ |
| 6224 best_score= score; | |
| 6225 best_coeff= i; | |
| 6226 best_change= change; | |
| 6227 best_unquant_change= unquant_change; | |
| 6228 } | |
| 6229 } | |
| 6230 if(level){ | |
| 6231 prev_level= level + 64; | |
| 6232 if(prev_level&(~127)) | |
| 6233 prev_level= 0; | |
| 6234 prev_run= run; | |
| 6235 run=0; | |
| 6236 }else{ | |
| 6237 run++; | |
| 6238 } | |
| 6239 } | |
| 6240 #ifdef REFINE_STATS | |
| 6241 STOP_TIMER("iterative step")} | |
| 6242 #endif | |
| 6243 | |
| 6244 if(best_change){ | |
| 6245 int j= perm_scantable[ best_coeff ]; | |
| 2967 | 6246 |
| 1777 | 6247 block[j] += best_change; |
| 2967 | 6248 |
| 1777 | 6249 if(best_coeff > last_non_zero){ |
| 6250 last_non_zero= best_coeff; | |
| 6251 assert(block[j]); | |
| 6252 #ifdef REFINE_STATS | |
| 6253 after_last++; | |
| 6254 #endif | |
| 6255 }else{ | |
| 6256 #ifdef REFINE_STATS | |
| 6257 if(block[j]){ | |
| 6258 if(block[j] - best_change){ | |
| 6259 if(ABS(block[j]) > ABS(block[j] - best_change)){ | |
| 6260 raise++; | |
| 6261 }else{ | |
| 6262 lower++; | |
| 6263 } | |
| 6264 }else{ | |
| 6265 from_zero++; | |
| 6266 } | |
| 6267 }else{ | |
| 6268 to_zero++; | |
| 6269 } | |
| 6270 #endif | |
| 6271 for(; last_non_zero>=start_i; last_non_zero--){ | |
| 6272 if(block[perm_scantable[last_non_zero]]) | |
| 6273 break; | |
| 6274 } | |
| 6275 } | |
| 6276 #ifdef REFINE_STATS | |
| 6277 count++; | |
| 6278 if(256*256*256*64 % count == 0){ | |
| 6279 printf("after_last:%d to_zero:%d from_zero:%d raise:%d lower:%d sign:%d xyp:%d/%d/%d\n", after_last, to_zero, from_zero, raise, lower, messed_sign, s->mb_x, s->mb_y, s->picture_number); | |
| 6280 } | |
| 6281 #endif | |
| 6282 run=0; | |
| 6283 rle_index=0; | |
| 6284 for(i=start_i; i<=last_non_zero; i++){ | |
| 6285 int j= perm_scantable[i]; | |
| 6286 const int level= block[j]; | |
| 2967 | 6287 |
| 1777 | 6288 if(level){ |
| 6289 run_tab[rle_index++]=run; | |
| 6290 run=0; | |
| 6291 }else{ | |
| 6292 run++; | |
| 6293 } | |
| 6294 } | |
| 2967 | 6295 |
| 1784 | 6296 s->dsp.add_8x8basis(rem, basis[j], best_unquant_change); |
| 1777 | 6297 }else{ |
| 6298 break; | |
| 6299 } | |
| 6300 } | |
| 6301 #ifdef REFINE_STATS | |
| 6302 if(last_non_zero>0){ | |
| 6303 STOP_TIMER("iterative search") | |
| 6304 } | |
| 6305 } | |
| 6306 #endif | |
| 6307 | |
| 6308 return last_non_zero; | |
| 6309 } | |
| 6310 | |
| 2967 | 6311 static int dct_quantize_c(MpegEncContext *s, |
| 0 | 6312 DCTELEM *block, int n, |
| 344 | 6313 int qscale, int *overflow) |
| 0 | 6314 { |
| 1715 | 6315 int i, j, level, last_non_zero, q, start_i; |
| 0 | 6316 const int *qmat; |
| 1064 | 6317 const uint8_t *scantable= s->intra_scantable.scantable; |
| 344 | 6318 int bias; |
| 6319 int max=0; | |
| 6320 unsigned int threshold1, threshold2; | |
|
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
6321 |
| 1092 | 6322 s->dsp.fdct (block); |
| 0 | 6323 |
| 1597 | 6324 if(s->dct_error_sum) |
| 1719 | 6325 s->denoise_dct(s, block); |
| 1597 | 6326 |
| 0 | 6327 if (s->mb_intra) { |
|
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6328 if (!s->h263_aic) { |
|
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6329 if (n < 4) |
|
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6330 q = s->y_dc_scale; |
|
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6331 else |
|
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6332 q = s->c_dc_scale; |
|
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6333 q = q << 3; |
|
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6334 } else |
|
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6335 /* 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
|
6336 q = 1 << 3; |
| 2967 | 6337 |
| 0 | 6338 /* note: block[0] is assumed to be positive */ |
| 6339 block[0] = (block[0] + (q >> 1)) / q; | |
| 1715 | 6340 start_i = 1; |
| 0 | 6341 last_non_zero = 0; |
| 344 | 6342 qmat = s->q_intra_matrix[qscale]; |
| 635 | 6343 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
| 0 | 6344 } else { |
| 1715 | 6345 start_i = 0; |
| 0 | 6346 last_non_zero = -1; |
| 344 | 6347 qmat = s->q_inter_matrix[qscale]; |
| 635 | 6348 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
| 0 | 6349 } |
| 635 | 6350 threshold1= (1<<QMAT_SHIFT) - bias - 1; |
| 6351 threshold2= (threshold1<<1); | |
| 1715 | 6352 for(i=63;i>=start_i;i--) { |
| 764 | 6353 j = scantable[i]; |
| 1715 | 6354 level = block[j] * qmat[j]; |
| 6355 | |
| 6356 if(((unsigned)(level+threshold1))>threshold2){ | |
| 6357 last_non_zero = i; | |
| 6358 break; | |
| 6359 }else{ | |
| 6360 block[j]=0; | |
| 6361 } | |
| 6362 } | |
| 6363 for(i=start_i; i<=last_non_zero; i++) { | |
| 6364 j = scantable[i]; | |
| 6365 level = block[j] * qmat[j]; | |
| 344 | 6366 |
| 1215 | 6367 // if( bias+level >= (1<<QMAT_SHIFT) |
| 6368 // || bias-level >= (1<<QMAT_SHIFT)){ | |
| 344 | 6369 if(((unsigned)(level+threshold1))>threshold2){ |
| 6370 if(level>0){ | |
| 635 | 6371 level= (bias + level)>>QMAT_SHIFT; |
| 344 | 6372 block[j]= level; |
| 6373 }else{ | |
| 635 | 6374 level= (bias - level)>>QMAT_SHIFT; |
| 344 | 6375 block[j]= -level; |
| 0 | 6376 } |
| 344 | 6377 max |=level; |
| 6378 }else{ | |
| 6379 block[j]=0; | |
| 0 | 6380 } |
| 6381 } | |
|
2627
bf158d23bbcc
Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents:
2620
diff
changeset
|
6382 *overflow= s->max_qcoeff < max; //overflow might have happened |
| 2967 | 6383 |
| 764 | 6384 /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */ |
| 1092 | 6385 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM) |
| 2979 | 6386 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero); |
| 764 | 6387 |
| 0 | 6388 return last_non_zero; |
| 6389 } | |
| 6390 | |
|
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
|
6391 #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
|
6392 |
| 2967 | 6393 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
|
6394 DCTELEM *block, int n, int qscale) |
| 0 | 6395 { |
| 200 | 6396 int i, level, nCoeffs; |
| 1064 | 6397 const uint16_t *quant_matrix; |
| 0 | 6398 |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6399 nCoeffs= s->block_last_index[n]; |
| 2967 | 6400 |
| 6401 if (n < 4) | |
| 1689 | 6402 block[0] = block[0] * s->y_dc_scale; |
| 6403 else | |
| 6404 block[0] = block[0] * s->c_dc_scale; | |
| 6405 /* XXX: only mpeg1 */ | |
| 6406 quant_matrix = s->intra_matrix; | |
| 6407 for(i=1;i<=nCoeffs;i++) { | |
| 6408 int j= s->intra_scantable.permutated[i]; | |
| 6409 level = block[j]; | |
| 6410 if (level) { | |
| 6411 if (level < 0) { | |
| 6412 level = -level; | |
| 6413 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
| 6414 level = (level - 1) | 1; | |
| 6415 level = -level; | |
| 6416 } else { | |
| 6417 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
| 6418 level = (level - 1) | 1; | |
| 0 | 6419 } |
| 1689 | 6420 block[j] = level; |
| 0 | 6421 } |
| 6422 } | |
| 6423 } | |
|
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
|
6424 |
| 2967 | 6425 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, |
| 1689 | 6426 DCTELEM *block, int n, int qscale) |
| 6427 { | |
| 6428 int i, level, nCoeffs; | |
| 6429 const uint16_t *quant_matrix; | |
| 6430 | |
| 6431 nCoeffs= s->block_last_index[n]; | |
| 2967 | 6432 |
| 1689 | 6433 quant_matrix = s->inter_matrix; |
| 6434 for(i=0; i<=nCoeffs; i++) { | |
| 6435 int j= s->intra_scantable.permutated[i]; | |
| 6436 level = block[j]; | |
| 6437 if (level) { | |
| 6438 if (level < 0) { | |
| 6439 level = -level; | |
| 6440 level = (((level << 1) + 1) * qscale * | |
| 6441 ((int) (quant_matrix[j]))) >> 4; | |
| 6442 level = (level - 1) | 1; | |
| 6443 level = -level; | |
| 6444 } else { | |
| 6445 level = (((level << 1) + 1) * qscale * | |
| 6446 ((int) (quant_matrix[j]))) >> 4; | |
| 6447 level = (level - 1) | 1; | |
| 6448 } | |
| 6449 block[j] = level; | |
| 6450 } | |
| 6451 } | |
| 6452 } | |
| 6453 | |
| 2967 | 6454 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s, |
| 325 | 6455 DCTELEM *block, int n, int qscale) |
| 6456 { | |
| 6457 int i, level, nCoeffs; | |
| 1064 | 6458 const uint16_t *quant_matrix; |
| 325 | 6459 |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6460 if(s->alternate_scan) nCoeffs= 63; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6461 else nCoeffs= s->block_last_index[n]; |
| 2967 | 6462 |
| 6463 if (n < 4) | |
| 1689 | 6464 block[0] = block[0] * s->y_dc_scale; |
| 6465 else | |
| 6466 block[0] = block[0] * s->c_dc_scale; | |
| 6467 quant_matrix = s->intra_matrix; | |
| 6468 for(i=1;i<=nCoeffs;i++) { | |
| 6469 int j= s->intra_scantable.permutated[i]; | |
| 6470 level = block[j]; | |
| 6471 if (level) { | |
| 6472 if (level < 0) { | |
| 6473 level = -level; | |
| 6474 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
| 6475 level = -level; | |
| 6476 } else { | |
| 6477 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
| 6478 } | |
| 6479 block[j] = level; | |
| 6480 } | |
| 6481 } | |
| 6482 } | |
| 6483 | |
| 2967 | 6484 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, |
| 1689 | 6485 DCTELEM *block, int n, int qscale) |
| 6486 { | |
| 6487 int i, level, nCoeffs; | |
| 6488 const uint16_t *quant_matrix; | |
| 6489 int sum=-1; | |
| 6490 | |
| 6491 if(s->alternate_scan) nCoeffs= 63; | |
| 6492 else nCoeffs= s->block_last_index[n]; | |
| 2967 | 6493 |
| 1689 | 6494 quant_matrix = s->inter_matrix; |
| 6495 for(i=0; i<=nCoeffs; i++) { | |
| 6496 int j= s->intra_scantable.permutated[i]; | |
| 6497 level = block[j]; | |
| 6498 if (level) { | |
| 6499 if (level < 0) { | |
| 6500 level = -level; | |
| 6501 level = (((level << 1) + 1) * qscale * | |
| 6502 ((int) (quant_matrix[j]))) >> 4; | |
| 6503 level = -level; | |
| 6504 } else { | |
| 6505 level = (((level << 1) + 1) * qscale * | |
| 6506 ((int) (quant_matrix[j]))) >> 4; | |
| 6507 } | |
| 6508 block[j] = level; | |
| 6509 sum+=level; | |
| 6510 } | |
| 6511 } | |
| 6512 block[63]^=sum&1; | |
| 6513 } | |
| 6514 | |
| 2967 | 6515 static void dct_unquantize_h263_intra_c(MpegEncContext *s, |
| 1689 | 6516 DCTELEM *block, int n, int qscale) |
| 6517 { | |
| 6518 int i, level, qmul, qadd; | |
| 6519 int nCoeffs; | |
| 2967 | 6520 |
| 1689 | 6521 assert(s->block_last_index[n]>=0); |
| 2967 | 6522 |
| 1689 | 6523 qmul = qscale << 1; |
| 2967 | 6524 |
| 1689 | 6525 if (!s->h263_aic) { |
| 2967 | 6526 if (n < 4) |
| 325 | 6527 block[0] = block[0] * s->y_dc_scale; |
| 6528 else | |
| 6529 block[0] = block[0] * s->c_dc_scale; | |
| 1689 | 6530 qadd = (qscale - 1) | 1; |
| 6531 }else{ | |
| 6532 qadd = 0; | |
| 6533 } | |
| 6534 if(s->ac_pred) | |
| 6535 nCoeffs=63; | |
| 6536 else | |
| 6537 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; | |
| 6538 | |
| 6539 for(i=1; i<=nCoeffs; i++) { | |
| 6540 level = block[i]; | |
| 6541 if (level) { | |
| 6542 if (level < 0) { | |
| 6543 level = level * qmul - qadd; | |
| 6544 } else { | |
| 6545 level = level * qmul + qadd; | |
| 325 | 6546 } |
| 1689 | 6547 block[i] = level; |
| 325 | 6548 } |
| 6549 } | |
| 6550 } | |
| 6551 | |
| 2967 | 6552 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
|
6553 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
|
6554 { |
|
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
|
6555 int i, level, qmul, qadd; |
| 200 | 6556 int nCoeffs; |
| 2967 | 6557 |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6558 assert(s->block_last_index[n]>=0); |
| 2967 | 6559 |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6560 qadd = (qscale - 1) | 1; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6561 qmul = qscale << 1; |
| 2967 | 6562 |
| 1689 | 6563 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; |
| 6564 | |
| 6565 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
|
6566 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
|
6567 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
|
6568 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
|
6569 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
|
6570 } 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
|
6571 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
|
6572 } |
|
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
|
6573 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
|
6574 } |
|
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
|
6575 } |
|
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
|
6576 } |
| 0 | 6577 |
|
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
|
6578 #ifdef CONFIG_ENCODERS |
| 0 | 6579 AVCodec h263_encoder = { |
| 6580 "h263", | |
| 6581 CODEC_TYPE_VIDEO, | |
| 6582 CODEC_ID_H263, | |
| 6583 sizeof(MpegEncContext), | |
| 6584 MPV_encode_init, | |
| 6585 MPV_encode_picture, | |
| 6586 MPV_encode_end, | |
| 2524 | 6587 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 0 | 6588 }; |
| 6589 | |
| 6590 AVCodec h263p_encoder = { | |
| 6591 "h263p", | |
| 6592 CODEC_TYPE_VIDEO, | |
| 6593 CODEC_ID_H263P, | |
| 6594 sizeof(MpegEncContext), | |
| 6595 MPV_encode_init, | |
| 6596 MPV_encode_picture, | |
| 6597 MPV_encode_end, | |
| 2524 | 6598 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 0 | 6599 }; |
| 6600 | |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6601 AVCodec flv_encoder = { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6602 "flv", |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6603 CODEC_TYPE_VIDEO, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6604 CODEC_ID_FLV1, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6605 sizeof(MpegEncContext), |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6606 MPV_encode_init, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6607 MPV_encode_picture, |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6608 MPV_encode_end, |
| 2524 | 6609 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6610 }; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6611 |
| 0 | 6612 AVCodec rv10_encoder = { |
| 6613 "rv10", | |
| 6614 CODEC_TYPE_VIDEO, | |
| 6615 CODEC_ID_RV10, | |
| 6616 sizeof(MpegEncContext), | |
| 6617 MPV_encode_init, | |
| 6618 MPV_encode_picture, | |
| 6619 MPV_encode_end, | |
| 2524 | 6620 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 0 | 6621 }; |
| 6622 | |
| 2380 | 6623 AVCodec rv20_encoder = { |
| 6624 "rv20", | |
| 6625 CODEC_TYPE_VIDEO, | |
| 6626 CODEC_ID_RV20, | |
| 6627 sizeof(MpegEncContext), | |
| 6628 MPV_encode_init, | |
| 6629 MPV_encode_picture, | |
| 6630 MPV_encode_end, | |
| 2524 | 6631 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 2380 | 6632 }; |
| 6633 | |
| 71 | 6634 AVCodec mpeg4_encoder = { |
| 6635 "mpeg4", | |
| 0 | 6636 CODEC_TYPE_VIDEO, |
| 71 | 6637 CODEC_ID_MPEG4, |
| 0 | 6638 sizeof(MpegEncContext), |
| 6639 MPV_encode_init, | |
| 6640 MPV_encode_picture, | |
| 6641 MPV_encode_end, | |
| 2524 | 6642 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 2111 | 6643 .capabilities= CODEC_CAP_DELAY, |
| 0 | 6644 }; |
| 6645 | |
| 307 | 6646 AVCodec msmpeg4v1_encoder = { |
| 6647 "msmpeg4v1", | |
| 0 | 6648 CODEC_TYPE_VIDEO, |
| 307 | 6649 CODEC_ID_MSMPEG4V1, |
| 0 | 6650 sizeof(MpegEncContext), |
| 6651 MPV_encode_init, | |
| 6652 MPV_encode_picture, | |
| 6653 MPV_encode_end, | |
| 2524 | 6654 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 0 | 6655 }; |
| 307 | 6656 |
| 6657 AVCodec msmpeg4v2_encoder = { | |
| 6658 "msmpeg4v2", | |
| 6659 CODEC_TYPE_VIDEO, | |
| 6660 CODEC_ID_MSMPEG4V2, | |
| 6661 sizeof(MpegEncContext), | |
| 6662 MPV_encode_init, | |
| 6663 MPV_encode_picture, | |
| 6664 MPV_encode_end, | |
| 2524 | 6665 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 307 | 6666 }; |
| 6667 | |
| 6668 AVCodec msmpeg4v3_encoder = { | |
| 6669 "msmpeg4", | |
| 6670 CODEC_TYPE_VIDEO, | |
| 6671 CODEC_ID_MSMPEG4V3, | |
| 6672 sizeof(MpegEncContext), | |
| 6673 MPV_encode_init, | |
| 6674 MPV_encode_picture, | |
| 6675 MPV_encode_end, | |
| 2524 | 6676 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 307 | 6677 }; |
| 499 | 6678 |
| 6679 AVCodec wmv1_encoder = { | |
| 6680 "wmv1", | |
| 6681 CODEC_TYPE_VIDEO, | |
| 6682 CODEC_ID_WMV1, | |
| 6683 sizeof(MpegEncContext), | |
| 6684 MPV_encode_init, | |
| 6685 MPV_encode_picture, | |
| 6686 MPV_encode_end, | |
| 2524 | 6687 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, |
| 499 | 6688 }; |
| 6689 | |
| 1042 | 6690 AVCodec mjpeg_encoder = { |
| 6691 "mjpeg", | |
| 6692 CODEC_TYPE_VIDEO, | |
| 6693 CODEC_ID_MJPEG, | |
| 6694 sizeof(MpegEncContext), | |
| 6695 MPV_encode_init, | |
| 6696 MPV_encode_picture, | |
| 6697 MPV_encode_end, | |
| 2524 | 6698 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, -1}, |
| 1042 | 6699 }; |
|
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
|
6700 |
|
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
|
6701 #endif //CONFIG_ENCODERS |
