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