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