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