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