Mercurial > libavcodec.hg
annotate mpegvideo.c @ 2363:e0bda0b8359a libavcodec
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
author | michael |
---|---|
date | Tue, 23 Nov 2004 23:58:54 +0000 |
parents | ada3891b859d |
children | f8a229dfa2e8 |
rev | line source |
---|---|
0 | 1 /* |
2 * The simplest mpeg encoder (well, it was the simplest!) | |
429 | 3 * Copyright (c) 2000,2001 Fabrice Bellard. |
1739
07a484280a82
copyright year update of the files i touched and remembered, things look annoyingly unmaintained otherwise
michael
parents:
1729
diff
changeset
|
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> |
0 | 5 * |
429 | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Lesser General Public | |
8 * License as published by the Free Software Foundation; either | |
9 * version 2 of the License, or (at your option) any later version. | |
0 | 10 * |
429 | 11 * This library is distributed in the hope that it will be useful, |
0 | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
429 | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 * Lesser General Public License for more details. | |
0 | 15 * |
429 | 16 * You should have received a copy of the GNU Lesser General Public |
17 * License along with this library; if not, write to the Free Software | |
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
295 | 19 * |
325 | 20 * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at> |
0 | 21 */ |
701 | 22 |
1106 | 23 /** |
24 * @file mpegvideo.c | |
25 * The simplest mpeg encoder (well, it was the simplest!). | |
26 */ | |
27 | |
0 | 28 #include "avcodec.h" |
29 #include "dsputil.h" | |
30 #include "mpegvideo.h" | |
1557 | 31 #include "faandct.h" |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
32 #include <limits.h> |
0 | 33 |
17
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
34 #ifdef USE_FASTMEMCPY |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
35 #include "fastmemcpy.h" |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
36 #endif |
b69fe46fd708
Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents:
13
diff
changeset
|
37 |
1422
efeed6e29f9b
oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents:
1421
diff
changeset
|
38 //#undef NDEBUG |
efeed6e29f9b
oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents:
1421
diff
changeset
|
39 //#include <assert.h> |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
40 |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
41 #ifdef CONFIG_ENCODERS |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
42 static void encode_picture(MpegEncContext *s, int picture_number); |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
43 #endif //CONFIG_ENCODERS |
1689 | 44 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, |
45 DCTELEM *block, int n, int qscale); | |
46 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, | |
47 DCTELEM *block, int n, int qscale); | |
48 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s, | |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
49 DCTELEM *block, int n, int qscale); |
1689 | 50 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, |
325 | 51 DCTELEM *block, int n, int qscale); |
1689 | 52 static void dct_unquantize_h263_intra_c(MpegEncContext *s, |
53 DCTELEM *block, int n, int qscale); | |
54 static void dct_unquantize_h263_inter_c(MpegEncContext *s, | |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
55 DCTELEM *block, int n, int qscale); |
1064 | 56 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w); |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
57 #ifdef CONFIG_ENCODERS |
344 | 58 static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); |
945 | 59 static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); |
1777 | 60 static int dct_quantize_refine(MpegEncContext *s, DCTELEM *block, int16_t *weight, DCTELEM *orig, int n, int qscale); |
1389 | 61 static int sse_mb(MpegEncContext *s); |
1719 | 62 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block); |
1070
6da5ae9ee199
more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents:
1064
diff
changeset
|
63 #endif //CONFIG_ENCODERS |
206 | 64 |
1381 | 65 #ifdef HAVE_XVMC |
66 extern int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx); | |
67 extern void XVMC_field_end(MpegEncContext *s); | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1579
diff
changeset
|
68 extern void XVMC_decode_mb(MpegEncContext *s); |
1381 | 69 #endif |
70 | |
1064 | 71 void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, int w)= draw_edges_c; |
206 | 72 |
0 | 73 |
74 /* enable all paranoid tests for rounding, overflows, etc... */ | |
75 //#define PARANOID | |
76 | |
77 //#define DEBUG | |
78 | |
321 | 79 |
0 | 80 /* for jpeg fast DCT */ |
81 #define CONST_BITS 14 | |
82 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
83 static const uint16_t aanscales[64] = { |
0 | 84 /* precomputed values scaled up by 14 bits */ |
85 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | |
86 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270, | |
87 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906, | |
88 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315, | |
89 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | |
90 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552, | |
936 | 91 8867 , 12299, 11585, 10426, 8867, 6967, 4799, 2446, |
92 4520 , 6270, 5906, 5315, 4520, 3552, 2446, 1247 | |
0 | 93 }; |
94 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
95 static const uint8_t h263_chroma_roundtab[16] = { |
1013 | 96 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
0 | 97 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, |
98 }; | |
99 | |
1644 | 100 static const uint8_t ff_default_chroma_qscale_table[32]={ |
101 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | |
102 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31 | |
103 }; | |
104 | |
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
|
105 #ifdef CONFIG_ENCODERS |
1162 | 106 static uint8_t (*default_mv_penalty)[MAX_MV*2+1]=NULL; |
1064 | 107 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
|
108 |
998 | 109 enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1}; |
110 | |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
111 static void convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64], |
1064 | 112 const uint16_t *quant_matrix, int bias, int qmin, int qmax) |
0 | 113 { |
344 | 114 int qscale; |
0 | 115 |
709
afeff6ccb7f5
convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents:
706
diff
changeset
|
116 for(qscale=qmin; qscale<=qmax; qscale++){ |
344 | 117 int i; |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
118 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
|
119 #ifdef FAAN_POSTSCALE |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
120 || dsp->fdct == ff_faandct |
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
121 #endif |
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
122 ) { |
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
|
123 for(i=0;i<64;i++) { |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
124 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
|
125 /* 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
|
126 /* 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
|
127 /* (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
|
128 /* 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
|
129 |
1064 | 130 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
|
131 (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
|
132 } |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
133 } else if (dsp->fdct == fdct_ifast |
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
134 #ifndef FAAN_POSTSCALE |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
135 || dsp->fdct == ff_faandct |
1562
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
136 #endif |
bf452704100f
optionally merge postscale into quantization table for the float aan dct
michael
parents:
1557
diff
changeset
|
137 ) { |
344 | 138 for(i=0;i<64;i++) { |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
139 const int j= dsp->idct_permutation[i]; |
344 | 140 /* 16 <= qscale * quant_matrix[i] <= 7905 */ |
141 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ | |
142 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ | |
143 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */ | |
144 | |
1064 | 145 qmat[qscale][i] = (int)((uint64_t_C(1) << (QMAT_SHIFT + 14)) / |
344 | 146 (aanscales[i] * qscale * quant_matrix[j])); |
147 } | |
148 } else { | |
149 for(i=0;i<64;i++) { | |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
150 const int j= dsp->idct_permutation[i]; |
344 | 151 /* We can safely suppose that 16 <= quant_matrix[i] <= 255 |
152 So 16 <= qscale * quant_matrix[i] <= 7905 | |
153 so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 | |
154 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 | |
155 */ | |
1064 | 156 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j])); |
945 | 157 // 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
|
158 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
|
159 |
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
160 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
|
161 qmat16[qscale][1][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][0][i]); |
344 | 162 } |
0 | 163 } |
164 } | |
165 } | |
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
|
166 |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
167 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
|
168 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
|
169 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
|
170 |
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
171 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
|
172 } |
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
|
173 #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
|
174 |
1273 | 175 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
|
176 int i; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
177 int end; |
764 | 178 |
179 st->scantable= src_scantable; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
180 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
181 for(i=0; i<64; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
182 int j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
183 j = src_scantable[i]; |
1273 | 184 st->permutated[i] = permutation[j]; |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
185 #ifdef ARCH_POWERPC |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
186 st->inverse[j] = i; |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
187 #endif |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
188 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
189 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
190 end=-1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
191 for(i=0; i<64; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
192 int j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
193 j = st->permutated[i]; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
194 if(j>end) end=j; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
195 st->raster_end[i]= end; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
196 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
197 } |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
198 |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1523
diff
changeset
|
199 #ifdef CONFIG_ENCODERS |
1411 | 200 void ff_write_quant_matrix(PutBitContext *pb, int16_t *matrix){ |
201 int i; | |
202 | |
203 if(matrix){ | |
204 put_bits(pb, 1, 1); | |
205 for(i=0;i<64;i++) { | |
206 put_bits(pb, 8, matrix[ ff_zigzag_direct[i] ]); | |
207 } | |
208 }else | |
209 put_bits(pb, 1, 0); | |
210 } | |
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1523
diff
changeset
|
211 #endif //CONFIG_ENCODERS |
1411 | 212 |
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
|
213 /* 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
|
214 int DCT_common_init(MpegEncContext *s) |
0 | 215 { |
1689 | 216 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; |
217 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c; | |
218 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c; | |
219 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c; | |
220 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c; | |
221 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; | |
1092 | 222 |
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
|
223 #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
|
224 s->dct_quantize= dct_quantize_c; |
1719 | 225 s->denoise_dct= denoise_dct_c; |
1092 | 226 #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
|
227 |
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
228 #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
|
229 MPV_common_init_mmx(s); |
8 | 230 #endif |
514
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
231 #ifdef ARCH_ALPHA |
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
232 MPV_common_init_axp(s); |
c9f724e3a797
Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents:
506
diff
changeset
|
233 #endif |
628
f596db4aa871
sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents:
625
diff
changeset
|
234 #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
|
235 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
|
236 #endif |
721
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
237 #ifdef HAVE_MMI |
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
238 MPV_common_init_mmi(s); |
71f669e9f633
ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents:
717
diff
changeset
|
239 #endif |
730 | 240 #ifdef ARCH_ARMV4L |
874 | 241 MPV_common_init_armv4l(s); |
730 | 242 #endif |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
243 #ifdef ARCH_POWERPC |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
244 MPV_common_init_ppc(s); |
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
245 #endif |
730 | 246 |
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
|
247 #ifdef CONFIG_ENCODERS |
1007 | 248 s->fast_dct_quantize= s->dct_quantize; |
249 | |
945 | 250 if(s->flags&CODEC_FLAG_TRELLIS_QUANT){ |
251 s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_* | |
252 } | |
253 | |
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
|
254 #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
|
255 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
256 /* load & permutate scantables |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
257 note: only wmv uses differnt ones |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
258 */ |
1708 | 259 if(s->alternate_scan){ |
260 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan); | |
261 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan); | |
262 }else{ | |
263 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct); | |
264 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct); | |
265 } | |
1273 | 266 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan); |
267 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan); | |
591 | 268 |
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
|
269 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
|
270 } |
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
271 |
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
|
272 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
|
273 *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
|
274 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
|
275 } |
14d01ccc0081
picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents:
1530
diff
changeset
|
276 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
277 static void copy_picture_attributes(MpegEncContext *s, AVFrame *dst, AVFrame *src){ |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
278 int i; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
279 |
1702 | 280 dst->pict_type = src->pict_type; |
281 dst->quality = src->quality; | |
282 dst->coded_picture_number = src->coded_picture_number; | |
283 dst->display_picture_number = src->display_picture_number; | |
284 // dst->reference = src->reference; | |
285 dst->pts = src->pts; | |
286 dst->interlaced_frame = src->interlaced_frame; | |
287 dst->top_field_first = src->top_field_first; | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
288 |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
289 if(s->avctx->me_threshold){ |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
290 if(!src->motion_val[0]) |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
291 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_val not set!\n"); |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
292 if(!src->mb_type) |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
293 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.mb_type not set!\n"); |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
294 if(!src->ref_index[0]) |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
295 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.ref_index not set!\n"); |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
296 if(src->motion_subsample_log2 != dst->motion_subsample_log2) |
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
297 av_log(s->avctx, AV_LOG_ERROR, "AVFrame.motion_subsample_log2 doesnt match! (%d!=%d)\n", |
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
298 src->motion_subsample_log2, dst->motion_subsample_log2); |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
299 |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
300 memcpy(dst->mb_type, src->mb_type, s->mb_stride * s->mb_height * sizeof(dst->mb_type[0])); |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
301 |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
302 for(i=0; i<2; i++){ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
303 int stride= ((16*s->mb_width )>>src->motion_subsample_log2) + 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
304 int height= ((16*s->mb_height)>>src->motion_subsample_log2); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
305 |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
306 if(src->motion_val[i] && src->motion_val[i] != dst->motion_val[i]){ |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
307 memcpy(dst->motion_val[i], src->motion_val[i], 2*stride*height*sizeof(int16_t)); |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
308 } |
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
309 if(src->ref_index[i] && src->ref_index[i] != dst->ref_index[i]){ |
1948 | 310 memcpy(dst->ref_index[i], src->ref_index[i], s->b8_stride*2*s->mb_height*sizeof(int8_t)); |
1945
32f68745c431
passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder
michael
parents:
1944
diff
changeset
|
311 } |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
312 } |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
313 } |
1702 | 314 } |
315 | |
903 | 316 /** |
924 | 317 * allocates a Picture |
318 * The pixels are allocated/set by calling get_buffer() if shared=0 | |
903 | 319 */ |
924 | 320 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
|
321 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
|
322 const int mb_array_size= s->mb_stride*s->mb_height; |
1655 | 323 const int b8_array_size= s->b8_stride*s->mb_height*2; |
324 const int b4_array_size= s->b4_stride*s->mb_height*4; | |
1168 | 325 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
|
326 |
924 | 327 if(shared){ |
328 assert(pic->data[0]); | |
329 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED); | |
330 pic->type= FF_BUFFER_TYPE_SHARED; | |
331 }else{ | |
332 int r; | |
333 | |
334 assert(!pic->data[0]); | |
335 | |
925 | 336 r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic); |
924 | 337 |
338 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
|
339 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (%d %d %d %p)\n", r, pic->age, pic->type, pic->data[0]); |
924 | 340 return -1; |
341 } | |
342 | |
343 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
|
344 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (stride changed)\n"); |
924 | 345 return -1; |
346 } | |
347 | |
348 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
|
349 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (uv stride missmatch)\n"); |
924 | 350 return -1; |
351 } | |
352 | |
353 s->linesize = pic->linesize[0]; | |
354 s->uvlinesize= pic->linesize[1]; | |
903 | 355 } |
924 | 356 |
357 if(pic->qscale_table==NULL){ | |
358 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
|
359 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
|
360 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
|
361 CHECKED_ALLOCZ(pic->mb_mean , mb_array_size * sizeof(int8_t)) |
924 | 362 } |
363 | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
364 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
|
365 CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t)) |
1742 | 366 CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(uint32_t)) |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
367 pic->mb_type= pic->mb_type_base + s->mb_stride+1; |
1168 | 368 if(s->out_format == FMT_H264){ |
369 for(i=0; i<2; i++){ | |
1885 | 370 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+2) * sizeof(int16_t)) |
371 pic->motion_val[i]= pic->motion_val_base[i]+2; | |
1948 | 372 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t)) |
1655 | 373 } |
1669 | 374 pic->motion_subsample_log2= 2; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
375 }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){ |
1655 | 376 for(i=0; i<2; i++){ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
377 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+2) * sizeof(int16_t)) |
1885 | 378 pic->motion_val[i]= pic->motion_val_base[i]+2; |
1948 | 379 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t)) |
1168 | 380 } |
1669 | 381 pic->motion_subsample_log2= 3; |
1168 | 382 } |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
383 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
384 CHECKED_ALLOCZ(pic->dct_coeff, 64 * mb_array_size * sizeof(DCTELEM)*6) |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
385 } |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
386 pic->qstride= s->mb_stride; |
1546 | 387 CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan)) |
924 | 388 } |
1168 | 389 |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
390 //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
|
391 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
|
392 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
|
393 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
|
394 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
|
395 |
903 | 396 return 0; |
397 fail: //for the CHECKED_ALLOCZ macro | |
398 return -1; | |
399 } | |
400 | |
924 | 401 /** |
402 * deallocates a picture | |
403 */ | |
903 | 404 static void free_picture(MpegEncContext *s, Picture *pic){ |
405 int i; | |
924 | 406 |
407 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){ | |
925 | 408 s->avctx->release_buffer(s->avctx, (AVFrame*)pic); |
924 | 409 } |
410 | |
903 | 411 av_freep(&pic->mb_var); |
412 av_freep(&pic->mc_mb_var); | |
413 av_freep(&pic->mb_mean); | |
414 av_freep(&pic->mbskip_table); | |
415 av_freep(&pic->qscale_table); | |
1168 | 416 av_freep(&pic->mb_type_base); |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
417 av_freep(&pic->dct_coeff); |
1546 | 418 av_freep(&pic->pan_scan); |
1168 | 419 pic->mb_type= NULL; |
420 for(i=0; i<2; i++){ | |
1655 | 421 av_freep(&pic->motion_val_base[i]); |
1168 | 422 av_freep(&pic->ref_index[i]); |
423 } | |
1214 | 424 |
425 if(pic->type == FF_BUFFER_TYPE_SHARED){ | |
924 | 426 for(i=0; i<4; i++){ |
427 pic->base[i]= | |
428 pic->data[i]= NULL; | |
429 } | |
430 pic->type= 0; | |
903 | 431 } |
432 } | |
433 | |
1799 | 434 static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ |
435 int i; | |
436 | |
1838 | 437 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264) |
1799 | 438 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance |
439 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17; | |
440 | |
441 //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer() | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
442 CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t)) |
1799 | 443 s->rd_scratchpad= s->me.scratchpad; |
444 s->b_scratchpad= s->me.scratchpad; | |
445 s->obmc_scratchpad= s->me.scratchpad + 16; | |
446 if (s->encoding) { | |
447 CHECKED_ALLOCZ(s->me.map , ME_MAP_SIZE*sizeof(uint32_t)) | |
448 CHECKED_ALLOCZ(s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t)) | |
449 if(s->avctx->noise_reduction){ | |
450 CHECKED_ALLOCZ(s->dct_error_sum, 2 * 64 * sizeof(int)) | |
451 } | |
452 } | |
1848
c72589baee53
initial chroma_format changes,xvmc tweaks and codec_cap
iive
parents:
1846
diff
changeset
|
453 CHECKED_ALLOCZ(s->blocks, 64*12*2 * sizeof(DCTELEM)) |
1799 | 454 s->block= s->blocks[0]; |
455 | |
456 for(i=0;i<12;i++){ | |
457 s->pblocks[i] = (short *)(&s->block[i]); | |
458 } | |
459 return 0; | |
460 fail: | |
461 return -1; //free() through MPV_common_end() | |
462 } | |
463 | |
464 static void free_duplicate_context(MpegEncContext *s){ | |
465 if(s==NULL) return; | |
466 | |
467 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL; | |
468 av_freep(&s->me.scratchpad); | |
469 s->rd_scratchpad= | |
470 s->b_scratchpad= | |
471 s->obmc_scratchpad= NULL; | |
472 | |
473 av_freep(&s->dct_error_sum); | |
474 av_freep(&s->me.map); | |
475 av_freep(&s->me.score_map); | |
476 av_freep(&s->blocks); | |
477 s->block= NULL; | |
478 } | |
479 | |
480 static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){ | |
481 #define COPY(a) bak->a= src->a | |
482 COPY(allocated_edge_emu_buffer); | |
483 COPY(edge_emu_buffer); | |
484 COPY(me.scratchpad); | |
485 COPY(rd_scratchpad); | |
486 COPY(b_scratchpad); | |
487 COPY(obmc_scratchpad); | |
488 COPY(me.map); | |
489 COPY(me.score_map); | |
490 COPY(blocks); | |
491 COPY(block); | |
492 COPY(start_mb_y); | |
493 COPY(end_mb_y); | |
494 COPY(me.map_generation); | |
495 COPY(pb); | |
496 COPY(dct_error_sum); | |
1810 | 497 COPY(dct_count[0]); |
498 COPY(dct_count[1]); | |
1799 | 499 #undef COPY |
500 } | |
501 | |
1827 | 502 void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){ |
1799 | 503 MpegEncContext bak; |
1827 | 504 int i; |
1799 | 505 //FIXME copy only needed parts |
506 //START_TIMER | |
507 backup_duplicate_context(&bak, dst); | |
508 memcpy(dst, src, sizeof(MpegEncContext)); | |
509 backup_duplicate_context(dst, &bak); | |
1827 | 510 for(i=0;i<12;i++){ |
511 dst->pblocks[i] = (short *)(&dst->block[i]); | |
512 } | |
1799 | 513 //STOP_TIMER("update_duplicate_context") //about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads |
514 } | |
515 | |
516 static void update_duplicate_context_after_me(MpegEncContext *dst, MpegEncContext *src){ | |
517 #define COPY(a) dst->a= src->a | |
518 COPY(pict_type); | |
519 COPY(current_picture); | |
520 COPY(f_code); | |
521 COPY(b_code); | |
522 COPY(qscale); | |
523 COPY(lambda); | |
524 COPY(lambda2); | |
525 COPY(picture_in_gop_number); | |
526 COPY(gop_picture_number); | |
527 COPY(frame_pred_frame_dct); //FIXME dont set in encode_header | |
528 COPY(progressive_frame); //FIXME dont set in encode_header | |
529 COPY(partitioned_frame); //FIXME dont set in encode_header | |
530 #undef COPY | |
531 } | |
532 | |
1892 | 533 /** |
534 * sets the given MpegEncContext to common defaults (same for encoding and decoding). | |
535 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
536 */ | |
537 static void MPV_common_defaults(MpegEncContext *s){ | |
538 s->y_dc_scale_table= | |
539 s->c_dc_scale_table= ff_mpeg1_dc_scale_table; | |
540 s->chroma_qscale_table= ff_default_chroma_qscale_table; | |
541 s->progressive_frame= 1; | |
542 s->progressive_sequence= 1; | |
543 s->picture_structure= PICT_FRAME; | |
544 | |
545 s->coded_picture_number = 0; | |
546 s->picture_number = 0; | |
547 s->input_picture_number = 0; | |
548 | |
549 s->picture_in_gop_number = 0; | |
1894 | 550 |
551 s->f_code = 1; | |
552 s->b_code = 1; | |
1892 | 553 } |
554 | |
555 /** | |
556 * sets the given MpegEncContext to defaults for decoding. | |
557 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
558 */ | |
559 void MPV_decode_defaults(MpegEncContext *s){ | |
560 MPV_common_defaults(s); | |
561 } | |
562 | |
563 /** | |
564 * sets the given MpegEncContext to defaults for encoding. | |
565 * the changed fields will not depend upon the prior state of the MpegEncContext. | |
566 */ | |
1902
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
567 |
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
568 #ifdef CONFIG_ENCODERS |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
569 static void MPV_encode_defaults(MpegEncContext *s){ |
1892 | 570 static int done=0; |
571 | |
572 MPV_common_defaults(s); | |
573 | |
574 if(!done){ | |
575 int i; | |
576 done=1; | |
577 | |
578 default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); | |
579 memset(default_mv_penalty, 0, sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1)); | |
580 memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1)); | |
581 | |
582 for(i=-16; i<16; i++){ | |
583 default_fcode_tab[i + MAX_MV]= 1; | |
584 } | |
585 } | |
586 s->me.mv_penalty= default_mv_penalty; | |
587 s->fcode_tab= default_fcode_tab; | |
588 } | |
1902
a5588762c4fa
Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents:
1894
diff
changeset
|
589 #endif //CONFIG_ENCODERS |
1892 | 590 |
591 /** | |
592 * init common structure for both encoder and decoder. | |
593 * this assumes that some variables like width/height are already set | |
594 */ | |
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
|
595 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
|
596 { |
1708 | 597 int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y; |
726
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
598 |
1991 | 599 if(s->avctx->thread_count > MAX_THREADS || (16*s->avctx->thread_count > s->height && s->height)){ |
1989 | 600 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n"); |
601 return -1; | |
602 } | |
603 | |
1092 | 604 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
|
605 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
|
606 |
754 | 607 s->flags= s->avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
608 s->flags2= s->avctx->flags2; |
726
a91203b34e71
moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents:
721
diff
changeset
|
609 |
903 | 610 s->mb_width = (s->width + 15) / 16; |
0 | 611 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
|
612 s->mb_stride = s->mb_width + 1; |
1655 | 613 s->b8_stride = s->mb_width*2 + 1; |
614 s->b4_stride = s->mb_width*4 + 1; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
615 mb_array_size= s->mb_height * s->mb_stride; |
1708 | 616 mv_table_size= (s->mb_height+2) * s->mb_stride + 1; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
617 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
618 /* set chroma shifts */ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
619 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt,&(s->chroma_x_shift), |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
620 &(s->chroma_y_shift) ); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
621 |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
622 /* 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
|
623 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
|
624 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
|
625 |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
626 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
|
627 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
628 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
|
629 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
|
630 s->block_wrap[2]= |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
631 s->block_wrap[3]= s->b8_stride; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
632 s->block_wrap[4]= |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
633 s->block_wrap[5]= s->mb_stride; |
1892 | 634 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
635 y_size = s->b8_stride * (2 * s->mb_height + 1); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
636 c_size = s->mb_stride * (s->mb_height + 1); |
756 | 637 yc_size = y_size + 2 * c_size; |
1892 | 638 |
701 | 639 /* convert fourcc to upper case */ |
1116 | 640 s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF) |
641 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 ) | |
642 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16) | |
643 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24); | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
644 |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
645 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
|
646 + (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
|
647 + (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
|
648 + (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
|
649 |
925 | 650 s->avctx->coded_frame= (AVFrame*)&s->current_picture; |
903 | 651 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
652 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
|
653 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
|
654 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
|
655 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
|
656 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
657 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
658 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
|
659 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
660 if (s->encoding) { |
324 | 661 /* 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
|
662 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
|
663 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
|
664 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
|
665 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
|
666 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
|
667 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
|
668 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
|
669 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
|
670 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
|
671 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
|
672 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
|
673 s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1; |
324 | 674 |
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
675 if(s->msmpeg4_version){ |
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
676 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
|
677 } |
612 | 678 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
|
679 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
680 /* Allocate MB type table */ |
1708 | 681 CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint16_t)) //needed for encoding |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
682 |
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
|
683 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
|
684 |
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
|
685 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
|
686 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
|
687 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
|
688 CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t)) |
1556 | 689 CHECKED_ALLOCZ(s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) |
690 CHECKED_ALLOCZ(s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*)) | |
1597 | 691 |
692 if(s->avctx->noise_reduction){ | |
693 CHECKED_ALLOCZ(s->dct_offset, 2 * 64 * sizeof(uint16_t)) | |
694 } | |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
695 } |
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
696 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
|
697 |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
698 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
|
699 |
1708 | 700 if(s->codec_id==CODEC_ID_MPEG4 || (s->flags & CODEC_FLAG_INTERLACED_ME)){ |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
701 /* interlaced direct mode decoding tables */ |
1708 | 702 for(i=0; i<2; i++){ |
703 int j, k; | |
704 for(j=0; j<2; j++){ | |
705 for(k=0; k<2; k++){ | |
706 CHECKED_ALLOCZ(s->b_field_mv_table_base[i][j][k] , mv_table_size * 2 * sizeof(int16_t)) | |
707 s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1; | |
708 } | |
709 CHECKED_ALLOCZ(s->b_field_select_table[i][j] , mb_array_size * 2 * sizeof(uint8_t)) | |
710 CHECKED_ALLOCZ(s->p_field_mv_table_base[i][j] , mv_table_size * 2 * sizeof(int16_t)) | |
711 s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1; | |
712 } | |
713 CHECKED_ALLOCZ(s->p_field_select_table[i] , mb_array_size * 2 * sizeof(uint8_t)) | |
714 } | |
0 | 715 } |
767 | 716 if (s->out_format == FMT_H263) { |
0 | 717 /* ac values */ |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
718 CHECKED_ALLOCZ(s->ac_val_base, yc_size * sizeof(int16_t) * 16); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
719 s->ac_val[0] = s->ac_val_base + s->b8_stride + 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
720 s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1; |
0 | 721 s->ac_val[2] = s->ac_val[1] + c_size; |
722 | |
723 /* cbp values */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
724 CHECKED_ALLOCZ(s->coded_block_base, y_size); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
725 s->coded_block= s->coded_block_base + s->b8_stride + 1; |
333 | 726 |
727 /* divx501 bitstream reorder buffer */ | |
456 | 728 CHECKED_ALLOCZ(s->bitstream_buffer, BITSTREAM_BUFFER_SIZE); |
843 | 729 |
456 | 730 /* 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
|
731 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
|
732 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
|
733 } |
756 | 734 |
735 if (s->h263_pred || s->h263_plus || !s->encoding) { | |
736 /* dc values */ | |
737 //MN: we need these for error resilience of intra-frames | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
738 CHECKED_ALLOCZ(s->dc_val_base, yc_size * sizeof(int16_t)); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
739 s->dc_val[0] = s->dc_val_base + s->b8_stride + 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
740 s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1; |
756 | 741 s->dc_val[2] = s->dc_val[1] + c_size; |
742 for(i=0;i<yc_size;i++) | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
743 s->dc_val_base[i] = 1024; |
756 | 744 } |
745 | |
611
3214d3f4519e
error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents:
608
diff
changeset
|
746 /* 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
|
747 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
|
748 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
|
749 |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
750 /* 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
|
751 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
|
752 //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
|
753 CHECKED_ALLOCZ(s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE); |
294 | 754 |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
755 s->parse_context.state= -1; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
756 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
757 s->visualization_buffer[0] = av_malloc((s->mb_width*16 + 2*EDGE_WIDTH) * s->mb_height*16 + 2*EDGE_WIDTH); |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
758 s->visualization_buffer[1] = av_malloc((s->mb_width*8 + EDGE_WIDTH) * s->mb_height*8 + EDGE_WIDTH); |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
759 s->visualization_buffer[2] = av_malloc((s->mb_width*8 + EDGE_WIDTH) * s->mb_height*8 + EDGE_WIDTH); |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
760 } |
842
e460775adb38
cleanup (breaks compatibility, requested by fabrice)
michaelni
parents:
828
diff
changeset
|
761 |
0 | 762 s->context_initialized = 1; |
1799 | 763 |
764 s->thread_context[0]= s; | |
765 for(i=1; i<s->avctx->thread_count; i++){ | |
766 s->thread_context[i]= av_malloc(sizeof(MpegEncContext)); | |
767 memcpy(s->thread_context[i], s, sizeof(MpegEncContext)); | |
768 } | |
769 | |
770 for(i=0; i<s->avctx->thread_count; i++){ | |
771 if(init_duplicate_context(s->thread_context[i], s) < 0) | |
772 goto fail; | |
773 s->thread_context[i]->start_mb_y= (s->mb_height*(i ) + s->avctx->thread_count/2) / s->avctx->thread_count; | |
774 s->thread_context[i]->end_mb_y = (s->mb_height*(i+1) + s->avctx->thread_count/2) / s->avctx->thread_count; | |
775 } | |
776 | |
0 | 777 return 0; |
778 fail: | |
244 | 779 MPV_common_end(s); |
780 return -1; | |
781 } | |
782 | |
783 /* init common structure for both encoder and decoder */ | |
784 void MPV_common_end(MpegEncContext *s) | |
785 { | |
1708 | 786 int i, j, k; |
244 | 787 |
1799 | 788 for(i=0; i<s->avctx->thread_count; i++){ |
789 free_duplicate_context(s->thread_context[i]); | |
790 } | |
791 for(i=1; i<s->avctx->thread_count; i++){ | |
792 av_freep(&s->thread_context[i]); | |
793 } | |
794 | |
1344
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
795 av_freep(&s->parse_context.buffer); |
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
796 s->parse_context.buffer_size=0; |
447b88b784ee
memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents:
1339
diff
changeset
|
797 |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
798 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
|
799 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
|
800 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
|
801 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
|
802 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
|
803 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
|
804 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
|
805 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
|
806 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
|
807 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
|
808 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
|
809 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
|
810 s->b_direct_mv_table= NULL; |
1708 | 811 for(i=0; i<2; i++){ |
812 for(j=0; j<2; j++){ | |
813 for(k=0; k<2; k++){ | |
814 av_freep(&s->b_field_mv_table_base[i][j][k]); | |
815 s->b_field_mv_table[i][j][k]=NULL; | |
816 } | |
817 av_freep(&s->b_field_select_table[i][j]); | |
818 av_freep(&s->p_field_mv_table_base[i][j]); | |
819 s->p_field_mv_table[i][j]=NULL; | |
820 } | |
821 av_freep(&s->p_field_select_table[i]); | |
822 } | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
823 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
824 av_freep(&s->dc_val_base); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
825 av_freep(&s->ac_val_base); |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
826 av_freep(&s->coded_block_base); |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
827 av_freep(&s->mbintra_table); |
456 | 828 av_freep(&s->cbp_table); |
829 av_freep(&s->pred_dir_table); | |
830 | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
831 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
|
832 av_freep(&s->prev_pict_types); |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
376
diff
changeset
|
833 av_freep(&s->bitstream_buffer); |
612 | 834 av_freep(&s->avctx->stats_out); |
650
ef4a33aad86e
reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents:
635
diff
changeset
|
835 av_freep(&s->ac_stats); |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
836 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
|
837 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
|
838 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
|
839 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
|
840 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
|
841 av_freep(&s->q_intra_matrix16); |
d736e24bf303
move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents:
1553
diff
changeset
|
842 av_freep(&s->q_inter_matrix16); |
1556 | 843 av_freep(&s->input_picture); |
844 av_freep(&s->reordered_input_picture); | |
1597 | 845 av_freep(&s->dct_offset); |
903 | 846 |
1573 | 847 if(s->picture){ |
848 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
849 free_picture(s, &s->picture[i]); | |
850 } | |
0 | 851 } |
1552
26c6ecba99a1
dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents:
1546
diff
changeset
|
852 av_freep(&s->picture); |
0 | 853 s->context_initialized = 0; |
1523 | 854 s->last_picture_ptr= |
855 s->next_picture_ptr= | |
856 s->current_picture_ptr= NULL; | |
2231 | 857 s->linesize= s->uvlinesize= 0; |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
858 |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
859 for(i=0; i<3; i++) |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
860 av_freep(&s->visualization_buffer[i]); |
2231 | 861 |
862 avcodec_default_free_buffers(s->avctx); | |
0 | 863 } |
864 | |
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
|
865 #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
|
866 |
0 | 867 /* init video encoder */ |
868 int MPV_encode_init(AVCodecContext *avctx) | |
869 { | |
870 MpegEncContext *s = avctx->priv_data; | |
1424 | 871 int i, dummy; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
872 int chroma_h_shift, chroma_v_shift; |
1892 | 873 |
874 MPV_encode_defaults(s); | |
315 | 875 |
1402
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1397
diff
changeset
|
876 avctx->pix_fmt = PIX_FMT_YUV420P; // FIXME |
f662e9c86cf2
* fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents:
1397
diff
changeset
|
877 |
0 | 878 s->bit_rate = avctx->bit_rate; |
879 s->width = avctx->width; | |
880 s->height = avctx->height; | |
456 | 881 if(avctx->gop_size > 600){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
882 av_log(avctx, AV_LOG_ERROR, "Warning keyframe interval too large! reducing it ...\n"); |
456 | 883 avctx->gop_size=600; |
884 } | |
0 | 885 s->gop_size = avctx->gop_size; |
194
27d1773552c9
mpeg4 encoder fix by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents:
191
diff
changeset
|
886 s->avctx = avctx; |
294 | 887 s->flags= avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
888 s->flags2= avctx->flags2; |
324 | 889 s->max_b_frames= avctx->max_b_frames; |
344 | 890 s->codec_id= avctx->codec->id; |
456 | 891 s->luma_elim_threshold = avctx->luma_elim_threshold; |
892 s->chroma_elim_threshold= avctx->chroma_elim_threshold; | |
893 s->strict_std_compliance= avctx->strict_std_compliance; | |
894 s->data_partitioning= avctx->flags & CODEC_FLAG_PART; | |
936 | 895 s->quarter_sample= (avctx->flags & CODEC_FLAG_QPEL)!=0; |
599 | 896 s->mpeg_quant= avctx->mpeg_quant; |
1661 | 897 s->rtp_mode= !!avctx->rtp_payload_size; |
1992 | 898 s->intra_dc_precision= avctx->intra_dc_precision; |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
899 s->user_specified_pts = AV_NOPTS_VALUE; |
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
|
900 |
0 | 901 if (s->gop_size <= 1) { |
902 s->intra_only = 1; | |
903 s->gop_size = 12; | |
904 } else { | |
905 s->intra_only = 0; | |
906 } | |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
907 |
936 | 908 s->me_method = avctx->me_method; |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
909 |
320
cda7d0857baf
- ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents:
315
diff
changeset
|
910 /* Fixed QSCALE */ |
1708 | 911 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
|
912 |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
913 s->adaptive_quant= ( s->avctx->lumi_masking |
693
b6a7ff92df57
darkness masking (lumi masking does only bright stuff now)
michaelni
parents:
690
diff
changeset
|
914 || s->avctx->dark_masking |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
915 || s->avctx->temporal_cplx_masking |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
916 || s->avctx->spatial_cplx_masking |
1616 | 917 || s->avctx->p_masking |
918 || (s->flags&CODEC_FLAG_QP_RD)) | |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
919 && !s->fixed_qscale; |
697 | 920 |
1708 | 921 s->obmc= !!(s->flags & CODEC_FLAG_OBMC); |
922 s->loop_filter= !!(s->flags & CODEC_FLAG_LOOP_FILTER); | |
923 s->alternate_scan= !!(s->flags & CODEC_FLAG_ALT_SCAN); | |
1633 | 924 |
1711 | 925 if(avctx->rc_max_rate && !avctx->rc_buffer_size){ |
926 av_log(avctx, AV_LOG_ERROR, "a vbv buffer size is needed, for encoding with a maximum bitrate\n"); | |
927 return -1; | |
928 } | |
929 | |
930 if(avctx->rc_min_rate && avctx->rc_max_rate != avctx->rc_min_rate){ | |
931 av_log(avctx, AV_LOG_INFO, "Warning min_rate > 0 but min_rate != max_rate isnt recommanded!\n"); | |
1907 | 932 } |
933 | |
2063 | 934 if(avctx->rc_min_rate && avctx->rc_min_rate > avctx->bit_rate){ |
935 av_log(avctx, AV_LOG_INFO, "bitrate below min bitrate\n"); | |
936 return -1; | |
937 } | |
938 | |
939 if(avctx->rc_max_rate && avctx->rc_max_rate < avctx->bit_rate){ | |
940 av_log(avctx, AV_LOG_INFO, "bitrate above max bitrate\n"); | |
941 return -1; | |
942 } | |
943 | |
1907 | 944 if( s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate |
945 && (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO) | |
946 && 90000LL * (avctx->rc_buffer_size-1) > s->avctx->rc_max_rate*0xFFFFLL){ | |
1711 | 947 |
1907 | 948 av_log(avctx, AV_LOG_INFO, "Warning vbv_delay will be set to 0xFFFF (=VBR) as the specified vbv buffer is too large for the given bitrate!\n"); |
949 } | |
950 | |
1633 | 951 if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4 |
1790 | 952 && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P && s->codec_id != CODEC_ID_FLV1){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
953 av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n"); |
1188 | 954 return -1; |
955 } | |
1711 | 956 |
1633 | 957 if(s->obmc && s->avctx->mb_decision != FF_MB_DECISION_SIMPLE){ |
958 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with simple mb decission\n"); | |
959 return -1; | |
960 } | |
961 | |
1644 | 962 if(s->obmc && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P){ |
963 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with H263(+)\n"); | |
964 return -1; | |
965 } | |
966 | |
1188 | 967 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
|
968 av_log(avctx, AV_LOG_ERROR, "qpel not supported by codec\n"); |
1188 | 969 return -1; |
970 } | |
971 | |
972 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
|
973 av_log(avctx, AV_LOG_ERROR, "data partitioning not supported by codec\n"); |
1188 | 974 return -1; |
975 } | |
976 | |
1421 | 977 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
|
978 av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n"); |
1188 | 979 return -1; |
980 } | |
1958 | 981 |
982 if((s->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN)) | |
983 && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO){ | |
984 av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n"); | |
985 return -1; | |
986 } | |
987 | |
1188 | 988 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
|
989 av_log(avctx, AV_LOG_ERROR, "mpeg2 style quantization not supporetd by codec\n"); |
1188 | 990 return -1; |
991 } | |
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
|
992 |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
993 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
|
994 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
|
995 return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
996 } |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
997 |
1622 | 998 if((s->flags & CODEC_FLAG_QP_RD) && s->avctx->mb_decision != FF_MB_DECISION_RD){ |
999 av_log(avctx, AV_LOG_ERROR, "QP RD needs mbd=2\n"); | |
1000 return -1; | |
1001 } | |
1002 | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1003 if(s->avctx->scenechange_threshold < 1000000000 && (s->flags & CODEC_FLAG_CLOSED_GOP)){ |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1004 av_log(avctx, AV_LOG_ERROR, "closed gop with scene change detection arent supported yet\n"); |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1005 return -1; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1006 } |
1799 | 1007 |
1008 if(s->avctx->thread_count > 1 && s->codec_id != CODEC_ID_MPEG4 | |
1009 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO | |
1010 && (s->codec_id != CODEC_ID_H263P || !(s->flags & CODEC_FLAG_H263P_SLICE_STRUCT))){ | |
1011 av_log(avctx, AV_LOG_ERROR, "multi threaded encoding not supported by codec\n"); | |
1012 return -1; | |
1013 } | |
1014 | |
1015 if(s->avctx->thread_count > 1) | |
1016 s->rtp_mode= 1; | |
1760 | 1017 |
1018 i= ff_gcd(avctx->frame_rate, avctx->frame_rate_base); | |
1019 if(i > 1){ | |
1020 av_log(avctx, AV_LOG_INFO, "removing common factors from framerate\n"); | |
1021 avctx->frame_rate /= i; | |
1022 avctx->frame_rate_base /= i; | |
1023 // return -1; | |
1024 } | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
1025 |
1150 | 1026 if(s->codec_id==CODEC_ID_MJPEG){ |
1027 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x | |
1028 s->inter_quant_bias= 0; | |
1421 | 1029 }else if(s->mpeg_quant || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO){ |
1150 | 1030 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x |
1031 s->inter_quant_bias= 0; | |
1032 }else{ | |
1033 s->intra_quant_bias=0; | |
1034 s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x | |
1035 } | |
1036 | |
1037 if(avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS) | |
1038 s->intra_quant_bias= avctx->intra_quant_bias; | |
1039 if(avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS) | |
1040 s->inter_quant_bias= avctx->inter_quant_bias; | |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1041 |
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1042 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
|
1043 |
1424 | 1044 av_reduce(&s->time_increment_resolution, &dummy, s->avctx->frame_rate, s->avctx->frame_rate_base, (1<<16)-1); |
1045 s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1; | |
1046 | |
0 | 1047 switch(avctx->codec->id) { |
1048 case CODEC_ID_MPEG1VIDEO: | |
1049 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
|
1050 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
|
1051 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
0 | 1052 break; |
1421 | 1053 case CODEC_ID_MPEG2VIDEO: |
1054 s->out_format = FMT_MPEG1; | |
1055 s->low_delay= 0; //s->max_b_frames ? 0 : 1; | |
1056 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); | |
1661 | 1057 s->rtp_mode= 1; |
1421 | 1058 break; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1059 case CODEC_ID_LJPEG: |
0 | 1060 case CODEC_ID_MJPEG: |
1061 s->out_format = FMT_MJPEG; | |
1062 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
|
1063 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
|
1064 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
|
1065 s->mjpeg_vsample[0] = 1<<chroma_v_shift; |
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1066 s->mjpeg_vsample[1] = 1; |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1067 s->mjpeg_vsample[2] = 1; |
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1288
diff
changeset
|
1068 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
|
1069 s->mjpeg_hsample[1] = 1; |
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1070 s->mjpeg_hsample[2] = 1; |
0 | 1071 if (mjpeg_init(s) < 0) |
1072 return -1; | |
336 | 1073 avctx->delay=0; |
924 | 1074 s->low_delay=1; |
0 | 1075 break; |
1042 | 1076 #ifdef CONFIG_RISKY |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1077 case CODEC_ID_H261: |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1078 s->out_format = FMT_H261; |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1079 avctx->delay=0; |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1080 s->low_delay=1; |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1081 break; |
0 | 1082 case CODEC_ID_H263: |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1083 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
|
1084 av_log(avctx, AV_LOG_INFO, "Input picture size isn't suitable for h263 codec! try h263+\n"); |
0 | 1085 return -1; |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1086 } |
0 | 1087 s->out_format = FMT_H263; |
1644 | 1088 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; |
336 | 1089 avctx->delay=0; |
924 | 1090 s->low_delay=1; |
0 | 1091 break; |
1092 case CODEC_ID_H263P: | |
1093 s->out_format = FMT_H263; | |
1094 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
|
1095 /* Fx */ |
1644 | 1096 s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0; |
1095
c7604e6291c5
extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents:
1094
diff
changeset
|
1097 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0; |
1644 | 1098 s->modified_quant= s->h263_aic; |
1637 | 1099 s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0; |
1644 | 1100 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0; |
1101 s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0; | |
1102 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus; | |
1661 | 1103 s->h263_slice_structured= (s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) ? 1:0; |
1644 | 1104 |
1095
c7604e6291c5
extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents:
1094
diff
changeset
|
1105 /* /Fx */ |
79
82e579c37bc3
Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents:
78
diff
changeset
|
1106 /* These are just to be sure */ |
336 | 1107 avctx->delay=0; |
924 | 1108 s->low_delay=1; |
0 | 1109 break; |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1110 case CODEC_ID_FLV1: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1111 s->out_format = FMT_H263; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1112 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
|
1113 s->unrestricted_mv = 1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1114 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
|
1115 avctx->delay=0; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1116 s->low_delay=1; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
1117 break; |
0 | 1118 case CODEC_ID_RV10: |
1119 s->out_format = FMT_H263; | |
336 | 1120 avctx->delay=0; |
924 | 1121 s->low_delay=1; |
0 | 1122 break; |
71 | 1123 case CODEC_ID_MPEG4: |
0 | 1124 s->out_format = FMT_H263; |
1125 s->h263_pred = 1; | |
1126 s->unrestricted_mv = 1; | |
924 | 1127 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
|
1128 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); |
0 | 1129 break; |
307 | 1130 case CODEC_ID_MSMPEG4V1: |
0 | 1131 s->out_format = FMT_H263; |
1132 s->h263_msmpeg4 = 1; | |
1133 s->h263_pred = 1; | |
1134 s->unrestricted_mv = 1; | |
307 | 1135 s->msmpeg4_version= 1; |
336 | 1136 avctx->delay=0; |
924 | 1137 s->low_delay=1; |
307 | 1138 break; |
1139 case CODEC_ID_MSMPEG4V2: | |
1140 s->out_format = FMT_H263; | |
1141 s->h263_msmpeg4 = 1; | |
1142 s->h263_pred = 1; | |
1143 s->unrestricted_mv = 1; | |
1144 s->msmpeg4_version= 2; | |
336 | 1145 avctx->delay=0; |
924 | 1146 s->low_delay=1; |
307 | 1147 break; |
1148 case CODEC_ID_MSMPEG4V3: | |
1149 s->out_format = FMT_H263; | |
1150 s->h263_msmpeg4 = 1; | |
1151 s->h263_pred = 1; | |
1152 s->unrestricted_mv = 1; | |
1153 s->msmpeg4_version= 3; | |
1163 | 1154 s->flipflop_rounding=1; |
336 | 1155 avctx->delay=0; |
924 | 1156 s->low_delay=1; |
0 | 1157 break; |
499 | 1158 case CODEC_ID_WMV1: |
1159 s->out_format = FMT_H263; | |
1160 s->h263_msmpeg4 = 1; | |
1161 s->h263_pred = 1; | |
1162 s->unrestricted_mv = 1; | |
1163 s->msmpeg4_version= 4; | |
1163 | 1164 s->flipflop_rounding=1; |
499 | 1165 avctx->delay=0; |
924 | 1166 s->low_delay=1; |
499 | 1167 break; |
1168 case CODEC_ID_WMV2: | |
1169 s->out_format = FMT_H263; | |
1170 s->h263_msmpeg4 = 1; | |
1171 s->h263_pred = 1; | |
1172 s->unrestricted_mv = 1; | |
1173 s->msmpeg4_version= 5; | |
1163 | 1174 s->flipflop_rounding=1; |
499 | 1175 avctx->delay=0; |
924 | 1176 s->low_delay=1; |
499 | 1177 break; |
1042 | 1178 #endif |
0 | 1179 default: |
1180 return -1; | |
1181 } | |
2042 | 1182 |
1183 avctx->has_b_frames= !s->low_delay; | |
1749
7b11032507e2
removing broken framerate conversation hack in mpeg1/2
michael
parents:
1742
diff
changeset
|
1184 |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1185 s->encoding = 1; |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
1186 |
0 | 1187 /* init */ |
1188 if (MPV_common_init(s) < 0) | |
1189 return -1; | |
1678 | 1190 |
1191 if(s->modified_quant) | |
1192 s->chroma_qscale_table= ff_h263_chroma_qscale_table; | |
1193 s->progressive_frame= | |
1708 | 1194 s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)); |
1799 | 1195 s->quant_precision=5; |
0 | 1196 |
1729 | 1197 ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp); |
1198 | |
815
78accc54493b
put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents:
814
diff
changeset
|
1199 #ifdef CONFIG_ENCODERS |
1042 | 1200 #ifdef CONFIG_RISKY |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1201 if (s->out_format == FMT_H261) |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1202 ff_h261_encode_init(s); |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1203 if (s->out_format == FMT_H263) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1204 h263_encode_init(s); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1205 if(s->msmpeg4_version) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1206 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
|
1207 #endif |
1042 | 1208 if (s->out_format == FMT_MPEG1) |
1209 ff_mpeg1_encode_init(s); | |
1210 #endif | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1211 |
1892 | 1212 /* init q matrix */ |
60 | 1213 for(i=0;i<64;i++) { |
1092 | 1214 int j= s->dsp.idct_permutation[i]; |
1042 | 1215 #ifdef CONFIG_RISKY |
599 | 1216 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
|
1217 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
|
1218 s->inter_matrix[j] = ff_mpeg4_default_non_intra_matrix[i]; |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
1219 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1220 s->intra_matrix[j] = |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1221 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
1042 | 1222 }else |
1223 #endif | |
1421 | 1224 { /* mpeg1/2 */ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
1225 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
|
1226 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; |
599 | 1227 } |
1411 | 1228 if(s->avctx->intra_matrix) |
1229 s->intra_matrix[j] = s->avctx->intra_matrix[i]; | |
1230 if(s->avctx->inter_matrix) | |
1231 s->inter_matrix[j] = s->avctx->inter_matrix[i]; | |
344 | 1232 } |
1233 | |
1234 /* precompute matrix */ | |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
1235 /* for mjpeg, we do include qscale in the matrix */ |
344 | 1236 if (s->out_format != FMT_MJPEG) { |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
1237 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
|
1238 s->intra_matrix, s->intra_quant_bias, 1, 31); |
1579
039cb2296de2
make convert_matrix() independant of MpegEncContext
michael
parents:
1573
diff
changeset
|
1239 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
|
1240 s->inter_matrix, s->inter_quant_bias, 1, 31); |
60 | 1241 } |
1242 | |
329 | 1243 if(ff_rate_control_init(s) < 0) |
1244 return -1; | |
1892 | 1245 |
0 | 1246 return 0; |
1247 } | |
1248 | |
1249 int MPV_encode_end(AVCodecContext *avctx) | |
1250 { | |
1251 MpegEncContext *s = avctx->priv_data; | |
1252 | |
1253 #ifdef STATS | |
1254 print_stats(); | |
1255 #endif | |
329 | 1256 |
1257 ff_rate_control_uninit(s); | |
1258 | |
0 | 1259 MPV_common_end(s); |
1260 if (s->out_format == FMT_MJPEG) | |
1261 mjpeg_close(s); | |
1458
40b69d238beb
AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents:
1451
diff
changeset
|
1262 |
1424 | 1263 av_freep(&avctx->extradata); |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
1264 |
0 | 1265 return 0; |
1266 } | |
1267 | |
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
|
1268 #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
|
1269 |
1042 | 1270 void init_rl(RLTable *rl) |
1271 { | |
1064 | 1272 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1]; |
1273 uint8_t index_run[MAX_RUN+1]; | |
1042 | 1274 int last, run, level, start, end, i; |
1275 | |
1276 /* compute max_level[], max_run[] and index_run[] */ | |
1277 for(last=0;last<2;last++) { | |
1278 if (last == 0) { | |
1279 start = 0; | |
1280 end = rl->last; | |
1281 } else { | |
1282 start = rl->last; | |
1283 end = rl->n; | |
1284 } | |
1285 | |
1286 memset(max_level, 0, MAX_RUN + 1); | |
1287 memset(max_run, 0, MAX_LEVEL + 1); | |
1288 memset(index_run, rl->n, MAX_RUN + 1); | |
1289 for(i=start;i<end;i++) { | |
1290 run = rl->table_run[i]; | |
1291 level = rl->table_level[i]; | |
1292 if (index_run[run] == rl->n) | |
1293 index_run[run] = i; | |
1294 if (level > max_level[run]) | |
1295 max_level[run] = level; | |
1296 if (run > max_run[level]) | |
1297 max_run[level] = run; | |
1298 } | |
1299 rl->max_level[last] = av_malloc(MAX_RUN + 1); | |
1300 memcpy(rl->max_level[last], max_level, MAX_RUN + 1); | |
1301 rl->max_run[last] = av_malloc(MAX_LEVEL + 1); | |
1302 memcpy(rl->max_run[last], max_run, MAX_LEVEL + 1); | |
1303 rl->index_run[last] = av_malloc(MAX_RUN + 1); | |
1304 memcpy(rl->index_run[last], index_run, MAX_RUN + 1); | |
1305 } | |
1306 } | |
1307 | |
0 | 1308 /* 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
|
1309 //FIXME check that this is ok for mpeg4 interlaced |
1064 | 1310 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w) |
0 | 1311 { |
1064 | 1312 uint8_t *ptr, *last_line; |
0 | 1313 int i; |
1314 | |
1315 last_line = buf + (height - 1) * wrap; | |
1316 for(i=0;i<w;i++) { | |
1317 /* top and bottom */ | |
1318 memcpy(buf - (i + 1) * wrap, buf, width); | |
1319 memcpy(last_line + (i + 1) * wrap, last_line, width); | |
1320 } | |
1321 /* left and right */ | |
1322 ptr = buf; | |
1323 for(i=0;i<height;i++) { | |
1324 memset(ptr - w, ptr[0], w); | |
1325 memset(ptr + width, ptr[width-1], w); | |
1326 ptr += wrap; | |
1327 } | |
1328 /* corners */ | |
1329 for(i=0;i<w;i++) { | |
1330 memset(buf - (i + 1) * wrap - w, buf[0], w); /* top left */ | |
1331 memset(buf - (i + 1) * wrap + width, buf[width-1], w); /* top right */ | |
1332 memset(last_line + (i + 1) * wrap - w, last_line[0], w); /* top left */ | |
1333 memset(last_line + (i + 1) * wrap + width, last_line[width-1], w); /* top right */ | |
1334 } | |
1335 } | |
1336 | |
1586 | 1337 int ff_find_unused_picture(MpegEncContext *s, int shared){ |
924 | 1338 int i; |
1339 | |
1340 if(shared){ | |
1341 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1342 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) return i; |
924 | 1343 } |
1344 }else{ | |
1345 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1346 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) return i; //FIXME |
924 | 1347 } |
1348 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1586 | 1349 if(s->picture[i].data[0]==NULL) return i; |
924 | 1350 } |
1351 } | |
1352 | |
1586 | 1353 assert(0); |
1354 return -1; | |
924 | 1355 } |
1356 | |
1597 | 1357 static void update_noise_reduction(MpegEncContext *s){ |
1358 int intra, i; | |
1359 | |
1360 for(intra=0; intra<2; intra++){ | |
1361 if(s->dct_count[intra] > (1<<16)){ | |
1362 for(i=0; i<64; i++){ | |
1363 s->dct_error_sum[intra][i] >>=1; | |
1364 } | |
1365 s->dct_count[intra] >>= 1; | |
1366 } | |
1367 | |
1368 for(i=0; i<64; i++){ | |
1369 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); | |
1370 } | |
1371 } | |
1372 } | |
1373 | |
1586 | 1374 /** |
1375 * generic function for encode/decode called after coding/decoding the header and before a frame is coded/decoded | |
1376 */ | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1377 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) |
0 | 1378 { |
924 | 1379 int i; |
925 | 1380 AVFrame *pic; |
46
931417475f5b
fixed mpeg1 first block bug (pb with black picture optimisation for B frames)
glantau
parents:
40
diff
changeset
|
1381 s->mb_skiped = 0; |
1168 | 1382 |
1234 | 1383 assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3); |
1228 | 1384 |
903 | 1385 /* mark&release old frames */ |
1944 | 1386 if (s->pict_type != B_TYPE && s->last_picture_ptr && s->last_picture_ptr != s->next_picture_ptr && s->last_picture_ptr->data[0]) { |
1138 | 1387 avctx->release_buffer(avctx, (AVFrame*)s->last_picture_ptr); |
903 | 1388 |
1389 /* release forgotten pictures */ | |
1390 /* if(mpeg124/h263) */ | |
1391 if(!s->encoding){ | |
1392 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1138 | 1393 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
|
1394 av_log(avctx, AV_LOG_ERROR, "releasing zombie picture\n"); |
925 | 1395 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); |
903 | 1396 } |
1397 } | |
1398 } | |
1399 } | |
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1400 alloc: |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1401 if(!s->encoding){ |
1228 | 1402 /* release non refernce frames */ |
1403 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1404 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
1405 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
1406 } | |
1407 } | |
1408 | |
1586 | 1409 if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL) |
1410 pic= (AVFrame*)s->current_picture_ptr; //we allready have a unused image (maybe it was set before reading the header) | |
1411 else{ | |
1412 i= ff_find_unused_picture(s, 0); | |
1413 pic= (AVFrame*)&s->picture[i]; | |
1414 } | |
1415 | |
1944 | 1416 pic->reference= s->pict_type != B_TYPE && !s->dropable ? 3 : 0; |
1138 | 1417 |
1705 | 1418 pic->coded_picture_number= s->coded_picture_number++; |
903 | 1419 |
1384 | 1420 if( alloc_picture(s, (Picture*)pic, 0) < 0) |
1421 return -1; | |
903 | 1422 |
1586 | 1423 s->current_picture_ptr= (Picture*)pic; |
1658 | 1424 s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic |
1659 | 1425 s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence; |
903 | 1426 } |
456 | 1427 |
1173 | 1428 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
|
1429 // 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
|
1430 // 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
|
1431 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE; |
1173 | 1432 |
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
|
1433 copy_picture(&s->current_picture, s->current_picture_ptr); |
1173 | 1434 |
1234 | 1435 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){ |
903 | 1436 if (s->pict_type != B_TYPE) { |
1138 | 1437 s->last_picture_ptr= s->next_picture_ptr; |
1944 | 1438 if(!s->dropable) |
1439 s->next_picture_ptr= s->current_picture_ptr; | |
1440 } | |
1441 /* av_log(s->avctx, AV_LOG_DEBUG, "L%p N%p C%p L%p N%p C%p type:%d drop:%d\n", s->last_picture_ptr, s->next_picture_ptr,s->current_picture_ptr, | |
1442 s->last_picture_ptr ? s->last_picture_ptr->data[0] : NULL, | |
1443 s->next_picture_ptr ? s->next_picture_ptr->data[0] : NULL, | |
1444 s->current_picture_ptr ? s->current_picture_ptr->data[0] : NULL, | |
1445 s->pict_type, s->dropable);*/ | |
1214 | 1446 |
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
|
1447 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
|
1448 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); |
1138 | 1449 |
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
|
1450 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
|
1451 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); |
1393 | 1452 assert(s->pict_type != B_TYPE); //these should have been dropped if we dont have a reference |
1453 goto alloc; | |
1454 } | |
1455 | |
1456 assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0])); | |
1457 | |
1138 | 1458 if(s->picture_structure!=PICT_FRAME){ |
1459 int i; | |
1460 for(i=0; i<4; i++){ | |
1461 if(s->picture_structure == PICT_BOTTOM_FIELD){ | |
1462 s->current_picture.data[i] += s->current_picture.linesize[i]; | |
1463 } | |
1464 s->current_picture.linesize[i] *= 2; | |
1465 s->last_picture.linesize[i] *=2; | |
1466 s->next_picture.linesize[i] *=2; | |
1467 } | |
553 | 1468 } |
1168 | 1469 } |
903 | 1470 |
910
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1471 s->hurry_up= s->avctx->hurry_up; |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1472 s->error_resilience= avctx->error_resilience; |
eb448df811be
fixing files where the first frame isn a keyframe
michaelni
parents:
909
diff
changeset
|
1473 |
591 | 1474 /* set dequantizer, we cant do it during init as it might change for mpeg4 |
1475 and we cant do it in the header decode as init isnt called for mpeg4 there yet */ | |
1689 | 1476 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){ |
1477 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; | |
1478 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; | |
2345 | 1479 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ |
1689 | 1480 s->dct_unquantize_intra = s->dct_unquantize_h263_intra; |
1481 s->dct_unquantize_inter = s->dct_unquantize_h263_inter; | |
1482 }else{ | |
1483 s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra; | |
1484 s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter; | |
1485 } | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1486 |
1597 | 1487 if(s->dct_error_sum){ |
1488 assert(s->avctx->noise_reduction && s->encoding); | |
1489 | |
1490 update_noise_reduction(s); | |
1491 } | |
1492 | |
1381 | 1493 #ifdef HAVE_XVMC |
1494 if(s->avctx->xvmc_acceleration) | |
1495 return XVMC_field_start(s, avctx); | |
1496 #endif | |
771
d4cc92144266
handle direct rendering buffer allocation failure
michaelni
parents:
768
diff
changeset
|
1497 return 0; |
0 | 1498 } |
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
|
1499 |
0 | 1500 /* generic function for encode/decode called after a frame has been coded/decoded */ |
1501 void MPV_frame_end(MpegEncContext *s) | |
1502 { | |
903 | 1503 int i; |
0 | 1504 /* draw edge for correct motion prediction if outside */ |
1381 | 1505 #ifdef HAVE_XVMC |
1506 //just to make sure that all data is rendered. | |
1507 if(s->avctx->xvmc_acceleration){ | |
1508 XVMC_field_end(s); | |
1509 }else | |
1510 #endif | |
1542
576861d6343a
emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents:
1539
diff
changeset
|
1511 if(s->unrestricted_mv && s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) { |
903 | 1512 draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH ); |
1513 draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
1514 draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2); | |
0 | 1515 } |
207 | 1516 emms_c(); |
329 | 1517 |
612 | 1518 s->last_pict_type = s->pict_type; |
329 | 1519 if(s->pict_type!=B_TYPE){ |
1520 s->last_non_b_pict_type= s->pict_type; | |
1521 } | |
1138 | 1522 #if 0 |
1523 /* copy back current_picture variables */ | |
903 | 1524 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
1525 if(s->picture[i].data[0] == s->current_picture.data[0]){ | |
1526 s->picture[i]= s->current_picture; | |
1527 break; | |
1528 } | |
1529 } | |
1530 assert(i<MAX_PICTURE_COUNT); | |
1138 | 1531 #endif |
903 | 1532 |
1228 | 1533 if(s->encoding){ |
1534 /* release non refernce frames */ | |
1535 for(i=0; i<MAX_PICTURE_COUNT; i++){ | |
1536 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){ | |
1537 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]); | |
1538 } | |
1539 } | |
324 | 1540 } |
1138 | 1541 // clear copies, to avoid confusion |
1542 #if 0 | |
1543 memset(&s->last_picture, 0, sizeof(Picture)); | |
1544 memset(&s->next_picture, 0, sizeof(Picture)); | |
1545 memset(&s->current_picture, 0, sizeof(Picture)); | |
1546 #endif | |
2213 | 1547 s->avctx->coded_frame= (AVFrame*)s->current_picture_ptr; |
903 | 1548 } |
1549 | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1550 /** |
1285 | 1551 * draws an line from (ex, ey) -> (sx, sy). |
1552 * @param w width of the image | |
1553 * @param h height of the image | |
1554 * @param stride stride/linesize of the image | |
1555 * @param color color of the arrow | |
1556 */ | |
1557 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ | |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1558 int t, x, y, fr, f; |
1285 | 1559 |
1560 sx= clip(sx, 0, w-1); | |
1561 sy= clip(sy, 0, h-1); | |
1562 ex= clip(ex, 0, w-1); | |
1563 ey= clip(ey, 0, h-1); | |
1564 | |
1565 buf[sy*stride + sx]+= color; | |
1566 | |
1567 if(ABS(ex - sx) > ABS(ey - sy)){ | |
1568 if(sx > ex){ | |
1569 t=sx; sx=ex; ex=t; | |
1570 t=sy; sy=ey; ey=t; | |
1571 } | |
1572 buf+= sx + sy*stride; | |
1573 ex-= sx; | |
1574 f= ((ey-sy)<<16)/ex; | |
1575 for(x= 0; x <= ex; x++){ | |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1576 y = (x*f)>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1577 fr= (x*f)&0xFFFF; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1578 buf[ y *stride + x]+= (color*(0x10000-fr))>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1579 buf[(y+1)*stride + x]+= (color* fr )>>16; |
1285 | 1580 } |
1581 }else{ | |
1582 if(sy > ey){ | |
1583 t=sx; sx=ex; ex=t; | |
1584 t=sy; sy=ey; ey=t; | |
1585 } | |
1586 buf+= sx + sy*stride; | |
1587 ey-= sy; | |
1588 if(ey) f= ((ex-sx)<<16)/ey; | |
1589 else f= 0; | |
1590 for(y= 0; y <= ey; y++){ | |
1918
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1591 x = (y*f)>>16; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1592 fr= (y*f)&0xFFFF; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1593 buf[y*stride + x ]+= (color*(0x10000-fr))>>16;; |
ea20f38b8d57
nicer looking arrows for the motion vector vissualization
michael
parents:
1916
diff
changeset
|
1594 buf[y*stride + x+1]+= (color* fr )>>16;; |
1285 | 1595 } |
1596 } | |
1597 } | |
1598 | |
1599 /** | |
1600 * draws an arrow from (ex, ey) -> (sx, sy). | |
1601 * @param w width of the image | |
1602 * @param h height of the image | |
1603 * @param stride stride/linesize of the image | |
1604 * @param color color of the arrow | |
1605 */ | |
1606 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){ | |
1607 int dx,dy; | |
1608 | |
1609 sx= clip(sx, -100, w+100); | |
1610 sy= clip(sy, -100, h+100); | |
1611 ex= clip(ex, -100, w+100); | |
1612 ey= clip(ey, -100, h+100); | |
1613 | |
1614 dx= ex - sx; | |
1615 dy= ey - sy; | |
1616 | |
1617 if(dx*dx + dy*dy > 3*3){ | |
1618 int rx= dx + dy; | |
1619 int ry= -dx + dy; | |
1620 int length= ff_sqrt((rx*rx + ry*ry)<<8); | |
1621 | |
1622 //FIXME subpixel accuracy | |
1623 rx= ROUNDED_DIV(rx*3<<4, length); | |
1624 ry= ROUNDED_DIV(ry*3<<4, length); | |
1625 | |
1626 draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color); | |
1627 draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color); | |
1628 } | |
1629 draw_line(buf, sx, sy, ex, ey, w, h, stride, color); | |
1630 } | |
1631 | |
1632 /** | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1633 * 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
|
1634 */ |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1635 void ff_print_debug_info(MpegEncContext *s, AVFrame *pict){ |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1636 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1637 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
|
1638 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1639 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
|
1640 int x,y; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1641 |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1642 av_log(s->avctx,AV_LOG_DEBUG,"New frame, type: "); |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1643 switch (pict->pict_type) { |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1644 case FF_I_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"I\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1645 case FF_P_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"P\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1646 case FF_B_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"B\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1647 case FF_S_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"S\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1648 case FF_SI_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SI\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1649 case FF_SP_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SP\n"); break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1650 } |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1651 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
|
1652 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
|
1653 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
|
1654 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
|
1655 if(count>9) count=9; |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1656 av_log(s->avctx, AV_LOG_DEBUG, "%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
|
1657 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1658 if(s->avctx->debug&FF_DEBUG_QP){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1659 av_log(s->avctx, AV_LOG_DEBUG, "%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
|
1660 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1661 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
|
1662 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
|
1663 //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
|
1664 if(IS_PCM(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1665 av_log(s->avctx, AV_LOG_DEBUG, "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
|
1666 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
|
1667 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
|
1668 else if(IS_INTRA4x4(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1669 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
|
1670 else if(IS_INTRA16x16(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1671 av_log(s->avctx, AV_LOG_DEBUG, "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
|
1672 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
|
1673 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
|
1674 else if(IS_DIRECT(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1675 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
|
1676 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
|
1677 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
|
1678 else if(IS_GMC(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1679 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
|
1680 else if(IS_SKIP(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1681 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
|
1682 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
|
1683 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
|
1684 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
|
1685 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
|
1686 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
|
1687 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
|
1688 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
|
1689 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1690 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1691 //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
|
1692 if(IS_8X8(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1693 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
|
1694 else if(IS_16X8(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1695 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
|
1696 else if(IS_8X16(mb_type)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1697 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
|
1698 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
|
1699 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
|
1700 else |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1701 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
|
1702 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1703 |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1704 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
|
1705 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
|
1706 else |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1707 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
|
1708 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1709 // 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
|
1710 } |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1711 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
|
1712 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1713 } |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
1714 |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1715 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){ |
1285 | 1716 const int shift= 1 + s->quarter_sample; |
1717 int mb_y; | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1718 uint8_t *ptr; |
1707 | 1719 int i; |
1723
033d889d7c2c
non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1722
diff
changeset
|
1720 int h_chroma_shift, v_chroma_shift; |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1721 const int width = s->avctx->width; |
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1722 const int height= s->avctx->height; |
1285 | 1723 s->low_delay=0; //needed to see the vectors without trashing the buffers |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1724 |
1723
033d889d7c2c
non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1722
diff
changeset
|
1725 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1726 for(i=0; i<3; i++){ |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1727 memcpy(s->visualization_buffer[i], pict->data[i], (i==0) ? pict->linesize[i]*height:pict->linesize[i]*height >> v_chroma_shift); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1728 pict->data[i]= s->visualization_buffer[i]; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1729 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1730 pict->type= FF_BUFFER_TYPE_COPY; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1731 ptr= pict->data[0]; |
1285 | 1732 |
1733 for(mb_y=0; mb_y<s->mb_height; mb_y++){ | |
1734 int mb_x; | |
1735 for(mb_x=0; mb_x<s->mb_width; mb_x++){ | |
1736 const int mb_index= mb_x + mb_y*s->mb_stride; | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1737 if((s->avctx->debug_mv) && pict->motion_val){ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1738 int type; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1739 for(type=0; type<3; type++){ |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
1740 int direction = 0; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1741 switch (type) { |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1742 case 0: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_P_FOR)) || (pict->pict_type!=FF_P_TYPE)) |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1743 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1744 direction = 0; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1745 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1746 case 1: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_B_FOR)) || (pict->pict_type!=FF_B_TYPE)) |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1747 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1748 direction = 0; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1749 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1750 case 2: if ((!(s->avctx->debug_mv&FF_DEBUG_VIS_MV_B_BACK)) || (pict->pict_type!=FF_B_TYPE)) |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1751 continue; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1752 direction = 1; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1753 break; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1754 } |
1712 | 1755 if(!USES_LIST(pict->mb_type[mb_index], direction)) |
1756 continue; | |
1757 | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
1758 //FIXME for h264 |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1759 if(IS_8X8(pict->mb_type[mb_index])){ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1760 int i; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1761 for(i=0; i<4; i++){ |
1285 | 1762 int sx= mb_x*16 + 4 + 8*(i&1); |
1763 int sy= mb_y*16 + 4 + 8*(i>>1); | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
1764 int xy= mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*s->b8_stride; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1765 int mx= (pict->motion_val[direction][xy][0]>>shift) + sx; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1766 int my= (pict->motion_val[direction][xy][1]>>shift) + sy; |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1767 draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1768 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1769 }else if(IS_16X8(pict->mb_type[mb_index])){ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1770 int i; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1771 for(i=0; i<2; i++){ |
1629
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1772 int sx=mb_x*16 + 8; |
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1773 int sy=mb_y*16 + 4 + 8*i; |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
1774 int xy= mb_x*2 + (mb_y*2 + i)*s->b8_stride; |
1947
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1775 int mx=(pict->motion_val[direction][xy][0]>>shift); |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1776 int my=(pict->motion_val[direction][xy][1]>>shift); |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1777 |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1778 if(IS_INTERLACED(pict->mb_type[mb_index])) |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1779 my*=2; |
b306574523ad
fix y scale of mv vissualization of interlaced MVs
michael
parents:
1945
diff
changeset
|
1780 |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1781 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100); |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1782 } |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1783 }else{ |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1784 int sx= mb_x*16 + 8; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1785 int sy= mb_y*16 + 8; |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
1786 int xy= mb_x*2 + mb_y*2*s->b8_stride; |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1787 int mx= (pict->motion_val[direction][xy][0]>>shift) + sx; |
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1788 int my= (pict->motion_val[direction][xy][1]>>shift) + sy; |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
1789 draw_arrow(ptr, sx, sy, mx, my, width, height, s->linesize, 100); |
1629
74685a0ec851
16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1628
diff
changeset
|
1790 } |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1705
diff
changeset
|
1791 } |
1685 | 1792 } |
1793 if((s->avctx->debug&FF_DEBUG_VIS_QP) && pict->motion_val){ | |
1794 uint64_t c= (pict->qscale_table[mb_index]*128/31) * 0x0101010101010101ULL; | |
1795 int y; | |
1796 for(y=0; y<8; y++){ | |
1797 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= c; | |
1798 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= c; | |
1799 } | |
1800 } | |
1801 if((s->avctx->debug&FF_DEBUG_VIS_MB_TYPE) && pict->motion_val){ | |
1802 int mb_type= pict->mb_type[mb_index]; | |
1803 uint64_t u,v; | |
1804 int y; | |
1805 #define COLOR(theta, r)\ | |
1806 u= (int)(128 + r*cos(theta*3.141592/180));\ | |
1807 v= (int)(128 + r*sin(theta*3.141592/180)); | |
1808 | |
1809 | |
1810 u=v=128; | |
1811 if(IS_PCM(mb_type)){ | |
1812 COLOR(120,48) | |
1813 }else if((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) || IS_INTRA16x16(mb_type)){ | |
1814 COLOR(30,48) | |
1815 }else if(IS_INTRA4x4(mb_type)){ | |
1816 COLOR(90,48) | |
1817 }else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type)){ | |
1818 // COLOR(120,48) | |
1819 }else if(IS_DIRECT(mb_type)){ | |
1820 COLOR(150,48) | |
1821 }else if(IS_GMC(mb_type) && IS_SKIP(mb_type)){ | |
1822 COLOR(170,48) | |
1823 }else if(IS_GMC(mb_type)){ | |
1824 COLOR(190,48) | |
1825 }else if(IS_SKIP(mb_type)){ | |
1826 // COLOR(180,48) | |
1827 }else if(!USES_LIST(mb_type, 1)){ | |
1828 COLOR(240,48) | |
1829 }else if(!USES_LIST(mb_type, 0)){ | |
1830 COLOR(0,48) | |
1831 }else{ | |
1832 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); | |
1833 COLOR(300,48) | |
1834 } | |
1835 | |
1836 u*= 0x0101010101010101ULL; | |
1837 v*= 0x0101010101010101ULL; | |
1838 for(y=0; y<8; y++){ | |
1839 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= u; | |
1840 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= v; | |
1841 } | |
1842 | |
1843 //segmentation | |
1844 if(IS_8X8(mb_type) || IS_16X8(mb_type)){ | |
1845 *(uint64_t*)(pict->data[0] + 16*mb_x + 0 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL; | |
1846 *(uint64_t*)(pict->data[0] + 16*mb_x + 8 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL; | |
1847 } | |
1848 if(IS_8X8(mb_type) || IS_8X16(mb_type)){ | |
1849 for(y=0; y<16; y++) | |
1850 pict->data[0][16*mb_x + 8 + (16*mb_y + y)*pict->linesize[0]]^= 0x80; | |
1851 } | |
1852 | |
1853 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264){ | |
1854 // hmm | |
1855 } | |
1285 | 1856 } |
1857 s->mbskip_table[mb_index]=0; | |
1858 } | |
1859 } | |
1860 } | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1861 } |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
1862 |
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
|
1863 #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
|
1864 |
915 | 1865 static int get_sae(uint8_t *src, int ref, int stride){ |
1866 int x,y; | |
1867 int acc=0; | |
1868 | |
1869 for(y=0; y<16; y++){ | |
1870 for(x=0; x<16; x++){ | |
1871 acc+= ABS(src[x+y*stride] - ref); | |
1872 } | |
1873 } | |
1874 | |
1875 return acc; | |
1876 } | |
1877 | |
1878 static int get_intra_count(MpegEncContext *s, uint8_t *src, uint8_t *ref, int stride){ | |
1879 int x, y, w, h; | |
1880 int acc=0; | |
1881 | |
1882 w= s->width &~15; | |
1883 h= s->height&~15; | |
1884 | |
1885 for(y=0; y<h; y+=16){ | |
1886 for(x=0; x<w; x+=16){ | |
1887 int offset= x + y*stride; | |
1708 | 1888 int sad = s->dsp.sad[0](NULL, src + offset, ref + offset, stride, 16); |
915 | 1889 int mean= (s->dsp.pix_sum(src + offset, stride) + 128)>>8; |
1890 int sae = get_sae(src + offset, mean, stride); | |
1891 | |
1892 acc+= sae + 500 < sad; | |
1893 } | |
1894 } | |
1895 return acc; | |
1896 } | |
1897 | |
924 | 1898 |
925 | 1899 static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){ |
1373 | 1900 AVFrame *pic=NULL; |
924 | 1901 int i; |
903 | 1902 const int encoding_delay= s->max_b_frames; |
924 | 1903 int direct=1; |
1373 | 1904 |
1905 if(pic_arg){ | |
924 | 1906 if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0; |
1907 if(pic_arg->linesize[0] != s->linesize) direct=0; | |
1908 if(pic_arg->linesize[1] != s->uvlinesize) direct=0; | |
1909 if(pic_arg->linesize[2] != s->uvlinesize) direct=0; | |
1910 | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
1911 // av_log(AV_LOG_DEBUG, "%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize); |
924 | 1912 |
1913 if(direct){ | |
1586 | 1914 i= ff_find_unused_picture(s, 1); |
924 | 1915 |
925 | 1916 pic= (AVFrame*)&s->picture[i]; |
1168 | 1917 pic->reference= 3; |
903 | 1918 |
924 | 1919 for(i=0; i<4; i++){ |
1920 pic->data[i]= pic_arg->data[i]; | |
1921 pic->linesize[i]= pic_arg->linesize[i]; | |
1922 } | |
1923 alloc_picture(s, (Picture*)pic, 1); | |
1924 }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
|
1925 int offset= 16; |
1586 | 1926 i= ff_find_unused_picture(s, 0); |
924 | 1927 |
925 | 1928 pic= (AVFrame*)&s->picture[i]; |
1168 | 1929 pic->reference= 3; |
924 | 1930 |
1931 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
|
1932 |
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
|
1933 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
|
1934 && 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
|
1935 && pic->data[2] + offset == pic_arg->data[2]){ |
924 | 1936 // empty |
1937 }else{ | |
1938 int h_chroma_shift, v_chroma_shift; | |
1939 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); | |
1940 | |
1941 for(i=0; i<3; i++){ | |
1942 int src_stride= pic_arg->linesize[i]; | |
1943 int dst_stride= i ? s->uvlinesize : s->linesize; | |
1944 int h_shift= i ? h_chroma_shift : 0; | |
1945 int v_shift= i ? v_chroma_shift : 0; | |
1946 int w= s->width >>h_shift; | |
1947 int h= s->height>>v_shift; | |
1948 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
|
1949 uint8_t *dst= pic->data[i] + offset; |
924 | 1950 |
1951 if(src_stride==dst_stride) | |
1952 memcpy(dst, src, src_stride*h); | |
1953 else{ | |
1954 while(h--){ | |
1955 memcpy(dst, src, w); | |
1956 dst += dst_stride; | |
1957 src += src_stride; | |
1958 } | |
1959 } | |
1960 } | |
1961 } | |
324 | 1962 } |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
1963 copy_picture_attributes(s, pic, pic_arg); |
1702 | 1964 |
1705 | 1965 pic->display_picture_number= s->input_picture_number++; |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1966 |
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1829
diff
changeset
|
1967 if(pic->pts != AV_NOPTS_VALUE){ |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1968 if(s->user_specified_pts != AV_NOPTS_VALUE){ |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1969 int64_t time= av_rescale(pic->pts, s->avctx->frame_rate, s->avctx->frame_rate_base*(int64_t)AV_TIME_BASE); |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1970 int64_t last= av_rescale(s->user_specified_pts, s->avctx->frame_rate, s->avctx->frame_rate_base*(int64_t)AV_TIME_BASE); |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1971 |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1972 if(time <= last){ |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1973 av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%Ld, last=%Ld\n", pic->pts, s->user_specified_pts); |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1974 return -1; |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1975 } |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1976 } |
2251 | 1977 s->user_specified_pts= pic->pts; |
1829 | 1978 }else{ |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
1979 if(s->user_specified_pts != AV_NOPTS_VALUE){ |
2251 | 1980 s->user_specified_pts= |
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1829
diff
changeset
|
1981 pic->pts= s->user_specified_pts + AV_TIME_BASE*(int64_t)s->avctx->frame_rate_base / s->avctx->frame_rate; |
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1829
diff
changeset
|
1982 av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%Ld)\n", pic->pts); |
1829 | 1983 }else{ |
1831
cd2d7fcfab7a
use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0
michael
parents:
1829
diff
changeset
|
1984 pic->pts= av_rescale(pic->display_picture_number*(int64_t)s->avctx->frame_rate_base, AV_TIME_BASE, s->avctx->frame_rate); |
1829 | 1985 } |
1986 } | |
1373 | 1987 } |
1829 | 1988 |
903 | 1989 /* shift buffer entries */ |
1990 for(i=1; i<MAX_PICTURE_COUNT /*s->encoding_delay+1*/; i++) | |
1991 s->input_picture[i-1]= s->input_picture[i]; | |
1992 | |
1993 s->input_picture[encoding_delay]= (Picture*)pic; | |
1994 | |
1995 return 0; | |
1996 } | |
1997 | |
1998 static void select_input_picture(MpegEncContext *s){ | |
1999 int i; | |
924 | 2000 |
903 | 2001 for(i=1; i<MAX_PICTURE_COUNT; i++) |
2002 s->reordered_input_picture[i-1]= s->reordered_input_picture[i]; | |
2003 s->reordered_input_picture[MAX_PICTURE_COUNT-1]= NULL; | |
2004 | |
2005 /* set next picture types & ordering */ | |
2006 if(s->reordered_input_picture[0]==NULL && s->input_picture[0]){ | |
1138 | 2007 if(/*s->picture_in_gop_number >= s->gop_size ||*/ s->next_picture_ptr==NULL || s->intra_only){ |
915 | 2008 s->reordered_input_picture[0]= s->input_picture[0]; |
2009 s->reordered_input_picture[0]->pict_type= I_TYPE; | |
1705 | 2010 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
915 | 2011 }else{ |
2012 int b_frames; | |
2013 | |
2014 if(s->flags&CODEC_FLAG_PASS2){ | |
2015 for(i=0; i<s->max_b_frames+1; i++){ | |
2016 int pict_num= s->input_picture[0]->display_picture_number + i; | |
2017 int pict_type= s->rc_context.entry[pict_num].new_pict_type; | |
2363
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2018 |
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2019 if(!s->input_picture[i]){ |
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2020 if(i>0) |
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2021 s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE; |
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2022 break; |
e0bda0b8359a
Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)
michael
parents:
2345
diff
changeset
|
2023 } |
915 | 2024 s->input_picture[i]->pict_type= pict_type; |
2025 | |
2026 if(i + 1 >= s->rc_context.num_entries) break; | |
2027 } | |
2028 } | |
924 | 2029 |
2297 | 2030 if(s->avctx->b_frame_strategy==0){ |
915 | 2031 b_frames= s->max_b_frames; |
1373 | 2032 while(b_frames && !s->input_picture[b_frames]) b_frames--; |
1687 | 2033 }else if(s->avctx->b_frame_strategy==1){ |
915 | 2034 for(i=1; i<s->max_b_frames+1; i++){ |
1373 | 2035 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){ |
915 | 2036 s->input_picture[i]->b_frame_score= |
924 | 2037 get_intra_count(s, s->input_picture[i ]->data[0], |
2038 s->input_picture[i-1]->data[0], s->linesize) + 1; | |
915 | 2039 } |
2040 } | |
2041 for(i=0; i<s->max_b_frames; i++){ | |
1373 | 2042 if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/40) break; |
915 | 2043 } |
2044 | |
2045 b_frames= FFMAX(0, i-1); | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2046 |
915 | 2047 /* reset scores */ |
2048 for(i=0; i<b_frames+1; i++){ | |
2049 s->input_picture[i]->b_frame_score=0; | |
2050 } | |
2051 }else{ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2052 av_log(s->avctx, AV_LOG_ERROR, "illegal b frame strategy\n"); |
915 | 2053 b_frames=0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2054 } |
915 | 2055 |
2056 emms_c(); | |
2057 //static int b_count=0; | |
2058 //b_count+= b_frames; | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2059 //av_log(s->avctx, AV_LOG_DEBUG, "b_frames: %d\n", b_count); |
2297 | 2060 |
2061 for(i= b_frames - 1; i>=0; i--){ | |
2062 int type= s->input_picture[i]->pict_type; | |
2063 if(type && type != B_TYPE) | |
2064 b_frames= i; | |
2065 } | |
2066 if(s->input_picture[b_frames]->pict_type == B_TYPE && b_frames == s->max_b_frames){ | |
2067 av_log(s->avctx, AV_LOG_ERROR, "warning, too many bframes in a row\n"); | |
2068 } | |
2069 | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2070 if(s->picture_in_gop_number + b_frames >= s->gop_size){ |
2298 | 2071 if((s->flags2 & CODEC_FLAG2_STRICT_GOP) && s->gop_size > s->picture_in_gop_number){ |
2072 b_frames= s->gop_size - s->picture_in_gop_number - 1; | |
2073 }else{ | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2074 if(s->flags & CODEC_FLAG_CLOSED_GOP) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2075 b_frames=0; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2076 s->input_picture[b_frames]->pict_type= I_TYPE; |
2298 | 2077 } |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2078 } |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2079 |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2080 if( (s->flags & CODEC_FLAG_CLOSED_GOP) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2081 && b_frames |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2082 && s->input_picture[b_frames]->pict_type== I_TYPE) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2083 b_frames--; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2084 |
915 | 2085 s->reordered_input_picture[0]= s->input_picture[b_frames]; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2086 if(s->reordered_input_picture[0]->pict_type != I_TYPE) |
915 | 2087 s->reordered_input_picture[0]->pict_type= P_TYPE; |
1705 | 2088 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
915 | 2089 for(i=0; i<b_frames; i++){ |
2090 s->reordered_input_picture[i+1]= s->input_picture[i]; | |
2091 s->reordered_input_picture[i+1]->pict_type= B_TYPE; | |
1705 | 2092 s->reordered_input_picture[i+1]->coded_picture_number= s->coded_picture_number++; |
903 | 2093 } |
324 | 2094 } |
2095 } | |
903 | 2096 |
2097 if(s->reordered_input_picture[0]){ | |
1168 | 2098 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=B_TYPE ? 3 : 0; |
1138 | 2099 |
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
|
2100 copy_picture(&s->new_picture, s->reordered_input_picture[0]); |
924 | 2101 |
2102 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ | |
1138 | 2103 // input is a shared pix, so we cant modifiy it -> alloc a new one & ensure that the shared one is reuseable |
2104 | |
1586 | 2105 int i= ff_find_unused_picture(s, 0); |
924 | 2106 Picture *pic= &s->picture[i]; |
2107 | |
2108 /* mark us unused / free shared pic */ | |
2109 for(i=0; i<4; i++) | |
2110 s->reordered_input_picture[0]->data[i]= NULL; | |
2111 s->reordered_input_picture[0]->type= 0; | |
2112 | |
1702 | 2113 pic->reference = s->reordered_input_picture[0]->reference; |
924 | 2114 |
2115 alloc_picture(s, pic, 0); | |
2116 | |
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
2117 copy_picture_attributes(s, (AVFrame*)pic, (AVFrame*)s->reordered_input_picture[0]); |
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
2118 |
1138 | 2119 s->current_picture_ptr= pic; |
924 | 2120 }else{ |
1138 | 2121 // input is not a shared pix -> reuse buffer for current_pix |
2122 | |
924 | 2123 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER |
2124 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); | |
2125 | |
1138 | 2126 s->current_picture_ptr= s->reordered_input_picture[0]; |
924 | 2127 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
|
2128 s->new_picture.data[i]+=16; |
924 | 2129 } |
903 | 2130 } |
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
|
2131 copy_picture(&s->current_picture, s->current_picture_ptr); |
903 | 2132 |
2133 s->picture_number= s->new_picture.display_picture_number; | |
2134 //printf("dpn:%d\n", s->picture_number); | |
2135 }else{ | |
2136 memset(&s->new_picture, 0, sizeof(Picture)); | |
324 | 2137 } |
2138 } | |
2139 | |
0 | 2140 int MPV_encode_picture(AVCodecContext *avctx, |
2141 unsigned char *buf, int buf_size, void *data) | |
2142 { | |
2143 MpegEncContext *s = avctx->priv_data; | |
925 | 2144 AVFrame *pic_arg = data; |
1684 | 2145 int i, stuffing_count; |
0 | 2146 |
1397 | 2147 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
|
2148 av_log(avctx, AV_LOG_ERROR, "this codec supports only YUV420P\n"); |
1397 | 2149 return -1; |
2150 } | |
2151 | |
1799 | 2152 for(i=0; i<avctx->thread_count; i++){ |
1838 | 2153 int start_y= s->thread_context[i]->start_mb_y; |
2154 int end_y= s->thread_context[i]-> end_mb_y; | |
1799 | 2155 int h= s->mb_height; |
1838 | 2156 uint8_t *start= buf + buf_size*start_y/h; |
2157 uint8_t *end = buf + buf_size* end_y/h; | |
1799 | 2158 |
2159 init_put_bits(&s->thread_context[i]->pb, start, end - start); | |
2160 } | |
0 | 2161 |
903 | 2162 s->picture_in_gop_number++; |
2163 | |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2164 if(load_input_picture(s, pic_arg) < 0) |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2165 return -1; |
329 | 2166 |
903 | 2167 select_input_picture(s); |
324 | 2168 |
2169 /* output? */ | |
903 | 2170 if(s->new_picture.data[0]){ |
2171 s->pict_type= s->new_picture.pict_type; | |
2172 //emms_c(); | |
2173 //printf("qs:%f %f %d\n", s->new_picture.quality, s->current_picture.quality, s->qscale); | |
553 | 2174 MPV_frame_start(s, avctx); |
286 | 2175 |
324 | 2176 encode_picture(s, s->picture_number); |
652 | 2177 |
376 | 2178 avctx->real_pict_num = s->picture_number; |
324 | 2179 avctx->header_bits = s->header_bits; |
2180 avctx->mv_bits = s->mv_bits; | |
2181 avctx->misc_bits = s->misc_bits; | |
2182 avctx->i_tex_bits = s->i_tex_bits; | |
2183 avctx->p_tex_bits = s->p_tex_bits; | |
2184 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
|
2185 avctx->p_count = s->mb_num - s->i_count - s->skip_count; //FIXME f/b_count in avctx |
324 | 2186 avctx->skip_count = s->skip_count; |
0 | 2187 |
324 | 2188 MPV_frame_end(s); |
2189 | |
2190 if (s->out_format == FMT_MJPEG) | |
2191 mjpeg_picture_trailer(s); | |
329 | 2192 |
2193 if(s->flags&CODEC_FLAG_PASS1) | |
2194 ff_write_pass1_stats(s); | |
1138 | 2195 |
2196 for(i=0; i<4; i++){ | |
2197 avctx->error[i] += s->current_picture_ptr->error[i]; | |
2198 } | |
1766 | 2199 |
1684 | 2200 flush_put_bits(&s->pb); |
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
2201 s->frame_bits = put_bits_count(&s->pb); |
1766 | 2202 |
2203 stuffing_count= ff_vbv_update(s, s->frame_bits); | |
2204 if(stuffing_count){ | |
2205 switch(s->codec_id){ | |
2206 case CODEC_ID_MPEG1VIDEO: | |
2207 case CODEC_ID_MPEG2VIDEO: | |
2208 while(stuffing_count--){ | |
2209 put_bits(&s->pb, 8, 0); | |
2210 } | |
2211 break; | |
2212 case CODEC_ID_MPEG4: | |
2213 put_bits(&s->pb, 16, 0); | |
2214 put_bits(&s->pb, 16, 0x1C3); | |
2215 stuffing_count -= 4; | |
2216 while(stuffing_count--){ | |
2217 put_bits(&s->pb, 8, 0xFF); | |
2218 } | |
2219 break; | |
2220 default: | |
2221 av_log(s->avctx, AV_LOG_ERROR, "vbv buffer overflow\n"); | |
2222 } | |
2223 flush_put_bits(&s->pb); | |
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
2224 s->frame_bits = put_bits_count(&s->pb); |
1766 | 2225 } |
2226 | |
2227 /* update mpeg1/2 vbv_delay for CBR */ | |
1907 | 2228 if(s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate && s->out_format == FMT_MPEG1 |
2229 && 90000LL * (avctx->rc_buffer_size-1) <= s->avctx->rc_max_rate*0xFFFFLL){ | |
1766 | 2230 int vbv_delay; |
2231 | |
2232 assert(s->repeat_first_field==0); | |
2233 | |
2234 vbv_delay= lrintf(90000 * s->rc_context.buffer_index / s->avctx->rc_max_rate); | |
2235 assert(vbv_delay < 0xFFFF); | |
2236 | |
2237 s->vbv_delay_ptr[0] &= 0xF8; | |
2238 s->vbv_delay_ptr[0] |= vbv_delay>>13; | |
2239 s->vbv_delay_ptr[1] = vbv_delay>>5; | |
2240 s->vbv_delay_ptr[2] &= 0x07; | |
2241 s->vbv_delay_ptr[2] |= vbv_delay<<3; | |
2242 } | |
2243 s->total_bits += s->frame_bits; | |
2244 avctx->frame_bits = s->frame_bits; | |
2245 }else{ | |
2246 assert((pbBufPtr(&s->pb) == s->pb.buf)); | |
2247 s->frame_bits=0; | |
1684 | 2248 } |
1766 | 2249 assert((s->frame_bits&7)==0); |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2250 |
1684 | 2251 return s->frame_bits/8; |
0 | 2252 } |
2253 | |
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
|
2254 #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
|
2255 |
255 | 2256 static inline void gmc1_motion(MpegEncContext *s, |
1064 | 2257 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2258 uint8_t **ref_picture) |
255 | 2259 { |
1064 | 2260 uint8_t *ptr; |
556 | 2261 int offset, src_x, src_y, linesize, uvlinesize; |
255 | 2262 int motion_x, motion_y; |
566 | 2263 int emu=0; |
255 | 2264 |
2265 motion_x= s->sprite_offset[0][0]; | |
2266 motion_y= s->sprite_offset[0][1]; | |
2267 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
2268 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
2269 motion_x<<=(3-s->sprite_warping_accuracy); | |
2270 motion_y<<=(3-s->sprite_warping_accuracy); | |
2271 src_x = clip(src_x, -16, s->width); | |
2272 if (src_x == s->width) | |
2273 motion_x =0; | |
2274 src_y = clip(src_y, -16, s->height); | |
2275 if (src_y == s->height) | |
2276 motion_y =0; | |
753 | 2277 |
255 | 2278 linesize = s->linesize; |
556 | 2279 uvlinesize = s->uvlinesize; |
753 | 2280 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2281 ptr = ref_picture[0] + (src_y * linesize) + src_x; |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2282 |
566 | 2283 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
|
2284 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
|
2285 || (unsigned)src_y >= s->v_edge_pos - 17){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2286 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 | 2287 ptr= s->edge_emu_buffer; |
2288 } | |
2289 } | |
753 | 2290 |
2291 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
|
2292 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
|
2293 s->dsp.gmc1(dest_y+8, ptr+8, linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding); |
753 | 2294 }else{ |
2295 int dxy; | |
2296 | |
2297 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2); | |
2298 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
|
2299 s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16); |
753 | 2300 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2301 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
|
2302 } |
753 | 2303 } |
2304 | |
2305 if(s->flags&CODEC_FLAG_GRAY) return; | |
255 | 2306 |
2307 motion_x= s->sprite_offset[1][0]; | |
2308 motion_y= s->sprite_offset[1][1]; | |
2309 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
2310 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
2311 motion_x<<=(3-s->sprite_warping_accuracy); | |
2312 motion_y<<=(3-s->sprite_warping_accuracy); | |
2313 src_x = clip(src_x, -8, s->width>>1); | |
2314 if (src_x == s->width>>1) | |
2315 motion_x =0; | |
2316 src_y = clip(src_y, -8, s->height>>1); | |
2317 if (src_y == s->height>>1) | |
2318 motion_y =0; | |
2319 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2320 offset = (src_y * uvlinesize) + src_x; |
255 | 2321 ptr = ref_picture[1] + offset; |
1002 | 2322 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
|
2323 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
|
2324 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2325 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 | 2326 ptr= s->edge_emu_buffer; |
2327 emu=1; | |
2328 } | |
566 | 2329 } |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2330 s->dsp.gmc1(dest_cb, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
566 | 2331 |
255 | 2332 ptr = ref_picture[2] + offset; |
566 | 2333 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2334 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 | 2335 ptr= s->edge_emu_buffer; |
2336 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2337 s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
255 | 2338 |
2339 return; | |
2340 } | |
2341 | |
753 | 2342 static inline void gmc_motion(MpegEncContext *s, |
1064 | 2343 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2344 uint8_t **ref_picture) |
753 | 2345 { |
1064 | 2346 uint8_t *ptr; |
753 | 2347 int linesize, uvlinesize; |
2348 const int a= s->sprite_warping_accuracy; | |
2349 int ox, oy; | |
2350 | |
2351 linesize = s->linesize; | |
2352 uvlinesize = s->uvlinesize; | |
2353 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2354 ptr = ref_picture[0]; |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2355 |
753 | 2356 ox= s->sprite_offset[0][0] + s->sprite_delta[0][0]*s->mb_x*16 + s->sprite_delta[0][1]*s->mb_y*16; |
2357 oy= s->sprite_offset[0][1] + s->sprite_delta[1][0]*s->mb_x*16 + s->sprite_delta[1][1]*s->mb_y*16; | |
2358 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2359 s->dsp.gmc(dest_y, ptr, linesize, 16, |
753 | 2360 ox, |
2361 oy, | |
2362 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2363 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2364 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2365 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
|
2366 s->dsp.gmc(dest_y+8, ptr, linesize, 16, |
753 | 2367 ox + s->sprite_delta[0][0]*8, |
2368 oy + s->sprite_delta[1][0]*8, | |
2369 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2370 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2371 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2372 s->h_edge_pos, s->v_edge_pos); | |
2373 | |
2374 if(s->flags&CODEC_FLAG_GRAY) return; | |
2375 | |
2376 ox= s->sprite_offset[1][0] + s->sprite_delta[0][0]*s->mb_x*8 + s->sprite_delta[0][1]*s->mb_y*8; | |
2377 oy= s->sprite_offset[1][1] + s->sprite_delta[1][0]*s->mb_x*8 + s->sprite_delta[1][1]*s->mb_y*8; | |
2378 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2379 ptr = ref_picture[1]; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2380 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8, |
753 | 2381 ox, |
2382 oy, | |
2383 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2384 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2385 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2386 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2387 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2388 ptr = ref_picture[2]; |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2389 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8, |
753 | 2390 ox, |
2391 oy, | |
2392 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2393 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2394 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2395 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2396 } | |
2397 | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2398 /** |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2399 * 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
|
2400 * @param buf destination buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2401 * @param src source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2402 * @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
|
2403 * @param block_w width of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2404 * @param block_h height of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2405 * @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
|
2406 * @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
|
2407 * @param w width of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2408 * @param h height of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2409 */ |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2410 void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h, |
553 | 2411 int src_x, int src_y, int w, int h){ |
2412 int x, y; | |
2413 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
|
2414 |
553 | 2415 if(src_y>= h){ |
2416 src+= (h-1-src_y)*linesize; | |
2417 src_y=h-1; | |
554 | 2418 }else if(src_y<=-block_h){ |
2419 src+= (1-block_h-src_y)*linesize; | |
2420 src_y=1-block_h; | |
553 | 2421 } |
2422 if(src_x>= w){ | |
2423 src+= (w-1-src_x); | |
2424 src_x=w-1; | |
554 | 2425 }else if(src_x<=-block_w){ |
2426 src+= (1-block_w-src_x); | |
2427 src_x=1-block_w; | |
553 | 2428 } |
2429 | |
847 | 2430 start_y= FFMAX(0, -src_y); |
2431 start_x= FFMAX(0, -src_x); | |
2432 end_y= FFMIN(block_h, h-src_y); | |
2433 end_x= FFMIN(block_w, w-src_x); | |
566 | 2434 |
553 | 2435 // copy existing part |
2436 for(y=start_y; y<end_y; y++){ | |
2437 for(x=start_x; x<end_x; x++){ | |
2438 buf[x + y*linesize]= src[x + y*linesize]; | |
2439 } | |
2440 } | |
2441 | |
2442 //top | |
2443 for(y=0; y<start_y; y++){ | |
2444 for(x=start_x; x<end_x; x++){ | |
2445 buf[x + y*linesize]= buf[x + start_y*linesize]; | |
2446 } | |
2447 } | |
2448 | |
2449 //bottom | |
2450 for(y=end_y; y<block_h; y++){ | |
2451 for(x=start_x; x<end_x; x++){ | |
2452 buf[x + y*linesize]= buf[x + (end_y-1)*linesize]; | |
2453 } | |
2454 } | |
2455 | |
2456 for(y=0; y<block_h; y++){ | |
2457 //left | |
2458 for(x=0; x<start_x; x++){ | |
2459 buf[x + y*linesize]= buf[start_x + y*linesize]; | |
2460 } | |
2461 | |
2462 //right | |
2463 for(x=end_x; x<block_w; x++){ | |
2464 buf[x + y*linesize]= buf[end_x - 1 + y*linesize]; | |
2465 } | |
2466 } | |
2467 } | |
2468 | |
1633 | 2469 static inline int hpel_motion(MpegEncContext *s, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2470 uint8_t *dest, uint8_t *src, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2471 int field_based, int field_select, |
1633 | 2472 int src_x, int src_y, |
2473 int width, int height, int stride, | |
2474 int h_edge_pos, int v_edge_pos, | |
2475 int w, int h, op_pixels_func *pix_op, | |
2476 int motion_x, int motion_y) | |
2477 { | |
2478 int dxy; | |
2479 int emu=0; | |
2480 | |
2481 dxy = ((motion_y & 1) << 1) | (motion_x & 1); | |
2482 src_x += motion_x >> 1; | |
2483 src_y += motion_y >> 1; | |
2484 | |
2485 /* WARNING: do no forget half pels */ | |
2486 src_x = clip(src_x, -16, width); //FIXME unneeded for emu? | |
2487 if (src_x == width) | |
2488 dxy &= ~1; | |
2489 src_y = clip(src_y, -16, height); | |
2490 if (src_y == height) | |
2491 dxy &= ~2; | |
2492 src += src_y * stride + src_x; | |
2493 | |
2494 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){ | |
2495 if( (unsigned)src_x > h_edge_pos - (motion_x&1) - w | |
2496 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2497 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2498 src_x, src_y<<field_based, h_edge_pos, s->v_edge_pos); |
1633 | 2499 src= s->edge_emu_buffer; |
2500 emu=1; | |
2501 } | |
2502 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2503 if(field_select) |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2504 src += s->linesize; |
1633 | 2505 pix_op[dxy](dest, src, stride, h); |
2506 return emu; | |
2507 } | |
553 | 2508 |
2292 | 2509 static inline int hpel_motion_lowres(MpegEncContext *s, |
2510 uint8_t *dest, uint8_t *src, | |
2511 int field_based, int field_select, | |
2512 int src_x, int src_y, | |
2513 int width, int height, int stride, | |
2514 int h_edge_pos, int v_edge_pos, | |
2515 int w, int h, h264_chroma_mc_func *pix_op, | |
2516 int motion_x, int motion_y) | |
2517 { | |
2518 const int lowres= s->avctx->lowres; | |
2519 const int s_mask= (2<<lowres)-1; | |
2520 int emu=0; | |
2521 int sx, sy; | |
2522 | |
2523 if(s->quarter_sample){ | |
2524 motion_x/=2; | |
2525 motion_y/=2; | |
2526 } | |
2527 | |
2528 sx= motion_x & s_mask; | |
2529 sy= motion_y & s_mask; | |
2530 src_x += motion_x >> (lowres+1); | |
2531 src_y += motion_y >> (lowres+1); | |
2532 | |
2533 src += src_y * stride + src_x; | |
2534 | |
2535 if( (unsigned)src_x > h_edge_pos - (!!sx) - w | |
2536 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
2537 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based, | |
2538 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
2539 src= s->edge_emu_buffer; | |
2540 emu=1; | |
2541 } | |
2542 | |
2543 sx <<= 2 - lowres; | |
2544 sy <<= 2 - lowres; | |
2545 if(field_select) | |
2546 src += s->linesize; | |
2547 pix_op[lowres](dest, src, stride, h, sx, sy); | |
2548 return emu; | |
2549 } | |
2550 | |
0 | 2551 /* apply one mpeg motion vector to the three components */ |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2552 static always_inline void mpeg_motion(MpegEncContext *s, |
1064 | 2553 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2554 int field_based, int bottom_field, int field_select, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2555 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
0 | 2556 int motion_x, int motion_y, int h) |
2557 { | |
1846 | 2558 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
2559 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize; | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2560 |
651 | 2561 #if 0 |
255 | 2562 if(s->quarter_sample) |
2563 { | |
2564 motion_x>>=1; | |
2565 motion_y>>=1; | |
2566 } | |
651 | 2567 #endif |
1633 | 2568 |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
2569 v_edge_pos = s->v_edge_pos >> field_based; |
1846 | 2570 linesize = s->current_picture.linesize[0] << field_based; |
1138 | 2571 uvlinesize = s->current_picture.linesize[1] << field_based; |
1633 | 2572 |
1846 | 2573 dxy = ((motion_y & 1) << 1) | (motion_x & 1); |
2574 src_x = s->mb_x* 16 + (motion_x >> 1); | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2575 src_y =(s->mb_y<<(4-field_based)) + (motion_y >> 1); |
485 | 2576 |
0 | 2577 if (s->out_format == FMT_H263) { |
1916 | 2578 if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){ |
2579 mx = (motion_x>>1)|(motion_x&1); | |
2580 my = motion_y >>1; | |
2581 uvdxy = ((my & 1) << 1) | (mx & 1); | |
2582 uvsrc_x = s->mb_x* 8 + (mx >> 1); | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2583 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1); |
1916 | 2584 }else{ |
2585 uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1); | |
2586 uvsrc_x = src_x>>1; | |
2587 uvsrc_y = src_y>>1; | |
2588 } | |
2044
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2589 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261 |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2590 mx = motion_x / 4; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2591 my = motion_y / 4; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2592 uvdxy = 0; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2593 uvsrc_x = s->mb_x*8 + mx; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2594 uvsrc_y = s->mb_y*8 + my; |
0 | 2595 } else { |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2596 if(s->chroma_y_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2597 mx = motion_x / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2598 my = motion_y / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2599 uvdxy = ((my & 1) << 1) | (mx & 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2600 uvsrc_x = s->mb_x* 8 + (mx >> 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2601 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2602 } else { |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2603 if(s->chroma_x_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2604 //Chroma422 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2605 mx = motion_x / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2606 uvdxy = ((motion_y & 1) << 1) | (mx & 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2607 uvsrc_x = s->mb_x* 8 + (mx >> 1); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2608 uvsrc_y = src_y; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2609 } else { |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2610 //Chroma444 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2611 uvdxy = dxy; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2612 uvsrc_x = src_x; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2613 uvsrc_y = src_y; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2614 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2615 } |
1846 | 2616 } |
2617 | |
2618 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2619 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2620 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2621 | |
2622 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16 | |
2623 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2624 if(s->codec_id == CODEC_ID_MPEG2VIDEO || |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2625 s->codec_id == CODEC_ID_MPEG1VIDEO){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2626 av_log(s->avctx,AV_LOG_DEBUG,"MPEG motion vector out of boundary\n"); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2627 return ; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2628 } |
1846 | 2629 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, |
2630 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); | |
2631 ptr_y = s->edge_emu_buffer; | |
2632 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1874 | 2633 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; |
1846 | 2634 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, |
2635 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2636 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, | |
2637 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2638 ptr_cb= uvbuf; | |
2639 ptr_cr= uvbuf+16; | |
2640 } | |
2641 } | |
2642 | |
2643 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data | |
2644 dest_y += s->linesize; | |
2645 dest_cb+= s->uvlinesize; | |
2646 dest_cr+= s->uvlinesize; | |
2647 } | |
2648 | |
2649 if(field_select){ | |
2650 ptr_y += s->linesize; | |
2651 ptr_cb+= s->uvlinesize; | |
2652 ptr_cr+= s->uvlinesize; | |
2653 } | |
2654 | |
2655 pix_op[0][dxy](dest_y, ptr_y, linesize, h); | |
0 | 2656 |
1846 | 2657 if(!(s->flags&CODEC_FLAG_GRAY)){ |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2658 pix_op[s->chroma_x_shift][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2659 pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift); |
1846 | 2660 } |
2291 | 2661 if(s->out_format == FMT_H261){ |
2662 ff_h261_loop_filter(s); | |
2663 } | |
0 | 2664 } |
2256 | 2665 |
2666 /* apply one mpeg motion vector to the three components */ | |
2667 static always_inline void mpeg_motion_lowres(MpegEncContext *s, | |
2668 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2669 int field_based, int bottom_field, int field_select, | |
2670 uint8_t **ref_picture, h264_chroma_mc_func *pix_op, | |
2671 int motion_x, int motion_y, int h) | |
2672 { | |
2673 uint8_t *ptr_y, *ptr_cb, *ptr_cr; | |
2674 int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, uvlinesize, linesize, sx, sy, uvsx, uvsy; | |
2675 const int lowres= s->avctx->lowres; | |
2676 const int block_s= 8>>lowres; | |
2677 const int s_mask= (2<<lowres)-1; | |
2678 const int h_edge_pos = s->h_edge_pos >> lowres; | |
2679 const int v_edge_pos = s->v_edge_pos >> lowres; | |
2680 linesize = s->current_picture.linesize[0] << field_based; | |
2681 uvlinesize = s->current_picture.linesize[1] << field_based; | |
2682 | |
2260 | 2683 if(s->quarter_sample){ //FIXME obviously not perfect but qpel wont work in lowres anyway |
2684 motion_x/=2; | |
2685 motion_y/=2; | |
2686 } | |
2687 | |
2688 if(field_based){ | |
2689 motion_y += (bottom_field - field_select)*((1<<lowres)-1); | |
2690 } | |
2691 | |
2256 | 2692 sx= motion_x & s_mask; |
2693 sy= motion_y & s_mask; | |
2694 src_x = s->mb_x*2*block_s + (motion_x >> (lowres+1)); | |
2260 | 2695 src_y =(s->mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1)); |
2256 | 2696 |
2697 if (s->out_format == FMT_H263) { | |
2265 | 2698 uvsx = ((motion_x>>1) & s_mask) | (sx&1); |
2699 uvsy = ((motion_y>>1) & s_mask) | (sy&1); | |
2256 | 2700 uvsrc_x = src_x>>1; |
2701 uvsrc_y = src_y>>1; | |
2702 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261 | |
2703 mx = motion_x / 4; | |
2704 my = motion_y / 4; | |
2705 uvsx = (2*mx) & s_mask; | |
2706 uvsy = (2*my) & s_mask; | |
2707 uvsrc_x = s->mb_x*block_s + (mx >> lowres); | |
2708 uvsrc_y = s->mb_y*block_s + (my >> lowres); | |
2709 } else { | |
2710 mx = motion_x / 2; | |
2711 my = motion_y / 2; | |
2712 uvsx = mx & s_mask; | |
2713 uvsy = my & s_mask; | |
2714 uvsrc_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
2260 | 2715 uvsrc_y =(s->mb_y*block_s>>field_based) + (my >> (lowres+1)); |
2256 | 2716 } |
2717 | |
2718 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2719 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2720 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2721 | |
2722 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s | |
2723 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
2724 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, | |
2725 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
2726 ptr_y = s->edge_emu_buffer; | |
2727 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2728 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; | |
2729 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, | |
2730 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); | |
2731 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, | |
2732 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); | |
2733 ptr_cb= uvbuf; | |
2734 ptr_cr= uvbuf+16; | |
2735 } | |
2736 } | |
2737 | |
2260 | 2738 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data |
2739 dest_y += s->linesize; | |
2740 dest_cb+= s->uvlinesize; | |
2741 dest_cr+= s->uvlinesize; | |
2742 } | |
2743 | |
2744 if(field_select){ | |
2745 ptr_y += s->linesize; | |
2746 ptr_cb+= s->uvlinesize; | |
2747 ptr_cr+= s->uvlinesize; | |
2748 } | |
2749 | |
2256 | 2750 sx <<= 2 - lowres; |
2751 sy <<= 2 - lowres; | |
2752 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy); | |
2753 | |
2754 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2755 uvsx <<= 2 - lowres; | |
2756 uvsy <<= 2 - lowres; | |
2757 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
2758 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
2759 } | |
2291 | 2760 //FIXME h261 lowres loop filter |
2256 | 2761 } |
2762 | |
1633 | 2763 //FIXME move to dsputil, avg variant, 16x16 version |
2764 static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride){ | |
2765 int x; | |
2766 uint8_t * const top = src[1]; | |
2767 uint8_t * const left = src[2]; | |
2768 uint8_t * const mid = src[0]; | |
2769 uint8_t * const right = src[3]; | |
2770 uint8_t * const bottom= src[4]; | |
2771 #define OBMC_FILTER(x, t, l, m, r, b)\ | |
2772 dst[x]= (t*top[x] + l*left[x] + m*mid[x] + r*right[x] + b*bottom[x] + 4)>>3 | |
2773 #define OBMC_FILTER4(x, t, l, m, r, b)\ | |
2774 OBMC_FILTER(x , t, l, m, r, b);\ | |
2775 OBMC_FILTER(x+1 , t, l, m, r, b);\ | |
2776 OBMC_FILTER(x +stride, t, l, m, r, b);\ | |
2777 OBMC_FILTER(x+1+stride, t, l, m, r, b); | |
2778 | |
2779 x=0; | |
2780 OBMC_FILTER (x , 2, 2, 4, 0, 0); | |
2781 OBMC_FILTER (x+1, 2, 1, 5, 0, 0); | |
2782 OBMC_FILTER4(x+2, 2, 1, 5, 0, 0); | |
2783 OBMC_FILTER4(x+4, 2, 0, 5, 1, 0); | |
2784 OBMC_FILTER (x+6, 2, 0, 5, 1, 0); | |
2785 OBMC_FILTER (x+7, 2, 0, 4, 2, 0); | |
2786 x+= stride; | |
2787 OBMC_FILTER (x , 1, 2, 5, 0, 0); | |
2788 OBMC_FILTER (x+1, 1, 2, 5, 0, 0); | |
2789 OBMC_FILTER (x+6, 1, 0, 5, 2, 0); | |
2790 OBMC_FILTER (x+7, 1, 0, 5, 2, 0); | |
2791 x+= stride; | |
2792 OBMC_FILTER4(x , 1, 2, 5, 0, 0); | |
2793 OBMC_FILTER4(x+2, 1, 1, 6, 0, 0); | |
2794 OBMC_FILTER4(x+4, 1, 0, 6, 1, 0); | |
2795 OBMC_FILTER4(x+6, 1, 0, 5, 2, 0); | |
2796 x+= 2*stride; | |
2797 OBMC_FILTER4(x , 0, 2, 5, 0, 1); | |
2798 OBMC_FILTER4(x+2, 0, 1, 6, 0, 1); | |
2799 OBMC_FILTER4(x+4, 0, 0, 6, 1, 1); | |
2800 OBMC_FILTER4(x+6, 0, 0, 5, 2, 1); | |
2801 x+= 2*stride; | |
2802 OBMC_FILTER (x , 0, 2, 5, 0, 1); | |
2803 OBMC_FILTER (x+1, 0, 2, 5, 0, 1); | |
2804 OBMC_FILTER4(x+2, 0, 1, 5, 0, 2); | |
2805 OBMC_FILTER4(x+4, 0, 0, 5, 1, 2); | |
2806 OBMC_FILTER (x+6, 0, 0, 5, 2, 1); | |
2807 OBMC_FILTER (x+7, 0, 0, 5, 2, 1); | |
2808 x+= stride; | |
2809 OBMC_FILTER (x , 0, 2, 4, 0, 2); | |
2810 OBMC_FILTER (x+1, 0, 1, 5, 0, 2); | |
2811 OBMC_FILTER (x+6, 0, 0, 5, 1, 2); | |
2812 OBMC_FILTER (x+7, 0, 0, 4, 2, 2); | |
2813 } | |
2814 | |
2815 /* obmc for 1 8x8 luma block */ | |
2816 static inline void obmc_motion(MpegEncContext *s, | |
2817 uint8_t *dest, uint8_t *src, | |
2818 int src_x, int src_y, | |
2819 op_pixels_func *pix_op, | |
2820 int16_t mv[5][2]/* mid top left right bottom*/) | |
2821 #define MID 0 | |
2822 { | |
2823 int i; | |
2824 uint8_t *ptr[5]; | |
2825 | |
2826 assert(s->quarter_sample==0); | |
2827 | |
2828 for(i=0; i<5; i++){ | |
2829 if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){ | |
2830 ptr[i]= ptr[MID]; | |
2831 }else{ | |
1799 | 2832 ptr[i]= s->obmc_scratchpad + 8*(i&1) + s->linesize*8*(i>>1); |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2833 hpel_motion(s, ptr[i], src, 0, 0, |
1633 | 2834 src_x, src_y, |
2835 s->width, s->height, s->linesize, | |
2836 s->h_edge_pos, s->v_edge_pos, | |
2837 8, 8, pix_op, | |
2838 mv[i][0], mv[i][1]); | |
2839 } | |
2840 } | |
2841 | |
2842 put_obmc(dest, ptr, s->linesize); | |
2843 } | |
0 | 2844 |
255 | 2845 static inline void qpel_motion(MpegEncContext *s, |
1064 | 2846 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2847 int field_based, int bottom_field, int field_select, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2848 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
651 | 2849 qpel_mc_func (*qpix_op)[16], |
255 | 2850 int motion_x, int motion_y, int h) |
2851 { | |
1846 | 2852 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
2853 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, linesize, uvlinesize; | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2854 |
255 | 2855 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
1846 | 2856 src_x = s->mb_x * 16 + (motion_x >> 2); |
255 | 2857 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2); |
2858 | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
2859 v_edge_pos = s->v_edge_pos >> field_based; |
255 | 2860 linesize = s->linesize << field_based; |
671 | 2861 uvlinesize = s->uvlinesize << field_based; |
554 | 2862 |
671 | 2863 if(field_based){ |
2864 mx= motion_x/2; | |
2865 my= motion_y>>1; | |
1048 | 2866 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){ |
2867 static const int rtab[8]= {0,0,1,1,0,0,0,1}; | |
2868 mx= (motion_x>>1) + rtab[motion_x&7]; | |
2869 my= (motion_y>>1) + rtab[motion_y&7]; | |
760 | 2870 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){ |
671 | 2871 mx= (motion_x>>1)|(motion_x&1); |
2872 my= (motion_y>>1)|(motion_y&1); | |
2873 }else{ | |
2874 mx= motion_x/2; | |
2875 my= motion_y/2; | |
2876 } | |
2877 mx= (mx>>1)|(mx&1); | |
2878 my= (my>>1)|(my&1); | |
1048 | 2879 |
1846 | 2880 uvdxy= (mx&1) | ((my&1)<<1); |
671 | 2881 mx>>=1; |
2882 my>>=1; | |
255 | 2883 |
1846 | 2884 uvsrc_x = s->mb_x * 8 + mx; |
2885 uvsrc_y = s->mb_y * (8 >> field_based) + my; | |
2886 | |
2887 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2888 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2889 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2890 | |
2891 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16 | |
2892 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){ | |
2893 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, | |
2894 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); | |
2895 ptr_y= s->edge_emu_buffer; | |
2896 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1874 | 2897 uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize; |
1846 | 2898 ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based, |
2899 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2900 ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based, | |
2901 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2902 ptr_cb= uvbuf; | |
2903 ptr_cr= uvbuf + 16; | |
2904 } | |
2905 } | |
2906 | |
2907 if(!field_based) | |
2908 qpix_op[0][dxy](dest_y, ptr_y, linesize); | |
2909 else{ | |
2910 if(bottom_field){ | |
2911 dest_y += s->linesize; | |
2912 dest_cb+= s->uvlinesize; | |
2913 dest_cr+= s->uvlinesize; | |
2914 } | |
2915 | |
2916 if(field_select){ | |
2917 ptr_y += s->linesize; | |
2918 ptr_cb += s->uvlinesize; | |
2919 ptr_cr += s->uvlinesize; | |
2920 } | |
2921 //damn interlaced mode | |
2922 //FIXME boundary mirroring is not exactly correct here | |
2923 qpix_op[1][dxy](dest_y , ptr_y , linesize); | |
2924 qpix_op[1][dxy](dest_y+8, ptr_y+8, linesize); | |
2925 } | |
2926 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2927 pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1); | |
2928 pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1); | |
2929 } | |
255 | 2930 } |
2931 | |
1013 | 2932 inline int ff_h263_round_chroma(int x){ |
2933 if (x >= 0) | |
2934 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
2935 else { | |
2936 x = -x; | |
2937 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
2938 } | |
2939 } | |
255 | 2940 |
1225 | 2941 /** |
1633 | 2942 * h263 chorma 4mv motion compensation. |
2943 */ | |
2944 static inline void chroma_4mv_motion(MpegEncContext *s, | |
2945 uint8_t *dest_cb, uint8_t *dest_cr, | |
2946 uint8_t **ref_picture, | |
2947 op_pixels_func *pix_op, | |
2948 int mx, int my){ | |
2949 int dxy, emu=0, src_x, src_y, offset; | |
2950 uint8_t *ptr; | |
2951 | |
2952 /* In case of 8X8, we construct a single chroma motion vector | |
2953 with a special rounding */ | |
2954 mx= ff_h263_round_chroma(mx); | |
2955 my= ff_h263_round_chroma(my); | |
2956 | |
2957 dxy = ((my & 1) << 1) | (mx & 1); | |
2958 mx >>= 1; | |
2959 my >>= 1; | |
2960 | |
2961 src_x = s->mb_x * 8 + mx; | |
2962 src_y = s->mb_y * 8 + my; | |
2963 src_x = clip(src_x, -8, s->width/2); | |
2964 if (src_x == s->width/2) | |
2965 dxy &= ~1; | |
2966 src_y = clip(src_y, -8, s->height/2); | |
2967 if (src_y == s->height/2) | |
2968 dxy &= ~2; | |
2969 | |
2970 offset = (src_y * (s->uvlinesize)) + src_x; | |
2971 ptr = ref_picture[1] + offset; | |
2972 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
2973 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8 | |
2974 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){ | |
2975 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); | |
2976 ptr= s->edge_emu_buffer; | |
2977 emu=1; | |
2978 } | |
2979 } | |
2980 pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8); | |
2981 | |
2982 ptr = ref_picture[2] + offset; | |
2983 if(emu){ | |
2984 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); | |
2985 ptr= s->edge_emu_buffer; | |
2986 } | |
2987 pix_op[dxy](dest_cr, ptr, s->uvlinesize, 8); | |
2988 } | |
2989 | |
2292 | 2990 static inline void chroma_4mv_motion_lowres(MpegEncContext *s, |
2991 uint8_t *dest_cb, uint8_t *dest_cr, | |
2992 uint8_t **ref_picture, | |
2993 h264_chroma_mc_func *pix_op, | |
2994 int mx, int my){ | |
2995 const int lowres= s->avctx->lowres; | |
2996 const int block_s= 8>>lowres; | |
2997 const int s_mask= (2<<lowres)-1; | |
2998 const int h_edge_pos = s->h_edge_pos >> (lowres+1); | |
2999 const int v_edge_pos = s->v_edge_pos >> (lowres+1); | |
3000 int emu=0, src_x, src_y, offset, sx, sy; | |
3001 uint8_t *ptr; | |
3002 | |
3003 if(s->quarter_sample){ | |
3004 mx/=2; | |
3005 my/=2; | |
3006 } | |
3007 | |
3008 /* In case of 8X8, we construct a single chroma motion vector | |
3009 with a special rounding */ | |
3010 mx= ff_h263_round_chroma(mx); | |
3011 my= ff_h263_round_chroma(my); | |
3012 | |
3013 sx= mx & s_mask; | |
3014 sy= my & s_mask; | |
3015 src_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
3016 src_y = s->mb_y*block_s + (my >> (lowres+1)); | |
3017 | |
3018 offset = src_y * s->uvlinesize + src_x; | |
3019 ptr = ref_picture[1] + offset; | |
3020 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
3021 if( (unsigned)src_x > h_edge_pos - (!!sx) - block_s | |
3022 || (unsigned)src_y > v_edge_pos - (!!sy) - block_s){ | |
3023 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
3024 ptr= s->edge_emu_buffer; | |
3025 emu=1; | |
3026 } | |
3027 } | |
3028 sx <<= 2 - lowres; | |
3029 sy <<= 2 - lowres; | |
3030 pix_op[lowres](dest_cb, ptr, s->uvlinesize, block_s, sx, sy); | |
3031 | |
3032 ptr = ref_picture[2] + offset; | |
3033 if(emu){ | |
3034 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
3035 ptr= s->edge_emu_buffer; | |
3036 } | |
3037 pix_op[lowres](dest_cr, ptr, s->uvlinesize, block_s, sx, sy); | |
3038 } | |
3039 | |
1633 | 3040 /** |
1225 | 3041 * motion compesation of a single macroblock |
3042 * @param s context | |
3043 * @param dest_y luma destination pointer | |
3044 * @param dest_cb chroma cb/u destination pointer | |
3045 * @param dest_cr chroma cr/v destination pointer | |
3046 * @param dir direction (0->forward, 1->backward) | |
3047 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
3048 * @param pic_op halfpel motion compensation function (average or put normally) | |
3049 * @param pic_op qpel motion compensation function (average or put normally) | |
3050 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
3051 */ | |
0 | 3052 static inline void MPV_motion(MpegEncContext *s, |
1064 | 3053 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
3054 int dir, uint8_t **ref_picture, | |
651 | 3055 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]) |
0 | 3056 { |
1633 | 3057 int dxy, mx, my, src_x, src_y, motion_x, motion_y; |
0 | 3058 int mb_x, mb_y, i; |
1064 | 3059 uint8_t *ptr, *dest; |
0 | 3060 |
3061 mb_x = s->mb_x; | |
3062 mb_y = s->mb_y; | |
3063 | |
1655 | 3064 if(s->obmc && s->pict_type != B_TYPE){ |
1633 | 3065 int16_t mv_cache[4][4][2]; |
3066 const int xy= s->mb_x + s->mb_y*s->mb_stride; | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3067 const int mot_stride= s->b8_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3068 const int mot_xy= mb_x*2 + mb_y*2*mot_stride; |
1633 | 3069 |
3070 assert(!s->mb_skiped); | |
3071 | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3072 memcpy(mv_cache[1][1], s->current_picture.motion_val[0][mot_xy ], sizeof(int16_t)*4); |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3073 memcpy(mv_cache[2][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4); |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3074 memcpy(mv_cache[3][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4); |
1633 | 3075 |
3076 if(mb_y==0 || IS_INTRA(s->current_picture.mb_type[xy-s->mb_stride])){ | |
3077 memcpy(mv_cache[0][1], mv_cache[1][1], sizeof(int16_t)*4); | |
3078 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3079 memcpy(mv_cache[0][1], s->current_picture.motion_val[0][mot_xy-mot_stride], sizeof(int16_t)*4); |
1633 | 3080 } |
3081 | |
3082 if(mb_x==0 || IS_INTRA(s->current_picture.mb_type[xy-1])){ | |
3083 *(int32_t*)mv_cache[1][0]= *(int32_t*)mv_cache[1][1]; | |
3084 *(int32_t*)mv_cache[2][0]= *(int32_t*)mv_cache[2][1]; | |
3085 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3086 *(int32_t*)mv_cache[1][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3087 *(int32_t*)mv_cache[2][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1+mot_stride]; |
1633 | 3088 } |
3089 | |
3090 if(mb_x+1>=s->mb_width || IS_INTRA(s->current_picture.mb_type[xy+1])){ | |
3091 *(int32_t*)mv_cache[1][3]= *(int32_t*)mv_cache[1][2]; | |
3092 *(int32_t*)mv_cache[2][3]= *(int32_t*)mv_cache[2][2]; | |
3093 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3094 *(int32_t*)mv_cache[1][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3095 *(int32_t*)mv_cache[2][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2+mot_stride]; |
1633 | 3096 } |
3097 | |
3098 mx = 0; | |
3099 my = 0; | |
3100 for(i=0;i<4;i++) { | |
3101 const int x= (i&1)+1; | |
3102 const int y= (i>>1)+1; | |
3103 int16_t mv[5][2]= { | |
3104 {mv_cache[y][x ][0], mv_cache[y][x ][1]}, | |
3105 {mv_cache[y-1][x][0], mv_cache[y-1][x][1]}, | |
3106 {mv_cache[y][x-1][0], mv_cache[y][x-1][1]}, | |
3107 {mv_cache[y][x+1][0], mv_cache[y][x+1][1]}, | |
3108 {mv_cache[y+1][x][0], mv_cache[y+1][x][1]}}; | |
3109 //FIXME cleanup | |
3110 obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize, | |
3111 ref_picture[0], | |
3112 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, | |
3113 pix_op[1], | |
3114 mv); | |
3115 | |
3116 mx += mv[0][0]; | |
3117 my += mv[0][1]; | |
3118 } | |
3119 if(!(s->flags&CODEC_FLAG_GRAY)) | |
3120 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
3121 | |
3122 return; | |
3123 } | |
3124 | |
0 | 3125 switch(s->mv_type) { |
3126 case MV_TYPE_16X16: | |
1042 | 3127 #ifdef CONFIG_RISKY |
255 | 3128 if(s->mcsel){ |
753 | 3129 if(s->real_sprite_warping_points==1){ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3130 gmc1_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3131 ref_picture); |
753 | 3132 }else{ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3133 gmc_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3134 ref_picture); |
753 | 3135 } |
651 | 3136 }else if(s->quarter_sample){ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3137 qpel_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3138 0, 0, 0, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3139 ref_picture, pix_op, qpix_op, |
255 | 3140 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
936 | 3141 }else if(s->mspel){ |
3142 ff_mspel_motion(s, dest_y, dest_cb, dest_cr, | |
3143 ref_picture, pix_op, | |
3144 s->mv[dir][0][0], s->mv[dir][0][1], 16); | |
1042 | 3145 }else |
3146 #endif | |
3147 { | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3148 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3149 0, 0, 0, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3150 ref_picture, pix_op, |
255 | 3151 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
3152 } | |
0 | 3153 break; |
3154 case MV_TYPE_8X8: | |
673 | 3155 mx = 0; |
3156 my = 0; | |
3157 if(s->quarter_sample){ | |
3158 for(i=0;i<4;i++) { | |
3159 motion_x = s->mv[dir][i][0]; | |
3160 motion_y = s->mv[dir][i][1]; | |
0 | 3161 |
673 | 3162 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
3163 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8; | |
3164 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8; | |
3165 | |
3166 /* WARNING: do no forget half pels */ | |
3167 src_x = clip(src_x, -16, s->width); | |
3168 if (src_x == s->width) | |
3169 dxy &= ~3; | |
3170 src_y = clip(src_y, -16, s->height); | |
3171 if (src_y == s->height) | |
3172 dxy &= ~12; | |
0 | 3173 |
673 | 3174 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x); |
3175 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
|
3176 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
|
3177 || (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
|
3178 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 | 3179 ptr= s->edge_emu_buffer; |
3180 } | |
3181 } | |
3182 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize; | |
3183 qpix_op[1][dxy](dest, ptr, s->linesize); | |
3184 | |
3185 mx += s->mv[dir][i][0]/2; | |
3186 my += s->mv[dir][i][1]/2; | |
3187 } | |
3188 }else{ | |
3189 for(i=0;i<4;i++) { | |
1633 | 3190 hpel_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3191 ref_picture[0], 0, 0, |
1633 | 3192 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, |
3193 s->width, s->height, s->linesize, | |
3194 s->h_edge_pos, s->v_edge_pos, | |
3195 8, 8, pix_op[1], | |
3196 s->mv[dir][i][0], s->mv[dir][i][1]); | |
673 | 3197 |
3198 mx += s->mv[dir][i][0]; | |
3199 my += s->mv[dir][i][1]; | |
554 | 3200 } |
0 | 3201 } |
673 | 3202 |
1633 | 3203 if(!(s->flags&CODEC_FLAG_GRAY)) |
3204 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
0 | 3205 break; |
3206 case MV_TYPE_FIELD: | |
3207 if (s->picture_structure == PICT_FRAME) { | |
671 | 3208 if(s->quarter_sample){ |
1843 | 3209 for(i=0; i<2; i++){ |
3210 qpel_motion(s, dest_y, dest_cb, dest_cr, | |
3211 1, i, s->field_select[dir][i], | |
3212 ref_picture, pix_op, qpix_op, | |
3213 s->mv[dir][i][0], s->mv[dir][i][1], 8); | |
3214 } | |
671 | 3215 }else{ |
3216 /* top field */ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3217 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3218 1, 0, s->field_select[dir][0], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3219 ref_picture, pix_op, |
671 | 3220 s->mv[dir][0][0], s->mv[dir][0][1], 8); |
3221 /* bottom field */ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3222 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3223 1, 1, s->field_select[dir][1], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3224 ref_picture, pix_op, |
671 | 3225 s->mv[dir][1][0], s->mv[dir][1][1], 8); |
3226 } | |
0 | 3227 } else { |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3228 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3229 ref_picture= s->current_picture_ptr->data; |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
3230 } |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
3231 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3232 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3233 0, 0, s->field_select[dir][0], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3234 ref_picture, pix_op, |
1096
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
3235 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
0 | 3236 } |
3237 break; | |
1843 | 3238 case MV_TYPE_16X8: |
3239 for(i=0; i<2; i++){ | |
3240 uint8_t ** ref2picture; | |
3241 | |
3242 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ | |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3243 ref2picture= ref_picture; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3244 }else{ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3245 ref2picture= s->current_picture_ptr->data; |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3246 } |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3247 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3248 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
1843 | 3249 0, 0, s->field_select[dir][i], |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3250 ref2picture, pix_op, |
1843 | 3251 s->mv[dir][i][0], s->mv[dir][i][1] + 16*i, 8); |
3252 | |
3253 dest_y += 16*s->linesize; | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3254 dest_cb+= (16>>s->chroma_y_shift)*s->uvlinesize; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3255 dest_cr+= (16>>s->chroma_y_shift)*s->uvlinesize; |
1843 | 3256 } |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3257 break; |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3258 case MV_TYPE_DMV: |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3259 if(s->picture_structure == PICT_FRAME){ |
1843 | 3260 for(i=0; i<2; i++){ |
3261 int j; | |
3262 for(j=0; j<2; j++){ | |
3263 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
3264 1, j, j^i, | |
3265 ref_picture, pix_op, | |
3266 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], 8); | |
3267 } | |
3268 pix_op = s->dsp.avg_pixels_tab; | |
3269 } | |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3270 }else{ |
1843 | 3271 for(i=0; i<2; i++){ |
3272 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
3273 0, 0, s->picture_structure != i+1, | |
3274 ref_picture, pix_op, | |
3275 s->mv[dir][2*i][0],s->mv[dir][2*i][1],16); | |
3276 | |
3277 // after put we make avg of the same block | |
3278 pix_op=s->dsp.avg_pixels_tab; | |
3279 | |
3280 //opposite parity is always in the same frame if this is second field | |
3281 if(!s->first_field){ | |
3282 ref_picture = s->current_picture_ptr->data; | |
3283 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3284 } |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3285 } |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3286 break; |
1633 | 3287 default: assert(0); |
0 | 3288 } |
3289 } | |
3290 | |
2256 | 3291 /** |
3292 * motion compesation of a single macroblock | |
3293 * @param s context | |
3294 * @param dest_y luma destination pointer | |
3295 * @param dest_cb chroma cb/u destination pointer | |
3296 * @param dest_cr chroma cr/v destination pointer | |
3297 * @param dir direction (0->forward, 1->backward) | |
3298 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
3299 * @param pic_op halfpel motion compensation function (average or put normally) | |
3300 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
3301 */ | |
3302 static inline void MPV_motion_lowres(MpegEncContext *s, | |
3303 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
3304 int dir, uint8_t **ref_picture, | |
3305 h264_chroma_mc_func *pix_op) | |
3306 { | |
2292 | 3307 int mx, my; |
2260 | 3308 int mb_x, mb_y, i; |
3309 const int lowres= s->avctx->lowres; | |
3310 const int block_s= 8>>lowres; | |
3311 | |
3312 mb_x = s->mb_x; | |
3313 mb_y = s->mb_y; | |
3314 | |
3315 switch(s->mv_type) { | |
3316 case MV_TYPE_16X16: | |
3317 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3318 0, 0, 0, | |
3319 ref_picture, pix_op, | |
3320 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
3321 break; | |
2292 | 3322 case MV_TYPE_8X8: |
2260 | 3323 mx = 0; |
3324 my = 0; | |
3325 for(i=0;i<4;i++) { | |
2292 | 3326 hpel_motion_lowres(s, dest_y + ((i & 1) + (i >> 1) * s->linesize)*block_s, |
2260 | 3327 ref_picture[0], 0, 0, |
2292 | 3328 (2*mb_x + (i & 1))*block_s, (2*mb_y + (i >>1))*block_s, |
2260 | 3329 s->width, s->height, s->linesize, |
2292 | 3330 s->h_edge_pos >> lowres, s->v_edge_pos >> lowres, |
3331 block_s, block_s, pix_op, | |
2260 | 3332 s->mv[dir][i][0], s->mv[dir][i][1]); |
3333 | |
3334 mx += s->mv[dir][i][0]; | |
3335 my += s->mv[dir][i][1]; | |
3336 } | |
3337 | |
3338 if(!(s->flags&CODEC_FLAG_GRAY)) | |
2292 | 3339 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my); |
3340 break; | |
2260 | 3341 case MV_TYPE_FIELD: |
3342 if (s->picture_structure == PICT_FRAME) { | |
3343 /* top field */ | |
3344 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3345 1, 0, s->field_select[dir][0], | |
3346 ref_picture, pix_op, | |
3347 s->mv[dir][0][0], s->mv[dir][0][1], block_s); | |
3348 /* bottom field */ | |
3349 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3350 1, 1, s->field_select[dir][1], | |
3351 ref_picture, pix_op, | |
3352 s->mv[dir][1][0], s->mv[dir][1][1], block_s); | |
3353 } else { | |
3354 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ | |
3355 ref_picture= s->current_picture_ptr->data; | |
3356 } | |
3357 | |
3358 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3359 0, 0, s->field_select[dir][0], | |
3360 ref_picture, pix_op, | |
3361 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
3362 } | |
3363 break; | |
3364 case MV_TYPE_16X8: | |
3365 for(i=0; i<2; i++){ | |
3366 uint8_t ** ref2picture; | |
3367 | |
3368 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ | |
3369 ref2picture= ref_picture; | |
3370 }else{ | |
3371 ref2picture= s->current_picture_ptr->data; | |
3372 } | |
3373 | |
3374 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3375 0, 0, s->field_select[dir][i], | |
3376 ref2picture, pix_op, | |
3377 s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s); | |
3378 | |
3379 dest_y += 2*block_s*s->linesize; | |
3380 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
3381 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
3382 } | |
3383 break; | |
3384 case MV_TYPE_DMV: | |
3385 if(s->picture_structure == PICT_FRAME){ | |
3386 for(i=0; i<2; i++){ | |
3387 int j; | |
3388 for(j=0; j<2; j++){ | |
3389 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3390 1, j, j^i, | |
3391 ref_picture, pix_op, | |
3392 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s); | |
3393 } | |
3394 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
3395 } | |
3396 }else{ | |
3397 for(i=0; i<2; i++){ | |
3398 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3399 0, 0, s->picture_structure != i+1, | |
3400 ref_picture, pix_op, | |
3401 s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s); | |
3402 | |
3403 // after put we make avg of the same block | |
3404 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
3405 | |
3406 //opposite parity is always in the same frame if this is second field | |
3407 if(!s->first_field){ | |
3408 ref_picture = s->current_picture_ptr->data; | |
3409 } | |
3410 } | |
3411 } | |
3412 break; | |
3413 default: assert(0); | |
3414 } | |
2256 | 3415 } |
0 | 3416 |
3417 /* put block[] to dest[] */ | |
3418 static inline void put_dct(MpegEncContext *s, | |
1651 | 3419 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
0 | 3420 { |
1689 | 3421 s->dct_unquantize_intra(s, block, i, qscale); |
1092 | 3422 s->dsp.idct_put (dest, line_size, block); |
0 | 3423 } |
3424 | |
3425 /* add block[] to dest[] */ | |
3426 static inline void add_dct(MpegEncContext *s, | |
1064 | 3427 DCTELEM *block, int i, uint8_t *dest, int line_size) |
0 | 3428 { |
3429 if (s->block_last_index[i] >= 0) { | |
1092 | 3430 s->dsp.idct_add (dest, line_size, block); |
481 | 3431 } |
3432 } | |
3433 | |
3434 static inline void add_dequant_dct(MpegEncContext *s, | |
1644 | 3435 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
481 | 3436 { |
3437 if (s->block_last_index[i] >= 0) { | |
1689 | 3438 s->dct_unquantize_inter(s, block, i, qscale); |
324 | 3439 |
1092 | 3440 s->dsp.idct_add (dest, line_size, block); |
0 | 3441 } |
3442 } | |
3443 | |
456 | 3444 /** |
3445 * cleans dc, ac, coded_block for the current non intra MB | |
3446 */ | |
3447 void ff_clean_intra_table_entries(MpegEncContext *s) | |
3448 { | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3449 int wrap = s->b8_stride; |
456 | 3450 int xy = s->block_index[0]; |
3451 | |
3452 s->dc_val[0][xy ] = | |
3453 s->dc_val[0][xy + 1 ] = | |
3454 s->dc_val[0][xy + wrap] = | |
3455 s->dc_val[0][xy + 1 + wrap] = 1024; | |
3456 /* ac pred */ | |
1064 | 3457 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); |
3458 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); | |
456 | 3459 if (s->msmpeg4_version>=3) { |
3460 s->coded_block[xy ] = | |
3461 s->coded_block[xy + 1 ] = | |
3462 s->coded_block[xy + wrap] = | |
3463 s->coded_block[xy + 1 + wrap] = 0; | |
3464 } | |
3465 /* chroma */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3466 wrap = s->mb_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3467 xy = s->mb_x + s->mb_y * wrap; |
456 | 3468 s->dc_val[1][xy] = |
3469 s->dc_val[2][xy] = 1024; | |
3470 /* ac pred */ | |
1064 | 3471 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t)); |
3472 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t)); | |
456 | 3473 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3474 s->mbintra_table[xy]= 0; |
456 | 3475 } |
3476 | |
0 | 3477 /* generic function called after a macroblock has been parsed by the |
3478 decoder or after it has been encoded by the encoder. | |
3479 | |
3480 Important variables used: | |
3481 s->mb_intra : true if intra macroblock | |
3482 s->mv_dir : motion vector direction | |
3483 s->mv_type : motion vector type | |
3484 s->mv : motion vector | |
3485 s->interlaced_dct : true if interlaced dct used (mpeg2) | |
3486 */ | |
2256 | 3487 static always_inline void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], int lowres_flag) |
0 | 3488 { |
244 | 3489 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
|
3490 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; |
1381 | 3491 #ifdef HAVE_XVMC |
3492 if(s->avctx->xvmc_acceleration){ | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1579
diff
changeset
|
3493 XVMC_decode_mb(s);//xvmc uses pblocks |
1381 | 3494 return; |
3495 } | |
3496 #endif | |
0 | 3497 |
3498 mb_x = s->mb_x; | |
3499 mb_y = s->mb_y; | |
3500 | |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3501 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3502 /* save DCT coefficients */ |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3503 int i,j; |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3504 DCTELEM *dct = &s->current_picture.dct_coeff[mb_xy*64*6]; |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3505 for(i=0; i<6; i++) |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3506 for(j=0; j<64; j++) |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3507 *dct++ = block[i][s->dsp.idct_permutation[j]]; |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3508 } |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3509 |
903 | 3510 s->current_picture.qscale_table[mb_xy]= s->qscale; |
108
1e4a4af694d1
exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents:
79
diff
changeset
|
3511 |
0 | 3512 /* update DC predictors for P macroblocks */ |
3513 if (!s->mb_intra) { | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3514 if (s->h263_pred || s->h263_aic) { |
481 | 3515 if(s->mbintra_table[mb_xy]) |
456 | 3516 ff_clean_intra_table_entries(s); |
0 | 3517 } else { |
456 | 3518 s->last_dc[0] = |
3519 s->last_dc[1] = | |
0 | 3520 s->last_dc[2] = 128 << s->intra_dc_precision; |
3521 } | |
3522 } | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3523 else if (s->h263_pred || s->h263_aic) |
481 | 3524 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
|
3525 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3526 if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { //FIXME precalc |
1064 | 3527 uint8_t *dest_y, *dest_cb, *dest_cr; |
481 | 3528 int dct_linesize, dct_offset; |
651 | 3529 op_pixels_func (*op_pix)[4]; |
3530 qpel_mc_func (*op_qpix)[16]; | |
1138 | 3531 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics |
3532 const int uvlinesize= s->current_picture.linesize[1]; | |
2256 | 3533 const int readable= s->pict_type != B_TYPE || s->encoding || s->avctx->draw_horiz_band || lowres_flag; |
3534 const int block_size= lowres_flag ? 8>>s->avctx->lowres : 8; | |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3535 |
903 | 3536 /* avoid copy if macroblock skipped in last frame too */ |
3537 /* skip only during decoding as we might trash the buffers during encoding a bit */ | |
3538 if(!s->encoding){ | |
1064 | 3539 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy]; |
903 | 3540 const int age= s->current_picture.age; |
3541 | |
3542 assert(age); | |
3543 | |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3544 if (s->mb_skiped) { |
903 | 3545 s->mb_skiped= 0; |
3546 assert(s->pict_type!=I_TYPE); | |
3547 | |
556 | 3548 (*mbskip_ptr) ++; /* indicate that this time we skiped it */ |
3549 if(*mbskip_ptr >99) *mbskip_ptr= 99; | |
3550 | |
903 | 3551 /* 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
|
3552 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
|
3553 return; |
903 | 3554 } |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3555 } 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
|
3556 (*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
|
3557 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
|
3558 } else{ |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3559 *mbskip_ptr = 0; /* not skipped */ |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3560 } |
717 | 3561 } |
2256 | 3562 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3563 dct_linesize = linesize << s->interlaced_dct; |
2256 | 3564 dct_offset =(s->interlaced_dct)? linesize : linesize*block_size; |
3565 | |
1632 | 3566 if(readable){ |
3567 dest_y= s->dest[0]; | |
3568 dest_cb= s->dest[1]; | |
3569 dest_cr= s->dest[2]; | |
3570 }else{ | |
1799 | 3571 dest_y = s->b_scratchpad; |
1834 | 3572 dest_cb= s->b_scratchpad+16*linesize; |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3573 dest_cr= s->b_scratchpad+32*linesize; |
1632 | 3574 } |
2256 | 3575 |
0 | 3576 if (!s->mb_intra) { |
3577 /* motion handling */ | |
456 | 3578 /* decoding or more than one mb_type (MC was allready done otherwise) */ |
1389 | 3579 if(!s->encoding){ |
2256 | 3580 if(lowres_flag){ |
3581 h264_chroma_mc_func *op_pix = s->dsp.put_h264_chroma_pixels_tab; | |
3582 | |
3583 if (s->mv_dir & MV_DIR_FORWARD) { | |
3584 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix); | |
3585 op_pix = s->dsp.avg_h264_chroma_pixels_tab; | |
3586 } | |
3587 if (s->mv_dir & MV_DIR_BACKWARD) { | |
3588 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix); | |
3589 } | |
324 | 3590 }else{ |
2256 | 3591 if ((!s->no_rounding) || s->pict_type==B_TYPE){ |
3592 op_pix = s->dsp.put_pixels_tab; | |
3593 op_qpix= s->dsp.put_qpel_pixels_tab; | |
3594 }else{ | |
3595 op_pix = s->dsp.put_no_rnd_pixels_tab; | |
3596 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; | |
3597 } | |
3598 if (s->mv_dir & MV_DIR_FORWARD) { | |
3599 MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix); | |
3600 op_pix = s->dsp.avg_pixels_tab; | |
3601 op_qpix= s->dsp.avg_qpel_pixels_tab; | |
3602 } | |
3603 if (s->mv_dir & MV_DIR_BACKWARD) { | |
3604 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); | |
3605 } | |
324 | 3606 } |
0 | 3607 } |
3608 | |
481 | 3609 /* skip dequant / idct if we are really late ;) */ |
814 | 3610 if(s->hurry_up>1) return; |
481 | 3611 |
0 | 3612 /* add dct residue */ |
1421 | 3613 if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO |
711 | 3614 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){ |
2256 | 3615 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
3616 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
3617 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
3618 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
0 | 3619 |
485 | 3620 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1644 | 3621 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
3622 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
485 | 3623 } |
936 | 3624 } else if(s->codec_id != CODEC_ID_WMV2){ |
2256 | 3625 add_dct(s, block[0], 0, dest_y , dct_linesize); |
3626 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize); | |
3627 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize); | |
3628 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize); | |
481 | 3629 |
485 | 3630 if(!(s->flags&CODEC_FLAG_GRAY)){ |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3631 if(s->chroma_y_shift){//Chroma420 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3632 add_dct(s, block[4], 4, dest_cb, uvlinesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3633 add_dct(s, block[5], 5, dest_cr, uvlinesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3634 }else{ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3635 //chroma422 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3636 dct_linesize = uvlinesize << s->interlaced_dct; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3637 dct_offset =(s->interlaced_dct)? uvlinesize : uvlinesize*8; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3638 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3639 add_dct(s, block[4], 4, dest_cb, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3640 add_dct(s, block[5], 5, dest_cr, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3641 add_dct(s, block[6], 6, dest_cb+dct_offset, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3642 add_dct(s, block[7], 7, dest_cr+dct_offset, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3643 if(!s->chroma_x_shift){//Chroma444 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3644 add_dct(s, block[8], 8, dest_cb+8, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3645 add_dct(s, block[9], 9, dest_cr+8, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3646 add_dct(s, block[10], 10, dest_cb+8+dct_offset, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3647 add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3648 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3649 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3650 }//fi gray |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3651 } |
1042 | 3652 #ifdef CONFIG_RISKY |
3653 else{ | |
936 | 3654 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); |
481 | 3655 } |
1042 | 3656 #endif |
0 | 3657 } else { |
3658 /* dct only in intra block */ | |
1421 | 3659 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ |
2256 | 3660 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
3661 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
3662 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
3663 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
0 | 3664 |
711 | 3665 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1651 | 3666 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
3667 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
711 | 3668 } |
3669 }else{ | |
2256 | 3670 s->dsp.idct_put(dest_y , dct_linesize, block[0]); |
3671 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]); | |
3672 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]); | |
3673 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]); | |
711 | 3674 |
3675 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3676 if(s->chroma_y_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3677 s->dsp.idct_put(dest_cb, uvlinesize, block[4]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3678 s->dsp.idct_put(dest_cr, uvlinesize, block[5]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3679 }else{ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3680 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3681 dct_linesize = uvlinesize << s->interlaced_dct; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3682 dct_offset =(s->interlaced_dct)? uvlinesize : uvlinesize*8; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3683 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3684 s->dsp.idct_put(dest_cb, dct_linesize, block[4]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3685 s->dsp.idct_put(dest_cr, dct_linesize, block[5]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3686 s->dsp.idct_put(dest_cb + dct_offset, dct_linesize, block[6]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3687 s->dsp.idct_put(dest_cr + dct_offset, dct_linesize, block[7]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3688 if(!s->chroma_x_shift){//Chroma444 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3689 s->dsp.idct_put(dest_cb + 8, dct_linesize, block[8]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3690 s->dsp.idct_put(dest_cr + 8, dct_linesize, block[9]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3691 s->dsp.idct_put(dest_cb + 8 + dct_offset, dct_linesize, block[10]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3692 s->dsp.idct_put(dest_cr + 8 + dct_offset, dct_linesize, block[11]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3693 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3694 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3695 }//gray |
485 | 3696 } |
0 | 3697 } |
1632 | 3698 if(!readable){ |
3699 s->dsp.put_pixels_tab[0][0](s->dest[0], dest_y , linesize,16); | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3700 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[1], dest_cb, uvlinesize,16 >> s->chroma_y_shift); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3701 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift); |
1632 | 3702 } |
0 | 3703 } |
294 | 3704 } |
3705 | |
2256 | 3706 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){ |
3707 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1); | |
3708 else MPV_decode_mb_internal(s, block, 0); | |
3709 } | |
3710 | |
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
|
3711 #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
|
3712 |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3713 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold) |
456 | 3714 { |
3715 static const char tab[64]= | |
3716 {3,2,2,1,1,1,1,1, | |
3717 1,1,1,1,1,1,1,1, | |
3718 1,1,1,1,1,1,1,1, | |
3719 0,0,0,0,0,0,0,0, | |
3720 0,0,0,0,0,0,0,0, | |
3721 0,0,0,0,0,0,0,0, | |
3722 0,0,0,0,0,0,0,0, | |
3723 0,0,0,0,0,0,0,0}; | |
3724 int score=0; | |
3725 int run=0; | |
3726 int i; | |
3727 DCTELEM *block= s->block[n]; | |
3728 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
|
3729 int skip_dc; |
456 | 3730 |
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
|
3731 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
|
3732 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
|
3733 threshold= -threshold; |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3734 }else |
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3735 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
|
3736 |
456 | 3737 /* are all which we could set to zero are allready zero? */ |
3738 if(last_index<=skip_dc - 1) return; | |
3739 | |
3740 for(i=0; i<=last_index; i++){ | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3741 const int j = s->intra_scantable.permutated[i]; |
456 | 3742 const int level = ABS(block[j]); |
3743 if(level==1){ | |
3744 if(skip_dc && i==0) continue; | |
3745 score+= tab[run]; | |
3746 run=0; | |
3747 }else if(level>1){ | |
3748 return; | |
3749 }else{ | |
3750 run++; | |
3751 } | |
3752 } | |
3753 if(score >= threshold) return; | |
3754 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
|
3755 const int j = s->intra_scantable.permutated[i]; |
456 | 3756 block[j]=0; |
3757 } | |
3758 if(block[0]) s->block_last_index[n]= 0; | |
3759 else s->block_last_index[n]= -1; | |
3760 } | |
3761 | |
344 | 3762 static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index) |
3763 { | |
3764 int i; | |
3765 const int maxlevel= s->max_qcoeff; | |
3766 const int minlevel= s->min_qcoeff; | |
1722
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3767 int overflow=0; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3768 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3769 if(s->mb_intra){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3770 i=1; //skip clipping of intra dc |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3771 }else |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3772 i=0; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3773 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3774 for(;i<=last_index; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3775 const int j= s->intra_scantable.permutated[i]; |
344 | 3776 int level = block[j]; |
3777 | |
1722
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3778 if (level>maxlevel){ |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3779 level=maxlevel; |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3780 overflow++; |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3781 }else if(level<minlevel){ |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3782 level=minlevel; |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3783 overflow++; |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3784 } |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3785 |
344 | 3786 block[j]= level; |
3787 } | |
1722
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3788 |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3789 if(overflow && s->avctx->mb_decision == FF_MB_DECISION_SIMPLE) |
7e040c2a86e4
warn the user if we had to clip some dct coefficient due to a crappy format which doenst support the whole needed range (msmpeg4/wmv mostly but mpeg1 too to a lesser extend)
michael
parents:
1719
diff
changeset
|
3790 av_log(s->avctx, AV_LOG_INFO, "warning, cliping %d dct coefficents to %d..%d\n", overflow, minlevel, maxlevel); |
344 | 3791 } |
324 | 3792 |
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
|
3793 #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
|
3794 |
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3795 /** |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3796 * |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3797 * @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
|
3798 */ |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3799 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){ |
1368 | 3800 if (s->avctx->draw_horiz_band) { |
1370 | 3801 AVFrame *src; |
1368 | 3802 int offset[4]; |
1370 | 3803 |
3804 if(s->picture_structure != PICT_FRAME){ | |
3805 h <<= 1; | |
3806 y <<= 1; | |
3807 if(s->first_field && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return; | |
3808 } | |
3809 | |
2266
514949de5d15
set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
michael
parents:
2265
diff
changeset
|
3810 h= FFMIN(h, s->avctx->height - y); |
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3811 |
1370 | 3812 if(s->pict_type==B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER)) |
3813 src= (AVFrame*)s->current_picture_ptr; | |
3814 else if(s->last_picture_ptr) | |
3815 src= (AVFrame*)s->last_picture_ptr; | |
3816 else | |
3817 return; | |
3818 | |
1369 | 3819 if(s->pict_type==B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){ |
1368 | 3820 offset[0]= |
3821 offset[1]= | |
3822 offset[2]= | |
3823 offset[3]= 0; | |
3824 }else{ | |
3825 offset[0]= y * s->linesize;; | |
3826 offset[1]= | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3827 offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize; |
1368 | 3828 offset[3]= 0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3829 } |
1368 | 3830 |
813 | 3831 emms_c(); |
3832 | |
1370 | 3833 s->avctx->draw_horiz_band(s->avctx, src, offset, |
3834 y, s->picture_structure, h); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3835 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3836 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3837 |
1389 | 3838 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename |
3839 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics | |
3840 const int uvlinesize= s->current_picture.linesize[1]; | |
2256 | 3841 const int mb_size= 4 - s->avctx->lowres; |
1389 | 3842 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3843 s->block_index[0]= s->b8_stride*(s->mb_y*2 ) - 2 + s->mb_x*2; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3844 s->block_index[1]= s->b8_stride*(s->mb_y*2 ) - 1 + s->mb_x*2; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3845 s->block_index[2]= s->b8_stride*(s->mb_y*2 + 1) - 2 + s->mb_x*2; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3846 s->block_index[3]= s->b8_stride*(s->mb_y*2 + 1) - 1 + s->mb_x*2; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3847 s->block_index[4]= s->mb_stride*(s->mb_y + 1) + s->b8_stride*s->mb_height*2 + s->mb_x - 1; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3848 s->block_index[5]= s->mb_stride*(s->mb_y + s->mb_height + 2) + s->b8_stride*s->mb_height*2 + s->mb_x - 1; |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3849 //block_index is not used by mpeg2, so it is not affected by chroma_format |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3850 |
2256 | 3851 s->dest[0] = s->current_picture.data[0] + ((s->mb_x - 1) << mb_size); |
3852 s->dest[1] = s->current_picture.data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
3853 s->dest[2] = s->current_picture.data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
2168 | 3854 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3855 if(!(s->pict_type==B_TYPE && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME)) |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3856 { |
2256 | 3857 s->dest[0] += s->mb_y * linesize << mb_size; |
3858 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift); | |
3859 s->dest[2] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift); | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3860 } |
1389 | 3861 } |
3862 | |
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
|
3863 #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
|
3864 |
1777 | 3865 static void get_vissual_weight(int16_t *weight, uint8_t *ptr, int stride){ |
3866 int x, y; | |
3867 //FIXME optimize | |
3868 for(y=0; y<8; y++){ | |
3869 for(x=0; x<8; x++){ | |
3870 int x2, y2; | |
3871 int sum=0; | |
3872 int sqr=0; | |
3873 int count=0; | |
3874 | |
3875 for(y2= FFMAX(y-1, 0); y2 < FFMIN(8, y+2); y2++){ | |
3876 for(x2= FFMAX(x-1, 0); x2 < FFMIN(8, x+2); x2++){ | |
3877 int v= ptr[x2 + y2*stride]; | |
3878 sum += v; | |
3879 sqr += v*v; | |
3880 count++; | |
3881 } | |
3882 } | |
3883 weight[x + 8*y]= (36*ff_sqrt(count*sqr - sum*sum)) / count; | |
3884 } | |
3885 } | |
3886 } | |
3887 | |
324 | 3888 static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) |
294 | 3889 { |
1777 | 3890 int16_t weight[6][64]; |
3891 DCTELEM orig[6][64]; | |
294 | 3892 const int mb_x= s->mb_x; |
3893 const int mb_y= s->mb_y; | |
3894 int i; | |
456 | 3895 int skip_dct[6]; |
697 | 3896 int dct_offset = s->linesize*8; //default for progressive frames |
1778 | 3897 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
3898 int wrap_y, wrap_c; | |
697 | 3899 |
456 | 3900 for(i=0; i<6; i++) skip_dct[i]=0; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3901 |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3902 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
|
3903 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
|
3904 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
|
3905 |
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
|
3906 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
|
3907 update_qscale(s); |
1616 | 3908 |
3909 if(!(s->flags&CODEC_FLAG_QP_RD)){ | |
3910 s->dquant= s->qscale - last_qp; | |
3911 | |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3912 if(s->out_format==FMT_H263){ |
1616 | 3913 s->dquant= clip(s->dquant, -2, 2); //FIXME RD |
697 | 3914 |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3915 if(s->codec_id==CODEC_ID_MPEG4){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3916 if(!s->mb_intra){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3917 if(s->pict_type == B_TYPE){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3918 if(s->dquant&1) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3919 s->dquant= (s->dquant/2)*2; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3920 if(s->mv_dir&MV_DIRECT) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3921 s->dquant= 0; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3922 } |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3923 if(s->mv_type==MV_TYPE_8X8) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3924 s->dquant=0; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3925 } |
1616 | 3926 } |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3927 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3928 } |
1652 | 3929 ff_set_qscale(s, last_qp + s->dquant); |
2054 | 3930 }else if(s->flags&CODEC_FLAG_QP_RD) |
3931 ff_set_qscale(s, s->qscale + s->dquant); | |
294 | 3932 |
1778 | 3933 wrap_y = s->linesize; |
3934 wrap_c = s->uvlinesize; | |
3935 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16; | |
3936 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
3937 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
3938 | |
3939 if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){ | |
2165
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3940 uint8_t *ebuf= s->edge_emu_buffer + 32; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3941 ff_emulated_edge_mc(ebuf , ptr_y , wrap_y,16,16,mb_x*16,mb_y*16, s->width , s->height); |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3942 ptr_y= ebuf; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3943 ff_emulated_edge_mc(ebuf+18*wrap_y , ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3944 ptr_cb= ebuf+18*wrap_y; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3945 ff_emulated_edge_mc(ebuf+18*wrap_y+8, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1); |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3946 ptr_cr= ebuf+18*wrap_y+8; |
1778 | 3947 } |
3948 | |
324 | 3949 if (s->mb_intra) { |
697 | 3950 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
3951 int progressive_score, interlaced_score; | |
1708 | 3952 |
1729 | 3953 s->interlaced_dct=0; |
1777 | 3954 progressive_score= s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y, 8) |
3955 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y*8, NULL, wrap_y, 8) - 400; | |
1729 | 3956 |
3957 if(progressive_score > 0){ | |
1777 | 3958 interlaced_score = s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y*2, 8) |
3959 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y , NULL, wrap_y*2, 8); | |
1729 | 3960 if(progressive_score > interlaced_score){ |
3961 s->interlaced_dct=1; | |
697 | 3962 |
1729 | 3963 dct_offset= wrap_y; |
3964 wrap_y<<=1; | |
3965 } | |
3966 } | |
697 | 3967 } |
3968 | |
1777 | 3969 s->dsp.get_pixels(s->block[0], ptr_y , wrap_y); |
3970 s->dsp.get_pixels(s->block[1], ptr_y + 8, wrap_y); | |
3971 s->dsp.get_pixels(s->block[2], ptr_y + dct_offset , wrap_y); | |
3972 s->dsp.get_pixels(s->block[3], ptr_y + dct_offset + 8, wrap_y); | |
294 | 3973 |
487 | 3974 if(s->flags&CODEC_FLAG_GRAY){ |
3975 skip_dct[4]= 1; | |
3976 skip_dct[5]= 1; | |
3977 }else{ | |
1777 | 3978 s->dsp.get_pixels(s->block[4], ptr_cb, wrap_c); |
3979 s->dsp.get_pixels(s->block[5], ptr_cr, wrap_c); | |
3980 } | |
324 | 3981 }else{ |
651 | 3982 op_pixels_func (*op_pix)[4]; |
3983 qpel_mc_func (*op_qpix)[16]; | |
1064 | 3984 uint8_t *dest_y, *dest_cb, *dest_cr; |
294 | 3985 |
1389 | 3986 dest_y = s->dest[0]; |
3987 dest_cb = s->dest[1]; | |
3988 dest_cr = s->dest[2]; | |
324 | 3989 |
327 | 3990 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
|
3991 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
|
3992 op_qpix= s->dsp.put_qpel_pixels_tab; |
295 | 3993 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
3994 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
|
3995 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; |
324 | 3996 } |
295 | 3997 |
324 | 3998 if (s->mv_dir & MV_DIR_FORWARD) { |
903 | 3999 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
|
4000 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
|
4001 op_qpix= s->dsp.avg_qpel_pixels_tab; |
324 | 4002 } |
4003 if (s->mv_dir & MV_DIR_BACKWARD) { | |
903 | 4004 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); |
324 | 4005 } |
295 | 4006 |
697 | 4007 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
4008 int progressive_score, interlaced_score; | |
1729 | 4009 |
4010 s->interlaced_dct=0; | |
4011 progressive_score= s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y, 8) | |
4012 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y*8, ptr_y + wrap_y*8, wrap_y, 8) - 400; | |
697 | 4013 |
1729 | 4014 if(s->avctx->ildct_cmp == FF_CMP_VSSE) progressive_score -= 400; |
4015 | |
4016 if(progressive_score>0){ | |
4017 interlaced_score = s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y*2, 8) | |
4018 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y , ptr_y + wrap_y , wrap_y*2, 8); | |
697 | 4019 |
1729 | 4020 if(progressive_score > interlaced_score){ |
4021 s->interlaced_dct=1; | |
4022 | |
4023 dct_offset= wrap_y; | |
4024 wrap_y<<=1; | |
4025 } | |
4026 } | |
697 | 4027 } |
4028 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4029 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
|
4030 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
|
4031 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
|
4032 s->dsp.diff_pixels(s->block[3], ptr_y + dct_offset + 8, dest_y + dct_offset + 8, wrap_y); |
487 | 4033 |
4034 if(s->flags&CODEC_FLAG_GRAY){ | |
4035 skip_dct[4]= 1; | |
4036 skip_dct[5]= 1; | |
4037 }else{ | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4038 s->dsp.diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c); |
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4039 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c); |
487 | 4040 } |
456 | 4041 /* 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
|
4042 if(s->current_picture.mc_mb_var[s->mb_stride*mb_y+ mb_x]<2*s->qscale*s->qscale){ |
697 | 4043 //FIXME optimize |
1708 | 4044 if(s->dsp.sad[1](NULL, ptr_y , dest_y , wrap_y, 8) < 20*s->qscale) skip_dct[0]= 1; |
4045 if(s->dsp.sad[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20*s->qscale) skip_dct[1]= 1; | |
4046 if(s->dsp.sad[1](NULL, ptr_y +dct_offset , dest_y +dct_offset , wrap_y, 8) < 20*s->qscale) skip_dct[2]= 1; | |
4047 if(s->dsp.sad[1](NULL, ptr_y +dct_offset+ 8, dest_y +dct_offset+ 8, wrap_y, 8) < 20*s->qscale) skip_dct[3]= 1; | |
4048 if(s->dsp.sad[1](NULL, ptr_cb , dest_cb , wrap_c, 8) < 20*s->qscale) skip_dct[4]= 1; | |
4049 if(s->dsp.sad[1](NULL, ptr_cr , dest_cr , wrap_c, 8) < 20*s->qscale) skip_dct[5]= 1; | |
456 | 4050 } |
1778 | 4051 } |
4052 | |
4053 if(s->avctx->quantizer_noise_shaping){ | |
4054 if(!skip_dct[0]) get_vissual_weight(weight[0], ptr_y , wrap_y); | |
4055 if(!skip_dct[1]) get_vissual_weight(weight[1], ptr_y + 8, wrap_y); | |
4056 if(!skip_dct[2]) get_vissual_weight(weight[2], ptr_y + dct_offset , wrap_y); | |
4057 if(!skip_dct[3]) get_vissual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y); | |
4058 if(!skip_dct[4]) get_vissual_weight(weight[4], ptr_cb , wrap_c); | |
4059 if(!skip_dct[5]) get_vissual_weight(weight[5], ptr_cr , wrap_c); | |
4060 memcpy(orig[0], s->block[0], sizeof(DCTELEM)*64*6); | |
294 | 4061 } |
4062 | |
4063 /* DCT & quantize */ | |
1778 | 4064 assert(s->out_format!=FMT_MJPEG || s->qscale==8); |
4065 { | |
344 | 4066 for(i=0;i<6;i++) { |
456 | 4067 if(!skip_dct[i]){ |
4068 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
|
4069 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, s->qscale, &overflow); |
344 | 4070 // 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
|
4071 // 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
|
4072 // of improve it. Just INTRADC clipping deserves changes in quantizer |
456 | 4073 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); |
4074 }else | |
4075 s->block_last_index[i]= -1; | |
344 | 4076 } |
1777 | 4077 if(s->avctx->quantizer_noise_shaping){ |
4078 for(i=0;i<6;i++) { | |
4079 if(!skip_dct[i]){ | |
4080 s->block_last_index[i] = dct_quantize_refine(s, s->block[i], weight[i], orig[i], i, s->qscale); | |
4081 } | |
4082 } | |
4083 } | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4084 |
456 | 4085 if(s->luma_elim_threshold && !s->mb_intra) |
4086 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
|
4087 dct_single_coeff_elimination(s, i, s->luma_elim_threshold); |
456 | 4088 if(s->chroma_elim_threshold && !s->mb_intra) |
4089 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
|
4090 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold); |
1497 | 4091 |
4092 if(s->flags & CODEC_FLAG_CBP_RD){ | |
4093 for(i=0;i<6;i++) { | |
4094 if(s->block_last_index[i] == -1) | |
4095 s->coded_score[i]= INT_MAX/256; | |
4096 } | |
4097 } | |
294 | 4098 } |
4099 | |
487 | 4100 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ |
4101 s->block_last_index[4]= | |
4102 s->block_last_index[5]= 0; | |
4103 s->block[4][0]= | |
1011 | 4104 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale; |
487 | 4105 } |
4106 | |
1708 | 4107 //non c quantize code returns incorrect block_last_index FIXME |
4108 if(s->alternate_scan && s->dct_quantize != dct_quantize_c){ | |
4109 for(i=0; i<6; i++){ | |
4110 int j; | |
4111 if(s->block_last_index[i]>0){ | |
4112 for(j=63; j>0; j--){ | |
4113 if(s->block[i][ s->intra_scantable.permutated[j] ]) break; | |
4114 } | |
4115 s->block_last_index[i]= j; | |
4116 } | |
4117 } | |
4118 } | |
4119 | |
294 | 4120 /* huffman encode */ |
936 | 4121 switch(s->codec_id){ //FIXME funct ptr could be slightly faster |
4122 case CODEC_ID_MPEG1VIDEO: | |
1421 | 4123 case CODEC_ID_MPEG2VIDEO: |
936 | 4124 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; |
1042 | 4125 #ifdef CONFIG_RISKY |
936 | 4126 case CODEC_ID_MPEG4: |
4127 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
4128 case CODEC_ID_MSMPEG4V2: | |
4129 case CODEC_ID_MSMPEG4V3: | |
4130 case CODEC_ID_WMV1: | |
4131 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
4132 case CODEC_ID_WMV2: | |
4133 ff_wmv2_encode_mb(s, s->block, motion_x, motion_y); break; | |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4134 case CODEC_ID_H261: |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4135 ff_h261_encode_mb(s, s->block, motion_x, motion_y); break; |
936 | 4136 case CODEC_ID_H263: |
4137 case CODEC_ID_H263P: | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4138 case CODEC_ID_FLV1: |
936 | 4139 case CODEC_ID_RV10: |
4140 h263_encode_mb(s, s->block, motion_x, motion_y); break; | |
1042 | 4141 #endif |
4142 case CODEC_ID_MJPEG: | |
4143 mjpeg_encode_mb(s, s->block); break; | |
936 | 4144 default: |
4145 assert(0); | |
294 | 4146 } |
4147 } | |
4148 | |
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
|
4149 #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
|
4150 |
1368 | 4151 void ff_mpeg_flush(AVCodecContext *avctx){ |
4152 int i; | |
4153 MpegEncContext *s = avctx->priv_data; | |
4154 | |
1751 | 4155 if(s==NULL || s->picture==NULL) |
4156 return; | |
4157 | |
1368 | 4158 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
4159 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL | |
4160 || s->picture[i].type == FF_BUFFER_TYPE_USER)) | |
4161 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); | |
4162 } | |
1601 | 4163 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL; |
1395 | 4164 |
4165 s->parse_context.state= -1; | |
4166 s->parse_context.frame_start_found= 0; | |
4167 s->parse_context.overread= 0; | |
4168 s->parse_context.overread_index= 0; | |
4169 s->parse_context.index= 0; | |
4170 s->parse_context.last_index= 0; | |
1851 | 4171 s->bitstream_buffer_size=0; |
1368 | 4172 } |
4173 | |
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
|
4174 #ifdef CONFIG_ENCODERS |
1064 | 4175 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) |
294 | 4176 { |
1810 | 4177 const uint16_t *srcw= (uint16_t*)src; |
1799 | 4178 int words= length>>4; |
326 | 4179 int bits= length&15; |
4180 int i; | |
4181 | |
456 | 4182 if(length==0) return; |
1799 | 4183 |
1803 | 4184 if(words < 16){ |
4185 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); | |
4186 }else if(put_bits_count(pb)&7){ | |
4187 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); | |
1802
e91dbb5b1a8d
activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
michael
parents:
1801
diff
changeset
|
4188 }else{ |
1803 | 4189 for(i=0; put_bits_count(pb)&31; i++) |
4190 put_bits(pb, 8, src[i]); | |
1799 | 4191 flush_put_bits(pb); |
1803 | 4192 memcpy(pbBufPtr(pb), src+i, 2*words-i); |
4193 skip_put_bytes(pb, 2*words-i); | |
1802
e91dbb5b1a8d
activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr()
michael
parents:
1801
diff
changeset
|
4194 } |
1799 | 4195 |
1803 | 4196 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits)); |
0 | 4197 } |
4198 | |
456 | 4199 static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 4200 int i; |
4201 | |
4202 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
4203 | |
4204 /* mpeg1 */ | |
1160 | 4205 d->mb_skip_run= s->mb_skip_run; |
326 | 4206 for(i=0; i<3; i++) |
4207 d->last_dc[i]= s->last_dc[i]; | |
4208 | |
4209 /* statistics */ | |
4210 d->mv_bits= s->mv_bits; | |
4211 d->i_tex_bits= s->i_tex_bits; | |
4212 d->p_tex_bits= s->p_tex_bits; | |
4213 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
|
4214 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
|
4215 d->b_count= s->b_count; |
326 | 4216 d->skip_count= s->skip_count; |
4217 d->misc_bits= s->misc_bits; | |
329 | 4218 d->last_bits= 0; |
327 | 4219 |
1389 | 4220 d->mb_skiped= 0; |
912 | 4221 d->qscale= s->qscale; |
1616 | 4222 d->dquant= s->dquant; |
326 | 4223 } |
4224 | |
456 | 4225 static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 4226 int i; |
4227 | |
4228 memcpy(d->mv, s->mv, 2*4*2*sizeof(int)); | |
4229 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
4230 | |
4231 /* mpeg1 */ | |
1160 | 4232 d->mb_skip_run= s->mb_skip_run; |
326 | 4233 for(i=0; i<3; i++) |
4234 d->last_dc[i]= s->last_dc[i]; | |
4235 | |
4236 /* statistics */ | |
4237 d->mv_bits= s->mv_bits; | |
4238 d->i_tex_bits= s->i_tex_bits; | |
4239 d->p_tex_bits= s->p_tex_bits; | |
4240 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
|
4241 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
|
4242 d->b_count= s->b_count; |
326 | 4243 d->skip_count= s->skip_count; |
4244 d->misc_bits= s->misc_bits; | |
4245 | |
4246 d->mb_intra= s->mb_intra; | |
327 | 4247 d->mb_skiped= s->mb_skiped; |
326 | 4248 d->mv_type= s->mv_type; |
4249 d->mv_dir= s->mv_dir; | |
4250 d->pb= s->pb; | |
456 | 4251 if(s->data_partitioning){ |
4252 d->pb2= s->pb2; | |
4253 d->tex_pb= s->tex_pb; | |
4254 } | |
326 | 4255 d->block= s->block; |
4256 for(i=0; i<6; i++) | |
4257 d->block_last_index[i]= s->block_last_index[i]; | |
755 | 4258 d->interlaced_dct= s->interlaced_dct; |
912 | 4259 d->qscale= s->qscale; |
326 | 4260 } |
4261 | |
456 | 4262 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type, |
4263 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2], | |
4264 int *dmin, int *next_block, int motion_x, int motion_y) | |
4265 { | |
1389 | 4266 int score; |
4267 uint8_t *dest_backup[3]; | |
456 | 4268 |
4269 copy_context_before_encode(s, backup, type); | |
4270 | |
4271 s->block= s->blocks[*next_block]; | |
4272 s->pb= pb[*next_block]; | |
4273 if(s->data_partitioning){ | |
4274 s->pb2 = pb2 [*next_block]; | |
4275 s->tex_pb= tex_pb[*next_block]; | |
4276 } | |
1389 | 4277 |
4278 if(*next_block){ | |
4279 memcpy(dest_backup, s->dest, sizeof(s->dest)); | |
1799 | 4280 s->dest[0] = s->rd_scratchpad; |
4281 s->dest[1] = s->rd_scratchpad + 16*s->linesize; | |
4282 s->dest[2] = s->rd_scratchpad + 16*s->linesize + 8; | |
4283 assert(s->linesize >= 32); //FIXME | |
1389 | 4284 } |
456 | 4285 |
4286 encode_mb(s, motion_x, motion_y); | |
1389 | 4287 |
1786 | 4288 score= put_bits_count(&s->pb); |
456 | 4289 if(s->data_partitioning){ |
1786 | 4290 score+= put_bits_count(&s->pb2); |
4291 score+= put_bits_count(&s->tex_pb); | |
456 | 4292 } |
1389 | 4293 |
4294 if(s->avctx->mb_decision == FF_MB_DECISION_RD){ | |
4295 MPV_decode_mb(s, s->block); | |
4296 | |
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
|
4297 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
|
4298 score += sse_mb(s) << FF_LAMBDA_SHIFT; |
1389 | 4299 } |
4300 | |
4301 if(*next_block){ | |
4302 memcpy(s->dest, dest_backup, sizeof(s->dest)); | |
4303 } | |
4304 | |
4305 if(score<*dmin){ | |
4306 *dmin= score; | |
456 | 4307 *next_block^=1; |
4308 | |
4309 copy_context_after_encode(best, s, type); | |
4310 } | |
4311 } | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4312 |
1389 | 4313 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
|
4314 uint32_t *sq = squareTbl + 256; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4315 int acc=0; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4316 int x,y; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4317 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4318 if(w==16 && h==16) |
1708 | 4319 return s->dsp.sse[0](NULL, src1, src2, stride, 16); |
936 | 4320 else if(w==8 && h==8) |
1708 | 4321 return s->dsp.sse[1](NULL, src1, src2, stride, 8); |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4322 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4323 for(y=0; y<h; y++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4324 for(x=0; x<w; x++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4325 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
|
4326 } |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4327 } |
936 | 4328 |
4329 assert(acc>=0); | |
4330 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4331 return acc; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4332 } |
326 | 4333 |
1389 | 4334 static int sse_mb(MpegEncContext *s){ |
4335 int w= 16; | |
4336 int h= 16; | |
4337 | |
4338 if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; | |
4339 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; | |
4340 | |
4341 if(w==16 && h==16) | |
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4342 if(s->avctx->mb_cmp == FF_CMP_NSSE){ |
2066 | 4343 return s->dsp.nsse[0](s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], s->linesize, 16) |
4344 +s->dsp.nsse[1](s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], s->uvlinesize, 8) | |
4345 +s->dsp.nsse[1](s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], s->uvlinesize, 8); | |
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4346 }else{ |
1708 | 4347 return s->dsp.sse[0](NULL, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], s->linesize, 16) |
4348 +s->dsp.sse[1](NULL, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[1], s->uvlinesize, 8) | |
4349 +s->dsp.sse[1](NULL, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], s->uvlinesize, 8); | |
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4350 } |
1389 | 4351 else |
4352 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) | |
4353 +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) | |
4354 +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); | |
4355 } | |
4356 | |
1799 | 4357 static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){ |
4358 MpegEncContext *s= arg; | |
4359 | |
4360 | |
4361 s->me.pre_pass=1; | |
4362 s->me.dia_size= s->avctx->pre_dia_size; | |
4363 s->first_slice_line=1; | |
4364 for(s->mb_y= s->end_mb_y-1; s->mb_y >= s->start_mb_y; s->mb_y--) { | |
4365 for(s->mb_x=s->mb_width-1; s->mb_x >=0 ;s->mb_x--) { | |
4366 ff_pre_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
4367 } | |
4368 s->first_slice_line=0; | |
4369 } | |
4370 | |
4371 s->me.pre_pass=0; | |
4372 | |
4373 return 0; | |
4374 } | |
4375 | |
4376 static int estimate_motion_thread(AVCodecContext *c, void *arg){ | |
4377 MpegEncContext *s= arg; | |
4378 | |
4379 s->me.dia_size= s->avctx->dia_size; | |
4380 s->first_slice_line=1; | |
4381 for(s->mb_y= s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) { | |
4382 s->mb_x=0; //for block init below | |
4383 ff_init_block_index(s); | |
4384 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { | |
4385 s->block_index[0]+=2; | |
4386 s->block_index[1]+=2; | |
4387 s->block_index[2]+=2; | |
4388 s->block_index[3]+=2; | |
4389 | |
4390 /* compute motion vector & mb_type and store in context */ | |
4391 if(s->pict_type==B_TYPE) | |
4392 ff_estimate_b_frame_motion(s, s->mb_x, s->mb_y); | |
4393 else | |
4394 ff_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
4395 } | |
4396 s->first_slice_line=0; | |
4397 } | |
4398 return 0; | |
4399 } | |
4400 | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4401 static int mb_var_thread(AVCodecContext *c, void *arg){ |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4402 MpegEncContext *s= arg; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4403 int mb_x, mb_y; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4404 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4405 for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4406 for(mb_x=0; mb_x < s->mb_width; mb_x++) { |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4407 int xx = mb_x * 16; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4408 int yy = mb_y * 16; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4409 uint8_t *pix = s->new_picture.data[0] + (yy * s->linesize) + xx; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4410 int varc; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4411 int sum = s->dsp.pix_sum(pix, s->linesize); |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4412 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4413 varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4414 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4415 s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4416 s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
4417 s->me.mb_var_sum_temp += varc; |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4418 } |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4419 } |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4420 return 0; |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4421 } |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4422 |
1799 | 4423 static void write_slice_end(MpegEncContext *s){ |
4424 if(s->codec_id==CODEC_ID_MPEG4){ | |
4425 if(s->partitioned_frame){ | |
4426 ff_mpeg4_merge_partitions(s); | |
4427 } | |
4428 | |
4429 ff_mpeg4_stuffing(&s->pb); | |
4430 }else if(s->out_format == FMT_MJPEG){ | |
4431 ff_mjpeg_stuffing(&s->pb); | |
4432 } | |
4433 | |
4434 align_put_bits(&s->pb); | |
4435 flush_put_bits(&s->pb); | |
4436 } | |
4437 | |
4438 static int encode_thread(AVCodecContext *c, void *arg){ | |
4439 MpegEncContext *s= arg; | |
766 | 4440 int mb_x, mb_y, pdif = 0; |
1708 | 4441 int i, j; |
326 | 4442 MpegEncContext best_s, backup_s; |
1064 | 4443 uint8_t bit_buf[2][3000]; |
4444 uint8_t bit_buf2[2][3000]; | |
4445 uint8_t bit_buf_tex[2][3000]; | |
456 | 4446 PutBitContext pb[2], pb2[2], tex_pb[2]; |
1799 | 4447 //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y); |
456 | 4448 |
4449 for(i=0; i<2; i++){ | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1505
diff
changeset
|
4450 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
|
4451 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
|
4452 init_put_bits(&tex_pb[i], bit_buf_tex[i], 3000); |
456 | 4453 } |
0 | 4454 |
1786 | 4455 s->last_bits= put_bits_count(&s->pb); |
286 | 4456 s->mv_bits=0; |
4457 s->misc_bits=0; | |
4458 s->i_tex_bits=0; | |
4459 s->p_tex_bits=0; | |
4460 s->i_count=0; | |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4461 s->f_count=0; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4462 s->b_count=0; |
286 | 4463 s->skip_count=0; |
4464 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4465 for(i=0; i<3; i++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4466 /* init last dc values */ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4467 /* note: quant matrix value (8) is implied here */ |
1992 | 4468 s->last_dc[i] = 128 << s->intra_dc_precision; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4469 |
1148 | 4470 s->current_picture_ptr->error[i] = 0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4471 } |
1160 | 4472 s->mb_skip_run = 0; |
1708 | 4473 memset(s->last_mv, 0, sizeof(s->last_mv)); |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4474 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4475 s->last_mv_dir = 0; |
0 | 4476 |
1042 | 4477 #ifdef CONFIG_RISKY |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4478 switch(s->codec_id){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4479 case CODEC_ID_H263: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4480 case CODEC_ID_H263P: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4481 case CODEC_ID_FLV1: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4482 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
|
4483 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4484 case CODEC_ID_MPEG4: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4485 if(s->partitioned_frame) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4486 ff_mpeg4_init_partitions(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4487 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4488 } |
1042 | 4489 #endif |
456 | 4490 |
4491 s->resync_mb_x=0; | |
1799 | 4492 s->resync_mb_y=0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4493 s->first_slice_line = 1; |
766 | 4494 s->ptr_lastgob = s->pb.buf; |
1799 | 4495 for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { |
4496 // printf("row %d at %X\n", s->mb_y, (int)s); | |
1389 | 4497 s->mb_x=0; |
4498 s->mb_y= mb_y; | |
4499 | |
1652 | 4500 ff_set_qscale(s, s->qscale); |
1389 | 4501 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
|
4502 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4503 for(mb_x=0; mb_x < s->mb_width; mb_x++) { |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4504 int xy= mb_y*s->mb_stride + mb_x; // removed const, H261 needs to adjust this |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1173
diff
changeset
|
4505 int mb_type= s->mb_type[xy]; |
456 | 4506 // int d; |
1389 | 4507 int dmin= INT_MAX; |
1708 | 4508 int dir; |
0 | 4509 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4510 s->mb_x = mb_x; |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4511 s->mb_y = mb_y; // moved into loop, can get changed by H.261 |
1389 | 4512 ff_update_block_index(s); |
456 | 4513 |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4514 if(s->codec_id == CODEC_ID_H261){ |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4515 ff_h261_reorder_mb_index(s); |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4516 xy= s->mb_y*s->mb_stride + s->mb_x; |
2345 | 4517 mb_type= s->mb_type[xy]; |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4518 } |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4519 |
766 | 4520 /* write gob / video packet header */ |
1042 | 4521 #ifdef CONFIG_RISKY |
1661 | 4522 if(s->rtp_mode){ |
766 | 4523 int current_packet_size, is_gob_start; |
4524 | |
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
4525 current_packet_size= ((put_bits_count(&s->pb)+7)>>3) - (s->ptr_lastgob - s->pb.buf); |
1661 | 4526 |
4527 is_gob_start= s->avctx->rtp_payload_size && current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x>0; | |
4528 | |
1799 | 4529 if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0) is_gob_start=1; |
4530 | |
1661 | 4531 switch(s->codec_id){ |
4532 case CODEC_ID_H263: | |
4533 case CODEC_ID_H263P: | |
4534 if(!s->h263_slice_structured) | |
4535 if(s->mb_x || s->mb_y%s->gob_index) is_gob_start=0; | |
4536 break; | |
4537 case CODEC_ID_MPEG2VIDEO: | |
4538 if(s->mb_x==0 && s->mb_y!=0) is_gob_start=1; | |
4539 case CODEC_ID_MPEG1VIDEO: | |
4540 if(s->mb_skip_run) is_gob_start=0; | |
4541 break; | |
4542 } | |
1799 | 4543 |
1661 | 4544 if(is_gob_start){ |
1799 | 4545 if(s->start_mb_y != mb_y || mb_x!=0){ |
4546 write_slice_end(s); | |
4547 | |
4548 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame){ | |
4549 ff_mpeg4_init_partitions(s); | |
4550 } | |
1661 | 4551 } |
4552 | |
1786 | 4553 assert((put_bits_count(&s->pb)&7) == 0); |
1661 | 4554 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob; |
1688 | 4555 |
4556 if(s->avctx->error_rate && s->resync_mb_x + s->resync_mb_y > 0){ | |
1786 | 4557 int r= put_bits_count(&s->pb)/8 + s->picture_number + s->codec_id + s->mb_x + s->mb_y; |
1688 | 4558 int d= 100 / s->avctx->error_rate; |
4559 if(r % d == 0){ | |
4560 current_packet_size=0; | |
4561 #ifndef ALT_BITSTREAM_WRITER | |
4562 s->pb.buf_ptr= s->ptr_lastgob; | |
4563 #endif | |
4564 assert(pbBufPtr(&s->pb) == s->ptr_lastgob); | |
4565 } | |
4566 } | |
1661 | 4567 |
4568 if (s->avctx->rtp_callback) | |
2025
591233f22963
rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>)
michael
parents:
2024
diff
changeset
|
4569 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, 0); |
1661 | 4570 |
4571 switch(s->codec_id){ | |
4572 case CODEC_ID_MPEG4: | |
456 | 4573 ff_mpeg4_encode_video_packet_header(s); |
4574 ff_mpeg4_clean_buffers(s); | |
1661 | 4575 break; |
4576 case CODEC_ID_MPEG1VIDEO: | |
4577 case CODEC_ID_MPEG2VIDEO: | |
1421 | 4578 ff_mpeg1_encode_slice_header(s); |
4579 ff_mpeg1_clean_buffers(s); | |
1661 | 4580 break; |
4581 case CODEC_ID_H263: | |
4582 case CODEC_ID_H263P: | |
4583 h263_encode_gob_header(s, mb_y); | |
4584 break; | |
1160 | 4585 } |
1661 | 4586 |
4587 if(s->flags&CODEC_FLAG_PASS1){ | |
1786 | 4588 int bits= put_bits_count(&s->pb); |
1661 | 4589 s->misc_bits+= bits - s->last_bits; |
4590 s->last_bits= bits; | |
766 | 4591 } |
1661 | 4592 |
1662 | 4593 s->ptr_lastgob += current_packet_size; |
456 | 4594 s->first_slice_line=1; |
4595 s->resync_mb_x=mb_x; | |
4596 s->resync_mb_y=mb_y; | |
4597 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4598 } |
1042 | 4599 #endif |
456 | 4600 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4601 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
|
4602 && 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
|
4603 s->first_slice_line=0; |
456 | 4604 } |
4605 | |
1389 | 4606 s->mb_skiped=0; |
1616 | 4607 s->dquant=0; //only for QP_RD |
4608 | |
2230 | 4609 if(mb_type & (mb_type-1) || (s->flags & CODEC_FLAG_QP_RD)){ // more than 1 MB type possible or CODEC_FLAG_QP_RD |
327 | 4610 int next_block=0; |
456 | 4611 int pb_bits_count, pb2_bits_count, tex_pb_bits_count; |
326 | 4612 |
4613 copy_context_before_encode(&backup_s, s, -1); | |
456 | 4614 backup_s.pb= s->pb; |
4615 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
|
4616 best_s.partitioned_frame= s->partitioned_frame; |
456 | 4617 if(s->data_partitioning){ |
4618 backup_s.pb2= s->pb2; | |
4619 backup_s.tex_pb= s->tex_pb; | |
4620 } | |
326 | 4621 |
1708 | 4622 if(mb_type&CANDIDATE_MB_TYPE_INTER){ |
327 | 4623 s->mv_dir = MV_DIR_FORWARD; |
295 | 4624 s->mv_type = MV_TYPE_16X16; |
294 | 4625 s->mb_intra= 0; |
324 | 4626 s->mv[0][0][0] = s->p_mv_table[xy][0]; |
4627 s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
1708 | 4628 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb, |
456 | 4629 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
0 | 4630 } |
1708 | 4631 if(mb_type&CANDIDATE_MB_TYPE_INTER_I){ |
4632 s->mv_dir = MV_DIR_FORWARD; | |
4633 s->mv_type = MV_TYPE_FIELD; | |
4634 s->mb_intra= 0; | |
4635 for(i=0; i<2; i++){ | |
4636 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
4637 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
4638 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
4639 } | |
4640 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb, | |
4641 &dmin, &next_block, 0, 0); | |
4642 } | |
4643 if(mb_type&CANDIDATE_MB_TYPE_SKIPED){ | |
1494
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
4644 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
|
4645 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
|
4646 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
|
4647 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
|
4648 s->mv[0][0][1] = 0; |
1708 | 4649 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_SKIPED, pb, pb2, tex_pb, |
1494
3ee63c12ea30
optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents:
1490
diff
changeset
|
4650 &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
|
4651 } |
1708 | 4652 if(mb_type&CANDIDATE_MB_TYPE_INTER4V){ |
327 | 4653 s->mv_dir = MV_DIR_FORWARD; |
295 | 4654 s->mv_type = MV_TYPE_8X8; |
4655 s->mb_intra= 0; | |
4656 for(i=0; i<4; i++){ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
4657 s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
4658 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
295 | 4659 } |
1708 | 4660 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb, |
456 | 4661 &dmin, &next_block, 0, 0); |
327 | 4662 } |
1708 | 4663 if(mb_type&CANDIDATE_MB_TYPE_FORWARD){ |
327 | 4664 s->mv_dir = MV_DIR_FORWARD; |
4665 s->mv_type = MV_TYPE_16X16; | |
4666 s->mb_intra= 0; | |
4667 s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
4668 s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
1708 | 4669 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb, |
456 | 4670 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
327 | 4671 } |
1708 | 4672 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD){ |
327 | 4673 s->mv_dir = MV_DIR_BACKWARD; |
4674 s->mv_type = MV_TYPE_16X16; | |
4675 s->mb_intra= 0; | |
4676 s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
4677 s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
1708 | 4678 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb, |
456 | 4679 &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]); |
327 | 4680 } |
1708 | 4681 if(mb_type&CANDIDATE_MB_TYPE_BIDIR){ |
327 | 4682 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
4683 s->mv_type = MV_TYPE_16X16; | |
4684 s->mb_intra= 0; | |
4685 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
4686 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
4687 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
4688 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
1708 | 4689 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb, |
456 | 4690 &dmin, &next_block, 0, 0); |
327 | 4691 } |
1708 | 4692 if(mb_type&CANDIDATE_MB_TYPE_DIRECT){ |
936 | 4693 int mx= s->b_direct_mv_table[xy][0]; |
4694 int my= s->b_direct_mv_table[xy][1]; | |
4695 | |
327 | 4696 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
4697 s->mb_intra= 0; | |
1042 | 4698 #ifdef CONFIG_RISKY |
936 | 4699 ff_mpeg4_set_direct_mv(s, mx, my); |
1042 | 4700 #endif |
1708 | 4701 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb, |
936 | 4702 &dmin, &next_block, mx, my); |
295 | 4703 } |
1708 | 4704 if(mb_type&CANDIDATE_MB_TYPE_FORWARD_I){ |
4705 s->mv_dir = MV_DIR_FORWARD; | |
4706 s->mv_type = MV_TYPE_FIELD; | |
4707 s->mb_intra= 0; | |
4708 for(i=0; i<2; i++){ | |
4709 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
4710 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
4711 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
4712 } | |
4713 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb, | |
4714 &dmin, &next_block, 0, 0); | |
4715 } | |
4716 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD_I){ | |
4717 s->mv_dir = MV_DIR_BACKWARD; | |
4718 s->mv_type = MV_TYPE_FIELD; | |
4719 s->mb_intra= 0; | |
4720 for(i=0; i<2; i++){ | |
4721 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
4722 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
4723 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
4724 } | |
4725 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb, | |
4726 &dmin, &next_block, 0, 0); | |
4727 } | |
4728 if(mb_type&CANDIDATE_MB_TYPE_BIDIR_I){ | |
4729 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
4730 s->mv_type = MV_TYPE_FIELD; | |
4731 s->mb_intra= 0; | |
4732 for(dir=0; dir<2; dir++){ | |
4733 for(i=0; i<2; i++){ | |
4734 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
4735 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
4736 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
4737 } | |
4738 } | |
4739 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb, | |
4740 &dmin, &next_block, 0, 0); | |
4741 } | |
4742 if(mb_type&CANDIDATE_MB_TYPE_INTRA){ | |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4743 s->mv_dir = 0; |
295 | 4744 s->mv_type = MV_TYPE_16X16; |
294 | 4745 s->mb_intra= 1; |
4746 s->mv[0][0][0] = 0; | |
4747 s->mv[0][0][1] = 0; | |
1708 | 4748 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb, |
456 | 4749 &dmin, &next_block, 0, 0); |
1389 | 4750 if(s->h263_pred || s->h263_aic){ |
4751 if(best_s.mb_intra) | |
4752 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1; | |
4753 else | |
4754 ff_clean_intra_table_entries(s); //old mode? | |
4755 } | |
295 | 4756 } |
1616 | 4757 |
4758 if(s->flags & CODEC_FLAG_QP_RD){ | |
4759 if(best_s.mv_type==MV_TYPE_16X16 && !(best_s.mv_dir&MV_DIRECT)){ | |
4760 const int last_qp= backup_s.qscale; | |
4761 int dquant, dir, qp, dc[6]; | |
1617 | 4762 DCTELEM ac[6][16]; |
1623 | 4763 const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0; |
1616 | 4764 |
4765 assert(backup_s.dquant == 0); | |
4766 | |
4767 //FIXME intra | |
4768 s->mv_dir= best_s.mv_dir; | |
4769 s->mv_type = MV_TYPE_16X16; | |
4770 s->mb_intra= best_s.mb_intra; | |
4771 s->mv[0][0][0] = best_s.mv[0][0][0]; | |
4772 s->mv[0][0][1] = best_s.mv[0][0][1]; | |
4773 s->mv[1][0][0] = best_s.mv[1][0][0]; | |
4774 s->mv[1][0][1] = best_s.mv[1][0][1]; | |
4775 | |
4776 dir= s->pict_type == B_TYPE ? 2 : 1; | |
1623 | 4777 if(last_qp + dir > s->avctx->qmax) dir= -dir; |
1616 | 4778 for(dquant= dir; dquant<=2 && dquant>=-2; dquant += dir){ |
4779 qp= last_qp + dquant; | |
4780 if(qp < s->avctx->qmin || qp > s->avctx->qmax) | |
4781 break; | |
4782 backup_s.dquant= dquant; | |
2229 | 4783 if(s->mb_intra && s->dc_val[0]){ |
1617 | 4784 for(i=0; i<6; i++){ |
4785 dc[i]= s->dc_val[0][ s->block_index[i] ]; | |
4786 memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(DCTELEM)*16); | |
4787 } | |
1616 | 4788 } |
1617 | 4789 |
1708 | 4790 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb, |
1623 | 4791 &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]); |
1616 | 4792 if(best_s.qscale != qp){ |
2229 | 4793 if(s->mb_intra && s->dc_val[0]){ |
1617 | 4794 for(i=0; i<6; i++){ |
4795 s->dc_val[0][ s->block_index[i] ]= dc[i]; | |
4796 memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM)*16); | |
4797 } | |
1616 | 4798 } |
4799 if(dir > 0 && dquant==dir){ | |
4800 dquant= 0; | |
4801 dir= -dir; | |
4802 }else | |
4803 break; | |
4804 } | |
4805 } | |
4806 qp= best_s.qscale; | |
4807 s->current_picture.qscale_table[xy]= qp; | |
4808 } | |
4809 } | |
4810 | |
326 | 4811 copy_context_after_encode(s, &best_s, -1); |
456 | 4812 |
1786 | 4813 pb_bits_count= put_bits_count(&s->pb); |
456 | 4814 flush_put_bits(&s->pb); |
4815 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count); | |
4816 s->pb= backup_s.pb; | |
4817 | |
4818 if(s->data_partitioning){ | |
1786 | 4819 pb2_bits_count= put_bits_count(&s->pb2); |
456 | 4820 flush_put_bits(&s->pb2); |
4821 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count); | |
4822 s->pb2= backup_s.pb2; | |
4823 | |
1786 | 4824 tex_pb_bits_count= put_bits_count(&s->tex_pb); |
456 | 4825 flush_put_bits(&s->tex_pb); |
4826 ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count); | |
4827 s->tex_pb= backup_s.tex_pb; | |
4828 } | |
1786 | 4829 s->last_bits= put_bits_count(&s->pb); |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4830 |
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4831 #ifdef CONFIG_RISKY |
1389 | 4832 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
4833 ff_h263_update_motion_val(s); | |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4834 #endif |
1389 | 4835 |
1799 | 4836 if(next_block==0){ //FIXME 16 vs linesize16 |
4837 s->dsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16); | |
4838 s->dsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8); | |
4839 s->dsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8); | |
1389 | 4840 } |
4841 | |
4842 if(s->avctx->mb_decision == FF_MB_DECISION_BITS) | |
4843 MPV_decode_mb(s, s->block); | |
294 | 4844 } else { |
324 | 4845 int motion_x, motion_y; |
4846 s->mv_type=MV_TYPE_16X16; | |
294 | 4847 // only one MB-Type possible |
1013 | 4848 |
327 | 4849 switch(mb_type){ |
1708 | 4850 case CANDIDATE_MB_TYPE_INTRA: |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4851 s->mv_dir = 0; |
294 | 4852 s->mb_intra= 1; |
324 | 4853 motion_x= s->mv[0][0][0] = 0; |
4854 motion_y= s->mv[0][0][1] = 0; | |
327 | 4855 break; |
1708 | 4856 case CANDIDATE_MB_TYPE_INTER: |
324 | 4857 s->mv_dir = MV_DIR_FORWARD; |
4858 s->mb_intra= 0; | |
4859 motion_x= s->mv[0][0][0] = s->p_mv_table[xy][0]; | |
4860 motion_y= s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
327 | 4861 break; |
1708 | 4862 case CANDIDATE_MB_TYPE_INTER_I: |
4863 s->mv_dir = MV_DIR_FORWARD; | |
4864 s->mv_type = MV_TYPE_FIELD; | |
4865 s->mb_intra= 0; | |
4866 for(i=0; i<2; i++){ | |
4867 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
4868 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
4869 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
4870 } | |
4871 motion_x = motion_y = 0; | |
4872 break; | |
4873 case CANDIDATE_MB_TYPE_INTER4V: | |
456 | 4874 s->mv_dir = MV_DIR_FORWARD; |
4875 s->mv_type = MV_TYPE_8X8; | |
4876 s->mb_intra= 0; | |
4877 for(i=0; i<4; i++){ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
4878 s->mv[0][i][0] = s->current_picture.motion_val[0][s->block_index[i]][0]; |
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
4879 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
456 | 4880 } |
4881 motion_x= motion_y= 0; | |
4882 break; | |
1708 | 4883 case CANDIDATE_MB_TYPE_DIRECT: |
324 | 4884 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
4885 s->mb_intra= 0; | |
327 | 4886 motion_x=s->b_direct_mv_table[xy][0]; |
4887 motion_y=s->b_direct_mv_table[xy][1]; | |
1042 | 4888 #ifdef CONFIG_RISKY |
936 | 4889 ff_mpeg4_set_direct_mv(s, motion_x, motion_y); |
1042 | 4890 #endif |
327 | 4891 break; |
1708 | 4892 case CANDIDATE_MB_TYPE_BIDIR: |
324 | 4893 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
294 | 4894 s->mb_intra= 0; |
324 | 4895 motion_x=0; |
4896 motion_y=0; | |
4897 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
4898 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
4899 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
4900 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
327 | 4901 break; |
1708 | 4902 case CANDIDATE_MB_TYPE_BACKWARD: |
324 | 4903 s->mv_dir = MV_DIR_BACKWARD; |
4904 s->mb_intra= 0; | |
4905 motion_x= s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
4906 motion_y= s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
327 | 4907 break; |
1708 | 4908 case CANDIDATE_MB_TYPE_FORWARD: |
324 | 4909 s->mv_dir = MV_DIR_FORWARD; |
4910 s->mb_intra= 0; | |
4911 motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
4912 motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
4913 // printf(" %d %d ", motion_x, motion_y); | |
327 | 4914 break; |
1708 | 4915 case CANDIDATE_MB_TYPE_FORWARD_I: |
4916 s->mv_dir = MV_DIR_FORWARD; | |
4917 s->mv_type = MV_TYPE_FIELD; | |
4918 s->mb_intra= 0; | |
4919 for(i=0; i<2; i++){ | |
4920 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
4921 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
4922 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
4923 } | |
4924 motion_x=motion_y=0; | |
4925 break; | |
4926 case CANDIDATE_MB_TYPE_BACKWARD_I: | |
4927 s->mv_dir = MV_DIR_BACKWARD; | |
4928 s->mv_type = MV_TYPE_FIELD; | |
4929 s->mb_intra= 0; | |
4930 for(i=0; i<2; i++){ | |
4931 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
4932 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
4933 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
4934 } | |
4935 motion_x=motion_y=0; | |
4936 break; | |
4937 case CANDIDATE_MB_TYPE_BIDIR_I: | |
4938 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
4939 s->mv_type = MV_TYPE_FIELD; | |
4940 s->mb_intra= 0; | |
4941 for(dir=0; dir<2; dir++){ | |
4942 for(i=0; i<2; i++){ | |
4943 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
4944 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
4945 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
4946 } | |
4947 } | |
4948 motion_x=motion_y=0; | |
4949 break; | |
327 | 4950 default: |
324 | 4951 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
|
4952 av_log(s->avctx, AV_LOG_ERROR, "illegal MB type\n"); |
294 | 4953 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4954 |
324 | 4955 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
|
4956 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4957 // RAL: Update last macrobloc type |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4958 s->last_mv_dir = s->mv_dir; |
1389 | 4959 |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4960 #ifdef CONFIG_RISKY |
1389 | 4961 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
4962 ff_h263_update_motion_val(s); | |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4963 #endif |
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4964 |
1389 | 4965 MPV_decode_mb(s, s->block); |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
244
diff
changeset
|
4966 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4967 |
327 | 4968 /* clean the MV table in IPS frames for direct mode in B frames */ |
4969 if(s->mb_intra /* && I,P,S_TYPE */){ | |
4970 s->p_mv_table[xy][0]=0; | |
4971 s->p_mv_table[xy][1]=0; | |
4972 } | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4973 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4974 if(s->flags&CODEC_FLAG_PSNR){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4975 int w= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4976 int h= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4977 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4978 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
|
4979 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; |
936 | 4980 |
1148 | 4981 s->current_picture_ptr->error[0] += sse( |
1389 | 4982 s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, |
4983 s->dest[0], w, h, s->linesize); | |
1148 | 4984 s->current_picture_ptr->error[1] += sse( |
1389 | 4985 s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
4986 s->dest[1], w>>1, h>>1, s->uvlinesize); | |
1148 | 4987 s->current_picture_ptr->error[2] += sse( |
1389 | 4988 s, s->new_picture .data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
4989 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
|
4990 } |
2345 | 4991 if(s->loop_filter){ |
4992 if(s->out_format == FMT_H263) | |
4993 ff_h263_loop_filter(s); | |
4994 } | |
1786 | 4995 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb)); |
0 | 4996 } |
4997 } | |
286 | 4998 |
1042 | 4999 #ifdef CONFIG_RISKY |
1799 | 5000 //not beautifull here but we must write it before flushing so it has to be here |
456 | 5001 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE) |
208 | 5002 msmpeg4_encode_ext_header(s); |
1042 | 5003 #endif |
456 | 5004 |
1799 | 5005 write_slice_end(s); |
5006 | |
231 | 5007 /* Send the last GOB if RTP */ |
1661 | 5008 if (s->avctx->rtp_callback) { |
234
5fc0c3af3fe4
alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents:
233
diff
changeset
|
5009 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob; |
231 | 5010 /* Call the RTP callback to send the last GOB */ |
1799 | 5011 emms_c(); |
2025
591233f22963
rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>)
michael
parents:
2024
diff
changeset
|
5012 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, 0); |
231 | 5013 } |
1799 | 5014 |
5015 return 0; | |
5016 } | |
5017 | |
5018 #define MERGE(field) dst->field += src->field; src->field=0 | |
5019 static void merge_context_after_me(MpegEncContext *dst, MpegEncContext *src){ | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5020 MERGE(me.scene_change_score); |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5021 MERGE(me.mc_mb_var_sum_temp); |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5022 MERGE(me.mb_var_sum_temp); |
1799 | 5023 } |
5024 | |
5025 static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src){ | |
5026 int i; | |
5027 | |
5028 MERGE(dct_count[0]); //note, the other dct vars are not part of the context | |
5029 MERGE(dct_count[1]); | |
5030 MERGE(mv_bits); | |
5031 MERGE(i_tex_bits); | |
5032 MERGE(p_tex_bits); | |
5033 MERGE(i_count); | |
5034 MERGE(f_count); | |
5035 MERGE(b_count); | |
5036 MERGE(skip_count); | |
5037 MERGE(misc_bits); | |
5038 MERGE(error_count); | |
5039 MERGE(padding_bug_score); | |
5040 | |
5041 if(dst->avctx->noise_reduction){ | |
5042 for(i=0; i<64; i++){ | |
5043 MERGE(dct_error_sum[0][i]); | |
5044 MERGE(dct_error_sum[1][i]); | |
5045 } | |
5046 } | |
5047 | |
5048 assert(put_bits_count(&src->pb) % 8 ==0); | |
5049 assert(put_bits_count(&dst->pb) % 8 ==0); | |
5050 ff_copy_bits(&dst->pb, src->pb.buf, put_bits_count(&src->pb)); | |
5051 flush_put_bits(&dst->pb); | |
5052 } | |
5053 | |
5054 static void encode_picture(MpegEncContext *s, int picture_number) | |
5055 { | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5056 int i; |
1799 | 5057 int bits; |
5058 | |
5059 s->picture_number = picture_number; | |
5060 | |
5061 /* Reset the average MB variance */ | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5062 s->me.mb_var_sum_temp = |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5063 s->me.mc_mb_var_sum_temp = 0; |
1799 | 5064 |
5065 #ifdef CONFIG_RISKY | |
5066 /* we need to initialize some time vars before we can encode b-frames */ | |
5067 // RAL: Condition added for MPEG1VIDEO | |
5068 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4)) | |
1834 | 5069 ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar |
1799 | 5070 #endif |
5071 | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5072 s->me.scene_change_score=0; |
1799 | 5073 |
2053 | 5074 // s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration |
1799 | 5075 |
5076 if(s->pict_type==I_TYPE){ | |
5077 if(s->msmpeg4_version >= 3) s->no_rounding=1; | |
5078 else s->no_rounding=0; | |
5079 }else if(s->pict_type!=B_TYPE){ | |
5080 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4) | |
5081 s->no_rounding ^= 1; | |
5082 } | |
5083 | |
5084 s->mb_intra=0; //for the rate distoration & bit compare functions | |
5085 for(i=1; i<s->avctx->thread_count; i++){ | |
1827 | 5086 ff_update_duplicate_context(s->thread_context[i], s); |
1799 | 5087 } |
1962 | 5088 |
5089 ff_init_me(s); | |
5090 | |
1799 | 5091 /* Estimate motion for every MB */ |
5092 if(s->pict_type != I_TYPE){ | |
1955
5dafb10e0252
reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold
michael
parents:
1948
diff
changeset
|
5093 if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){ |
1799 | 5094 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ |
5095 s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5096 } | |
5097 } | |
5098 | |
5099 s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5100 }else /* if(s->pict_type == I_TYPE) */{ | |
5101 /* I-Frame */ | |
5102 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
5103 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
5104 | |
5105 if(!s->fixed_qscale){ | |
5106 /* finding spatial complexity for I-frame rate control */ | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5107 s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); |
1799 | 5108 } |
5109 } | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5110 for(i=1; i<s->avctx->thread_count; i++){ |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5111 merge_context_after_me(s, s->thread_context[i]); |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5112 } |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5113 s->current_picture.mc_mb_var_sum= s->current_picture_ptr->mc_mb_var_sum= s->me.mc_mb_var_sum_temp; |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5114 s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp; |
1799 | 5115 emms_c(); |
5116 | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5117 if(s->me.scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){ |
1799 | 5118 s->pict_type= I_TYPE; |
5119 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
5120 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
5121 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); | |
5122 } | |
5123 | |
5124 if(!s->umvplus){ | |
5125 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { | |
5126 s->f_code= ff_get_best_fcode(s, s->p_mv_table, CANDIDATE_MB_TYPE_INTER); | |
5127 | |
5128 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
5129 int a,b; | |
5130 a= ff_get_best_fcode(s, s->p_field_mv_table[0][0], CANDIDATE_MB_TYPE_INTER_I); //FIXME field_select | |
5131 b= ff_get_best_fcode(s, s->p_field_mv_table[1][1], CANDIDATE_MB_TYPE_INTER_I); | |
5132 s->f_code= FFMAX(s->f_code, FFMAX(a,b)); | |
5133 } | |
5134 | |
5135 ff_fix_long_p_mvs(s); | |
5136 ff_fix_long_mvs(s, NULL, 0, s->p_mv_table, s->f_code, CANDIDATE_MB_TYPE_INTER, 0); | |
5137 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5138 int j; |
1799 | 5139 for(i=0; i<2; i++){ |
5140 for(j=0; j<2; j++) | |
5141 ff_fix_long_mvs(s, s->p_field_select_table[i], j, | |
5142 s->p_field_mv_table[i][j], s->f_code, CANDIDATE_MB_TYPE_INTER_I, 0); | |
5143 } | |
5144 } | |
5145 } | |
5146 | |
5147 if(s->pict_type==B_TYPE){ | |
5148 int a, b; | |
5149 | |
5150 a = ff_get_best_fcode(s, s->b_forw_mv_table, CANDIDATE_MB_TYPE_FORWARD); | |
5151 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
5152 s->f_code = FFMAX(a, b); | |
5153 | |
5154 a = ff_get_best_fcode(s, s->b_back_mv_table, CANDIDATE_MB_TYPE_BACKWARD); | |
5155 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
5156 s->b_code = FFMAX(a, b); | |
5157 | |
5158 ff_fix_long_mvs(s, NULL, 0, s->b_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_FORWARD, 1); | |
5159 ff_fix_long_mvs(s, NULL, 0, s->b_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BACKWARD, 1); | |
5160 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
5161 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
5162 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5163 int dir, j; |
1799 | 5164 for(dir=0; dir<2; dir++){ |
5165 for(i=0; i<2; i++){ | |
5166 for(j=0; j<2; j++){ | |
5167 int type= dir ? (CANDIDATE_MB_TYPE_BACKWARD_I|CANDIDATE_MB_TYPE_BIDIR_I) | |
5168 : (CANDIDATE_MB_TYPE_FORWARD_I |CANDIDATE_MB_TYPE_BIDIR_I); | |
5169 ff_fix_long_mvs(s, s->b_field_select_table[dir][i], j, | |
5170 s->b_field_mv_table[dir][i][j], dir ? s->b_code : s->f_code, type, 1); | |
5171 } | |
5172 } | |
5173 } | |
5174 } | |
5175 } | |
5176 } | |
5177 | |
5178 if (!s->fixed_qscale) | |
5179 s->current_picture.quality = ff_rate_estimate_qscale(s); //FIXME pic_ptr | |
5180 | |
5181 if(s->adaptive_quant){ | |
5182 #ifdef CONFIG_RISKY | |
5183 switch(s->codec_id){ | |
5184 case CODEC_ID_MPEG4: | |
5185 ff_clean_mpeg4_qscales(s); | |
5186 break; | |
5187 case CODEC_ID_H263: | |
5188 case CODEC_ID_H263P: | |
5189 case CODEC_ID_FLV1: | |
5190 ff_clean_h263_qscales(s); | |
5191 break; | |
5192 } | |
5193 #endif | |
5194 | |
5195 s->lambda= s->lambda_table[0]; | |
5196 //FIXME broken | |
5197 }else | |
5198 s->lambda= s->current_picture.quality; | |
5199 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); | |
5200 update_qscale(s); | |
5201 | |
5202 if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(s->flags & CODEC_FLAG_QSCALE)) | |
5203 s->qscale= 3; //reduce cliping problems | |
5204 | |
5205 if (s->out_format == FMT_MJPEG) { | |
5206 /* for mjpeg, we do include qscale in the matrix */ | |
5207 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; | |
5208 for(i=1;i<64;i++){ | |
5209 int j= s->dsp.idct_permutation[i]; | |
5210 | |
5211 s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3); | |
5212 } | |
5213 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, | |
5214 s->intra_matrix, s->intra_quant_bias, 8, 8); | |
5215 s->qscale= 8; | |
5216 } | |
5217 | |
5218 //FIXME var duplication | |
2235
0c04463f79d8
10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2231
diff
changeset
|
5219 s->current_picture_ptr->key_frame= |
1799 | 5220 s->current_picture.key_frame= s->pict_type == I_TYPE; //FIXME pic_ptr |
2235
0c04463f79d8
10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2231
diff
changeset
|
5221 s->current_picture_ptr->pict_type= |
1799 | 5222 s->current_picture.pict_type= s->pict_type; |
5223 | |
5224 if(s->current_picture.key_frame) | |
5225 s->picture_in_gop_number=0; | |
5226 | |
5227 s->last_bits= put_bits_count(&s->pb); | |
5228 switch(s->out_format) { | |
5229 case FMT_MJPEG: | |
5230 mjpeg_picture_header(s); | |
5231 break; | |
5232 #ifdef CONFIG_RISKY | |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5233 case FMT_H261: |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5234 ff_h261_encode_picture_header(s, picture_number); |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5235 break; |
1799 | 5236 case FMT_H263: |
5237 if (s->codec_id == CODEC_ID_WMV2) | |
5238 ff_wmv2_encode_picture_header(s, picture_number); | |
5239 else if (s->h263_msmpeg4) | |
5240 msmpeg4_encode_picture_header(s, picture_number); | |
5241 else if (s->h263_pred) | |
5242 mpeg4_encode_picture_header(s, picture_number); | |
5243 else if (s->codec_id == CODEC_ID_RV10) | |
5244 rv10_encode_picture_header(s, picture_number); | |
5245 else if (s->codec_id == CODEC_ID_FLV1) | |
5246 ff_flv_encode_picture_header(s, picture_number); | |
5247 else | |
5248 h263_encode_picture_header(s, picture_number); | |
5249 break; | |
5250 #endif | |
5251 case FMT_MPEG1: | |
5252 mpeg1_encode_picture_header(s, picture_number); | |
5253 break; | |
5254 case FMT_H264: | |
5255 break; | |
5256 default: | |
5257 assert(0); | |
5258 } | |
5259 bits= put_bits_count(&s->pb); | |
5260 s->header_bits= bits - s->last_bits; | |
5261 | |
5262 for(i=1; i<s->avctx->thread_count; i++){ | |
5263 update_duplicate_context_after_me(s->thread_context[i], s); | |
5264 } | |
5265 s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5266 for(i=1; i<s->avctx->thread_count; i++){ | |
5267 merge_context_after_encode(s, s->thread_context[i]); | |
5268 } | |
5269 emms_c(); | |
0 | 5270 } |
5271 | |
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5272 #endif //CONFIG_ENCODERS |
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5273 |
1719 | 5274 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block){ |
1597 | 5275 const int intra= s->mb_intra; |
5276 int i; | |
5277 | |
1599 | 5278 s->dct_count[intra]++; |
5279 | |
1597 | 5280 for(i=0; i<64; i++){ |
5281 int level= block[i]; | |
5282 | |
5283 if(level){ | |
5284 if(level>0){ | |
5285 s->dct_error_sum[intra][i] += level; | |
5286 level -= s->dct_offset[intra][i]; | |
5287 if(level<0) level=0; | |
5288 }else{ | |
5289 s->dct_error_sum[intra][i] -= level; | |
5290 level += s->dct_offset[intra][i]; | |
5291 if(level>0) level=0; | |
5292 } | |
5293 block[i]= level; | |
5294 } | |
5295 } | |
5296 } | |
5297 | |
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5298 #ifdef CONFIG_ENCODERS |
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5299 |
945 | 5300 static int dct_quantize_trellis_c(MpegEncContext *s, |
5301 DCTELEM *block, int n, | |
5302 int qscale, int *overflow){ | |
5303 const int *qmat; | |
1064 | 5304 const uint8_t *scantable= s->intra_scantable.scantable; |
1718 | 5305 const uint8_t *perm_scantable= s->intra_scantable.permutated; |
945 | 5306 int max=0; |
5307 unsigned int threshold1, threshold2; | |
5308 int bias=0; | |
5309 int run_tab[65]; | |
5310 int level_tab[65]; | |
5311 int score_tab[65]; | |
1718 | 5312 int survivor[65]; |
5313 int survivor_count; | |
946 | 5314 int last_run=0; |
5315 int last_level=0; | |
5316 int last_score= 0; | |
1718 | 5317 int last_i; |
1715 | 5318 int coeff[2][64]; |
945 | 5319 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
|
5320 int qmul, qadd, start_i, last_non_zero, i, dc; |
945 | 5321 const int esc_length= s->ac_esc_length; |
5322 uint8_t * length; | |
5323 uint8_t * last_length; | |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
5324 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
945 | 5325 |
1092 | 5326 s->dsp.fdct (block); |
1597 | 5327 |
5328 if(s->dct_error_sum) | |
1719 | 5329 s->denoise_dct(s, block); |
945 | 5330 qmul= qscale*16; |
5331 qadd= ((qscale-1)|1)*8; | |
946 | 5332 |
945 | 5333 if (s->mb_intra) { |
5334 int q; | |
5335 if (!s->h263_aic) { | |
5336 if (n < 4) | |
5337 q = s->y_dc_scale; | |
5338 else | |
5339 q = s->c_dc_scale; | |
5340 q = q << 3; | |
5341 } else{ | |
5342 /* For AIC we skip quant/dequant of INTRADC */ | |
5343 q = 1 << 3; | |
5344 qadd=0; | |
5345 } | |
5346 | |
5347 /* note: block[0] is assumed to be positive */ | |
5348 block[0] = (block[0] + (q >> 1)) / q; | |
5349 start_i = 1; | |
5350 last_non_zero = 0; | |
5351 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
|
5352 if(s->mpeg_quant || s->out_format == FMT_MPEG1) |
945 | 5353 bias= 1<<(QMAT_SHIFT-1); |
5354 length = s->intra_ac_vlc_length; | |
5355 last_length= s->intra_ac_vlc_last_length; | |
5356 } else { | |
5357 start_i = 0; | |
5358 last_non_zero = -1; | |
5359 qmat = s->q_inter_matrix[qscale]; | |
5360 length = s->inter_ac_vlc_length; | |
5361 last_length= s->inter_ac_vlc_last_length; | |
5362 } | |
1718 | 5363 last_i= start_i; |
945 | 5364 |
5365 threshold1= (1<<QMAT_SHIFT) - bias - 1; | |
5366 threshold2= (threshold1<<1); | |
946 | 5367 |
1715 | 5368 for(i=63; i>=start_i; i--) { |
5369 const int j = scantable[i]; | |
5370 int level = block[j] * qmat[j]; | |
5371 | |
5372 if(((unsigned)(level+threshold1))>threshold2){ | |
5373 last_non_zero = i; | |
5374 break; | |
5375 } | |
5376 } | |
5377 | |
5378 for(i=start_i; i<=last_non_zero; i++) { | |
945 | 5379 const int j = scantable[i]; |
1715 | 5380 int level = block[j] * qmat[j]; |
945 | 5381 |
5382 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
5383 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
5384 if(((unsigned)(level+threshold1))>threshold2){ | |
5385 if(level>0){ | |
5386 level= (bias + level)>>QMAT_SHIFT; | |
1718 | 5387 coeff[0][i]= level; |
5388 coeff[1][i]= level-1; | |
946 | 5389 // coeff[2][k]= level-2; |
945 | 5390 }else{ |
5391 level= (bias - level)>>QMAT_SHIFT; | |
1718 | 5392 coeff[0][i]= -level; |
5393 coeff[1][i]= -level+1; | |
946 | 5394 // coeff[2][k]= -level+2; |
945 | 5395 } |
1718 | 5396 coeff_count[i]= FFMIN(level, 2); |
5397 assert(coeff_count[i]); | |
945 | 5398 max |=level; |
5399 }else{ | |
1718 | 5400 coeff[0][i]= (level>>31)|1; |
5401 coeff_count[i]= 1; | |
945 | 5402 } |
5403 } | |
5404 | |
5405 *overflow= s->max_qcoeff < max; //overflow might have happend | |
5406 | |
5407 if(last_non_zero < start_i){ | |
5408 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); | |
5409 return last_non_zero; | |
5410 } | |
5411 | |
1718 | 5412 score_tab[start_i]= 0; |
5413 survivor[0]= start_i; | |
5414 survivor_count= 1; | |
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1497
diff
changeset
|
5415 |
1718 | 5416 for(i=start_i; i<=last_non_zero; i++){ |
5417 int level_index, j; | |
5418 const int dct_coeff= ABS(block[ scantable[i] ]); | |
945 | 5419 const int zero_distoration= dct_coeff*dct_coeff; |
946 | 5420 int best_score=256*256*256*120; |
945 | 5421 for(level_index=0; level_index < coeff_count[i]; level_index++){ |
5422 int distoration; | |
5423 int level= coeff[level_index][i]; | |
1716 | 5424 const int alevel= ABS(level); |
945 | 5425 int unquant_coeff; |
5426 | |
5427 assert(level); | |
5428 | |
5429 if(s->out_format == FMT_H263){ | |
1716 | 5430 unquant_coeff= alevel*qmul + qadd; |
947 | 5431 }else{ //MPEG1 |
1718 | 5432 j= s->dsp.idct_permutation[ scantable[i] ]; //FIXME optimize |
947 | 5433 if(s->mb_intra){ |
1716 | 5434 unquant_coeff = (int)( alevel * qscale * s->intra_matrix[j]) >> 3; |
947 | 5435 unquant_coeff = (unquant_coeff - 1) | 1; |
5436 }else{ | |
1716 | 5437 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4; |
947 | 5438 unquant_coeff = (unquant_coeff - 1) | 1; |
5439 } | |
5440 unquant_coeff<<= 3; | |
5441 } | |
946 | 5442 |
1715 | 5443 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration; |
945 | 5444 level+=64; |
5445 if((level&(~127)) == 0){ | |
1718 | 5446 for(j=survivor_count-1; j>=0; j--){ |
5447 int run= i - survivor[j]; | |
947 | 5448 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 5449 score += score_tab[i-run]; |
5450 | |
5451 if(score < best_score){ | |
1718 | 5452 best_score= score; |
945 | 5453 run_tab[i+1]= run; |
5454 level_tab[i+1]= level-64; | |
5455 } | |
5456 } | |
5457 | |
5458 if(s->out_format == FMT_H263){ | |
1718 | 5459 for(j=survivor_count-1; j>=0; j--){ |
5460 int run= i - survivor[j]; | |
947 | 5461 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 5462 score += score_tab[i-run]; |
946 | 5463 if(score < last_score){ |
5464 last_score= score; | |
5465 last_run= run; | |
5466 last_level= level-64; | |
5467 last_i= i+1; | |
945 | 5468 } |
5469 } | |
5470 } | |
5471 }else{ | |
5472 distoration += esc_length*lambda; | |
1718 | 5473 for(j=survivor_count-1; j>=0; j--){ |
5474 int run= i - survivor[j]; | |
945 | 5475 int score= distoration + score_tab[i-run]; |
5476 | |
5477 if(score < best_score){ | |
1718 | 5478 best_score= score; |
945 | 5479 run_tab[i+1]= run; |
5480 level_tab[i+1]= level-64; | |
5481 } | |
5482 } | |
5483 | |
5484 if(s->out_format == FMT_H263){ | |
1718 | 5485 for(j=survivor_count-1; j>=0; j--){ |
5486 int run= i - survivor[j]; | |
945 | 5487 int score= distoration + score_tab[i-run]; |
946 | 5488 if(score < last_score){ |
5489 last_score= score; | |
5490 last_run= run; | |
5491 last_level= level-64; | |
5492 last_i= i+1; | |
945 | 5493 } |
5494 } | |
5495 } | |
5496 } | |
5497 } | |
946 | 5498 |
1718 | 5499 score_tab[i+1]= best_score; |
5500 | |
946 | 5501 //Note: there is a vlc code in mpeg4 which is 1 bit shorter then another one with a shorter run and the same level |
1718 | 5502 if(last_non_zero <= 27){ |
5503 for(; survivor_count; survivor_count--){ | |
5504 if(score_tab[ survivor[survivor_count-1] ] <= best_score) | |
5505 break; | |
5506 } | |
5507 }else{ | |
5508 for(; survivor_count; survivor_count--){ | |
5509 if(score_tab[ survivor[survivor_count-1] ] <= best_score + lambda) | |
5510 break; | |
5511 } | |
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
|
5512 } |
1718 | 5513 |
5514 survivor[ survivor_count++ ]= i+1; | |
945 | 5515 } |
946 | 5516 |
945 | 5517 if(s->out_format != FMT_H263){ |
946 | 5518 last_score= 256*256*256*120; |
1718 | 5519 for(i= survivor[0]; i<=last_non_zero + 1; i++){ |
946 | 5520 int score= score_tab[i]; |
947 | 5521 if(i) score += lambda*2; //FIXME exacter? |
5522 | |
946 | 5523 if(score < last_score){ |
5524 last_score= score; | |
5525 last_i= i; | |
5526 last_level= level_tab[i]; | |
5527 last_run= run_tab[i]; | |
5528 } | |
945 | 5529 } |
5530 } | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5531 |
1715 | 5532 s->coded_score[n] = last_score; |
945 | 5533 |
1716 | 5534 dc= ABS(block[0]); |
1718 | 5535 last_non_zero= last_i - 1; |
945 | 5536 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); |
5537 | |
5538 if(last_non_zero < start_i) | |
5539 return last_non_zero; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5540 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5541 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
|
5542 int best_level= 0; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5543 int best_score= dc * dc; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5544 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5545 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
|
5546 int level= coeff[i][0]; |
1716 | 5547 int alevel= ABS(level); |
5548 int unquant_coeff, score, distortion; | |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5549 |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5550 if(s->out_format == FMT_H263){ |
1716 | 5551 unquant_coeff= (alevel*qmul + qadd)>>3; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5552 }else{ //MPEG1 |
1716 | 5553 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4; |
5554 unquant_coeff = (unquant_coeff - 1) | 1; | |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5555 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5556 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
|
5557 unquant_coeff<<= 3 + 3; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5558 |
1716 | 5559 distortion= (unquant_coeff - dc) * (unquant_coeff - dc); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5560 level+=64; |
1716 | 5561 if((level&(~127)) == 0) score= distortion + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda; |
5562 else score= distortion + esc_length*lambda; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5563 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5564 if(score < best_score){ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5565 best_score= score; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5566 best_level= level - 64; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5567 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5568 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5569 block[0]= best_level; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5570 s->coded_score[n] = best_score - dc*dc; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5571 if(best_level == 0) return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5572 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
|
5573 } |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5574 |
946 | 5575 i= last_i; |
5576 assert(last_level); | |
1718 | 5577 |
5578 block[ perm_scantable[last_non_zero] ]= last_level; | |
946 | 5579 i -= last_run + 1; |
945 | 5580 |
1718 | 5581 for(; i>start_i; i -= run_tab[i] + 1){ |
5582 block[ perm_scantable[i-1] ]= level_tab[i]; | |
945 | 5583 } |
5584 | |
5585 return last_non_zero; | |
5586 } | |
5587 | |
1777 | 5588 //#define REFINE_STATS 1 |
5589 static int16_t basis[64][64]; | |
5590 | |
5591 static void build_basis(uint8_t *perm){ | |
5592 int i, j, x, y; | |
5593 emms_c(); | |
5594 for(i=0; i<8; i++){ | |
5595 for(j=0; j<8; j++){ | |
5596 for(y=0; y<8; y++){ | |
5597 for(x=0; x<8; x++){ | |
5598 double s= 0.25*(1<<BASIS_SHIFT); | |
5599 int index= 8*i + j; | |
5600 int perm_index= perm[index]; | |
5601 if(i==0) s*= sqrt(0.5); | |
5602 if(j==0) s*= sqrt(0.5); | |
5603 basis[perm_index][8*x + y]= lrintf(s * cos((M_PI/8.0)*i*(x+0.5)) * cos((M_PI/8.0)*j*(y+0.5))); | |
5604 } | |
5605 } | |
5606 } | |
5607 } | |
5608 } | |
5609 | |
5610 static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? | |
5611 DCTELEM *block, int16_t *weight, DCTELEM *orig, | |
5612 int n, int qscale){ | |
5613 int16_t rem[64]; | |
2289
5443c3fc2448
Quantizer noise shaping crashes on SSE2 machines patch by (Milan Cutka <cutka at szm dot sk>)
michael
parents:
2266
diff
changeset
|
5614 DCTELEM d1[64] __align16; |
1777 | 5615 const int *qmat; |
5616 const uint8_t *scantable= s->intra_scantable.scantable; | |
5617 const uint8_t *perm_scantable= s->intra_scantable.permutated; | |
5618 // unsigned int threshold1, threshold2; | |
5619 // int bias=0; | |
5620 int run_tab[65]; | |
5621 int prev_run=0; | |
5622 int prev_level=0; | |
5623 int qmul, qadd, start_i, last_non_zero, i, dc; | |
5624 uint8_t * length; | |
5625 uint8_t * last_length; | |
5626 int lambda; | |
5627 int rle_index, run, q, sum; | |
5628 #ifdef REFINE_STATS | |
5629 static int count=0; | |
5630 static int after_last=0; | |
5631 static int to_zero=0; | |
5632 static int from_zero=0; | |
5633 static int raise=0; | |
5634 static int lower=0; | |
5635 static int messed_sign=0; | |
5636 #endif | |
5637 | |
5638 if(basis[0][0] == 0) | |
5639 build_basis(s->dsp.idct_permutation); | |
5640 | |
5641 qmul= qscale*2; | |
5642 qadd= (qscale-1)|1; | |
5643 if (s->mb_intra) { | |
5644 if (!s->h263_aic) { | |
5645 if (n < 4) | |
5646 q = s->y_dc_scale; | |
5647 else | |
5648 q = s->c_dc_scale; | |
5649 } else{ | |
5650 /* For AIC we skip quant/dequant of INTRADC */ | |
5651 q = 1; | |
5652 qadd=0; | |
5653 } | |
5654 q <<= RECON_SHIFT-3; | |
5655 /* note: block[0] is assumed to be positive */ | |
5656 dc= block[0]*q; | |
5657 // block[0] = (block[0] + (q >> 1)) / q; | |
5658 start_i = 1; | |
5659 qmat = s->q_intra_matrix[qscale]; | |
5660 // if(s->mpeg_quant || s->out_format == FMT_MPEG1) | |
5661 // bias= 1<<(QMAT_SHIFT-1); | |
5662 length = s->intra_ac_vlc_length; | |
5663 last_length= s->intra_ac_vlc_last_length; | |
5664 } else { | |
5665 dc= 0; | |
5666 start_i = 0; | |
5667 qmat = s->q_inter_matrix[qscale]; | |
5668 length = s->inter_ac_vlc_length; | |
5669 last_length= s->inter_ac_vlc_last_length; | |
5670 } | |
5671 last_non_zero = s->block_last_index[n]; | |
5672 | |
5673 #ifdef REFINE_STATS | |
5674 {START_TIMER | |
5675 #endif | |
1784 | 5676 dc += (1<<(RECON_SHIFT-1)); |
5677 for(i=0; i<64; i++){ | |
5678 rem[i]= dc - (orig[i]<<RECON_SHIFT); //FIXME use orig dirrectly insteadof copying to rem[] | |
1777 | 5679 } |
5680 #ifdef REFINE_STATS | |
5681 STOP_TIMER("memset rem[]")} | |
5682 #endif | |
5683 sum=0; | |
5684 for(i=0; i<64; i++){ | |
5685 int one= 36; | |
5686 int qns=4; | |
5687 int w; | |
5688 | |
5689 w= ABS(weight[i]) + qns*one; | |
5690 w= 15 + (48*qns*one + w/2)/w; // 16 .. 63 | |
5691 | |
5692 weight[i] = w; | |
5693 // w=weight[i] = (63*qns + (w/2)) / w; | |
5694 | |
5695 assert(w>0); | |
5696 assert(w<(1<<6)); | |
5697 sum += w*w; | |
5698 } | |
5699 lambda= sum*(uint64_t)s->lambda2 >> (FF_LAMBDA_SHIFT - 6 + 6 + 6 + 6); | |
5700 #ifdef REFINE_STATS | |
5701 {START_TIMER | |
5702 #endif | |
5703 run=0; | |
5704 rle_index=0; | |
5705 for(i=start_i; i<=last_non_zero; i++){ | |
5706 int j= perm_scantable[i]; | |
5707 const int level= block[j]; | |
5708 int coeff; | |
5709 | |
5710 if(level){ | |
5711 if(level<0) coeff= qmul*level - qadd; | |
5712 else coeff= qmul*level + qadd; | |
5713 run_tab[rle_index++]=run; | |
5714 run=0; | |
5715 | |
1784 | 5716 s->dsp.add_8x8basis(rem, basis[j], coeff); |
1777 | 5717 }else{ |
5718 run++; | |
5719 } | |
5720 } | |
5721 #ifdef REFINE_STATS | |
5722 if(last_non_zero>0){ | |
5723 STOP_TIMER("init rem[]") | |
5724 } | |
5725 } | |
5726 | |
5727 {START_TIMER | |
5728 #endif | |
5729 for(;;){ | |
1784 | 5730 int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0); |
1777 | 5731 int best_coeff=0; |
5732 int best_change=0; | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5733 int run2, best_unquant_change=0, analyze_gradient; |
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5734 #ifdef REFINE_STATS |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5735 {START_TIMER |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5736 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5737 analyze_gradient = last_non_zero > 2 || s->avctx->quantizer_noise_shaping >= 3; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5738 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5739 if(analyze_gradient){ |
1777 | 5740 #ifdef REFINE_STATS |
5741 {START_TIMER | |
5742 #endif | |
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5743 for(i=0; i<64; i++){ |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5744 int w= weight[i]; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5745 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5746 d1[i] = (rem[i]*w*w + (1<<(RECON_SHIFT+12-1)))>>(RECON_SHIFT+12); |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5747 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5748 #ifdef REFINE_STATS |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5749 STOP_TIMER("rem*w*w")} |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5750 {START_TIMER |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5751 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5752 s->dsp.fdct(d1); |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5753 #ifdef REFINE_STATS |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5754 STOP_TIMER("dct")} |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5755 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5756 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5757 |
1777 | 5758 if(start_i){ |
5759 const int level= block[0]; | |
5760 int change, old_coeff; | |
5761 | |
5762 assert(s->mb_intra); | |
5763 | |
5764 old_coeff= q*level; | |
5765 | |
5766 for(change=-1; change<=1; change+=2){ | |
5767 int new_level= level + change; | |
5768 int score, new_coeff; | |
5769 | |
5770 new_coeff= q*new_level; | |
5771 if(new_coeff >= 2048 || new_coeff < 0) | |
5772 continue; | |
5773 | |
1784 | 5774 score= s->dsp.try_8x8basis(rem, weight, basis[0], new_coeff - old_coeff); |
1777 | 5775 if(score<best_score){ |
5776 best_score= score; | |
5777 best_coeff= 0; | |
5778 best_change= change; | |
5779 best_unquant_change= new_coeff - old_coeff; | |
5780 } | |
5781 } | |
5782 } | |
5783 | |
5784 run=0; | |
5785 rle_index=0; | |
5786 run2= run_tab[rle_index++]; | |
5787 prev_level=0; | |
5788 prev_run=0; | |
5789 | |
5790 for(i=start_i; i<64; i++){ | |
5791 int j= perm_scantable[i]; | |
5792 const int level= block[j]; | |
5793 int change, old_coeff; | |
5794 | |
5795 if(s->avctx->quantizer_noise_shaping < 3 && i > last_non_zero + 1) | |
5796 break; | |
5797 | |
5798 if(level){ | |
5799 if(level<0) old_coeff= qmul*level - qadd; | |
5800 else old_coeff= qmul*level + qadd; | |
5801 run2= run_tab[rle_index++]; //FIXME ! maybe after last | |
5802 }else{ | |
5803 old_coeff=0; | |
5804 run2--; | |
5805 assert(run2>=0 || i >= last_non_zero ); | |
5806 } | |
5807 | |
5808 for(change=-1; change<=1; change+=2){ | |
5809 int new_level= level + change; | |
5810 int score, new_coeff, unquant_change; | |
5811 | |
5812 score=0; | |
5813 if(s->avctx->quantizer_noise_shaping < 2 && ABS(new_level) > ABS(level)) | |
5814 continue; | |
5815 | |
5816 if(new_level){ | |
5817 if(new_level<0) new_coeff= qmul*new_level - qadd; | |
5818 else new_coeff= qmul*new_level + qadd; | |
5819 if(new_coeff >= 2048 || new_coeff <= -2048) | |
5820 continue; | |
5821 //FIXME check for overflow | |
5822 | |
5823 if(level){ | |
5824 if(level < 63 && level > -63){ | |
5825 if(i < last_non_zero) | |
5826 score += length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
5827 - length[UNI_AC_ENC_INDEX(run, level+64)]; | |
5828 else | |
5829 score += last_length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
5830 - last_length[UNI_AC_ENC_INDEX(run, level+64)]; | |
5831 } | |
5832 }else{ | |
5833 assert(ABS(new_level)==1); | |
1785
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5834 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5835 if(analyze_gradient){ |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5836 int g= d1[ scantable[i] ]; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5837 if(g && (g^new_level) >= 0) |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5838 continue; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5839 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5840 |
1777 | 5841 if(i < last_non_zero){ |
5842 int next_i= i + run2 + 1; | |
5843 int next_level= block[ perm_scantable[next_i] ] + 64; | |
5844 | |
5845 if(next_level&(~127)) | |
5846 next_level= 0; | |
5847 | |
5848 if(next_i < last_non_zero) | |
5849 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
5850 + length[UNI_AC_ENC_INDEX(run2, next_level)] | |
5851 - length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
5852 else | |
5853 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
5854 + last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
5855 - last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
5856 }else{ | |
5857 score += last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
5858 if(prev_level){ | |
5859 score += length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
5860 - last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
5861 } | |
5862 } | |
5863 } | |
5864 }else{ | |
5865 new_coeff=0; | |
5866 assert(ABS(level)==1); | |
5867 | |
5868 if(i < last_non_zero){ | |
5869 int next_i= i + run2 + 1; | |
5870 int next_level= block[ perm_scantable[next_i] ] + 64; | |
5871 | |
5872 if(next_level&(~127)) | |
5873 next_level= 0; | |
5874 | |
5875 if(next_i < last_non_zero) | |
5876 score += length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
5877 - length[UNI_AC_ENC_INDEX(run2, next_level)] | |
5878 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
5879 else | |
5880 score += last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
5881 - last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
5882 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
5883 }else{ | |
5884 score += -last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
5885 if(prev_level){ | |
5886 score += last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
5887 - length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
5888 } | |
5889 } | |
5890 } | |
5891 | |
5892 score *= lambda; | |
5893 | |
5894 unquant_change= new_coeff - old_coeff; | |
5895 assert((score < 100*lambda && score > -100*lambda) || lambda==0); | |
5896 | |
1784 | 5897 score+= s->dsp.try_8x8basis(rem, weight, basis[j], unquant_change); |
1777 | 5898 if(score<best_score){ |
5899 best_score= score; | |
5900 best_coeff= i; | |
5901 best_change= change; | |
5902 best_unquant_change= unquant_change; | |
5903 } | |
5904 } | |
5905 if(level){ | |
5906 prev_level= level + 64; | |
5907 if(prev_level&(~127)) | |
5908 prev_level= 0; | |
5909 prev_run= run; | |
5910 run=0; | |
5911 }else{ | |
5912 run++; | |
5913 } | |
5914 } | |
5915 #ifdef REFINE_STATS | |
5916 STOP_TIMER("iterative step")} | |
5917 #endif | |
5918 | |
5919 if(best_change){ | |
5920 int j= perm_scantable[ best_coeff ]; | |
5921 | |
5922 block[j] += best_change; | |
5923 | |
5924 if(best_coeff > last_non_zero){ | |
5925 last_non_zero= best_coeff; | |
5926 assert(block[j]); | |
5927 #ifdef REFINE_STATS | |
5928 after_last++; | |
5929 #endif | |
5930 }else{ | |
5931 #ifdef REFINE_STATS | |
5932 if(block[j]){ | |
5933 if(block[j] - best_change){ | |
5934 if(ABS(block[j]) > ABS(block[j] - best_change)){ | |
5935 raise++; | |
5936 }else{ | |
5937 lower++; | |
5938 } | |
5939 }else{ | |
5940 from_zero++; | |
5941 } | |
5942 }else{ | |
5943 to_zero++; | |
5944 } | |
5945 #endif | |
5946 for(; last_non_zero>=start_i; last_non_zero--){ | |
5947 if(block[perm_scantable[last_non_zero]]) | |
5948 break; | |
5949 } | |
5950 } | |
5951 #ifdef REFINE_STATS | |
5952 count++; | |
5953 if(256*256*256*64 % count == 0){ | |
5954 printf("after_last:%d to_zero:%d from_zero:%d raise:%d lower:%d sign:%d xyp:%d/%d/%d\n", after_last, to_zero, from_zero, raise, lower, messed_sign, s->mb_x, s->mb_y, s->picture_number); | |
5955 } | |
5956 #endif | |
5957 run=0; | |
5958 rle_index=0; | |
5959 for(i=start_i; i<=last_non_zero; i++){ | |
5960 int j= perm_scantable[i]; | |
5961 const int level= block[j]; | |
5962 | |
5963 if(level){ | |
5964 run_tab[rle_index++]=run; | |
5965 run=0; | |
5966 }else{ | |
5967 run++; | |
5968 } | |
5969 } | |
5970 | |
1784 | 5971 s->dsp.add_8x8basis(rem, basis[j], best_unquant_change); |
1777 | 5972 }else{ |
5973 break; | |
5974 } | |
5975 } | |
5976 #ifdef REFINE_STATS | |
5977 if(last_non_zero>0){ | |
5978 STOP_TIMER("iterative search") | |
5979 } | |
5980 } | |
5981 #endif | |
5982 | |
5983 return last_non_zero; | |
5984 } | |
5985 | |
220 | 5986 static int dct_quantize_c(MpegEncContext *s, |
0 | 5987 DCTELEM *block, int n, |
344 | 5988 int qscale, int *overflow) |
0 | 5989 { |
1715 | 5990 int i, j, level, last_non_zero, q, start_i; |
0 | 5991 const int *qmat; |
1064 | 5992 const uint8_t *scantable= s->intra_scantable.scantable; |
344 | 5993 int bias; |
5994 int max=0; | |
5995 unsigned int threshold1, threshold2; | |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
5996 |
1092 | 5997 s->dsp.fdct (block); |
0 | 5998 |
1597 | 5999 if(s->dct_error_sum) |
1719 | 6000 s->denoise_dct(s, block); |
1597 | 6001 |
0 | 6002 if (s->mb_intra) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6003 if (!s->h263_aic) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6004 if (n < 4) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6005 q = s->y_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6006 else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6007 q = s->c_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6008 q = q << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6009 } else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6010 /* 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
|
6011 q = 1 << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6012 |
0 | 6013 /* note: block[0] is assumed to be positive */ |
6014 block[0] = (block[0] + (q >> 1)) / q; | |
1715 | 6015 start_i = 1; |
0 | 6016 last_non_zero = 0; |
344 | 6017 qmat = s->q_intra_matrix[qscale]; |
635 | 6018 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 6019 } else { |
1715 | 6020 start_i = 0; |
0 | 6021 last_non_zero = -1; |
344 | 6022 qmat = s->q_inter_matrix[qscale]; |
635 | 6023 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 6024 } |
635 | 6025 threshold1= (1<<QMAT_SHIFT) - bias - 1; |
6026 threshold2= (threshold1<<1); | |
1715 | 6027 for(i=63;i>=start_i;i--) { |
764 | 6028 j = scantable[i]; |
1715 | 6029 level = block[j] * qmat[j]; |
6030 | |
6031 if(((unsigned)(level+threshold1))>threshold2){ | |
6032 last_non_zero = i; | |
6033 break; | |
6034 }else{ | |
6035 block[j]=0; | |
6036 } | |
6037 } | |
6038 for(i=start_i; i<=last_non_zero; i++) { | |
6039 j = scantable[i]; | |
6040 level = block[j] * qmat[j]; | |
344 | 6041 |
1215 | 6042 // if( bias+level >= (1<<QMAT_SHIFT) |
6043 // || bias-level >= (1<<QMAT_SHIFT)){ | |
344 | 6044 if(((unsigned)(level+threshold1))>threshold2){ |
6045 if(level>0){ | |
635 | 6046 level= (bias + level)>>QMAT_SHIFT; |
344 | 6047 block[j]= level; |
6048 }else{ | |
635 | 6049 level= (bias - level)>>QMAT_SHIFT; |
344 | 6050 block[j]= -level; |
0 | 6051 } |
344 | 6052 max |=level; |
6053 }else{ | |
6054 block[j]=0; | |
0 | 6055 } |
6056 } | |
344 | 6057 *overflow= s->max_qcoeff < max; //overflow might have happend |
6058 | |
764 | 6059 /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */ |
1092 | 6060 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM) |
6061 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero); | |
764 | 6062 |
0 | 6063 return last_non_zero; |
6064 } | |
6065 | |
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
|
6066 #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
|
6067 |
1689 | 6068 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6069 DCTELEM *block, int n, int qscale) |
0 | 6070 { |
200 | 6071 int i, level, nCoeffs; |
1064 | 6072 const uint16_t *quant_matrix; |
0 | 6073 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6074 nCoeffs= s->block_last_index[n]; |
200 | 6075 |
1689 | 6076 if (n < 4) |
6077 block[0] = block[0] * s->y_dc_scale; | |
6078 else | |
6079 block[0] = block[0] * s->c_dc_scale; | |
6080 /* XXX: only mpeg1 */ | |
6081 quant_matrix = s->intra_matrix; | |
6082 for(i=1;i<=nCoeffs;i++) { | |
6083 int j= s->intra_scantable.permutated[i]; | |
6084 level = block[j]; | |
6085 if (level) { | |
6086 if (level < 0) { | |
6087 level = -level; | |
6088 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6089 level = (level - 1) | 1; | |
6090 level = -level; | |
6091 } else { | |
6092 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6093 level = (level - 1) | 1; | |
0 | 6094 } |
1689 | 6095 block[j] = level; |
0 | 6096 } |
6097 } | |
6098 } | |
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
|
6099 |
1689 | 6100 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, |
6101 DCTELEM *block, int n, int qscale) | |
6102 { | |
6103 int i, level, nCoeffs; | |
6104 const uint16_t *quant_matrix; | |
6105 | |
6106 nCoeffs= s->block_last_index[n]; | |
6107 | |
6108 quant_matrix = s->inter_matrix; | |
6109 for(i=0; i<=nCoeffs; i++) { | |
6110 int j= s->intra_scantable.permutated[i]; | |
6111 level = block[j]; | |
6112 if (level) { | |
6113 if (level < 0) { | |
6114 level = -level; | |
6115 level = (((level << 1) + 1) * qscale * | |
6116 ((int) (quant_matrix[j]))) >> 4; | |
6117 level = (level - 1) | 1; | |
6118 level = -level; | |
6119 } else { | |
6120 level = (((level << 1) + 1) * qscale * | |
6121 ((int) (quant_matrix[j]))) >> 4; | |
6122 level = (level - 1) | 1; | |
6123 } | |
6124 block[j] = level; | |
6125 } | |
6126 } | |
6127 } | |
6128 | |
6129 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s, | |
325 | 6130 DCTELEM *block, int n, int qscale) |
6131 { | |
6132 int i, level, nCoeffs; | |
1064 | 6133 const uint16_t *quant_matrix; |
325 | 6134 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6135 if(s->alternate_scan) nCoeffs= 63; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6136 else nCoeffs= s->block_last_index[n]; |
325 | 6137 |
1689 | 6138 if (n < 4) |
6139 block[0] = block[0] * s->y_dc_scale; | |
6140 else | |
6141 block[0] = block[0] * s->c_dc_scale; | |
6142 quant_matrix = s->intra_matrix; | |
6143 for(i=1;i<=nCoeffs;i++) { | |
6144 int j= s->intra_scantable.permutated[i]; | |
6145 level = block[j]; | |
6146 if (level) { | |
6147 if (level < 0) { | |
6148 level = -level; | |
6149 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6150 level = -level; | |
6151 } else { | |
6152 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6153 } | |
6154 block[j] = level; | |
6155 } | |
6156 } | |
6157 } | |
6158 | |
6159 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, | |
6160 DCTELEM *block, int n, int qscale) | |
6161 { | |
6162 int i, level, nCoeffs; | |
6163 const uint16_t *quant_matrix; | |
6164 int sum=-1; | |
6165 | |
6166 if(s->alternate_scan) nCoeffs= 63; | |
6167 else nCoeffs= s->block_last_index[n]; | |
6168 | |
6169 quant_matrix = s->inter_matrix; | |
6170 for(i=0; i<=nCoeffs; i++) { | |
6171 int j= s->intra_scantable.permutated[i]; | |
6172 level = block[j]; | |
6173 if (level) { | |
6174 if (level < 0) { | |
6175 level = -level; | |
6176 level = (((level << 1) + 1) * qscale * | |
6177 ((int) (quant_matrix[j]))) >> 4; | |
6178 level = -level; | |
6179 } else { | |
6180 level = (((level << 1) + 1) * qscale * | |
6181 ((int) (quant_matrix[j]))) >> 4; | |
6182 } | |
6183 block[j] = level; | |
6184 sum+=level; | |
6185 } | |
6186 } | |
6187 block[63]^=sum&1; | |
6188 } | |
6189 | |
6190 static void dct_unquantize_h263_intra_c(MpegEncContext *s, | |
6191 DCTELEM *block, int n, int qscale) | |
6192 { | |
6193 int i, level, qmul, qadd; | |
6194 int nCoeffs; | |
6195 | |
6196 assert(s->block_last_index[n]>=0); | |
6197 | |
6198 qmul = qscale << 1; | |
6199 | |
6200 if (!s->h263_aic) { | |
325 | 6201 if (n < 4) |
6202 block[0] = block[0] * s->y_dc_scale; | |
6203 else | |
6204 block[0] = block[0] * s->c_dc_scale; | |
1689 | 6205 qadd = (qscale - 1) | 1; |
6206 }else{ | |
6207 qadd = 0; | |
6208 } | |
6209 if(s->ac_pred) | |
6210 nCoeffs=63; | |
6211 else | |
6212 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; | |
6213 | |
6214 for(i=1; i<=nCoeffs; i++) { | |
6215 level = block[i]; | |
6216 if (level) { | |
6217 if (level < 0) { | |
6218 level = level * qmul - qadd; | |
6219 } else { | |
6220 level = level * qmul + qadd; | |
325 | 6221 } |
1689 | 6222 block[i] = level; |
325 | 6223 } |
6224 } | |
6225 } | |
6226 | |
1689 | 6227 static void dct_unquantize_h263_inter_c(MpegEncContext *s, |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6228 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
|
6229 { |
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
|
6230 int i, level, qmul, qadd; |
200 | 6231 int nCoeffs; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
6232 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6233 assert(s->block_last_index[n]>=0); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6234 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6235 qadd = (qscale - 1) | 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6236 qmul = qscale << 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6237 |
1689 | 6238 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; |
6239 | |
6240 for(i=0; i<=nCoeffs; i++) { | |
13
174ef88f619a
use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents:
8
diff
changeset
|
6241 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
|
6242 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
|
6243 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
|
6244 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
|
6245 } 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
|
6246 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
|
6247 } |
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
|
6248 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
|
6249 } |
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
|
6250 } |
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
|
6251 } |
0 | 6252 |
1059 | 6253 static const AVOption mpeg4_options[] = |
6254 { | |
6255 AVOPTION_CODEC_INT("bitrate", "desired video bitrate", bit_rate, 4, 240000000, 800000), | |
6256 AVOPTION_CODEC_INT("ratetol", "number of bits the bitstream is allowed to diverge from the reference" | |
6257 "the reference can be CBR (for CBR pass1) or VBR (for pass2)", | |
6258 bit_rate_tolerance, 4, 240000000, 8000), | |
6259 AVOPTION_CODEC_INT("qmin", "minimum quantizer", qmin, 1, 31, 2), | |
6260 AVOPTION_CODEC_INT("qmax", "maximum quantizer", qmax, 1, 31, 31), | |
6261 AVOPTION_CODEC_STRING("rc_eq", "rate control equation", | |
6262 rc_eq, "tex^qComp,option1,options2", 0), | |
6263 AVOPTION_CODEC_INT("rc_minrate", "rate control minimum bitrate", | |
6264 rc_min_rate, 4, 24000000, 0), | |
6265 AVOPTION_CODEC_INT("rc_maxrate", "rate control maximum bitrate", | |
6266 rc_max_rate, 4, 24000000, 0), | |
1130 | 6267 AVOPTION_CODEC_DOUBLE("rc_buf_aggresivity", "rate control buffer aggresivity", |
6268 rc_buffer_aggressivity, 4, 24000000, 0), | |
6269 AVOPTION_CODEC_DOUBLE("rc_initial_cplx", "initial complexity for pass1 ratecontrol", | |
6270 rc_initial_cplx, 0., 9999999., 0), | |
6271 AVOPTION_CODEC_DOUBLE("i_quant_factor", "qscale factor between p and i frames", | |
6272 i_quant_factor, 0., 0., 0), | |
6273 AVOPTION_CODEC_DOUBLE("i_quant_offset", "qscale offset between p and i frames", | |
6274 i_quant_factor, -999999., 999999., 0), | |
6275 AVOPTION_CODEC_INT("dct_algo", "dct alghorithm", | |
6276 dct_algo, 0, 5, 0), // fixme - "Auto,FastInt,Int,MMX,MLib,Altivec" | |
6277 AVOPTION_CODEC_DOUBLE("lumi_masking", "luminance masking", | |
6278 lumi_masking, 0., 999999., 0), | |
6279 AVOPTION_CODEC_DOUBLE("temporal_cplx_masking", "temporary complexity masking", | |
6280 temporal_cplx_masking, 0., 999999., 0), | |
6281 AVOPTION_CODEC_DOUBLE("spatial_cplx_masking", "spatial complexity masking", | |
6282 spatial_cplx_masking, 0., 999999., 0), | |
6283 AVOPTION_CODEC_DOUBLE("p_masking", "p block masking", | |
6284 p_masking, 0., 999999., 0), | |
6285 AVOPTION_CODEC_DOUBLE("dark_masking", "darkness masking", | |
6286 dark_masking, 0., 999999., 0), | |
6287 AVOPTION_CODEC_INT("idct_algo", "idct alghorithm", | |
6288 idct_algo, 0, 8, 0), // fixme - "Auto,Int,Simple,SimpleMMX,LibMPEG2MMX,PS2,MLib,ARM,Altivec" | |
6289 | |
6290 AVOPTION_CODEC_INT("mb_qmin", "minimum MB quantizer", | |
6291 mb_qmin, 0, 8, 0), | |
6292 AVOPTION_CODEC_INT("mb_qmax", "maximum MB quantizer", | |
6293 mb_qmin, 0, 8, 0), | |
6294 | |
6295 AVOPTION_CODEC_INT("me_cmp", "ME compare function", | |
6296 me_cmp, 0, 24000000, 0), | |
6297 AVOPTION_CODEC_INT("me_sub_cmp", "subpixel ME compare function", | |
6298 me_sub_cmp, 0, 24000000, 0), | |
6299 | |
6300 | |
6301 AVOPTION_CODEC_INT("dia_size", "ME diamond size & shape", | |
6302 dia_size, 0, 24000000, 0), | |
6303 AVOPTION_CODEC_INT("last_predictor_count", "amount of previous MV predictors", | |
6304 last_predictor_count, 0, 24000000, 0), | |
6305 | |
6306 AVOPTION_CODEC_INT("pre_me", "pre pass for ME", | |
6307 pre_me, 0, 24000000, 0), | |
6308 AVOPTION_CODEC_INT("me_pre_cmp", "ME pre pass compare function", | |
6309 me_pre_cmp, 0, 24000000, 0), | |
6310 | |
6311 AVOPTION_CODEC_INT("me_range", "maximum ME search range", | |
6312 me_range, 0, 24000000, 0), | |
6313 AVOPTION_CODEC_INT("pre_dia_size", "ME pre pass diamod size & shape", | |
6314 pre_dia_size, 0, 24000000, 0), | |
6315 AVOPTION_CODEC_INT("me_subpel_quality", "subpel ME quality", | |
6316 me_subpel_quality, 0, 24000000, 0), | |
6317 AVOPTION_CODEC_INT("me_range", "maximum ME search range", | |
6318 me_range, 0, 24000000, 0), | |
1059 | 6319 AVOPTION_CODEC_FLAG("psnr", "calculate PSNR of compressed frames", |
6320 flags, CODEC_FLAG_PSNR, 0), | |
6321 AVOPTION_CODEC_RCOVERRIDE("rc_override", "ratecontrol override (=startframe,endframe,qscale,quality_factor)", | |
6322 rc_override), | |
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
6323 AVOPTION_SUB(avoptions_common), |
1059 | 6324 AVOPTION_END() |
6325 }; | |
6326 | |
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
|
6327 #ifdef CONFIG_ENCODERS |
1042 | 6328 #ifdef CONFIG_RISKY |
0 | 6329 AVCodec h263_encoder = { |
6330 "h263", | |
6331 CODEC_TYPE_VIDEO, | |
6332 CODEC_ID_H263, | |
6333 sizeof(MpegEncContext), | |
6334 MPV_encode_init, | |
6335 MPV_encode_picture, | |
6336 MPV_encode_end, | |
6337 }; | |
6338 | |
6339 AVCodec h263p_encoder = { | |
6340 "h263p", | |
6341 CODEC_TYPE_VIDEO, | |
6342 CODEC_ID_H263P, | |
6343 sizeof(MpegEncContext), | |
6344 MPV_encode_init, | |
6345 MPV_encode_picture, | |
6346 MPV_encode_end, | |
6347 }; | |
6348 | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6349 AVCodec flv_encoder = { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6350 "flv", |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6351 CODEC_TYPE_VIDEO, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6352 CODEC_ID_FLV1, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6353 sizeof(MpegEncContext), |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6354 MPV_encode_init, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6355 MPV_encode_picture, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6356 MPV_encode_end, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6357 }; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6358 |
0 | 6359 AVCodec rv10_encoder = { |
6360 "rv10", | |
6361 CODEC_TYPE_VIDEO, | |
6362 CODEC_ID_RV10, | |
6363 sizeof(MpegEncContext), | |
6364 MPV_encode_init, | |
6365 MPV_encode_picture, | |
6366 MPV_encode_end, | |
6367 }; | |
6368 | |
71 | 6369 AVCodec mpeg4_encoder = { |
6370 "mpeg4", | |
0 | 6371 CODEC_TYPE_VIDEO, |
71 | 6372 CODEC_ID_MPEG4, |
0 | 6373 sizeof(MpegEncContext), |
6374 MPV_encode_init, | |
6375 MPV_encode_picture, | |
6376 MPV_encode_end, | |
1059 | 6377 .options = mpeg4_options, |
2111 | 6378 .capabilities= CODEC_CAP_DELAY, |
0 | 6379 }; |
6380 | |
307 | 6381 AVCodec msmpeg4v1_encoder = { |
6382 "msmpeg4v1", | |
0 | 6383 CODEC_TYPE_VIDEO, |
307 | 6384 CODEC_ID_MSMPEG4V1, |
0 | 6385 sizeof(MpegEncContext), |
6386 MPV_encode_init, | |
6387 MPV_encode_picture, | |
6388 MPV_encode_end, | |
1130 | 6389 .options = mpeg4_options, |
0 | 6390 }; |
307 | 6391 |
6392 AVCodec msmpeg4v2_encoder = { | |
6393 "msmpeg4v2", | |
6394 CODEC_TYPE_VIDEO, | |
6395 CODEC_ID_MSMPEG4V2, | |
6396 sizeof(MpegEncContext), | |
6397 MPV_encode_init, | |
6398 MPV_encode_picture, | |
6399 MPV_encode_end, | |
1130 | 6400 .options = mpeg4_options, |
307 | 6401 }; |
6402 | |
6403 AVCodec msmpeg4v3_encoder = { | |
6404 "msmpeg4", | |
6405 CODEC_TYPE_VIDEO, | |
6406 CODEC_ID_MSMPEG4V3, | |
6407 sizeof(MpegEncContext), | |
6408 MPV_encode_init, | |
6409 MPV_encode_picture, | |
6410 MPV_encode_end, | |
1130 | 6411 .options = mpeg4_options, |
307 | 6412 }; |
499 | 6413 |
6414 AVCodec wmv1_encoder = { | |
6415 "wmv1", | |
6416 CODEC_TYPE_VIDEO, | |
6417 CODEC_ID_WMV1, | |
6418 sizeof(MpegEncContext), | |
6419 MPV_encode_init, | |
6420 MPV_encode_picture, | |
6421 MPV_encode_end, | |
1130 | 6422 .options = mpeg4_options, |
499 | 6423 }; |
6424 | |
1042 | 6425 #endif |
6426 | |
6427 AVCodec mjpeg_encoder = { | |
6428 "mjpeg", | |
6429 CODEC_TYPE_VIDEO, | |
6430 CODEC_ID_MJPEG, | |
6431 sizeof(MpegEncContext), | |
6432 MPV_encode_init, | |
6433 MPV_encode_picture, | |
6434 MPV_encode_end, | |
6435 }; | |
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
|
6436 |
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
|
6437 #endif //CONFIG_ENCODERS |