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