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