Mercurial > libavcodec.hg
annotate mpegvideo.c @ 2345:ada3891b859d libavcodec
H261 fixing and cleaning:
-corrected wrong value in mv data
-set correct mb_type after adjusting index
-don't use H263 loop filter when the loop filter flag is set but when
using the H261 encoder
-use the same unquantizer as H263 (which is optimized btw)
-removed unused members in H261Context
patch by (Maarten Daniels <maarten.daniels >at< luc >dot< ac >dot< be>)
regression test checksum update by me
author | michael |
---|---|
date | Fri, 12 Nov 2004 01:21:34 +0000 |
parents | 5e5cf598a48b |
children | e0bda0b8359a |
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; | |
2018 s->input_picture[i]->pict_type= pict_type; | |
2019 | |
2020 if(i + 1 >= s->rc_context.num_entries) break; | |
2021 } | |
2022 } | |
924 | 2023 |
2297 | 2024 if(s->avctx->b_frame_strategy==0){ |
915 | 2025 b_frames= s->max_b_frames; |
1373 | 2026 while(b_frames && !s->input_picture[b_frames]) b_frames--; |
1687 | 2027 }else if(s->avctx->b_frame_strategy==1){ |
915 | 2028 for(i=1; i<s->max_b_frames+1; i++){ |
1373 | 2029 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){ |
915 | 2030 s->input_picture[i]->b_frame_score= |
924 | 2031 get_intra_count(s, s->input_picture[i ]->data[0], |
2032 s->input_picture[i-1]->data[0], s->linesize) + 1; | |
915 | 2033 } |
2034 } | |
2035 for(i=0; i<s->max_b_frames; i++){ | |
1373 | 2036 if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/40) break; |
915 | 2037 } |
2038 | |
2039 b_frames= FFMAX(0, i-1); | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2040 |
915 | 2041 /* reset scores */ |
2042 for(i=0; i<b_frames+1; i++){ | |
2043 s->input_picture[i]->b_frame_score=0; | |
2044 } | |
2045 }else{ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2046 av_log(s->avctx, AV_LOG_ERROR, "illegal b frame strategy\n"); |
915 | 2047 b_frames=0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2048 } |
915 | 2049 |
2050 emms_c(); | |
2051 //static int b_count=0; | |
2052 //b_count+= b_frames; | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1597
diff
changeset
|
2053 //av_log(s->avctx, AV_LOG_DEBUG, "b_frames: %d\n", b_count); |
2297 | 2054 |
2055 for(i= b_frames - 1; i>=0; i--){ | |
2056 int type= s->input_picture[i]->pict_type; | |
2057 if(type && type != B_TYPE) | |
2058 b_frames= i; | |
2059 } | |
2060 if(s->input_picture[b_frames]->pict_type == B_TYPE && b_frames == s->max_b_frames){ | |
2061 av_log(s->avctx, AV_LOG_ERROR, "warning, too many bframes in a row\n"); | |
2062 } | |
2063 | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2064 if(s->picture_in_gop_number + b_frames >= s->gop_size){ |
2298 | 2065 if((s->flags2 & CODEC_FLAG2_STRICT_GOP) && s->gop_size > s->picture_in_gop_number){ |
2066 b_frames= s->gop_size - s->picture_in_gop_number - 1; | |
2067 }else{ | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2068 if(s->flags & CODEC_FLAG_CLOSED_GOP) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2069 b_frames=0; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2070 s->input_picture[b_frames]->pict_type= I_TYPE; |
2298 | 2071 } |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2072 } |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2073 |
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 |
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) |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2077 b_frames--; |
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1751
diff
changeset
|
2078 |
915 | 2079 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
|
2080 if(s->reordered_input_picture[0]->pict_type != I_TYPE) |
915 | 2081 s->reordered_input_picture[0]->pict_type= P_TYPE; |
1705 | 2082 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++; |
915 | 2083 for(i=0; i<b_frames; i++){ |
2084 s->reordered_input_picture[i+1]= s->input_picture[i]; | |
2085 s->reordered_input_picture[i+1]->pict_type= B_TYPE; | |
1705 | 2086 s->reordered_input_picture[i+1]->coded_picture_number= s->coded_picture_number++; |
903 | 2087 } |
324 | 2088 } |
2089 } | |
903 | 2090 |
2091 if(s->reordered_input_picture[0]){ | |
1168 | 2092 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=B_TYPE ? 3 : 0; |
1138 | 2093 |
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
|
2094 copy_picture(&s->new_picture, s->reordered_input_picture[0]); |
924 | 2095 |
2096 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){ | |
1138 | 2097 // input is a shared pix, so we cant modifiy it -> alloc a new one & ensure that the shared one is reuseable |
2098 | |
1586 | 2099 int i= ff_find_unused_picture(s, 0); |
924 | 2100 Picture *pic= &s->picture[i]; |
2101 | |
2102 /* mark us unused / free shared pic */ | |
2103 for(i=0; i<4; i++) | |
2104 s->reordered_input_picture[0]->data[i]= NULL; | |
2105 s->reordered_input_picture[0]->type= 0; | |
2106 | |
1702 | 2107 pic->reference = s->reordered_input_picture[0]->reference; |
924 | 2108 |
2109 alloc_picture(s, pic, 0); | |
2110 | |
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
|
2111 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
|
2112 |
1138 | 2113 s->current_picture_ptr= pic; |
924 | 2114 }else{ |
1138 | 2115 // input is not a shared pix -> reuse buffer for current_pix |
2116 | |
924 | 2117 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER |
2118 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL); | |
2119 | |
1138 | 2120 s->current_picture_ptr= s->reordered_input_picture[0]; |
924 | 2121 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
|
2122 s->new_picture.data[i]+=16; |
924 | 2123 } |
903 | 2124 } |
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
|
2125 copy_picture(&s->current_picture, s->current_picture_ptr); |
903 | 2126 |
2127 s->picture_number= s->new_picture.display_picture_number; | |
2128 //printf("dpn:%d\n", s->picture_number); | |
2129 }else{ | |
2130 memset(&s->new_picture, 0, sizeof(Picture)); | |
324 | 2131 } |
2132 } | |
2133 | |
0 | 2134 int MPV_encode_picture(AVCodecContext *avctx, |
2135 unsigned char *buf, int buf_size, void *data) | |
2136 { | |
2137 MpegEncContext *s = avctx->priv_data; | |
925 | 2138 AVFrame *pic_arg = data; |
1684 | 2139 int i, stuffing_count; |
0 | 2140 |
1397 | 2141 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
|
2142 av_log(avctx, AV_LOG_ERROR, "this codec supports only YUV420P\n"); |
1397 | 2143 return -1; |
2144 } | |
2145 | |
1799 | 2146 for(i=0; i<avctx->thread_count; i++){ |
1838 | 2147 int start_y= s->thread_context[i]->start_mb_y; |
2148 int end_y= s->thread_context[i]-> end_mb_y; | |
1799 | 2149 int h= s->mb_height; |
1838 | 2150 uint8_t *start= buf + buf_size*start_y/h; |
2151 uint8_t *end = buf + buf_size* end_y/h; | |
1799 | 2152 |
2153 init_put_bits(&s->thread_context[i]->pb, start, end - start); | |
2154 } | |
0 | 2155 |
903 | 2156 s->picture_in_gop_number++; |
2157 | |
2243
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2158 if(load_input_picture(s, pic_arg) < 0) |
b8bad8bbbc64
check if the user specified timestamps are strictly monotone
michael
parents:
2235
diff
changeset
|
2159 return -1; |
329 | 2160 |
903 | 2161 select_input_picture(s); |
324 | 2162 |
2163 /* output? */ | |
903 | 2164 if(s->new_picture.data[0]){ |
2165 s->pict_type= s->new_picture.pict_type; | |
2166 //emms_c(); | |
2167 //printf("qs:%f %f %d\n", s->new_picture.quality, s->current_picture.quality, s->qscale); | |
553 | 2168 MPV_frame_start(s, avctx); |
286 | 2169 |
324 | 2170 encode_picture(s, s->picture_number); |
652 | 2171 |
376 | 2172 avctx->real_pict_num = s->picture_number; |
324 | 2173 avctx->header_bits = s->header_bits; |
2174 avctx->mv_bits = s->mv_bits; | |
2175 avctx->misc_bits = s->misc_bits; | |
2176 avctx->i_tex_bits = s->i_tex_bits; | |
2177 avctx->p_tex_bits = s->p_tex_bits; | |
2178 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
|
2179 avctx->p_count = s->mb_num - s->i_count - s->skip_count; //FIXME f/b_count in avctx |
324 | 2180 avctx->skip_count = s->skip_count; |
0 | 2181 |
324 | 2182 MPV_frame_end(s); |
2183 | |
2184 if (s->out_format == FMT_MJPEG) | |
2185 mjpeg_picture_trailer(s); | |
329 | 2186 |
2187 if(s->flags&CODEC_FLAG_PASS1) | |
2188 ff_write_pass1_stats(s); | |
1138 | 2189 |
2190 for(i=0; i<4; i++){ | |
2191 avctx->error[i] += s->current_picture_ptr->error[i]; | |
2192 } | |
1766 | 2193 |
1684 | 2194 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
|
2195 s->frame_bits = put_bits_count(&s->pb); |
1766 | 2196 |
2197 stuffing_count= ff_vbv_update(s, s->frame_bits); | |
2198 if(stuffing_count){ | |
2199 switch(s->codec_id){ | |
2200 case CODEC_ID_MPEG1VIDEO: | |
2201 case CODEC_ID_MPEG2VIDEO: | |
2202 while(stuffing_count--){ | |
2203 put_bits(&s->pb, 8, 0); | |
2204 } | |
2205 break; | |
2206 case CODEC_ID_MPEG4: | |
2207 put_bits(&s->pb, 16, 0); | |
2208 put_bits(&s->pb, 16, 0x1C3); | |
2209 stuffing_count -= 4; | |
2210 while(stuffing_count--){ | |
2211 put_bits(&s->pb, 8, 0xFF); | |
2212 } | |
2213 break; | |
2214 default: | |
2215 av_log(s->avctx, AV_LOG_ERROR, "vbv buffer overflow\n"); | |
2216 } | |
2217 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
|
2218 s->frame_bits = put_bits_count(&s->pb); |
1766 | 2219 } |
2220 | |
2221 /* update mpeg1/2 vbv_delay for CBR */ | |
1907 | 2222 if(s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate && s->out_format == FMT_MPEG1 |
2223 && 90000LL * (avctx->rc_buffer_size-1) <= s->avctx->rc_max_rate*0xFFFFLL){ | |
1766 | 2224 int vbv_delay; |
2225 | |
2226 assert(s->repeat_first_field==0); | |
2227 | |
2228 vbv_delay= lrintf(90000 * s->rc_context.buffer_index / s->avctx->rc_max_rate); | |
2229 assert(vbv_delay < 0xFFFF); | |
2230 | |
2231 s->vbv_delay_ptr[0] &= 0xF8; | |
2232 s->vbv_delay_ptr[0] |= vbv_delay>>13; | |
2233 s->vbv_delay_ptr[1] = vbv_delay>>5; | |
2234 s->vbv_delay_ptr[2] &= 0x07; | |
2235 s->vbv_delay_ptr[2] |= vbv_delay<<3; | |
2236 } | |
2237 s->total_bits += s->frame_bits; | |
2238 avctx->frame_bits = s->frame_bits; | |
2239 }else{ | |
2240 assert((pbBufPtr(&s->pb) == s->pb.buf)); | |
2241 s->frame_bits=0; | |
1684 | 2242 } |
1766 | 2243 assert((s->frame_bits&7)==0); |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
2244 |
1684 | 2245 return s->frame_bits/8; |
0 | 2246 } |
2247 | |
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
|
2248 #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
|
2249 |
255 | 2250 static inline void gmc1_motion(MpegEncContext *s, |
1064 | 2251 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
|
2252 uint8_t **ref_picture) |
255 | 2253 { |
1064 | 2254 uint8_t *ptr; |
556 | 2255 int offset, src_x, src_y, linesize, uvlinesize; |
255 | 2256 int motion_x, motion_y; |
566 | 2257 int emu=0; |
255 | 2258 |
2259 motion_x= s->sprite_offset[0][0]; | |
2260 motion_y= s->sprite_offset[0][1]; | |
2261 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
2262 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
2263 motion_x<<=(3-s->sprite_warping_accuracy); | |
2264 motion_y<<=(3-s->sprite_warping_accuracy); | |
2265 src_x = clip(src_x, -16, s->width); | |
2266 if (src_x == s->width) | |
2267 motion_x =0; | |
2268 src_y = clip(src_y, -16, s->height); | |
2269 if (src_y == s->height) | |
2270 motion_y =0; | |
753 | 2271 |
255 | 2272 linesize = s->linesize; |
556 | 2273 uvlinesize = s->uvlinesize; |
753 | 2274 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2275 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
|
2276 |
566 | 2277 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
|
2278 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
|
2279 || (unsigned)src_y >= s->v_edge_pos - 17){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2280 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 | 2281 ptr= s->edge_emu_buffer; |
2282 } | |
2283 } | |
753 | 2284 |
2285 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
|
2286 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
|
2287 s->dsp.gmc1(dest_y+8, ptr+8, linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding); |
753 | 2288 }else{ |
2289 int dxy; | |
2290 | |
2291 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2); | |
2292 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
|
2293 s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16); |
753 | 2294 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2295 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
|
2296 } |
753 | 2297 } |
2298 | |
2299 if(s->flags&CODEC_FLAG_GRAY) return; | |
255 | 2300 |
2301 motion_x= s->sprite_offset[1][0]; | |
2302 motion_y= s->sprite_offset[1][1]; | |
2303 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1)); | |
2304 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1)); | |
2305 motion_x<<=(3-s->sprite_warping_accuracy); | |
2306 motion_y<<=(3-s->sprite_warping_accuracy); | |
2307 src_x = clip(src_x, -8, s->width>>1); | |
2308 if (src_x == s->width>>1) | |
2309 motion_x =0; | |
2310 src_y = clip(src_y, -8, s->height>>1); | |
2311 if (src_y == s->height>>1) | |
2312 motion_y =0; | |
2313 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2314 offset = (src_y * uvlinesize) + src_x; |
255 | 2315 ptr = ref_picture[1] + offset; |
1002 | 2316 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
|
2317 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
|
2318 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2319 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 | 2320 ptr= s->edge_emu_buffer; |
2321 emu=1; | |
2322 } | |
566 | 2323 } |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2324 s->dsp.gmc1(dest_cb, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
566 | 2325 |
255 | 2326 ptr = ref_picture[2] + offset; |
566 | 2327 if(emu){ |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2328 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, uvlinesize, 9, 9, src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1); |
566 | 2329 ptr= s->edge_emu_buffer; |
2330 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2331 s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding); |
255 | 2332 |
2333 return; | |
2334 } | |
2335 | |
753 | 2336 static inline void gmc_motion(MpegEncContext *s, |
1064 | 2337 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
|
2338 uint8_t **ref_picture) |
753 | 2339 { |
1064 | 2340 uint8_t *ptr; |
753 | 2341 int linesize, uvlinesize; |
2342 const int a= s->sprite_warping_accuracy; | |
2343 int ox, oy; | |
2344 | |
2345 linesize = s->linesize; | |
2346 uvlinesize = s->uvlinesize; | |
2347 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2348 ptr = ref_picture[0]; |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2349 |
753 | 2350 ox= s->sprite_offset[0][0] + s->sprite_delta[0][0]*s->mb_x*16 + s->sprite_delta[0][1]*s->mb_y*16; |
2351 oy= s->sprite_offset[0][1] + s->sprite_delta[1][0]*s->mb_x*16 + s->sprite_delta[1][1]*s->mb_y*16; | |
2352 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
2353 s->dsp.gmc(dest_y, ptr, linesize, 16, |
753 | 2354 ox, |
2355 oy, | |
2356 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2357 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2358 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2359 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
|
2360 s->dsp.gmc(dest_y+8, ptr, linesize, 16, |
753 | 2361 ox + s->sprite_delta[0][0]*8, |
2362 oy + s->sprite_delta[1][0]*8, | |
2363 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2364 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2365 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2366 s->h_edge_pos, s->v_edge_pos); | |
2367 | |
2368 if(s->flags&CODEC_FLAG_GRAY) return; | |
2369 | |
2370 ox= s->sprite_offset[1][0] + s->sprite_delta[0][0]*s->mb_x*8 + s->sprite_delta[0][1]*s->mb_y*8; | |
2371 oy= s->sprite_offset[1][1] + s->sprite_delta[1][0]*s->mb_x*8 + s->sprite_delta[1][1]*s->mb_y*8; | |
2372 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2373 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
|
2374 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8, |
753 | 2375 ox, |
2376 oy, | |
2377 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2378 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2379 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2380 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2381 | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2382 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
|
2383 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8, |
753 | 2384 ox, |
2385 oy, | |
2386 s->sprite_delta[0][0], s->sprite_delta[0][1], | |
2387 s->sprite_delta[1][0], s->sprite_delta[1][1], | |
2388 a+1, (1<<(2*a+1)) - s->no_rounding, | |
2389 s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2390 } | |
2391 | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2392 /** |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2393 * 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
|
2394 * @param buf destination buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2395 * @param src source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2396 * @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
|
2397 * @param block_w width of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2398 * @param block_h height of block |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2399 * @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
|
2400 * @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
|
2401 * @param w width of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2402 * @param h height of the source buffer |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2403 */ |
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1315
diff
changeset
|
2404 void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h, |
553 | 2405 int src_x, int src_y, int w, int h){ |
2406 int x, y; | |
2407 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
|
2408 |
553 | 2409 if(src_y>= h){ |
2410 src+= (h-1-src_y)*linesize; | |
2411 src_y=h-1; | |
554 | 2412 }else if(src_y<=-block_h){ |
2413 src+= (1-block_h-src_y)*linesize; | |
2414 src_y=1-block_h; | |
553 | 2415 } |
2416 if(src_x>= w){ | |
2417 src+= (w-1-src_x); | |
2418 src_x=w-1; | |
554 | 2419 }else if(src_x<=-block_w){ |
2420 src+= (1-block_w-src_x); | |
2421 src_x=1-block_w; | |
553 | 2422 } |
2423 | |
847 | 2424 start_y= FFMAX(0, -src_y); |
2425 start_x= FFMAX(0, -src_x); | |
2426 end_y= FFMIN(block_h, h-src_y); | |
2427 end_x= FFMIN(block_w, w-src_x); | |
566 | 2428 |
553 | 2429 // copy existing part |
2430 for(y=start_y; y<end_y; y++){ | |
2431 for(x=start_x; x<end_x; x++){ | |
2432 buf[x + y*linesize]= src[x + y*linesize]; | |
2433 } | |
2434 } | |
2435 | |
2436 //top | |
2437 for(y=0; y<start_y; y++){ | |
2438 for(x=start_x; x<end_x; x++){ | |
2439 buf[x + y*linesize]= buf[x + start_y*linesize]; | |
2440 } | |
2441 } | |
2442 | |
2443 //bottom | |
2444 for(y=end_y; y<block_h; y++){ | |
2445 for(x=start_x; x<end_x; x++){ | |
2446 buf[x + y*linesize]= buf[x + (end_y-1)*linesize]; | |
2447 } | |
2448 } | |
2449 | |
2450 for(y=0; y<block_h; y++){ | |
2451 //left | |
2452 for(x=0; x<start_x; x++){ | |
2453 buf[x + y*linesize]= buf[start_x + y*linesize]; | |
2454 } | |
2455 | |
2456 //right | |
2457 for(x=end_x; x<block_w; x++){ | |
2458 buf[x + y*linesize]= buf[end_x - 1 + y*linesize]; | |
2459 } | |
2460 } | |
2461 } | |
2462 | |
1633 | 2463 static inline int hpel_motion(MpegEncContext *s, |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2464 uint8_t *dest, uint8_t *src, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2465 int field_based, int field_select, |
1633 | 2466 int src_x, int src_y, |
2467 int width, int height, int stride, | |
2468 int h_edge_pos, int v_edge_pos, | |
2469 int w, int h, op_pixels_func *pix_op, | |
2470 int motion_x, int motion_y) | |
2471 { | |
2472 int dxy; | |
2473 int emu=0; | |
2474 | |
2475 dxy = ((motion_y & 1) << 1) | (motion_x & 1); | |
2476 src_x += motion_x >> 1; | |
2477 src_y += motion_y >> 1; | |
2478 | |
2479 /* WARNING: do no forget half pels */ | |
2480 src_x = clip(src_x, -16, width); //FIXME unneeded for emu? | |
2481 if (src_x == width) | |
2482 dxy &= ~1; | |
2483 src_y = clip(src_y, -16, height); | |
2484 if (src_y == height) | |
2485 dxy &= ~2; | |
2486 src += src_y * stride + src_x; | |
2487 | |
2488 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){ | |
2489 if( (unsigned)src_x > h_edge_pos - (motion_x&1) - w | |
2490 || (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
|
2491 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
|
2492 src_x, src_y<<field_based, h_edge_pos, s->v_edge_pos); |
1633 | 2493 src= s->edge_emu_buffer; |
2494 emu=1; | |
2495 } | |
2496 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2497 if(field_select) |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
2498 src += s->linesize; |
1633 | 2499 pix_op[dxy](dest, src, stride, h); |
2500 return emu; | |
2501 } | |
553 | 2502 |
2292 | 2503 static inline int hpel_motion_lowres(MpegEncContext *s, |
2504 uint8_t *dest, uint8_t *src, | |
2505 int field_based, int field_select, | |
2506 int src_x, int src_y, | |
2507 int width, int height, int stride, | |
2508 int h_edge_pos, int v_edge_pos, | |
2509 int w, int h, h264_chroma_mc_func *pix_op, | |
2510 int motion_x, int motion_y) | |
2511 { | |
2512 const int lowres= s->avctx->lowres; | |
2513 const int s_mask= (2<<lowres)-1; | |
2514 int emu=0; | |
2515 int sx, sy; | |
2516 | |
2517 if(s->quarter_sample){ | |
2518 motion_x/=2; | |
2519 motion_y/=2; | |
2520 } | |
2521 | |
2522 sx= motion_x & s_mask; | |
2523 sy= motion_y & s_mask; | |
2524 src_x += motion_x >> (lowres+1); | |
2525 src_y += motion_y >> (lowres+1); | |
2526 | |
2527 src += src_y * stride + src_x; | |
2528 | |
2529 if( (unsigned)src_x > h_edge_pos - (!!sx) - w | |
2530 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
2531 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based, | |
2532 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
2533 src= s->edge_emu_buffer; | |
2534 emu=1; | |
2535 } | |
2536 | |
2537 sx <<= 2 - lowres; | |
2538 sy <<= 2 - lowres; | |
2539 if(field_select) | |
2540 src += s->linesize; | |
2541 pix_op[lowres](dest, src, stride, h, sx, sy); | |
2542 return emu; | |
2543 } | |
2544 | |
0 | 2545 /* 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
|
2546 static always_inline void mpeg_motion(MpegEncContext *s, |
1064 | 2547 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
|
2548 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
|
2549 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
0 | 2550 int motion_x, int motion_y, int h) |
2551 { | |
1846 | 2552 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
2553 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
|
2554 |
651 | 2555 #if 0 |
255 | 2556 if(s->quarter_sample) |
2557 { | |
2558 motion_x>>=1; | |
2559 motion_y>>=1; | |
2560 } | |
651 | 2561 #endif |
1633 | 2562 |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
2563 v_edge_pos = s->v_edge_pos >> field_based; |
1846 | 2564 linesize = s->current_picture.linesize[0] << field_based; |
1138 | 2565 uvlinesize = s->current_picture.linesize[1] << field_based; |
1633 | 2566 |
1846 | 2567 dxy = ((motion_y & 1) << 1) | (motion_x & 1); |
2568 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
|
2569 src_y =(s->mb_y<<(4-field_based)) + (motion_y >> 1); |
485 | 2570 |
0 | 2571 if (s->out_format == FMT_H263) { |
1916 | 2572 if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){ |
2573 mx = (motion_x>>1)|(motion_x&1); | |
2574 my = motion_y >>1; | |
2575 uvdxy = ((my & 1) << 1) | (mx & 1); | |
2576 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
|
2577 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1); |
1916 | 2578 }else{ |
2579 uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1); | |
2580 uvsrc_x = src_x>>1; | |
2581 uvsrc_y = src_y>>1; | |
2582 } | |
2044
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2583 }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
|
2584 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
|
2585 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
|
2586 uvdxy = 0; |
b6f2add2511e
h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents:
2042
diff
changeset
|
2587 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
|
2588 uvsrc_y = s->mb_y*8 + my; |
0 | 2589 } else { |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2590 if(s->chroma_y_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2591 mx = motion_x / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2592 my = motion_y / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2593 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
|
2594 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
|
2595 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
|
2596 } else { |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2597 if(s->chroma_x_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2598 //Chroma422 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2599 mx = motion_x / 2; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2600 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
|
2601 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
|
2602 uvsrc_y = src_y; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2603 } else { |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2604 //Chroma444 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2605 uvdxy = dxy; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2606 uvsrc_x = src_x; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2607 uvsrc_y = src_y; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2608 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2609 } |
1846 | 2610 } |
2611 | |
2612 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2613 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2614 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2615 | |
2616 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16 | |
2617 || (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
|
2618 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
|
2619 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
|
2620 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
|
2621 return ; |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
2622 } |
1846 | 2623 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, |
2624 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); | |
2625 ptr_y = s->edge_emu_buffer; | |
2626 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1874 | 2627 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; |
1846 | 2628 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, |
2629 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2630 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, | |
2631 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2632 ptr_cb= uvbuf; | |
2633 ptr_cr= uvbuf+16; | |
2634 } | |
2635 } | |
2636 | |
2637 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data | |
2638 dest_y += s->linesize; | |
2639 dest_cb+= s->uvlinesize; | |
2640 dest_cr+= s->uvlinesize; | |
2641 } | |
2642 | |
2643 if(field_select){ | |
2644 ptr_y += s->linesize; | |
2645 ptr_cb+= s->uvlinesize; | |
2646 ptr_cr+= s->uvlinesize; | |
2647 } | |
2648 | |
2649 pix_op[0][dxy](dest_y, ptr_y, linesize, h); | |
0 | 2650 |
1846 | 2651 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
|
2652 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
|
2653 pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift); |
1846 | 2654 } |
2291 | 2655 if(s->out_format == FMT_H261){ |
2656 ff_h261_loop_filter(s); | |
2657 } | |
0 | 2658 } |
2256 | 2659 |
2660 /* apply one mpeg motion vector to the three components */ | |
2661 static always_inline void mpeg_motion_lowres(MpegEncContext *s, | |
2662 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2663 int field_based, int bottom_field, int field_select, | |
2664 uint8_t **ref_picture, h264_chroma_mc_func *pix_op, | |
2665 int motion_x, int motion_y, int h) | |
2666 { | |
2667 uint8_t *ptr_y, *ptr_cb, *ptr_cr; | |
2668 int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, uvlinesize, linesize, sx, sy, uvsx, uvsy; | |
2669 const int lowres= s->avctx->lowres; | |
2670 const int block_s= 8>>lowres; | |
2671 const int s_mask= (2<<lowres)-1; | |
2672 const int h_edge_pos = s->h_edge_pos >> lowres; | |
2673 const int v_edge_pos = s->v_edge_pos >> lowres; | |
2674 linesize = s->current_picture.linesize[0] << field_based; | |
2675 uvlinesize = s->current_picture.linesize[1] << field_based; | |
2676 | |
2260 | 2677 if(s->quarter_sample){ //FIXME obviously not perfect but qpel wont work in lowres anyway |
2678 motion_x/=2; | |
2679 motion_y/=2; | |
2680 } | |
2681 | |
2682 if(field_based){ | |
2683 motion_y += (bottom_field - field_select)*((1<<lowres)-1); | |
2684 } | |
2685 | |
2256 | 2686 sx= motion_x & s_mask; |
2687 sy= motion_y & s_mask; | |
2688 src_x = s->mb_x*2*block_s + (motion_x >> (lowres+1)); | |
2260 | 2689 src_y =(s->mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1)); |
2256 | 2690 |
2691 if (s->out_format == FMT_H263) { | |
2265 | 2692 uvsx = ((motion_x>>1) & s_mask) | (sx&1); |
2693 uvsy = ((motion_y>>1) & s_mask) | (sy&1); | |
2256 | 2694 uvsrc_x = src_x>>1; |
2695 uvsrc_y = src_y>>1; | |
2696 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261 | |
2697 mx = motion_x / 4; | |
2698 my = motion_y / 4; | |
2699 uvsx = (2*mx) & s_mask; | |
2700 uvsy = (2*my) & s_mask; | |
2701 uvsrc_x = s->mb_x*block_s + (mx >> lowres); | |
2702 uvsrc_y = s->mb_y*block_s + (my >> lowres); | |
2703 } else { | |
2704 mx = motion_x / 2; | |
2705 my = motion_y / 2; | |
2706 uvsx = mx & s_mask; | |
2707 uvsy = my & s_mask; | |
2708 uvsrc_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
2260 | 2709 uvsrc_y =(s->mb_y*block_s>>field_based) + (my >> (lowres+1)); |
2256 | 2710 } |
2711 | |
2712 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2713 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2714 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2715 | |
2716 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s | |
2717 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ | |
2718 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, | |
2719 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); | |
2720 ptr_y = s->edge_emu_buffer; | |
2721 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2722 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; | |
2723 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, | |
2724 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); | |
2725 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, | |
2726 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); | |
2727 ptr_cb= uvbuf; | |
2728 ptr_cr= uvbuf+16; | |
2729 } | |
2730 } | |
2731 | |
2260 | 2732 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data |
2733 dest_y += s->linesize; | |
2734 dest_cb+= s->uvlinesize; | |
2735 dest_cr+= s->uvlinesize; | |
2736 } | |
2737 | |
2738 if(field_select){ | |
2739 ptr_y += s->linesize; | |
2740 ptr_cb+= s->uvlinesize; | |
2741 ptr_cr+= s->uvlinesize; | |
2742 } | |
2743 | |
2256 | 2744 sx <<= 2 - lowres; |
2745 sy <<= 2 - lowres; | |
2746 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy); | |
2747 | |
2748 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2749 uvsx <<= 2 - lowres; | |
2750 uvsy <<= 2 - lowres; | |
2751 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
2752 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); | |
2753 } | |
2291 | 2754 //FIXME h261 lowres loop filter |
2256 | 2755 } |
2756 | |
1633 | 2757 //FIXME move to dsputil, avg variant, 16x16 version |
2758 static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride){ | |
2759 int x; | |
2760 uint8_t * const top = src[1]; | |
2761 uint8_t * const left = src[2]; | |
2762 uint8_t * const mid = src[0]; | |
2763 uint8_t * const right = src[3]; | |
2764 uint8_t * const bottom= src[4]; | |
2765 #define OBMC_FILTER(x, t, l, m, r, b)\ | |
2766 dst[x]= (t*top[x] + l*left[x] + m*mid[x] + r*right[x] + b*bottom[x] + 4)>>3 | |
2767 #define OBMC_FILTER4(x, t, l, m, r, b)\ | |
2768 OBMC_FILTER(x , t, l, m, r, b);\ | |
2769 OBMC_FILTER(x+1 , t, l, m, r, b);\ | |
2770 OBMC_FILTER(x +stride, t, l, m, r, b);\ | |
2771 OBMC_FILTER(x+1+stride, t, l, m, r, b); | |
2772 | |
2773 x=0; | |
2774 OBMC_FILTER (x , 2, 2, 4, 0, 0); | |
2775 OBMC_FILTER (x+1, 2, 1, 5, 0, 0); | |
2776 OBMC_FILTER4(x+2, 2, 1, 5, 0, 0); | |
2777 OBMC_FILTER4(x+4, 2, 0, 5, 1, 0); | |
2778 OBMC_FILTER (x+6, 2, 0, 5, 1, 0); | |
2779 OBMC_FILTER (x+7, 2, 0, 4, 2, 0); | |
2780 x+= stride; | |
2781 OBMC_FILTER (x , 1, 2, 5, 0, 0); | |
2782 OBMC_FILTER (x+1, 1, 2, 5, 0, 0); | |
2783 OBMC_FILTER (x+6, 1, 0, 5, 2, 0); | |
2784 OBMC_FILTER (x+7, 1, 0, 5, 2, 0); | |
2785 x+= stride; | |
2786 OBMC_FILTER4(x , 1, 2, 5, 0, 0); | |
2787 OBMC_FILTER4(x+2, 1, 1, 6, 0, 0); | |
2788 OBMC_FILTER4(x+4, 1, 0, 6, 1, 0); | |
2789 OBMC_FILTER4(x+6, 1, 0, 5, 2, 0); | |
2790 x+= 2*stride; | |
2791 OBMC_FILTER4(x , 0, 2, 5, 0, 1); | |
2792 OBMC_FILTER4(x+2, 0, 1, 6, 0, 1); | |
2793 OBMC_FILTER4(x+4, 0, 0, 6, 1, 1); | |
2794 OBMC_FILTER4(x+6, 0, 0, 5, 2, 1); | |
2795 x+= 2*stride; | |
2796 OBMC_FILTER (x , 0, 2, 5, 0, 1); | |
2797 OBMC_FILTER (x+1, 0, 2, 5, 0, 1); | |
2798 OBMC_FILTER4(x+2, 0, 1, 5, 0, 2); | |
2799 OBMC_FILTER4(x+4, 0, 0, 5, 1, 2); | |
2800 OBMC_FILTER (x+6, 0, 0, 5, 2, 1); | |
2801 OBMC_FILTER (x+7, 0, 0, 5, 2, 1); | |
2802 x+= stride; | |
2803 OBMC_FILTER (x , 0, 2, 4, 0, 2); | |
2804 OBMC_FILTER (x+1, 0, 1, 5, 0, 2); | |
2805 OBMC_FILTER (x+6, 0, 0, 5, 1, 2); | |
2806 OBMC_FILTER (x+7, 0, 0, 4, 2, 2); | |
2807 } | |
2808 | |
2809 /* obmc for 1 8x8 luma block */ | |
2810 static inline void obmc_motion(MpegEncContext *s, | |
2811 uint8_t *dest, uint8_t *src, | |
2812 int src_x, int src_y, | |
2813 op_pixels_func *pix_op, | |
2814 int16_t mv[5][2]/* mid top left right bottom*/) | |
2815 #define MID 0 | |
2816 { | |
2817 int i; | |
2818 uint8_t *ptr[5]; | |
2819 | |
2820 assert(s->quarter_sample==0); | |
2821 | |
2822 for(i=0; i<5; i++){ | |
2823 if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){ | |
2824 ptr[i]= ptr[MID]; | |
2825 }else{ | |
1799 | 2826 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
|
2827 hpel_motion(s, ptr[i], src, 0, 0, |
1633 | 2828 src_x, src_y, |
2829 s->width, s->height, s->linesize, | |
2830 s->h_edge_pos, s->v_edge_pos, | |
2831 8, 8, pix_op, | |
2832 mv[i][0], mv[i][1]); | |
2833 } | |
2834 } | |
2835 | |
2836 put_obmc(dest, ptr, s->linesize); | |
2837 } | |
0 | 2838 |
255 | 2839 static inline void qpel_motion(MpegEncContext *s, |
1064 | 2840 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
|
2841 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
|
2842 uint8_t **ref_picture, op_pixels_func (*pix_op)[4], |
651 | 2843 qpel_mc_func (*qpix_op)[16], |
255 | 2844 int motion_x, int motion_y, int h) |
2845 { | |
1846 | 2846 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
2847 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
|
2848 |
255 | 2849 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
1846 | 2850 src_x = s->mb_x * 16 + (motion_x >> 2); |
255 | 2851 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2); |
2852 | |
582
5132a4ee50cd
different edge positions fixed with edge emu / dr1
michaelni
parents:
575
diff
changeset
|
2853 v_edge_pos = s->v_edge_pos >> field_based; |
255 | 2854 linesize = s->linesize << field_based; |
671 | 2855 uvlinesize = s->uvlinesize << field_based; |
554 | 2856 |
671 | 2857 if(field_based){ |
2858 mx= motion_x/2; | |
2859 my= motion_y>>1; | |
1048 | 2860 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){ |
2861 static const int rtab[8]= {0,0,1,1,0,0,0,1}; | |
2862 mx= (motion_x>>1) + rtab[motion_x&7]; | |
2863 my= (motion_y>>1) + rtab[motion_y&7]; | |
760 | 2864 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){ |
671 | 2865 mx= (motion_x>>1)|(motion_x&1); |
2866 my= (motion_y>>1)|(motion_y&1); | |
2867 }else{ | |
2868 mx= motion_x/2; | |
2869 my= motion_y/2; | |
2870 } | |
2871 mx= (mx>>1)|(mx&1); | |
2872 my= (my>>1)|(my&1); | |
1048 | 2873 |
1846 | 2874 uvdxy= (mx&1) | ((my&1)<<1); |
671 | 2875 mx>>=1; |
2876 my>>=1; | |
255 | 2877 |
1846 | 2878 uvsrc_x = s->mb_x * 8 + mx; |
2879 uvsrc_y = s->mb_y * (8 >> field_based) + my; | |
2880 | |
2881 ptr_y = ref_picture[0] + src_y * linesize + src_x; | |
2882 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x; | |
2883 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x; | |
2884 | |
2885 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16 | |
2886 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){ | |
2887 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, | |
2888 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos); | |
2889 ptr_y= s->edge_emu_buffer; | |
2890 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
1874 | 2891 uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize; |
1846 | 2892 ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based, |
2893 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2894 ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based, | |
2895 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1); | |
2896 ptr_cb= uvbuf; | |
2897 ptr_cr= uvbuf + 16; | |
2898 } | |
2899 } | |
2900 | |
2901 if(!field_based) | |
2902 qpix_op[0][dxy](dest_y, ptr_y, linesize); | |
2903 else{ | |
2904 if(bottom_field){ | |
2905 dest_y += s->linesize; | |
2906 dest_cb+= s->uvlinesize; | |
2907 dest_cr+= s->uvlinesize; | |
2908 } | |
2909 | |
2910 if(field_select){ | |
2911 ptr_y += s->linesize; | |
2912 ptr_cb += s->uvlinesize; | |
2913 ptr_cr += s->uvlinesize; | |
2914 } | |
2915 //damn interlaced mode | |
2916 //FIXME boundary mirroring is not exactly correct here | |
2917 qpix_op[1][dxy](dest_y , ptr_y , linesize); | |
2918 qpix_op[1][dxy](dest_y+8, ptr_y+8, linesize); | |
2919 } | |
2920 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2921 pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1); | |
2922 pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1); | |
2923 } | |
255 | 2924 } |
2925 | |
1013 | 2926 inline int ff_h263_round_chroma(int x){ |
2927 if (x >= 0) | |
2928 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
2929 else { | |
2930 x = -x; | |
2931 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1)); | |
2932 } | |
2933 } | |
255 | 2934 |
1225 | 2935 /** |
1633 | 2936 * h263 chorma 4mv motion compensation. |
2937 */ | |
2938 static inline void chroma_4mv_motion(MpegEncContext *s, | |
2939 uint8_t *dest_cb, uint8_t *dest_cr, | |
2940 uint8_t **ref_picture, | |
2941 op_pixels_func *pix_op, | |
2942 int mx, int my){ | |
2943 int dxy, emu=0, src_x, src_y, offset; | |
2944 uint8_t *ptr; | |
2945 | |
2946 /* In case of 8X8, we construct a single chroma motion vector | |
2947 with a special rounding */ | |
2948 mx= ff_h263_round_chroma(mx); | |
2949 my= ff_h263_round_chroma(my); | |
2950 | |
2951 dxy = ((my & 1) << 1) | (mx & 1); | |
2952 mx >>= 1; | |
2953 my >>= 1; | |
2954 | |
2955 src_x = s->mb_x * 8 + mx; | |
2956 src_y = s->mb_y * 8 + my; | |
2957 src_x = clip(src_x, -8, s->width/2); | |
2958 if (src_x == s->width/2) | |
2959 dxy &= ~1; | |
2960 src_y = clip(src_y, -8, s->height/2); | |
2961 if (src_y == s->height/2) | |
2962 dxy &= ~2; | |
2963 | |
2964 offset = (src_y * (s->uvlinesize)) + src_x; | |
2965 ptr = ref_picture[1] + offset; | |
2966 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
2967 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8 | |
2968 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){ | |
2969 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); | |
2970 ptr= s->edge_emu_buffer; | |
2971 emu=1; | |
2972 } | |
2973 } | |
2974 pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8); | |
2975 | |
2976 ptr = ref_picture[2] + offset; | |
2977 if(emu){ | |
2978 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); | |
2979 ptr= s->edge_emu_buffer; | |
2980 } | |
2981 pix_op[dxy](dest_cr, ptr, s->uvlinesize, 8); | |
2982 } | |
2983 | |
2292 | 2984 static inline void chroma_4mv_motion_lowres(MpegEncContext *s, |
2985 uint8_t *dest_cb, uint8_t *dest_cr, | |
2986 uint8_t **ref_picture, | |
2987 h264_chroma_mc_func *pix_op, | |
2988 int mx, int my){ | |
2989 const int lowres= s->avctx->lowres; | |
2990 const int block_s= 8>>lowres; | |
2991 const int s_mask= (2<<lowres)-1; | |
2992 const int h_edge_pos = s->h_edge_pos >> (lowres+1); | |
2993 const int v_edge_pos = s->v_edge_pos >> (lowres+1); | |
2994 int emu=0, src_x, src_y, offset, sx, sy; | |
2995 uint8_t *ptr; | |
2996 | |
2997 if(s->quarter_sample){ | |
2998 mx/=2; | |
2999 my/=2; | |
3000 } | |
3001 | |
3002 /* In case of 8X8, we construct a single chroma motion vector | |
3003 with a special rounding */ | |
3004 mx= ff_h263_round_chroma(mx); | |
3005 my= ff_h263_round_chroma(my); | |
3006 | |
3007 sx= mx & s_mask; | |
3008 sy= my & s_mask; | |
3009 src_x = s->mb_x*block_s + (mx >> (lowres+1)); | |
3010 src_y = s->mb_y*block_s + (my >> (lowres+1)); | |
3011 | |
3012 offset = src_y * s->uvlinesize + src_x; | |
3013 ptr = ref_picture[1] + offset; | |
3014 if(s->flags&CODEC_FLAG_EMU_EDGE){ | |
3015 if( (unsigned)src_x > h_edge_pos - (!!sx) - block_s | |
3016 || (unsigned)src_y > v_edge_pos - (!!sy) - block_s){ | |
3017 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
3018 ptr= s->edge_emu_buffer; | |
3019 emu=1; | |
3020 } | |
3021 } | |
3022 sx <<= 2 - lowres; | |
3023 sy <<= 2 - lowres; | |
3024 pix_op[lowres](dest_cb, ptr, s->uvlinesize, block_s, sx, sy); | |
3025 | |
3026 ptr = ref_picture[2] + offset; | |
3027 if(emu){ | |
3028 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos); | |
3029 ptr= s->edge_emu_buffer; | |
3030 } | |
3031 pix_op[lowres](dest_cr, ptr, s->uvlinesize, block_s, sx, sy); | |
3032 } | |
3033 | |
1633 | 3034 /** |
1225 | 3035 * motion compesation of a single macroblock |
3036 * @param s context | |
3037 * @param dest_y luma destination pointer | |
3038 * @param dest_cb chroma cb/u destination pointer | |
3039 * @param dest_cr chroma cr/v destination pointer | |
3040 * @param dir direction (0->forward, 1->backward) | |
3041 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
3042 * @param pic_op halfpel motion compensation function (average or put normally) | |
3043 * @param pic_op qpel motion compensation function (average or put normally) | |
3044 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
3045 */ | |
0 | 3046 static inline void MPV_motion(MpegEncContext *s, |
1064 | 3047 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
3048 int dir, uint8_t **ref_picture, | |
651 | 3049 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16]) |
0 | 3050 { |
1633 | 3051 int dxy, mx, my, src_x, src_y, motion_x, motion_y; |
0 | 3052 int mb_x, mb_y, i; |
1064 | 3053 uint8_t *ptr, *dest; |
0 | 3054 |
3055 mb_x = s->mb_x; | |
3056 mb_y = s->mb_y; | |
3057 | |
1655 | 3058 if(s->obmc && s->pict_type != B_TYPE){ |
1633 | 3059 int16_t mv_cache[4][4][2]; |
3060 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
|
3061 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
|
3062 const int mot_xy= mb_x*2 + mb_y*2*mot_stride; |
1633 | 3063 |
3064 assert(!s->mb_skiped); | |
3065 | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3066 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
|
3067 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
|
3068 memcpy(mv_cache[3][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4); |
1633 | 3069 |
3070 if(mb_y==0 || IS_INTRA(s->current_picture.mb_type[xy-s->mb_stride])){ | |
3071 memcpy(mv_cache[0][1], mv_cache[1][1], sizeof(int16_t)*4); | |
3072 }else{ | |
1668
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[0][1], s->current_picture.motion_val[0][mot_xy-mot_stride], sizeof(int16_t)*4); |
1633 | 3074 } |
3075 | |
3076 if(mb_x==0 || IS_INTRA(s->current_picture.mb_type[xy-1])){ | |
3077 *(int32_t*)mv_cache[1][0]= *(int32_t*)mv_cache[1][1]; | |
3078 *(int32_t*)mv_cache[2][0]= *(int32_t*)mv_cache[2][1]; | |
3079 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3080 *(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
|
3081 *(int32_t*)mv_cache[2][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1+mot_stride]; |
1633 | 3082 } |
3083 | |
3084 if(mb_x+1>=s->mb_width || IS_INTRA(s->current_picture.mb_type[xy+1])){ | |
3085 *(int32_t*)mv_cache[1][3]= *(int32_t*)mv_cache[1][2]; | |
3086 *(int32_t*)mv_cache[2][3]= *(int32_t*)mv_cache[2][2]; | |
3087 }else{ | |
1668
30746f429df6
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1662
diff
changeset
|
3088 *(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
|
3089 *(int32_t*)mv_cache[2][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2+mot_stride]; |
1633 | 3090 } |
3091 | |
3092 mx = 0; | |
3093 my = 0; | |
3094 for(i=0;i<4;i++) { | |
3095 const int x= (i&1)+1; | |
3096 const int y= (i>>1)+1; | |
3097 int16_t mv[5][2]= { | |
3098 {mv_cache[y][x ][0], mv_cache[y][x ][1]}, | |
3099 {mv_cache[y-1][x][0], mv_cache[y-1][x][1]}, | |
3100 {mv_cache[y][x-1][0], mv_cache[y][x-1][1]}, | |
3101 {mv_cache[y][x+1][0], mv_cache[y][x+1][1]}, | |
3102 {mv_cache[y+1][x][0], mv_cache[y+1][x][1]}}; | |
3103 //FIXME cleanup | |
3104 obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize, | |
3105 ref_picture[0], | |
3106 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, | |
3107 pix_op[1], | |
3108 mv); | |
3109 | |
3110 mx += mv[0][0]; | |
3111 my += mv[0][1]; | |
3112 } | |
3113 if(!(s->flags&CODEC_FLAG_GRAY)) | |
3114 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
3115 | |
3116 return; | |
3117 } | |
3118 | |
0 | 3119 switch(s->mv_type) { |
3120 case MV_TYPE_16X16: | |
1042 | 3121 #ifdef CONFIG_RISKY |
255 | 3122 if(s->mcsel){ |
753 | 3123 if(s->real_sprite_warping_points==1){ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3124 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
|
3125 ref_picture); |
753 | 3126 }else{ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3127 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
|
3128 ref_picture); |
753 | 3129 } |
651 | 3130 }else if(s->quarter_sample){ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3131 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
|
3132 0, 0, 0, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3133 ref_picture, pix_op, qpix_op, |
255 | 3134 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
936 | 3135 }else if(s->mspel){ |
3136 ff_mspel_motion(s, dest_y, dest_cb, dest_cr, | |
3137 ref_picture, pix_op, | |
3138 s->mv[dir][0][0], s->mv[dir][0][1], 16); | |
1042 | 3139 }else |
3140 #endif | |
3141 { | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3142 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
|
3143 0, 0, 0, |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3144 ref_picture, pix_op, |
255 | 3145 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
3146 } | |
0 | 3147 break; |
3148 case MV_TYPE_8X8: | |
673 | 3149 mx = 0; |
3150 my = 0; | |
3151 if(s->quarter_sample){ | |
3152 for(i=0;i<4;i++) { | |
3153 motion_x = s->mv[dir][i][0]; | |
3154 motion_y = s->mv[dir][i][1]; | |
0 | 3155 |
673 | 3156 dxy = ((motion_y & 3) << 2) | (motion_x & 3); |
3157 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8; | |
3158 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8; | |
3159 | |
3160 /* WARNING: do no forget half pels */ | |
3161 src_x = clip(src_x, -16, s->width); | |
3162 if (src_x == s->width) | |
3163 dxy &= ~3; | |
3164 src_y = clip(src_y, -16, s->height); | |
3165 if (src_y == s->height) | |
3166 dxy &= ~12; | |
0 | 3167 |
673 | 3168 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x); |
3169 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
|
3170 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
|
3171 || (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
|
3172 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 | 3173 ptr= s->edge_emu_buffer; |
3174 } | |
3175 } | |
3176 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize; | |
3177 qpix_op[1][dxy](dest, ptr, s->linesize); | |
3178 | |
3179 mx += s->mv[dir][i][0]/2; | |
3180 my += s->mv[dir][i][1]/2; | |
3181 } | |
3182 }else{ | |
3183 for(i=0;i<4;i++) { | |
1633 | 3184 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
|
3185 ref_picture[0], 0, 0, |
1633 | 3186 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8, |
3187 s->width, s->height, s->linesize, | |
3188 s->h_edge_pos, s->v_edge_pos, | |
3189 8, 8, pix_op[1], | |
3190 s->mv[dir][i][0], s->mv[dir][i][1]); | |
673 | 3191 |
3192 mx += s->mv[dir][i][0]; | |
3193 my += s->mv[dir][i][1]; | |
554 | 3194 } |
0 | 3195 } |
673 | 3196 |
1633 | 3197 if(!(s->flags&CODEC_FLAG_GRAY)) |
3198 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); | |
0 | 3199 break; |
3200 case MV_TYPE_FIELD: | |
3201 if (s->picture_structure == PICT_FRAME) { | |
671 | 3202 if(s->quarter_sample){ |
1843 | 3203 for(i=0; i<2; i++){ |
3204 qpel_motion(s, dest_y, dest_cb, dest_cr, | |
3205 1, i, s->field_select[dir][i], | |
3206 ref_picture, pix_op, qpix_op, | |
3207 s->mv[dir][i][0], s->mv[dir][i][1], 8); | |
3208 } | |
671 | 3209 }else{ |
3210 /* top field */ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3211 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
|
3212 1, 0, s->field_select[dir][0], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3213 ref_picture, pix_op, |
671 | 3214 s->mv[dir][0][0], s->mv[dir][0][1], 8); |
3215 /* bottom field */ | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3216 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
|
3217 1, 1, s->field_select[dir][1], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3218 ref_picture, pix_op, |
671 | 3219 s->mv[dir][1][0], s->mv[dir][1][1], 8); |
3220 } | |
0 | 3221 } else { |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3222 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
|
3223 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
|
3224 } |
5e6e505d8997
field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents:
1095
diff
changeset
|
3225 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3226 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
|
3227 0, 0, s->field_select[dir][0], |
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3228 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
|
3229 s->mv[dir][0][0], s->mv[dir][0][1], 16); |
0 | 3230 } |
3231 break; | |
1843 | 3232 case MV_TYPE_16X8: |
3233 for(i=0; i<2; i++){ | |
3234 uint8_t ** ref2picture; | |
3235 | |
3236 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
|
3237 ref2picture= ref_picture; |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3238 }else{ |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3239 ref2picture= s->current_picture_ptr->data; |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3240 } |
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3241 |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3242 mpeg_motion(s, dest_y, dest_cb, dest_cr, |
1843 | 3243 0, 0, s->field_select[dir][i], |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3244 ref2picture, pix_op, |
1843 | 3245 s->mv[dir][i][0], s->mv[dir][i][1] + 16*i, 8); |
3246 | |
3247 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
|
3248 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
|
3249 dest_cr+= (16>>s->chroma_y_shift)*s->uvlinesize; |
1843 | 3250 } |
1339
338a2f6e6402
Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1328
diff
changeset
|
3251 break; |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3252 case MV_TYPE_DMV: |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3253 if(s->picture_structure == PICT_FRAME){ |
1843 | 3254 for(i=0; i<2; i++){ |
3255 int j; | |
3256 for(j=0; j<2; j++){ | |
3257 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
3258 1, j, j^i, | |
3259 ref_picture, pix_op, | |
3260 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], 8); | |
3261 } | |
3262 pix_op = s->dsp.avg_pixels_tab; | |
3263 } | |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3264 }else{ |
1843 | 3265 for(i=0; i<2; i++){ |
3266 mpeg_motion(s, dest_y, dest_cb, dest_cr, | |
3267 0, 0, s->picture_structure != i+1, | |
3268 ref_picture, pix_op, | |
3269 s->mv[dir][2*i][0],s->mv[dir][2*i][1],16); | |
3270 | |
3271 // after put we make avg of the same block | |
3272 pix_op=s->dsp.avg_pixels_tab; | |
3273 | |
3274 //opposite parity is always in the same frame if this is second field | |
3275 if(!s->first_field){ | |
3276 ref_picture = s->current_picture_ptr->data; | |
3277 } | |
1842
0d82db458a3c
interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents:
1838
diff
changeset
|
3278 } |
1326
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3279 } |
6cdd3b8f4fd3
DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents:
1317
diff
changeset
|
3280 break; |
1633 | 3281 default: assert(0); |
0 | 3282 } |
3283 } | |
3284 | |
2256 | 3285 /** |
3286 * motion compesation of a single macroblock | |
3287 * @param s context | |
3288 * @param dest_y luma destination pointer | |
3289 * @param dest_cb chroma cb/u destination pointer | |
3290 * @param dest_cr chroma cr/v destination pointer | |
3291 * @param dir direction (0->forward, 1->backward) | |
3292 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture | |
3293 * @param pic_op halfpel motion compensation function (average or put normally) | |
3294 * the motion vectors are taken from s->mv and the MV type from s->mv_type | |
3295 */ | |
3296 static inline void MPV_motion_lowres(MpegEncContext *s, | |
3297 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
3298 int dir, uint8_t **ref_picture, | |
3299 h264_chroma_mc_func *pix_op) | |
3300 { | |
2292 | 3301 int mx, my; |
2260 | 3302 int mb_x, mb_y, i; |
3303 const int lowres= s->avctx->lowres; | |
3304 const int block_s= 8>>lowres; | |
3305 | |
3306 mb_x = s->mb_x; | |
3307 mb_y = s->mb_y; | |
3308 | |
3309 switch(s->mv_type) { | |
3310 case MV_TYPE_16X16: | |
3311 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3312 0, 0, 0, | |
3313 ref_picture, pix_op, | |
3314 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
3315 break; | |
2292 | 3316 case MV_TYPE_8X8: |
2260 | 3317 mx = 0; |
3318 my = 0; | |
3319 for(i=0;i<4;i++) { | |
2292 | 3320 hpel_motion_lowres(s, dest_y + ((i & 1) + (i >> 1) * s->linesize)*block_s, |
2260 | 3321 ref_picture[0], 0, 0, |
2292 | 3322 (2*mb_x + (i & 1))*block_s, (2*mb_y + (i >>1))*block_s, |
2260 | 3323 s->width, s->height, s->linesize, |
2292 | 3324 s->h_edge_pos >> lowres, s->v_edge_pos >> lowres, |
3325 block_s, block_s, pix_op, | |
2260 | 3326 s->mv[dir][i][0], s->mv[dir][i][1]); |
3327 | |
3328 mx += s->mv[dir][i][0]; | |
3329 my += s->mv[dir][i][1]; | |
3330 } | |
3331 | |
3332 if(!(s->flags&CODEC_FLAG_GRAY)) | |
2292 | 3333 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my); |
3334 break; | |
2260 | 3335 case MV_TYPE_FIELD: |
3336 if (s->picture_structure == PICT_FRAME) { | |
3337 /* top field */ | |
3338 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3339 1, 0, s->field_select[dir][0], | |
3340 ref_picture, pix_op, | |
3341 s->mv[dir][0][0], s->mv[dir][0][1], block_s); | |
3342 /* bottom field */ | |
3343 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3344 1, 1, s->field_select[dir][1], | |
3345 ref_picture, pix_op, | |
3346 s->mv[dir][1][0], s->mv[dir][1][1], block_s); | |
3347 } else { | |
3348 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){ | |
3349 ref_picture= s->current_picture_ptr->data; | |
3350 } | |
3351 | |
3352 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3353 0, 0, s->field_select[dir][0], | |
3354 ref_picture, pix_op, | |
3355 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s); | |
3356 } | |
3357 break; | |
3358 case MV_TYPE_16X8: | |
3359 for(i=0; i<2; i++){ | |
3360 uint8_t ** ref2picture; | |
3361 | |
3362 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){ | |
3363 ref2picture= ref_picture; | |
3364 }else{ | |
3365 ref2picture= s->current_picture_ptr->data; | |
3366 } | |
3367 | |
3368 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3369 0, 0, s->field_select[dir][i], | |
3370 ref2picture, pix_op, | |
3371 s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s); | |
3372 | |
3373 dest_y += 2*block_s*s->linesize; | |
3374 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
3375 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize; | |
3376 } | |
3377 break; | |
3378 case MV_TYPE_DMV: | |
3379 if(s->picture_structure == PICT_FRAME){ | |
3380 for(i=0; i<2; i++){ | |
3381 int j; | |
3382 for(j=0; j<2; j++){ | |
3383 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3384 1, j, j^i, | |
3385 ref_picture, pix_op, | |
3386 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s); | |
3387 } | |
3388 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
3389 } | |
3390 }else{ | |
3391 for(i=0; i<2; i++){ | |
3392 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr, | |
3393 0, 0, s->picture_structure != i+1, | |
3394 ref_picture, pix_op, | |
3395 s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s); | |
3396 | |
3397 // after put we make avg of the same block | |
3398 pix_op = s->dsp.avg_h264_chroma_pixels_tab; | |
3399 | |
3400 //opposite parity is always in the same frame if this is second field | |
3401 if(!s->first_field){ | |
3402 ref_picture = s->current_picture_ptr->data; | |
3403 } | |
3404 } | |
3405 } | |
3406 break; | |
3407 default: assert(0); | |
3408 } | |
2256 | 3409 } |
0 | 3410 |
3411 /* put block[] to dest[] */ | |
3412 static inline void put_dct(MpegEncContext *s, | |
1651 | 3413 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
0 | 3414 { |
1689 | 3415 s->dct_unquantize_intra(s, block, i, qscale); |
1092 | 3416 s->dsp.idct_put (dest, line_size, block); |
0 | 3417 } |
3418 | |
3419 /* add block[] to dest[] */ | |
3420 static inline void add_dct(MpegEncContext *s, | |
1064 | 3421 DCTELEM *block, int i, uint8_t *dest, int line_size) |
0 | 3422 { |
3423 if (s->block_last_index[i] >= 0) { | |
1092 | 3424 s->dsp.idct_add (dest, line_size, block); |
481 | 3425 } |
3426 } | |
3427 | |
3428 static inline void add_dequant_dct(MpegEncContext *s, | |
1644 | 3429 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale) |
481 | 3430 { |
3431 if (s->block_last_index[i] >= 0) { | |
1689 | 3432 s->dct_unquantize_inter(s, block, i, qscale); |
324 | 3433 |
1092 | 3434 s->dsp.idct_add (dest, line_size, block); |
0 | 3435 } |
3436 } | |
3437 | |
456 | 3438 /** |
3439 * cleans dc, ac, coded_block for the current non intra MB | |
3440 */ | |
3441 void ff_clean_intra_table_entries(MpegEncContext *s) | |
3442 { | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3443 int wrap = s->b8_stride; |
456 | 3444 int xy = s->block_index[0]; |
3445 | |
3446 s->dc_val[0][xy ] = | |
3447 s->dc_val[0][xy + 1 ] = | |
3448 s->dc_val[0][xy + wrap] = | |
3449 s->dc_val[0][xy + 1 + wrap] = 1024; | |
3450 /* ac pred */ | |
1064 | 3451 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t)); |
3452 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t)); | |
456 | 3453 if (s->msmpeg4_version>=3) { |
3454 s->coded_block[xy ] = | |
3455 s->coded_block[xy + 1 ] = | |
3456 s->coded_block[xy + wrap] = | |
3457 s->coded_block[xy + 1 + wrap] = 0; | |
3458 } | |
3459 /* chroma */ | |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3460 wrap = s->mb_stride; |
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3461 xy = s->mb_x + s->mb_y * wrap; |
456 | 3462 s->dc_val[1][xy] = |
3463 s->dc_val[2][xy] = 1024; | |
3464 /* ac pred */ | |
1064 | 3465 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t)); |
3466 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t)); | |
456 | 3467 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3468 s->mbintra_table[xy]= 0; |
456 | 3469 } |
3470 | |
0 | 3471 /* generic function called after a macroblock has been parsed by the |
3472 decoder or after it has been encoded by the encoder. | |
3473 | |
3474 Important variables used: | |
3475 s->mb_intra : true if intra macroblock | |
3476 s->mv_dir : motion vector direction | |
3477 s->mv_type : motion vector type | |
3478 s->mv : motion vector | |
3479 s->interlaced_dct : true if interlaced dct used (mpeg2) | |
3480 */ | |
2256 | 3481 static always_inline void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], int lowres_flag) |
0 | 3482 { |
244 | 3483 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
|
3484 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; |
1381 | 3485 #ifdef HAVE_XVMC |
3486 if(s->avctx->xvmc_acceleration){ | |
1580
628bf341e099
XvMC speedup by removing one memcpy and doing MB packing
iive
parents:
1579
diff
changeset
|
3487 XVMC_decode_mb(s);//xvmc uses pblocks |
1381 | 3488 return; |
3489 } | |
3490 #endif | |
0 | 3491 |
3492 mb_x = s->mb_x; | |
3493 mb_y = s->mb_y; | |
3494 | |
1833
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3495 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
|
3496 /* save DCT coefficients */ |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3497 int i,j; |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3498 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
|
3499 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
|
3500 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
|
3501 *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
|
3502 } |
ba27ce284d07
export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents:
1831
diff
changeset
|
3503 |
903 | 3504 s->current_picture.qscale_table[mb_xy]= s->qscale; |
108
1e4a4af694d1
exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents:
79
diff
changeset
|
3505 |
0 | 3506 /* update DC predictors for P macroblocks */ |
3507 if (!s->mb_intra) { | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3508 if (s->h263_pred || s->h263_aic) { |
481 | 3509 if(s->mbintra_table[mb_xy]) |
456 | 3510 ff_clean_intra_table_entries(s); |
0 | 3511 } else { |
456 | 3512 s->last_dc[0] = |
3513 s->last_dc[1] = | |
0 | 3514 s->last_dc[2] = 128 << s->intra_dc_precision; |
3515 } | |
3516 } | |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
3517 else if (s->h263_pred || s->h263_aic) |
481 | 3518 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
|
3519 |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
3520 if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { //FIXME precalc |
1064 | 3521 uint8_t *dest_y, *dest_cb, *dest_cr; |
481 | 3522 int dct_linesize, dct_offset; |
651 | 3523 op_pixels_func (*op_pix)[4]; |
3524 qpel_mc_func (*op_qpix)[16]; | |
1138 | 3525 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics |
3526 const int uvlinesize= s->current_picture.linesize[1]; | |
2256 | 3527 const int readable= s->pict_type != B_TYPE || s->encoding || s->avctx->draw_horiz_band || lowres_flag; |
3528 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
|
3529 |
903 | 3530 /* avoid copy if macroblock skipped in last frame too */ |
3531 /* skip only during decoding as we might trash the buffers during encoding a bit */ | |
3532 if(!s->encoding){ | |
1064 | 3533 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy]; |
903 | 3534 const int age= s->current_picture.age; |
3535 | |
3536 assert(age); | |
3537 | |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3538 if (s->mb_skiped) { |
903 | 3539 s->mb_skiped= 0; |
3540 assert(s->pict_type!=I_TYPE); | |
3541 | |
556 | 3542 (*mbskip_ptr) ++; /* indicate that this time we skiped it */ |
3543 if(*mbskip_ptr >99) *mbskip_ptr= 99; | |
3544 | |
903 | 3545 /* 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
|
3546 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
|
3547 return; |
903 | 3548 } |
1021
2d7c9f5738de
trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents:
1014
diff
changeset
|
3549 } 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
|
3550 (*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
|
3551 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
|
3552 } else{ |
7
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3553 *mbskip_ptr = 0; /* not skipped */ |
1d3ac9654178
added skip macroblock optimization (big perf win on black regions for example)
glantau
parents:
0
diff
changeset
|
3554 } |
717 | 3555 } |
2256 | 3556 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3557 dct_linesize = linesize << s->interlaced_dct; |
2256 | 3558 dct_offset =(s->interlaced_dct)? linesize : linesize*block_size; |
3559 | |
1632 | 3560 if(readable){ |
3561 dest_y= s->dest[0]; | |
3562 dest_cb= s->dest[1]; | |
3563 dest_cr= s->dest[2]; | |
3564 }else{ | |
1799 | 3565 dest_y = s->b_scratchpad; |
1834 | 3566 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
|
3567 dest_cr= s->b_scratchpad+32*linesize; |
1632 | 3568 } |
2256 | 3569 |
0 | 3570 if (!s->mb_intra) { |
3571 /* motion handling */ | |
456 | 3572 /* decoding or more than one mb_type (MC was allready done otherwise) */ |
1389 | 3573 if(!s->encoding){ |
2256 | 3574 if(lowres_flag){ |
3575 h264_chroma_mc_func *op_pix = s->dsp.put_h264_chroma_pixels_tab; | |
3576 | |
3577 if (s->mv_dir & MV_DIR_FORWARD) { | |
3578 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix); | |
3579 op_pix = s->dsp.avg_h264_chroma_pixels_tab; | |
3580 } | |
3581 if (s->mv_dir & MV_DIR_BACKWARD) { | |
3582 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix); | |
3583 } | |
324 | 3584 }else{ |
2256 | 3585 if ((!s->no_rounding) || s->pict_type==B_TYPE){ |
3586 op_pix = s->dsp.put_pixels_tab; | |
3587 op_qpix= s->dsp.put_qpel_pixels_tab; | |
3588 }else{ | |
3589 op_pix = s->dsp.put_no_rnd_pixels_tab; | |
3590 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; | |
3591 } | |
3592 if (s->mv_dir & MV_DIR_FORWARD) { | |
3593 MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix); | |
3594 op_pix = s->dsp.avg_pixels_tab; | |
3595 op_qpix= s->dsp.avg_qpel_pixels_tab; | |
3596 } | |
3597 if (s->mv_dir & MV_DIR_BACKWARD) { | |
3598 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); | |
3599 } | |
324 | 3600 } |
0 | 3601 } |
3602 | |
481 | 3603 /* skip dequant / idct if we are really late ;) */ |
814 | 3604 if(s->hurry_up>1) return; |
481 | 3605 |
0 | 3606 /* add dct residue */ |
1421 | 3607 if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO |
711 | 3608 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){ |
2256 | 3609 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
3610 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
3611 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
3612 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
0 | 3613 |
485 | 3614 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1644 | 3615 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
3616 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
485 | 3617 } |
936 | 3618 } else if(s->codec_id != CODEC_ID_WMV2){ |
2256 | 3619 add_dct(s, block[0], 0, dest_y , dct_linesize); |
3620 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize); | |
3621 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize); | |
3622 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize); | |
481 | 3623 |
485 | 3624 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
|
3625 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
|
3626 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
|
3627 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
|
3628 }else{ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3629 //chroma422 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3630 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
|
3631 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
|
3632 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3633 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
|
3634 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
|
3635 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
|
3636 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
|
3637 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
|
3638 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
|
3639 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
|
3640 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
|
3641 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
|
3642 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3643 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3644 }//fi gray |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3645 } |
1042 | 3646 #ifdef CONFIG_RISKY |
3647 else{ | |
936 | 3648 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); |
481 | 3649 } |
1042 | 3650 #endif |
0 | 3651 } else { |
3652 /* dct only in intra block */ | |
1421 | 3653 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ |
2256 | 3654 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); |
3655 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); | |
3656 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); | |
3657 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); | |
0 | 3658 |
711 | 3659 if(!(s->flags&CODEC_FLAG_GRAY)){ |
1651 | 3660 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); |
3661 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); | |
711 | 3662 } |
3663 }else{ | |
2256 | 3664 s->dsp.idct_put(dest_y , dct_linesize, block[0]); |
3665 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]); | |
3666 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]); | |
3667 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]); | |
711 | 3668 |
3669 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
|
3670 if(s->chroma_y_shift){ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3671 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
|
3672 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
|
3673 }else{ |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3674 |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3675 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
|
3676 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
|
3677 |
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_cb, dct_linesize, block[4]); |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3679 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
|
3680 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
|
3681 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
|
3682 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
|
3683 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
|
3684 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
|
3685 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
|
3686 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
|
3687 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3688 } |
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3689 }//gray |
485 | 3690 } |
0 | 3691 } |
1632 | 3692 if(!readable){ |
3693 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
|
3694 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
|
3695 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift); |
1632 | 3696 } |
0 | 3697 } |
294 | 3698 } |
3699 | |
2256 | 3700 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){ |
3701 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1); | |
3702 else MPV_decode_mb_internal(s, block, 0); | |
3703 } | |
3704 | |
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
|
3705 #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
|
3706 |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3707 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold) |
456 | 3708 { |
3709 static const char tab[64]= | |
3710 {3,2,2,1,1,1,1,1, | |
3711 1,1,1,1,1,1,1,1, | |
3712 1,1,1,1,1,1,1,1, | |
3713 0,0,0,0,0,0,0,0, | |
3714 0,0,0,0,0,0,0,0, | |
3715 0,0,0,0,0,0,0,0, | |
3716 0,0,0,0,0,0,0,0, | |
3717 0,0,0,0,0,0,0,0}; | |
3718 int score=0; | |
3719 int run=0; | |
3720 int i; | |
3721 DCTELEM *block= s->block[n]; | |
3722 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
|
3723 int skip_dc; |
456 | 3724 |
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
|
3725 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
|
3726 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
|
3727 threshold= -threshold; |
605
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3728 }else |
40874804a5af
same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents:
604
diff
changeset
|
3729 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
|
3730 |
456 | 3731 /* are all which we could set to zero are allready zero? */ |
3732 if(last_index<=skip_dc - 1) return; | |
3733 | |
3734 for(i=0; i<=last_index; i++){ | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3735 const int j = s->intra_scantable.permutated[i]; |
456 | 3736 const int level = ABS(block[j]); |
3737 if(level==1){ | |
3738 if(skip_dc && i==0) continue; | |
3739 score+= tab[run]; | |
3740 run=0; | |
3741 }else if(level>1){ | |
3742 return; | |
3743 }else{ | |
3744 run++; | |
3745 } | |
3746 } | |
3747 if(score >= threshold) return; | |
3748 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
|
3749 const int j = s->intra_scantable.permutated[i]; |
456 | 3750 block[j]=0; |
3751 } | |
3752 if(block[0]) s->block_last_index[n]= 0; | |
3753 else s->block_last_index[n]= -1; | |
3754 } | |
3755 | |
344 | 3756 static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index) |
3757 { | |
3758 int i; | |
3759 const int maxlevel= s->max_qcoeff; | |
3760 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
|
3761 int overflow=0; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3762 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3763 if(s->mb_intra){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3764 i=1; //skip clipping of intra dc |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3765 }else |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3766 i=0; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3767 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3768 for(;i<=last_index; i++){ |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
3769 const int j= s->intra_scantable.permutated[i]; |
344 | 3770 int level = block[j]; |
3771 | |
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
|
3772 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
|
3773 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
|
3774 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
|
3775 }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
|
3776 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
|
3777 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
|
3778 } |
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 |
344 | 3780 block[j]= level; |
3781 } | |
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
|
3782 |
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 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
|
3784 av_log(s->avctx, AV_LOG_INFO, "warning, cliping %d dct coefficents to %d..%d\n", overflow, minlevel, maxlevel); |
344 | 3785 } |
324 | 3786 |
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
|
3787 #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
|
3788 |
1098
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3789 /** |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3790 * |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3791 * @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
|
3792 */ |
b7f267d168b7
mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents:
1096
diff
changeset
|
3793 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){ |
1368 | 3794 if (s->avctx->draw_horiz_band) { |
1370 | 3795 AVFrame *src; |
1368 | 3796 int offset[4]; |
1370 | 3797 |
3798 if(s->picture_structure != PICT_FRAME){ | |
3799 h <<= 1; | |
3800 y <<= 1; | |
3801 if(s->first_field && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return; | |
3802 } | |
3803 | |
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
|
3804 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
|
3805 |
1370 | 3806 if(s->pict_type==B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER)) |
3807 src= (AVFrame*)s->current_picture_ptr; | |
3808 else if(s->last_picture_ptr) | |
3809 src= (AVFrame*)s->last_picture_ptr; | |
3810 else | |
3811 return; | |
3812 | |
1369 | 3813 if(s->pict_type==B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){ |
1368 | 3814 offset[0]= |
3815 offset[1]= | |
3816 offset[2]= | |
3817 offset[3]= 0; | |
3818 }else{ | |
3819 offset[0]= y * s->linesize;; | |
3820 offset[1]= | |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3821 offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize; |
1368 | 3822 offset[3]= 0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3823 } |
1368 | 3824 |
813 | 3825 emms_c(); |
3826 | |
1370 | 3827 s->avctx->draw_horiz_band(s->avctx, src, offset, |
3828 y, s->picture_structure, h); | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3829 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3830 } |
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
3831 |
1389 | 3832 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename |
3833 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics | |
3834 const int uvlinesize= s->current_picture.linesize[1]; | |
2256 | 3835 const int mb_size= 4 - s->avctx->lowres; |
1389 | 3836 |
1938
e2501e6e7ff7
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents:
1918
diff
changeset
|
3837 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
|
3838 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
|
3839 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
|
3840 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
|
3841 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
|
3842 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
|
3843 //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
|
3844 |
2256 | 3845 s->dest[0] = s->current_picture.data[0] + ((s->mb_x - 1) << mb_size); |
3846 s->dest[1] = s->current_picture.data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
3847 s->dest[2] = s->current_picture.data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift)); | |
2168 | 3848 |
2074
2faafe7a3db6
mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents:
2066
diff
changeset
|
3849 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
|
3850 { |
2256 | 3851 s->dest[0] += s->mb_y * linesize << mb_size; |
3852 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift); | |
3853 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
|
3854 } |
1389 | 3855 } |
3856 | |
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
|
3857 #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
|
3858 |
1777 | 3859 static void get_vissual_weight(int16_t *weight, uint8_t *ptr, int stride){ |
3860 int x, y; | |
3861 //FIXME optimize | |
3862 for(y=0; y<8; y++){ | |
3863 for(x=0; x<8; x++){ | |
3864 int x2, y2; | |
3865 int sum=0; | |
3866 int sqr=0; | |
3867 int count=0; | |
3868 | |
3869 for(y2= FFMAX(y-1, 0); y2 < FFMIN(8, y+2); y2++){ | |
3870 for(x2= FFMAX(x-1, 0); x2 < FFMIN(8, x+2); x2++){ | |
3871 int v= ptr[x2 + y2*stride]; | |
3872 sum += v; | |
3873 sqr += v*v; | |
3874 count++; | |
3875 } | |
3876 } | |
3877 weight[x + 8*y]= (36*ff_sqrt(count*sqr - sum*sum)) / count; | |
3878 } | |
3879 } | |
3880 } | |
3881 | |
324 | 3882 static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) |
294 | 3883 { |
1777 | 3884 int16_t weight[6][64]; |
3885 DCTELEM orig[6][64]; | |
294 | 3886 const int mb_x= s->mb_x; |
3887 const int mb_y= s->mb_y; | |
3888 int i; | |
456 | 3889 int skip_dct[6]; |
697 | 3890 int dct_offset = s->linesize*8; //default for progressive frames |
1778 | 3891 uint8_t *ptr_y, *ptr_cb, *ptr_cr; |
3892 int wrap_y, wrap_c; | |
697 | 3893 |
456 | 3894 for(i=0; i<6; i++) skip_dct[i]=0; |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3895 |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3896 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
|
3897 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
|
3898 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
|
3899 |
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
|
3900 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
|
3901 update_qscale(s); |
1616 | 3902 |
3903 if(!(s->flags&CODEC_FLAG_QP_RD)){ | |
3904 s->dquant= s->qscale - last_qp; | |
3905 | |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3906 if(s->out_format==FMT_H263){ |
1616 | 3907 s->dquant= clip(s->dquant, -2, 2); //FIXME RD |
697 | 3908 |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3909 if(s->codec_id==CODEC_ID_MPEG4){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3910 if(!s->mb_intra){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3911 if(s->pict_type == B_TYPE){ |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3912 if(s->dquant&1) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3913 s->dquant= (s->dquant/2)*2; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3914 if(s->mv_dir&MV_DIRECT) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3915 s->dquant= 0; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3916 } |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3917 if(s->mv_type==MV_TYPE_8X8) |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3918 s->dquant=0; |
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
3919 } |
1616 | 3920 } |
690
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3921 } |
a1c69cb685b3
adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents:
673
diff
changeset
|
3922 } |
1652 | 3923 ff_set_qscale(s, last_qp + s->dquant); |
2054 | 3924 }else if(s->flags&CODEC_FLAG_QP_RD) |
3925 ff_set_qscale(s, s->qscale + s->dquant); | |
294 | 3926 |
1778 | 3927 wrap_y = s->linesize; |
3928 wrap_c = s->uvlinesize; | |
3929 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16; | |
3930 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
3931 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8; | |
3932 | |
3933 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
|
3934 uint8_t *ebuf= s->edge_emu_buffer + 32; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3935 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
|
3936 ptr_y= ebuf; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3937 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
|
3938 ptr_cb= ebuf+18*wrap_y; |
5ca07515a309
10l (dont store 2 different things at the same place ...)
michael
parents:
2132
diff
changeset
|
3939 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
|
3940 ptr_cr= ebuf+18*wrap_y+8; |
1778 | 3941 } |
3942 | |
324 | 3943 if (s->mb_intra) { |
697 | 3944 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
3945 int progressive_score, interlaced_score; | |
1708 | 3946 |
1729 | 3947 s->interlaced_dct=0; |
1777 | 3948 progressive_score= s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y, 8) |
3949 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y*8, NULL, wrap_y, 8) - 400; | |
1729 | 3950 |
3951 if(progressive_score > 0){ | |
1777 | 3952 interlaced_score = s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y*2, 8) |
3953 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y , NULL, wrap_y*2, 8); | |
1729 | 3954 if(progressive_score > interlaced_score){ |
3955 s->interlaced_dct=1; | |
697 | 3956 |
1729 | 3957 dct_offset= wrap_y; |
3958 wrap_y<<=1; | |
3959 } | |
3960 } | |
697 | 3961 } |
3962 | |
1777 | 3963 s->dsp.get_pixels(s->block[0], ptr_y , wrap_y); |
3964 s->dsp.get_pixels(s->block[1], ptr_y + 8, wrap_y); | |
3965 s->dsp.get_pixels(s->block[2], ptr_y + dct_offset , wrap_y); | |
3966 s->dsp.get_pixels(s->block[3], ptr_y + dct_offset + 8, wrap_y); | |
294 | 3967 |
487 | 3968 if(s->flags&CODEC_FLAG_GRAY){ |
3969 skip_dct[4]= 1; | |
3970 skip_dct[5]= 1; | |
3971 }else{ | |
1777 | 3972 s->dsp.get_pixels(s->block[4], ptr_cb, wrap_c); |
3973 s->dsp.get_pixels(s->block[5], ptr_cr, wrap_c); | |
3974 } | |
324 | 3975 }else{ |
651 | 3976 op_pixels_func (*op_pix)[4]; |
3977 qpel_mc_func (*op_qpix)[16]; | |
1064 | 3978 uint8_t *dest_y, *dest_cb, *dest_cr; |
294 | 3979 |
1389 | 3980 dest_y = s->dest[0]; |
3981 dest_cb = s->dest[1]; | |
3982 dest_cr = s->dest[2]; | |
324 | 3983 |
327 | 3984 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
|
3985 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
|
3986 op_qpix= s->dsp.put_qpel_pixels_tab; |
295 | 3987 }else{ |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
3988 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
|
3989 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab; |
324 | 3990 } |
295 | 3991 |
324 | 3992 if (s->mv_dir & MV_DIR_FORWARD) { |
903 | 3993 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
|
3994 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
|
3995 op_qpix= s->dsp.avg_qpel_pixels_tab; |
324 | 3996 } |
3997 if (s->mv_dir & MV_DIR_BACKWARD) { | |
903 | 3998 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix); |
324 | 3999 } |
295 | 4000 |
697 | 4001 if(s->flags&CODEC_FLAG_INTERLACED_DCT){ |
4002 int progressive_score, interlaced_score; | |
1729 | 4003 |
4004 s->interlaced_dct=0; | |
4005 progressive_score= s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y, 8) | |
4006 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y*8, ptr_y + wrap_y*8, wrap_y, 8) - 400; | |
697 | 4007 |
1729 | 4008 if(s->avctx->ildct_cmp == FF_CMP_VSSE) progressive_score -= 400; |
4009 | |
4010 if(progressive_score>0){ | |
4011 interlaced_score = s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y*2, 8) | |
4012 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y , ptr_y + wrap_y , wrap_y*2, 8); | |
697 | 4013 |
1729 | 4014 if(progressive_score > interlaced_score){ |
4015 s->interlaced_dct=1; | |
4016 | |
4017 dct_offset= wrap_y; | |
4018 wrap_y<<=1; | |
4019 } | |
4020 } | |
697 | 4021 } |
4022 | |
853
eacc2dd8fd9d
* using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents:
847
diff
changeset
|
4023 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
|
4024 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
|
4025 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
|
4026 s->dsp.diff_pixels(s->block[3], ptr_y + dct_offset + 8, dest_y + dct_offset + 8, wrap_y); |
487 | 4027 |
4028 if(s->flags&CODEC_FLAG_GRAY){ | |
4029 skip_dct[4]= 1; | |
4030 skip_dct[5]= 1; | |
4031 }else{ | |
853
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[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
|
4033 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c); |
487 | 4034 } |
456 | 4035 /* 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
|
4036 if(s->current_picture.mc_mb_var[s->mb_stride*mb_y+ mb_x]<2*s->qscale*s->qscale){ |
697 | 4037 //FIXME optimize |
1708 | 4038 if(s->dsp.sad[1](NULL, ptr_y , dest_y , wrap_y, 8) < 20*s->qscale) skip_dct[0]= 1; |
4039 if(s->dsp.sad[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20*s->qscale) skip_dct[1]= 1; | |
4040 if(s->dsp.sad[1](NULL, ptr_y +dct_offset , dest_y +dct_offset , wrap_y, 8) < 20*s->qscale) skip_dct[2]= 1; | |
4041 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; | |
4042 if(s->dsp.sad[1](NULL, ptr_cb , dest_cb , wrap_c, 8) < 20*s->qscale) skip_dct[4]= 1; | |
4043 if(s->dsp.sad[1](NULL, ptr_cr , dest_cr , wrap_c, 8) < 20*s->qscale) skip_dct[5]= 1; | |
456 | 4044 } |
1778 | 4045 } |
4046 | |
4047 if(s->avctx->quantizer_noise_shaping){ | |
4048 if(!skip_dct[0]) get_vissual_weight(weight[0], ptr_y , wrap_y); | |
4049 if(!skip_dct[1]) get_vissual_weight(weight[1], ptr_y + 8, wrap_y); | |
4050 if(!skip_dct[2]) get_vissual_weight(weight[2], ptr_y + dct_offset , wrap_y); | |
4051 if(!skip_dct[3]) get_vissual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y); | |
4052 if(!skip_dct[4]) get_vissual_weight(weight[4], ptr_cb , wrap_c); | |
4053 if(!skip_dct[5]) get_vissual_weight(weight[5], ptr_cr , wrap_c); | |
4054 memcpy(orig[0], s->block[0], sizeof(DCTELEM)*64*6); | |
294 | 4055 } |
4056 | |
4057 /* DCT & quantize */ | |
1778 | 4058 assert(s->out_format!=FMT_MJPEG || s->qscale==8); |
4059 { | |
344 | 4060 for(i=0;i<6;i++) { |
456 | 4061 if(!skip_dct[i]){ |
4062 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
|
4063 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, s->qscale, &overflow); |
344 | 4064 // 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
|
4065 // 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
|
4066 // of improve it. Just INTRADC clipping deserves changes in quantizer |
456 | 4067 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]); |
4068 }else | |
4069 s->block_last_index[i]= -1; | |
344 | 4070 } |
1777 | 4071 if(s->avctx->quantizer_noise_shaping){ |
4072 for(i=0;i<6;i++) { | |
4073 if(!skip_dct[i]){ | |
4074 s->block_last_index[i] = dct_quantize_refine(s, s->block[i], weight[i], orig[i], i, s->qscale); | |
4075 } | |
4076 } | |
4077 } | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
4078 |
456 | 4079 if(s->luma_elim_threshold && !s->mb_intra) |
4080 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
|
4081 dct_single_coeff_elimination(s, i, s->luma_elim_threshold); |
456 | 4082 if(s->chroma_elim_threshold && !s->mb_intra) |
4083 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
|
4084 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold); |
1497 | 4085 |
4086 if(s->flags & CODEC_FLAG_CBP_RD){ | |
4087 for(i=0;i<6;i++) { | |
4088 if(s->block_last_index[i] == -1) | |
4089 s->coded_score[i]= INT_MAX/256; | |
4090 } | |
4091 } | |
294 | 4092 } |
4093 | |
487 | 4094 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ |
4095 s->block_last_index[4]= | |
4096 s->block_last_index[5]= 0; | |
4097 s->block[4][0]= | |
1011 | 4098 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale; |
487 | 4099 } |
4100 | |
1708 | 4101 //non c quantize code returns incorrect block_last_index FIXME |
4102 if(s->alternate_scan && s->dct_quantize != dct_quantize_c){ | |
4103 for(i=0; i<6; i++){ | |
4104 int j; | |
4105 if(s->block_last_index[i]>0){ | |
4106 for(j=63; j>0; j--){ | |
4107 if(s->block[i][ s->intra_scantable.permutated[j] ]) break; | |
4108 } | |
4109 s->block_last_index[i]= j; | |
4110 } | |
4111 } | |
4112 } | |
4113 | |
294 | 4114 /* huffman encode */ |
936 | 4115 switch(s->codec_id){ //FIXME funct ptr could be slightly faster |
4116 case CODEC_ID_MPEG1VIDEO: | |
1421 | 4117 case CODEC_ID_MPEG2VIDEO: |
936 | 4118 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; |
1042 | 4119 #ifdef CONFIG_RISKY |
936 | 4120 case CODEC_ID_MPEG4: |
4121 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
4122 case CODEC_ID_MSMPEG4V2: | |
4123 case CODEC_ID_MSMPEG4V3: | |
4124 case CODEC_ID_WMV1: | |
4125 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break; | |
4126 case CODEC_ID_WMV2: | |
4127 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
|
4128 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
|
4129 ff_h261_encode_mb(s, s->block, motion_x, motion_y); break; |
936 | 4130 case CODEC_ID_H263: |
4131 case CODEC_ID_H263P: | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4132 case CODEC_ID_FLV1: |
936 | 4133 case CODEC_ID_RV10: |
4134 h263_encode_mb(s, s->block, motion_x, motion_y); break; | |
1042 | 4135 #endif |
4136 case CODEC_ID_MJPEG: | |
4137 mjpeg_encode_mb(s, s->block); break; | |
936 | 4138 default: |
4139 assert(0); | |
294 | 4140 } |
4141 } | |
4142 | |
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
|
4143 #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
|
4144 |
1368 | 4145 void ff_mpeg_flush(AVCodecContext *avctx){ |
4146 int i; | |
4147 MpegEncContext *s = avctx->priv_data; | |
4148 | |
1751 | 4149 if(s==NULL || s->picture==NULL) |
4150 return; | |
4151 | |
1368 | 4152 for(i=0; i<MAX_PICTURE_COUNT; i++){ |
4153 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL | |
4154 || s->picture[i].type == FF_BUFFER_TYPE_USER)) | |
4155 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]); | |
4156 } | |
1601 | 4157 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL; |
1395 | 4158 |
4159 s->parse_context.state= -1; | |
4160 s->parse_context.frame_start_found= 0; | |
4161 s->parse_context.overread= 0; | |
4162 s->parse_context.overread_index= 0; | |
4163 s->parse_context.index= 0; | |
4164 s->parse_context.last_index= 0; | |
1851 | 4165 s->bitstream_buffer_size=0; |
1368 | 4166 } |
4167 | |
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
|
4168 #ifdef CONFIG_ENCODERS |
1064 | 4169 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length) |
294 | 4170 { |
1810 | 4171 const uint16_t *srcw= (uint16_t*)src; |
1799 | 4172 int words= length>>4; |
326 | 4173 int bits= length&15; |
4174 int i; | |
4175 | |
456 | 4176 if(length==0) return; |
1799 | 4177 |
1803 | 4178 if(words < 16){ |
4179 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i])); | |
4180 }else if(put_bits_count(pb)&7){ | |
4181 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
|
4182 }else{ |
1803 | 4183 for(i=0; put_bits_count(pb)&31; i++) |
4184 put_bits(pb, 8, src[i]); | |
1799 | 4185 flush_put_bits(pb); |
1803 | 4186 memcpy(pbBufPtr(pb), src+i, 2*words-i); |
4187 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
|
4188 } |
1799 | 4189 |
1803 | 4190 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits)); |
0 | 4191 } |
4192 | |
456 | 4193 static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 4194 int i; |
4195 | |
4196 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
4197 | |
4198 /* mpeg1 */ | |
1160 | 4199 d->mb_skip_run= s->mb_skip_run; |
326 | 4200 for(i=0; i<3; i++) |
4201 d->last_dc[i]= s->last_dc[i]; | |
4202 | |
4203 /* statistics */ | |
4204 d->mv_bits= s->mv_bits; | |
4205 d->i_tex_bits= s->i_tex_bits; | |
4206 d->p_tex_bits= s->p_tex_bits; | |
4207 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
|
4208 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
|
4209 d->b_count= s->b_count; |
326 | 4210 d->skip_count= s->skip_count; |
4211 d->misc_bits= s->misc_bits; | |
329 | 4212 d->last_bits= 0; |
327 | 4213 |
1389 | 4214 d->mb_skiped= 0; |
912 | 4215 d->qscale= s->qscale; |
1616 | 4216 d->dquant= s->dquant; |
326 | 4217 } |
4218 | |
456 | 4219 static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){ |
326 | 4220 int i; |
4221 | |
4222 memcpy(d->mv, s->mv, 2*4*2*sizeof(int)); | |
4223 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop? | |
4224 | |
4225 /* mpeg1 */ | |
1160 | 4226 d->mb_skip_run= s->mb_skip_run; |
326 | 4227 for(i=0; i<3; i++) |
4228 d->last_dc[i]= s->last_dc[i]; | |
4229 | |
4230 /* statistics */ | |
4231 d->mv_bits= s->mv_bits; | |
4232 d->i_tex_bits= s->i_tex_bits; | |
4233 d->p_tex_bits= s->p_tex_bits; | |
4234 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
|
4235 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
|
4236 d->b_count= s->b_count; |
326 | 4237 d->skip_count= s->skip_count; |
4238 d->misc_bits= s->misc_bits; | |
4239 | |
4240 d->mb_intra= s->mb_intra; | |
327 | 4241 d->mb_skiped= s->mb_skiped; |
326 | 4242 d->mv_type= s->mv_type; |
4243 d->mv_dir= s->mv_dir; | |
4244 d->pb= s->pb; | |
456 | 4245 if(s->data_partitioning){ |
4246 d->pb2= s->pb2; | |
4247 d->tex_pb= s->tex_pb; | |
4248 } | |
326 | 4249 d->block= s->block; |
4250 for(i=0; i<6; i++) | |
4251 d->block_last_index[i]= s->block_last_index[i]; | |
755 | 4252 d->interlaced_dct= s->interlaced_dct; |
912 | 4253 d->qscale= s->qscale; |
326 | 4254 } |
4255 | |
456 | 4256 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type, |
4257 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2], | |
4258 int *dmin, int *next_block, int motion_x, int motion_y) | |
4259 { | |
1389 | 4260 int score; |
4261 uint8_t *dest_backup[3]; | |
456 | 4262 |
4263 copy_context_before_encode(s, backup, type); | |
4264 | |
4265 s->block= s->blocks[*next_block]; | |
4266 s->pb= pb[*next_block]; | |
4267 if(s->data_partitioning){ | |
4268 s->pb2 = pb2 [*next_block]; | |
4269 s->tex_pb= tex_pb[*next_block]; | |
4270 } | |
1389 | 4271 |
4272 if(*next_block){ | |
4273 memcpy(dest_backup, s->dest, sizeof(s->dest)); | |
1799 | 4274 s->dest[0] = s->rd_scratchpad; |
4275 s->dest[1] = s->rd_scratchpad + 16*s->linesize; | |
4276 s->dest[2] = s->rd_scratchpad + 16*s->linesize + 8; | |
4277 assert(s->linesize >= 32); //FIXME | |
1389 | 4278 } |
456 | 4279 |
4280 encode_mb(s, motion_x, motion_y); | |
1389 | 4281 |
1786 | 4282 score= put_bits_count(&s->pb); |
456 | 4283 if(s->data_partitioning){ |
1786 | 4284 score+= put_bits_count(&s->pb2); |
4285 score+= put_bits_count(&s->tex_pb); | |
456 | 4286 } |
1389 | 4287 |
4288 if(s->avctx->mb_decision == FF_MB_DECISION_RD){ | |
4289 MPV_decode_mb(s, s->block); | |
4290 | |
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
|
4291 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
|
4292 score += sse_mb(s) << FF_LAMBDA_SHIFT; |
1389 | 4293 } |
4294 | |
4295 if(*next_block){ | |
4296 memcpy(s->dest, dest_backup, sizeof(s->dest)); | |
4297 } | |
4298 | |
4299 if(score<*dmin){ | |
4300 *dmin= score; | |
456 | 4301 *next_block^=1; |
4302 | |
4303 copy_context_after_encode(best, s, type); | |
4304 } | |
4305 } | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4306 |
1389 | 4307 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
|
4308 uint32_t *sq = squareTbl + 256; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4309 int acc=0; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4310 int x,y; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4311 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4312 if(w==16 && h==16) |
1708 | 4313 return s->dsp.sse[0](NULL, src1, src2, stride, 16); |
936 | 4314 else if(w==8 && h==8) |
1708 | 4315 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
|
4316 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4317 for(y=0; y<h; y++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4318 for(x=0; x<w; x++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4319 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
|
4320 } |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4321 } |
936 | 4322 |
4323 assert(acc>=0); | |
4324 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4325 return acc; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4326 } |
326 | 4327 |
1389 | 4328 static int sse_mb(MpegEncContext *s){ |
4329 int w= 16; | |
4330 int h= 16; | |
4331 | |
4332 if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; | |
4333 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; | |
4334 | |
4335 if(w==16 && h==16) | |
2065
9e4bebc39ade
noise preserving sum of squares comparission function
michael
parents:
2063
diff
changeset
|
4336 if(s->avctx->mb_cmp == FF_CMP_NSSE){ |
2066 | 4337 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) |
4338 +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) | |
4339 +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
|
4340 }else{ |
1708 | 4341 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) |
4342 +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) | |
4343 +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
|
4344 } |
1389 | 4345 else |
4346 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) | |
4347 +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) | |
4348 +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); | |
4349 } | |
4350 | |
1799 | 4351 static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){ |
4352 MpegEncContext *s= arg; | |
4353 | |
4354 | |
4355 s->me.pre_pass=1; | |
4356 s->me.dia_size= s->avctx->pre_dia_size; | |
4357 s->first_slice_line=1; | |
4358 for(s->mb_y= s->end_mb_y-1; s->mb_y >= s->start_mb_y; s->mb_y--) { | |
4359 for(s->mb_x=s->mb_width-1; s->mb_x >=0 ;s->mb_x--) { | |
4360 ff_pre_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
4361 } | |
4362 s->first_slice_line=0; | |
4363 } | |
4364 | |
4365 s->me.pre_pass=0; | |
4366 | |
4367 return 0; | |
4368 } | |
4369 | |
4370 static int estimate_motion_thread(AVCodecContext *c, void *arg){ | |
4371 MpegEncContext *s= arg; | |
4372 | |
4373 s->me.dia_size= s->avctx->dia_size; | |
4374 s->first_slice_line=1; | |
4375 for(s->mb_y= s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) { | |
4376 s->mb_x=0; //for block init below | |
4377 ff_init_block_index(s); | |
4378 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { | |
4379 s->block_index[0]+=2; | |
4380 s->block_index[1]+=2; | |
4381 s->block_index[2]+=2; | |
4382 s->block_index[3]+=2; | |
4383 | |
4384 /* compute motion vector & mb_type and store in context */ | |
4385 if(s->pict_type==B_TYPE) | |
4386 ff_estimate_b_frame_motion(s, s->mb_x, s->mb_y); | |
4387 else | |
4388 ff_estimate_p_frame_motion(s, s->mb_x, s->mb_y); | |
4389 } | |
4390 s->first_slice_line=0; | |
4391 } | |
4392 return 0; | |
4393 } | |
4394 | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4395 static int mb_var_thread(AVCodecContext *c, void *arg){ |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4396 MpegEncContext *s= arg; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4397 int mb_x, mb_y; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4398 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4399 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
|
4400 for(mb_x=0; mb_x < s->mb_width; mb_x++) { |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4401 int xx = mb_x * 16; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4402 int yy = mb_y * 16; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4403 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
|
4404 int varc; |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4405 int sum = s->dsp.pix_sum(pix, s->linesize); |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4406 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4407 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
|
4408 |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4409 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
|
4410 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
|
4411 s->me.mb_var_sum_temp += varc; |
1804
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 } |
1805
5dd5b2052f5b
mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents:
1804
diff
changeset
|
4414 return 0; |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4415 } |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
4416 |
1799 | 4417 static void write_slice_end(MpegEncContext *s){ |
4418 if(s->codec_id==CODEC_ID_MPEG4){ | |
4419 if(s->partitioned_frame){ | |
4420 ff_mpeg4_merge_partitions(s); | |
4421 } | |
4422 | |
4423 ff_mpeg4_stuffing(&s->pb); | |
4424 }else if(s->out_format == FMT_MJPEG){ | |
4425 ff_mjpeg_stuffing(&s->pb); | |
4426 } | |
4427 | |
4428 align_put_bits(&s->pb); | |
4429 flush_put_bits(&s->pb); | |
4430 } | |
4431 | |
4432 static int encode_thread(AVCodecContext *c, void *arg){ | |
4433 MpegEncContext *s= arg; | |
766 | 4434 int mb_x, mb_y, pdif = 0; |
1708 | 4435 int i, j; |
326 | 4436 MpegEncContext best_s, backup_s; |
1064 | 4437 uint8_t bit_buf[2][3000]; |
4438 uint8_t bit_buf2[2][3000]; | |
4439 uint8_t bit_buf_tex[2][3000]; | |
456 | 4440 PutBitContext pb[2], pb2[2], tex_pb[2]; |
1799 | 4441 //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y); |
456 | 4442 |
4443 for(i=0; i<2; i++){ | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1505
diff
changeset
|
4444 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
|
4445 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
|
4446 init_put_bits(&tex_pb[i], bit_buf_tex[i], 3000); |
456 | 4447 } |
0 | 4448 |
1786 | 4449 s->last_bits= put_bits_count(&s->pb); |
286 | 4450 s->mv_bits=0; |
4451 s->misc_bits=0; | |
4452 s->i_tex_bits=0; | |
4453 s->p_tex_bits=0; | |
4454 s->i_count=0; | |
656
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4455 s->f_count=0; |
e47fa3e3f2d5
statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents:
652
diff
changeset
|
4456 s->b_count=0; |
286 | 4457 s->skip_count=0; |
4458 | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4459 for(i=0; i<3; i++){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4460 /* init last dc values */ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4461 /* note: quant matrix value (8) is implied here */ |
1992 | 4462 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
|
4463 |
1148 | 4464 s->current_picture_ptr->error[i] = 0; |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4465 } |
1160 | 4466 s->mb_skip_run = 0; |
1708 | 4467 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
|
4468 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4469 s->last_mv_dir = 0; |
0 | 4470 |
1042 | 4471 #ifdef CONFIG_RISKY |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4472 switch(s->codec_id){ |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4473 case CODEC_ID_H263: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4474 case CODEC_ID_H263P: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4475 case CODEC_ID_FLV1: |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4476 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
|
4477 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4478 case CODEC_ID_MPEG4: |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4479 if(s->partitioned_frame) |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4480 ff_mpeg4_init_partitions(s); |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4481 break; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
4482 } |
1042 | 4483 #endif |
456 | 4484 |
4485 s->resync_mb_x=0; | |
1799 | 4486 s->resync_mb_y=0; |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4487 s->first_slice_line = 1; |
766 | 4488 s->ptr_lastgob = s->pb.buf; |
1799 | 4489 for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) { |
4490 // printf("row %d at %X\n", s->mb_y, (int)s); | |
1389 | 4491 s->mb_x=0; |
4492 s->mb_y= mb_y; | |
4493 | |
1652 | 4494 ff_set_qscale(s, s->qscale); |
1389 | 4495 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
|
4496 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4497 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
|
4498 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
|
4499 int mb_type= s->mb_type[xy]; |
456 | 4500 // int d; |
1389 | 4501 int dmin= INT_MAX; |
1708 | 4502 int dir; |
0 | 4503 |
232
b640ec5948b0
- Now the ME is done for the entire picture when enconding, the
pulento
parents:
231
diff
changeset
|
4504 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
|
4505 s->mb_y = mb_y; // moved into loop, can get changed by H.261 |
1389 | 4506 ff_update_block_index(s); |
456 | 4507 |
2327
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4508 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
|
4509 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
|
4510 xy= s->mb_y*s->mb_stride + s->mb_x; |
2345 | 4511 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
|
4512 } |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
4513 |
766 | 4514 /* write gob / video packet header */ |
1042 | 4515 #ifdef CONFIG_RISKY |
1661 | 4516 if(s->rtp_mode){ |
766 | 4517 int current_packet_size, is_gob_start; |
4518 | |
1801
3f26dfb3eba4
replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents:
1799
diff
changeset
|
4519 current_packet_size= ((put_bits_count(&s->pb)+7)>>3) - (s->ptr_lastgob - s->pb.buf); |
1661 | 4520 |
4521 is_gob_start= s->avctx->rtp_payload_size && current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x>0; | |
4522 | |
1799 | 4523 if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0) is_gob_start=1; |
4524 | |
1661 | 4525 switch(s->codec_id){ |
4526 case CODEC_ID_H263: | |
4527 case CODEC_ID_H263P: | |
4528 if(!s->h263_slice_structured) | |
4529 if(s->mb_x || s->mb_y%s->gob_index) is_gob_start=0; | |
4530 break; | |
4531 case CODEC_ID_MPEG2VIDEO: | |
4532 if(s->mb_x==0 && s->mb_y!=0) is_gob_start=1; | |
4533 case CODEC_ID_MPEG1VIDEO: | |
4534 if(s->mb_skip_run) is_gob_start=0; | |
4535 break; | |
4536 } | |
1799 | 4537 |
1661 | 4538 if(is_gob_start){ |
1799 | 4539 if(s->start_mb_y != mb_y || mb_x!=0){ |
4540 write_slice_end(s); | |
4541 | |
4542 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame){ | |
4543 ff_mpeg4_init_partitions(s); | |
4544 } | |
1661 | 4545 } |
4546 | |
1786 | 4547 assert((put_bits_count(&s->pb)&7) == 0); |
1661 | 4548 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob; |
1688 | 4549 |
4550 if(s->avctx->error_rate && s->resync_mb_x + s->resync_mb_y > 0){ | |
1786 | 4551 int r= put_bits_count(&s->pb)/8 + s->picture_number + s->codec_id + s->mb_x + s->mb_y; |
1688 | 4552 int d= 100 / s->avctx->error_rate; |
4553 if(r % d == 0){ | |
4554 current_packet_size=0; | |
4555 #ifndef ALT_BITSTREAM_WRITER | |
4556 s->pb.buf_ptr= s->ptr_lastgob; | |
4557 #endif | |
4558 assert(pbBufPtr(&s->pb) == s->ptr_lastgob); | |
4559 } | |
4560 } | |
1661 | 4561 |
4562 if (s->avctx->rtp_callback) | |
2025
591233f22963
rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>)
michael
parents:
2024
diff
changeset
|
4563 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, current_packet_size, 0); |
1661 | 4564 |
4565 switch(s->codec_id){ | |
4566 case CODEC_ID_MPEG4: | |
456 | 4567 ff_mpeg4_encode_video_packet_header(s); |
4568 ff_mpeg4_clean_buffers(s); | |
1661 | 4569 break; |
4570 case CODEC_ID_MPEG1VIDEO: | |
4571 case CODEC_ID_MPEG2VIDEO: | |
1421 | 4572 ff_mpeg1_encode_slice_header(s); |
4573 ff_mpeg1_clean_buffers(s); | |
1661 | 4574 break; |
4575 case CODEC_ID_H263: | |
4576 case CODEC_ID_H263P: | |
4577 h263_encode_gob_header(s, mb_y); | |
4578 break; | |
1160 | 4579 } |
1661 | 4580 |
4581 if(s->flags&CODEC_FLAG_PASS1){ | |
1786 | 4582 int bits= put_bits_count(&s->pb); |
1661 | 4583 s->misc_bits+= bits - s->last_bits; |
4584 s->last_bits= bits; | |
766 | 4585 } |
1661 | 4586 |
1662 | 4587 s->ptr_lastgob += current_packet_size; |
456 | 4588 s->first_slice_line=1; |
4589 s->resync_mb_x=mb_x; | |
4590 s->resync_mb_y=mb_y; | |
4591 } | |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4592 } |
1042 | 4593 #endif |
456 | 4594 |
745
25d7fb7c89be
better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents:
731
diff
changeset
|
4595 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
|
4596 && 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
|
4597 s->first_slice_line=0; |
456 | 4598 } |
4599 | |
1389 | 4600 s->mb_skiped=0; |
1616 | 4601 s->dquant=0; //only for QP_RD |
4602 | |
2230 | 4603 if(mb_type & (mb_type-1) || (s->flags & CODEC_FLAG_QP_RD)){ // more than 1 MB type possible or CODEC_FLAG_QP_RD |
327 | 4604 int next_block=0; |
456 | 4605 int pb_bits_count, pb2_bits_count, tex_pb_bits_count; |
326 | 4606 |
4607 copy_context_before_encode(&backup_s, s, -1); | |
456 | 4608 backup_s.pb= s->pb; |
4609 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
|
4610 best_s.partitioned_frame= s->partitioned_frame; |
456 | 4611 if(s->data_partitioning){ |
4612 backup_s.pb2= s->pb2; | |
4613 backup_s.tex_pb= s->tex_pb; | |
4614 } | |
326 | 4615 |
1708 | 4616 if(mb_type&CANDIDATE_MB_TYPE_INTER){ |
327 | 4617 s->mv_dir = MV_DIR_FORWARD; |
295 | 4618 s->mv_type = MV_TYPE_16X16; |
294 | 4619 s->mb_intra= 0; |
324 | 4620 s->mv[0][0][0] = s->p_mv_table[xy][0]; |
4621 s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
1708 | 4622 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb, |
456 | 4623 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
0 | 4624 } |
1708 | 4625 if(mb_type&CANDIDATE_MB_TYPE_INTER_I){ |
4626 s->mv_dir = MV_DIR_FORWARD; | |
4627 s->mv_type = MV_TYPE_FIELD; | |
4628 s->mb_intra= 0; | |
4629 for(i=0; i<2; i++){ | |
4630 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
4631 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
4632 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
4633 } | |
4634 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb, | |
4635 &dmin, &next_block, 0, 0); | |
4636 } | |
4637 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
|
4638 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
|
4639 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
|
4640 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
|
4641 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
|
4642 s->mv[0][0][1] = 0; |
1708 | 4643 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
|
4644 &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
|
4645 } |
1708 | 4646 if(mb_type&CANDIDATE_MB_TYPE_INTER4V){ |
327 | 4647 s->mv_dir = MV_DIR_FORWARD; |
295 | 4648 s->mv_type = MV_TYPE_8X8; |
4649 s->mb_intra= 0; | |
4650 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
|
4651 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
|
4652 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
295 | 4653 } |
1708 | 4654 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb, |
456 | 4655 &dmin, &next_block, 0, 0); |
327 | 4656 } |
1708 | 4657 if(mb_type&CANDIDATE_MB_TYPE_FORWARD){ |
327 | 4658 s->mv_dir = MV_DIR_FORWARD; |
4659 s->mv_type = MV_TYPE_16X16; | |
4660 s->mb_intra= 0; | |
4661 s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
4662 s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
1708 | 4663 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb, |
456 | 4664 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]); |
327 | 4665 } |
1708 | 4666 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD){ |
327 | 4667 s->mv_dir = MV_DIR_BACKWARD; |
4668 s->mv_type = MV_TYPE_16X16; | |
4669 s->mb_intra= 0; | |
4670 s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
4671 s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
1708 | 4672 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb, |
456 | 4673 &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]); |
327 | 4674 } |
1708 | 4675 if(mb_type&CANDIDATE_MB_TYPE_BIDIR){ |
327 | 4676 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
4677 s->mv_type = MV_TYPE_16X16; | |
4678 s->mb_intra= 0; | |
4679 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
4680 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
4681 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
4682 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
1708 | 4683 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb, |
456 | 4684 &dmin, &next_block, 0, 0); |
327 | 4685 } |
1708 | 4686 if(mb_type&CANDIDATE_MB_TYPE_DIRECT){ |
936 | 4687 int mx= s->b_direct_mv_table[xy][0]; |
4688 int my= s->b_direct_mv_table[xy][1]; | |
4689 | |
327 | 4690 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
4691 s->mb_intra= 0; | |
1042 | 4692 #ifdef CONFIG_RISKY |
936 | 4693 ff_mpeg4_set_direct_mv(s, mx, my); |
1042 | 4694 #endif |
1708 | 4695 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb, |
936 | 4696 &dmin, &next_block, mx, my); |
295 | 4697 } |
1708 | 4698 if(mb_type&CANDIDATE_MB_TYPE_FORWARD_I){ |
4699 s->mv_dir = MV_DIR_FORWARD; | |
4700 s->mv_type = MV_TYPE_FIELD; | |
4701 s->mb_intra= 0; | |
4702 for(i=0; i<2; i++){ | |
4703 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
4704 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
4705 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
4706 } | |
4707 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb, | |
4708 &dmin, &next_block, 0, 0); | |
4709 } | |
4710 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD_I){ | |
4711 s->mv_dir = MV_DIR_BACKWARD; | |
4712 s->mv_type = MV_TYPE_FIELD; | |
4713 s->mb_intra= 0; | |
4714 for(i=0; i<2; i++){ | |
4715 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
4716 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
4717 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
4718 } | |
4719 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb, | |
4720 &dmin, &next_block, 0, 0); | |
4721 } | |
4722 if(mb_type&CANDIDATE_MB_TYPE_BIDIR_I){ | |
4723 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
4724 s->mv_type = MV_TYPE_FIELD; | |
4725 s->mb_intra= 0; | |
4726 for(dir=0; dir<2; dir++){ | |
4727 for(i=0; i<2; i++){ | |
4728 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
4729 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
4730 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
4731 } | |
4732 } | |
4733 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb, | |
4734 &dmin, &next_block, 0, 0); | |
4735 } | |
4736 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
|
4737 s->mv_dir = 0; |
295 | 4738 s->mv_type = MV_TYPE_16X16; |
294 | 4739 s->mb_intra= 1; |
4740 s->mv[0][0][0] = 0; | |
4741 s->mv[0][0][1] = 0; | |
1708 | 4742 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb, |
456 | 4743 &dmin, &next_block, 0, 0); |
1389 | 4744 if(s->h263_pred || s->h263_aic){ |
4745 if(best_s.mb_intra) | |
4746 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1; | |
4747 else | |
4748 ff_clean_intra_table_entries(s); //old mode? | |
4749 } | |
295 | 4750 } |
1616 | 4751 |
4752 if(s->flags & CODEC_FLAG_QP_RD){ | |
4753 if(best_s.mv_type==MV_TYPE_16X16 && !(best_s.mv_dir&MV_DIRECT)){ | |
4754 const int last_qp= backup_s.qscale; | |
4755 int dquant, dir, qp, dc[6]; | |
1617 | 4756 DCTELEM ac[6][16]; |
1623 | 4757 const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0; |
1616 | 4758 |
4759 assert(backup_s.dquant == 0); | |
4760 | |
4761 //FIXME intra | |
4762 s->mv_dir= best_s.mv_dir; | |
4763 s->mv_type = MV_TYPE_16X16; | |
4764 s->mb_intra= best_s.mb_intra; | |
4765 s->mv[0][0][0] = best_s.mv[0][0][0]; | |
4766 s->mv[0][0][1] = best_s.mv[0][0][1]; | |
4767 s->mv[1][0][0] = best_s.mv[1][0][0]; | |
4768 s->mv[1][0][1] = best_s.mv[1][0][1]; | |
4769 | |
4770 dir= s->pict_type == B_TYPE ? 2 : 1; | |
1623 | 4771 if(last_qp + dir > s->avctx->qmax) dir= -dir; |
1616 | 4772 for(dquant= dir; dquant<=2 && dquant>=-2; dquant += dir){ |
4773 qp= last_qp + dquant; | |
4774 if(qp < s->avctx->qmin || qp > s->avctx->qmax) | |
4775 break; | |
4776 backup_s.dquant= dquant; | |
2229 | 4777 if(s->mb_intra && s->dc_val[0]){ |
1617 | 4778 for(i=0; i<6; i++){ |
4779 dc[i]= s->dc_val[0][ s->block_index[i] ]; | |
4780 memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(DCTELEM)*16); | |
4781 } | |
1616 | 4782 } |
1617 | 4783 |
1708 | 4784 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb, |
1623 | 4785 &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]); |
1616 | 4786 if(best_s.qscale != qp){ |
2229 | 4787 if(s->mb_intra && s->dc_val[0]){ |
1617 | 4788 for(i=0; i<6; i++){ |
4789 s->dc_val[0][ s->block_index[i] ]= dc[i]; | |
4790 memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM)*16); | |
4791 } | |
1616 | 4792 } |
4793 if(dir > 0 && dquant==dir){ | |
4794 dquant= 0; | |
4795 dir= -dir; | |
4796 }else | |
4797 break; | |
4798 } | |
4799 } | |
4800 qp= best_s.qscale; | |
4801 s->current_picture.qscale_table[xy]= qp; | |
4802 } | |
4803 } | |
4804 | |
326 | 4805 copy_context_after_encode(s, &best_s, -1); |
456 | 4806 |
1786 | 4807 pb_bits_count= put_bits_count(&s->pb); |
456 | 4808 flush_put_bits(&s->pb); |
4809 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count); | |
4810 s->pb= backup_s.pb; | |
4811 | |
4812 if(s->data_partitioning){ | |
1786 | 4813 pb2_bits_count= put_bits_count(&s->pb2); |
456 | 4814 flush_put_bits(&s->pb2); |
4815 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count); | |
4816 s->pb2= backup_s.pb2; | |
4817 | |
1786 | 4818 tex_pb_bits_count= put_bits_count(&s->tex_pb); |
456 | 4819 flush_put_bits(&s->tex_pb); |
4820 ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count); | |
4821 s->tex_pb= backup_s.tex_pb; | |
4822 } | |
1786 | 4823 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
|
4824 |
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4825 #ifdef CONFIG_RISKY |
1389 | 4826 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
4827 ff_h263_update_motion_val(s); | |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4828 #endif |
1389 | 4829 |
1799 | 4830 if(next_block==0){ //FIXME 16 vs linesize16 |
4831 s->dsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16); | |
4832 s->dsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8); | |
4833 s->dsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8); | |
1389 | 4834 } |
4835 | |
4836 if(s->avctx->mb_decision == FF_MB_DECISION_BITS) | |
4837 MPV_decode_mb(s, s->block); | |
294 | 4838 } else { |
324 | 4839 int motion_x, motion_y; |
4840 s->mv_type=MV_TYPE_16X16; | |
294 | 4841 // only one MB-Type possible |
1013 | 4842 |
327 | 4843 switch(mb_type){ |
1708 | 4844 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
|
4845 s->mv_dir = 0; |
294 | 4846 s->mb_intra= 1; |
324 | 4847 motion_x= s->mv[0][0][0] = 0; |
4848 motion_y= s->mv[0][0][1] = 0; | |
327 | 4849 break; |
1708 | 4850 case CANDIDATE_MB_TYPE_INTER: |
324 | 4851 s->mv_dir = MV_DIR_FORWARD; |
4852 s->mb_intra= 0; | |
4853 motion_x= s->mv[0][0][0] = s->p_mv_table[xy][0]; | |
4854 motion_y= s->mv[0][0][1] = s->p_mv_table[xy][1]; | |
327 | 4855 break; |
1708 | 4856 case CANDIDATE_MB_TYPE_INTER_I: |
4857 s->mv_dir = MV_DIR_FORWARD; | |
4858 s->mv_type = MV_TYPE_FIELD; | |
4859 s->mb_intra= 0; | |
4860 for(i=0; i<2; i++){ | |
4861 j= s->field_select[0][i] = s->p_field_select_table[i][xy]; | |
4862 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0]; | |
4863 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1]; | |
4864 } | |
4865 motion_x = motion_y = 0; | |
4866 break; | |
4867 case CANDIDATE_MB_TYPE_INTER4V: | |
456 | 4868 s->mv_dir = MV_DIR_FORWARD; |
4869 s->mv_type = MV_TYPE_8X8; | |
4870 s->mb_intra= 0; | |
4871 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
|
4872 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
|
4873 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; |
456 | 4874 } |
4875 motion_x= motion_y= 0; | |
4876 break; | |
1708 | 4877 case CANDIDATE_MB_TYPE_DIRECT: |
324 | 4878 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; |
4879 s->mb_intra= 0; | |
327 | 4880 motion_x=s->b_direct_mv_table[xy][0]; |
4881 motion_y=s->b_direct_mv_table[xy][1]; | |
1042 | 4882 #ifdef CONFIG_RISKY |
936 | 4883 ff_mpeg4_set_direct_mv(s, motion_x, motion_y); |
1042 | 4884 #endif |
327 | 4885 break; |
1708 | 4886 case CANDIDATE_MB_TYPE_BIDIR: |
324 | 4887 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; |
294 | 4888 s->mb_intra= 0; |
324 | 4889 motion_x=0; |
4890 motion_y=0; | |
4891 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0]; | |
4892 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1]; | |
4893 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0]; | |
4894 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1]; | |
327 | 4895 break; |
1708 | 4896 case CANDIDATE_MB_TYPE_BACKWARD: |
324 | 4897 s->mv_dir = MV_DIR_BACKWARD; |
4898 s->mb_intra= 0; | |
4899 motion_x= s->mv[1][0][0] = s->b_back_mv_table[xy][0]; | |
4900 motion_y= s->mv[1][0][1] = s->b_back_mv_table[xy][1]; | |
327 | 4901 break; |
1708 | 4902 case CANDIDATE_MB_TYPE_FORWARD: |
324 | 4903 s->mv_dir = MV_DIR_FORWARD; |
4904 s->mb_intra= 0; | |
4905 motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0]; | |
4906 motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1]; | |
4907 // printf(" %d %d ", motion_x, motion_y); | |
327 | 4908 break; |
1708 | 4909 case CANDIDATE_MB_TYPE_FORWARD_I: |
4910 s->mv_dir = MV_DIR_FORWARD; | |
4911 s->mv_type = MV_TYPE_FIELD; | |
4912 s->mb_intra= 0; | |
4913 for(i=0; i<2; i++){ | |
4914 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy]; | |
4915 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0]; | |
4916 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1]; | |
4917 } | |
4918 motion_x=motion_y=0; | |
4919 break; | |
4920 case CANDIDATE_MB_TYPE_BACKWARD_I: | |
4921 s->mv_dir = MV_DIR_BACKWARD; | |
4922 s->mv_type = MV_TYPE_FIELD; | |
4923 s->mb_intra= 0; | |
4924 for(i=0; i<2; i++){ | |
4925 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy]; | |
4926 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0]; | |
4927 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1]; | |
4928 } | |
4929 motion_x=motion_y=0; | |
4930 break; | |
4931 case CANDIDATE_MB_TYPE_BIDIR_I: | |
4932 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; | |
4933 s->mv_type = MV_TYPE_FIELD; | |
4934 s->mb_intra= 0; | |
4935 for(dir=0; dir<2; dir++){ | |
4936 for(i=0; i<2; i++){ | |
4937 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy]; | |
4938 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0]; | |
4939 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1]; | |
4940 } | |
4941 } | |
4942 motion_x=motion_y=0; | |
4943 break; | |
327 | 4944 default: |
324 | 4945 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
|
4946 av_log(s->avctx, AV_LOG_ERROR, "illegal MB type\n"); |
294 | 4947 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4948 |
324 | 4949 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
|
4950 |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4951 // RAL: Update last macrobloc type |
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4952 s->last_mv_dir = s->mv_dir; |
1389 | 4953 |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4954 #ifdef CONFIG_RISKY |
1389 | 4955 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) |
4956 ff_h263_update_motion_val(s); | |
1451
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4957 #endif |
62c16edd18c6
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents:
1444
diff
changeset
|
4958 |
1389 | 4959 MPV_decode_mb(s, s->block); |
248
56ee684c48bb
- H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents:
244
diff
changeset
|
4960 } |
1051
e5a9dbf597d4
mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents:
1048
diff
changeset
|
4961 |
327 | 4962 /* clean the MV table in IPS frames for direct mode in B frames */ |
4963 if(s->mb_intra /* && I,P,S_TYPE */){ | |
4964 s->p_mv_table[xy][0]=0; | |
4965 s->p_mv_table[xy][1]=0; | |
4966 } | |
909
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4967 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4968 if(s->flags&CODEC_FLAG_PSNR){ |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4969 int w= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4970 int h= 16; |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4971 |
8ae1e4c24e91
new PSNR code (now works with chroma, b frames, ...)
michaelni
parents:
903
diff
changeset
|
4972 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
|
4973 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; |
936 | 4974 |
1148 | 4975 s->current_picture_ptr->error[0] += sse( |
1389 | 4976 s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, |
4977 s->dest[0], w, h, s->linesize); | |
1148 | 4978 s->current_picture_ptr->error[1] += sse( |
1389 | 4979 s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
4980 s->dest[1], w>>1, h>>1, s->uvlinesize); | |
1148 | 4981 s->current_picture_ptr->error[2] += sse( |
1389 | 4982 s, s->new_picture .data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8, |
4983 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
|
4984 } |
2345 | 4985 if(s->loop_filter){ |
4986 if(s->out_format == FMT_H263) | |
4987 ff_h263_loop_filter(s); | |
4988 } | |
1786 | 4989 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb)); |
0 | 4990 } |
4991 } | |
286 | 4992 |
1042 | 4993 #ifdef CONFIG_RISKY |
1799 | 4994 //not beautifull here but we must write it before flushing so it has to be here |
456 | 4995 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE) |
208 | 4996 msmpeg4_encode_ext_header(s); |
1042 | 4997 #endif |
456 | 4998 |
1799 | 4999 write_slice_end(s); |
5000 | |
231 | 5001 /* Send the last GOB if RTP */ |
1661 | 5002 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
|
5003 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob; |
231 | 5004 /* Call the RTP callback to send the last GOB */ |
1799 | 5005 emms_c(); |
2025
591233f22963
rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>)
michael
parents:
2024
diff
changeset
|
5006 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, 0); |
231 | 5007 } |
1799 | 5008 |
5009 return 0; | |
5010 } | |
5011 | |
5012 #define MERGE(field) dst->field += src->field; src->field=0 | |
5013 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
|
5014 MERGE(me.scene_change_score); |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5015 MERGE(me.mc_mb_var_sum_temp); |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5016 MERGE(me.mb_var_sum_temp); |
1799 | 5017 } |
5018 | |
5019 static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src){ | |
5020 int i; | |
5021 | |
5022 MERGE(dct_count[0]); //note, the other dct vars are not part of the context | |
5023 MERGE(dct_count[1]); | |
5024 MERGE(mv_bits); | |
5025 MERGE(i_tex_bits); | |
5026 MERGE(p_tex_bits); | |
5027 MERGE(i_count); | |
5028 MERGE(f_count); | |
5029 MERGE(b_count); | |
5030 MERGE(skip_count); | |
5031 MERGE(misc_bits); | |
5032 MERGE(error_count); | |
5033 MERGE(padding_bug_score); | |
5034 | |
5035 if(dst->avctx->noise_reduction){ | |
5036 for(i=0; i<64; i++){ | |
5037 MERGE(dct_error_sum[0][i]); | |
5038 MERGE(dct_error_sum[1][i]); | |
5039 } | |
5040 } | |
5041 | |
5042 assert(put_bits_count(&src->pb) % 8 ==0); | |
5043 assert(put_bits_count(&dst->pb) % 8 ==0); | |
5044 ff_copy_bits(&dst->pb, src->pb.buf, put_bits_count(&src->pb)); | |
5045 flush_put_bits(&dst->pb); | |
5046 } | |
5047 | |
5048 static void encode_picture(MpegEncContext *s, int picture_number) | |
5049 { | |
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2015
diff
changeset
|
5050 int i; |
1799 | 5051 int bits; |
5052 | |
5053 s->picture_number = picture_number; | |
5054 | |
5055 /* Reset the average MB variance */ | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5056 s->me.mb_var_sum_temp = |
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5057 s->me.mc_mb_var_sum_temp = 0; |
1799 | 5058 |
5059 #ifdef CONFIG_RISKY | |
5060 /* we need to initialize some time vars before we can encode b-frames */ | |
5061 // RAL: Condition added for MPEG1VIDEO | |
5062 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4)) | |
1834 | 5063 ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar |
1799 | 5064 #endif |
5065 | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5066 s->me.scene_change_score=0; |
1799 | 5067 |
2053 | 5068 // s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration |
1799 | 5069 |
5070 if(s->pict_type==I_TYPE){ | |
5071 if(s->msmpeg4_version >= 3) s->no_rounding=1; | |
5072 else s->no_rounding=0; | |
5073 }else if(s->pict_type!=B_TYPE){ | |
5074 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4) | |
5075 s->no_rounding ^= 1; | |
5076 } | |
5077 | |
5078 s->mb_intra=0; //for the rate distoration & bit compare functions | |
5079 for(i=1; i<s->avctx->thread_count; i++){ | |
1827 | 5080 ff_update_duplicate_context(s->thread_context[i], s); |
1799 | 5081 } |
1962 | 5082 |
5083 ff_init_me(s); | |
5084 | |
1799 | 5085 /* Estimate motion for every MB */ |
5086 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
|
5087 if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){ |
1799 | 5088 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){ |
5089 s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5090 } | |
5091 } | |
5092 | |
5093 s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5094 }else /* if(s->pict_type == I_TYPE) */{ | |
5095 /* I-Frame */ | |
5096 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
5097 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
5098 | |
5099 if(!s->fixed_qscale){ | |
5100 /* finding spatial complexity for I-frame rate control */ | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5101 s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); |
1799 | 5102 } |
5103 } | |
1804
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5104 for(i=1; i<s->avctx->thread_count; i++){ |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5105 merge_context_after_me(s, s->thread_context[i]); |
cc0a15943a87
multithreaded spatial complexity calculation for i frames
michael
parents:
1803
diff
changeset
|
5106 } |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5107 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
|
5108 s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp; |
1799 | 5109 emms_c(); |
5110 | |
2015
3ab8f3e2ae6a
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents:
1994
diff
changeset
|
5111 if(s->me.scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){ |
1799 | 5112 s->pict_type= I_TYPE; |
5113 for(i=0; i<s->mb_stride*s->mb_height; i++) | |
5114 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA; | |
5115 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum); | |
5116 } | |
5117 | |
5118 if(!s->umvplus){ | |
5119 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) { | |
5120 s->f_code= ff_get_best_fcode(s, s->p_mv_table, CANDIDATE_MB_TYPE_INTER); | |
5121 | |
5122 if(s->flags & CODEC_FLAG_INTERLACED_ME){ | |
5123 int a,b; | |
5124 a= ff_get_best_fcode(s, s->p_field_mv_table[0][0], CANDIDATE_MB_TYPE_INTER_I); //FIXME field_select | |
5125 b= ff_get_best_fcode(s, s->p_field_mv_table[1][1], CANDIDATE_MB_TYPE_INTER_I); | |
5126 s->f_code= FFMAX(s->f_code, FFMAX(a,b)); | |
5127 } | |
5128 | |
5129 ff_fix_long_p_mvs(s); | |
5130 ff_fix_long_mvs(s, NULL, 0, s->p_mv_table, s->f_code, CANDIDATE_MB_TYPE_INTER, 0); | |
5131 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
|
5132 int j; |
1799 | 5133 for(i=0; i<2; i++){ |
5134 for(j=0; j<2; j++) | |
5135 ff_fix_long_mvs(s, s->p_field_select_table[i], j, | |
5136 s->p_field_mv_table[i][j], s->f_code, CANDIDATE_MB_TYPE_INTER_I, 0); | |
5137 } | |
5138 } | |
5139 } | |
5140 | |
5141 if(s->pict_type==B_TYPE){ | |
5142 int a, b; | |
5143 | |
5144 a = ff_get_best_fcode(s, s->b_forw_mv_table, CANDIDATE_MB_TYPE_FORWARD); | |
5145 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
5146 s->f_code = FFMAX(a, b); | |
5147 | |
5148 a = ff_get_best_fcode(s, s->b_back_mv_table, CANDIDATE_MB_TYPE_BACKWARD); | |
5149 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, CANDIDATE_MB_TYPE_BIDIR); | |
5150 s->b_code = FFMAX(a, b); | |
5151 | |
5152 ff_fix_long_mvs(s, NULL, 0, s->b_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_FORWARD, 1); | |
5153 ff_fix_long_mvs(s, NULL, 0, s->b_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BACKWARD, 1); | |
5154 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
5155 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BIDIR, 1); | |
5156 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
|
5157 int dir, j; |
1799 | 5158 for(dir=0; dir<2; dir++){ |
5159 for(i=0; i<2; i++){ | |
5160 for(j=0; j<2; j++){ | |
5161 int type= dir ? (CANDIDATE_MB_TYPE_BACKWARD_I|CANDIDATE_MB_TYPE_BIDIR_I) | |
5162 : (CANDIDATE_MB_TYPE_FORWARD_I |CANDIDATE_MB_TYPE_BIDIR_I); | |
5163 ff_fix_long_mvs(s, s->b_field_select_table[dir][i], j, | |
5164 s->b_field_mv_table[dir][i][j], dir ? s->b_code : s->f_code, type, 1); | |
5165 } | |
5166 } | |
5167 } | |
5168 } | |
5169 } | |
5170 } | |
5171 | |
5172 if (!s->fixed_qscale) | |
5173 s->current_picture.quality = ff_rate_estimate_qscale(s); //FIXME pic_ptr | |
5174 | |
5175 if(s->adaptive_quant){ | |
5176 #ifdef CONFIG_RISKY | |
5177 switch(s->codec_id){ | |
5178 case CODEC_ID_MPEG4: | |
5179 ff_clean_mpeg4_qscales(s); | |
5180 break; | |
5181 case CODEC_ID_H263: | |
5182 case CODEC_ID_H263P: | |
5183 case CODEC_ID_FLV1: | |
5184 ff_clean_h263_qscales(s); | |
5185 break; | |
5186 } | |
5187 #endif | |
5188 | |
5189 s->lambda= s->lambda_table[0]; | |
5190 //FIXME broken | |
5191 }else | |
5192 s->lambda= s->current_picture.quality; | |
5193 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality); | |
5194 update_qscale(s); | |
5195 | |
5196 if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(s->flags & CODEC_FLAG_QSCALE)) | |
5197 s->qscale= 3; //reduce cliping problems | |
5198 | |
5199 if (s->out_format == FMT_MJPEG) { | |
5200 /* for mjpeg, we do include qscale in the matrix */ | |
5201 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0]; | |
5202 for(i=1;i<64;i++){ | |
5203 int j= s->dsp.idct_permutation[i]; | |
5204 | |
5205 s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3); | |
5206 } | |
5207 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, | |
5208 s->intra_matrix, s->intra_quant_bias, 8, 8); | |
5209 s->qscale= 8; | |
5210 } | |
5211 | |
5212 //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
|
5213 s->current_picture_ptr->key_frame= |
1799 | 5214 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
|
5215 s->current_picture_ptr->pict_type= |
1799 | 5216 s->current_picture.pict_type= s->pict_type; |
5217 | |
5218 if(s->current_picture.key_frame) | |
5219 s->picture_in_gop_number=0; | |
5220 | |
5221 s->last_bits= put_bits_count(&s->pb); | |
5222 switch(s->out_format) { | |
5223 case FMT_MJPEG: | |
5224 mjpeg_picture_header(s); | |
5225 break; | |
5226 #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
|
5227 case FMT_H261: |
5e5cf598a48b
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
2298
diff
changeset
|
5228 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
|
5229 break; |
1799 | 5230 case FMT_H263: |
5231 if (s->codec_id == CODEC_ID_WMV2) | |
5232 ff_wmv2_encode_picture_header(s, picture_number); | |
5233 else if (s->h263_msmpeg4) | |
5234 msmpeg4_encode_picture_header(s, picture_number); | |
5235 else if (s->h263_pred) | |
5236 mpeg4_encode_picture_header(s, picture_number); | |
5237 else if (s->codec_id == CODEC_ID_RV10) | |
5238 rv10_encode_picture_header(s, picture_number); | |
5239 else if (s->codec_id == CODEC_ID_FLV1) | |
5240 ff_flv_encode_picture_header(s, picture_number); | |
5241 else | |
5242 h263_encode_picture_header(s, picture_number); | |
5243 break; | |
5244 #endif | |
5245 case FMT_MPEG1: | |
5246 mpeg1_encode_picture_header(s, picture_number); | |
5247 break; | |
5248 case FMT_H264: | |
5249 break; | |
5250 default: | |
5251 assert(0); | |
5252 } | |
5253 bits= put_bits_count(&s->pb); | |
5254 s->header_bits= bits - s->last_bits; | |
5255 | |
5256 for(i=1; i<s->avctx->thread_count; i++){ | |
5257 update_duplicate_context_after_me(s->thread_context[i], s); | |
5258 } | |
5259 s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count); | |
5260 for(i=1; i<s->avctx->thread_count; i++){ | |
5261 merge_context_after_encode(s, s->thread_context[i]); | |
5262 } | |
5263 emms_c(); | |
0 | 5264 } |
5265 | |
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5266 #endif //CONFIG_ENCODERS |
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5267 |
1719 | 5268 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block){ |
1597 | 5269 const int intra= s->mb_intra; |
5270 int i; | |
5271 | |
1599 | 5272 s->dct_count[intra]++; |
5273 | |
1597 | 5274 for(i=0; i<64; i++){ |
5275 int level= block[i]; | |
5276 | |
5277 if(level){ | |
5278 if(level>0){ | |
5279 s->dct_error_sum[intra][i] += level; | |
5280 level -= s->dct_offset[intra][i]; | |
5281 if(level<0) level=0; | |
5282 }else{ | |
5283 s->dct_error_sum[intra][i] -= level; | |
5284 level += s->dct_offset[intra][i]; | |
5285 if(level>0) level=0; | |
5286 } | |
5287 block[i]= level; | |
5288 } | |
5289 } | |
5290 } | |
5291 | |
1686
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5292 #ifdef CONFIG_ENCODERS |
68abbec33289
Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents:
1685
diff
changeset
|
5293 |
945 | 5294 static int dct_quantize_trellis_c(MpegEncContext *s, |
5295 DCTELEM *block, int n, | |
5296 int qscale, int *overflow){ | |
5297 const int *qmat; | |
1064 | 5298 const uint8_t *scantable= s->intra_scantable.scantable; |
1718 | 5299 const uint8_t *perm_scantable= s->intra_scantable.permutated; |
945 | 5300 int max=0; |
5301 unsigned int threshold1, threshold2; | |
5302 int bias=0; | |
5303 int run_tab[65]; | |
5304 int level_tab[65]; | |
5305 int score_tab[65]; | |
1718 | 5306 int survivor[65]; |
5307 int survivor_count; | |
946 | 5308 int last_run=0; |
5309 int last_level=0; | |
5310 int last_score= 0; | |
1718 | 5311 int last_i; |
1715 | 5312 int coeff[2][64]; |
945 | 5313 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
|
5314 int qmul, qadd, start_i, last_non_zero, i, dc; |
945 | 5315 const int esc_length= s->ac_esc_length; |
5316 uint8_t * length; | |
5317 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
|
5318 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6); |
945 | 5319 |
1092 | 5320 s->dsp.fdct (block); |
1597 | 5321 |
5322 if(s->dct_error_sum) | |
1719 | 5323 s->denoise_dct(s, block); |
945 | 5324 qmul= qscale*16; |
5325 qadd= ((qscale-1)|1)*8; | |
946 | 5326 |
945 | 5327 if (s->mb_intra) { |
5328 int q; | |
5329 if (!s->h263_aic) { | |
5330 if (n < 4) | |
5331 q = s->y_dc_scale; | |
5332 else | |
5333 q = s->c_dc_scale; | |
5334 q = q << 3; | |
5335 } else{ | |
5336 /* For AIC we skip quant/dequant of INTRADC */ | |
5337 q = 1 << 3; | |
5338 qadd=0; | |
5339 } | |
5340 | |
5341 /* note: block[0] is assumed to be positive */ | |
5342 block[0] = (block[0] + (q >> 1)) / q; | |
5343 start_i = 1; | |
5344 last_non_zero = 0; | |
5345 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
|
5346 if(s->mpeg_quant || s->out_format == FMT_MPEG1) |
945 | 5347 bias= 1<<(QMAT_SHIFT-1); |
5348 length = s->intra_ac_vlc_length; | |
5349 last_length= s->intra_ac_vlc_last_length; | |
5350 } else { | |
5351 start_i = 0; | |
5352 last_non_zero = -1; | |
5353 qmat = s->q_inter_matrix[qscale]; | |
5354 length = s->inter_ac_vlc_length; | |
5355 last_length= s->inter_ac_vlc_last_length; | |
5356 } | |
1718 | 5357 last_i= start_i; |
945 | 5358 |
5359 threshold1= (1<<QMAT_SHIFT) - bias - 1; | |
5360 threshold2= (threshold1<<1); | |
946 | 5361 |
1715 | 5362 for(i=63; i>=start_i; i--) { |
5363 const int j = scantable[i]; | |
5364 int level = block[j] * qmat[j]; | |
5365 | |
5366 if(((unsigned)(level+threshold1))>threshold2){ | |
5367 last_non_zero = i; | |
5368 break; | |
5369 } | |
5370 } | |
5371 | |
5372 for(i=start_i; i<=last_non_zero; i++) { | |
945 | 5373 const int j = scantable[i]; |
1715 | 5374 int level = block[j] * qmat[j]; |
945 | 5375 |
5376 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
5377 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
5378 if(((unsigned)(level+threshold1))>threshold2){ | |
5379 if(level>0){ | |
5380 level= (bias + level)>>QMAT_SHIFT; | |
1718 | 5381 coeff[0][i]= level; |
5382 coeff[1][i]= level-1; | |
946 | 5383 // coeff[2][k]= level-2; |
945 | 5384 }else{ |
5385 level= (bias - level)>>QMAT_SHIFT; | |
1718 | 5386 coeff[0][i]= -level; |
5387 coeff[1][i]= -level+1; | |
946 | 5388 // coeff[2][k]= -level+2; |
945 | 5389 } |
1718 | 5390 coeff_count[i]= FFMIN(level, 2); |
5391 assert(coeff_count[i]); | |
945 | 5392 max |=level; |
5393 }else{ | |
1718 | 5394 coeff[0][i]= (level>>31)|1; |
5395 coeff_count[i]= 1; | |
945 | 5396 } |
5397 } | |
5398 | |
5399 *overflow= s->max_qcoeff < max; //overflow might have happend | |
5400 | |
5401 if(last_non_zero < start_i){ | |
5402 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); | |
5403 return last_non_zero; | |
5404 } | |
5405 | |
1718 | 5406 score_tab[start_i]= 0; |
5407 survivor[0]= start_i; | |
5408 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
|
5409 |
1718 | 5410 for(i=start_i; i<=last_non_zero; i++){ |
5411 int level_index, j; | |
5412 const int dct_coeff= ABS(block[ scantable[i] ]); | |
945 | 5413 const int zero_distoration= dct_coeff*dct_coeff; |
946 | 5414 int best_score=256*256*256*120; |
945 | 5415 for(level_index=0; level_index < coeff_count[i]; level_index++){ |
5416 int distoration; | |
5417 int level= coeff[level_index][i]; | |
1716 | 5418 const int alevel= ABS(level); |
945 | 5419 int unquant_coeff; |
5420 | |
5421 assert(level); | |
5422 | |
5423 if(s->out_format == FMT_H263){ | |
1716 | 5424 unquant_coeff= alevel*qmul + qadd; |
947 | 5425 }else{ //MPEG1 |
1718 | 5426 j= s->dsp.idct_permutation[ scantable[i] ]; //FIXME optimize |
947 | 5427 if(s->mb_intra){ |
1716 | 5428 unquant_coeff = (int)( alevel * qscale * s->intra_matrix[j]) >> 3; |
947 | 5429 unquant_coeff = (unquant_coeff - 1) | 1; |
5430 }else{ | |
1716 | 5431 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4; |
947 | 5432 unquant_coeff = (unquant_coeff - 1) | 1; |
5433 } | |
5434 unquant_coeff<<= 3; | |
5435 } | |
946 | 5436 |
1715 | 5437 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration; |
945 | 5438 level+=64; |
5439 if((level&(~127)) == 0){ | |
1718 | 5440 for(j=survivor_count-1; j>=0; j--){ |
5441 int run= i - survivor[j]; | |
947 | 5442 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 5443 score += score_tab[i-run]; |
5444 | |
5445 if(score < best_score){ | |
1718 | 5446 best_score= score; |
945 | 5447 run_tab[i+1]= run; |
5448 level_tab[i+1]= level-64; | |
5449 } | |
5450 } | |
5451 | |
5452 if(s->out_format == FMT_H263){ | |
1718 | 5453 for(j=survivor_count-1; j>=0; j--){ |
5454 int run= i - survivor[j]; | |
947 | 5455 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda; |
945 | 5456 score += score_tab[i-run]; |
946 | 5457 if(score < last_score){ |
5458 last_score= score; | |
5459 last_run= run; | |
5460 last_level= level-64; | |
5461 last_i= i+1; | |
945 | 5462 } |
5463 } | |
5464 } | |
5465 }else{ | |
5466 distoration += esc_length*lambda; | |
1718 | 5467 for(j=survivor_count-1; j>=0; j--){ |
5468 int run= i - survivor[j]; | |
945 | 5469 int score= distoration + score_tab[i-run]; |
5470 | |
5471 if(score < best_score){ | |
1718 | 5472 best_score= score; |
945 | 5473 run_tab[i+1]= run; |
5474 level_tab[i+1]= level-64; | |
5475 } | |
5476 } | |
5477 | |
5478 if(s->out_format == FMT_H263){ | |
1718 | 5479 for(j=survivor_count-1; j>=0; j--){ |
5480 int run= i - survivor[j]; | |
945 | 5481 int score= distoration + score_tab[i-run]; |
946 | 5482 if(score < last_score){ |
5483 last_score= score; | |
5484 last_run= run; | |
5485 last_level= level-64; | |
5486 last_i= i+1; | |
945 | 5487 } |
5488 } | |
5489 } | |
5490 } | |
5491 } | |
946 | 5492 |
1718 | 5493 score_tab[i+1]= best_score; |
5494 | |
946 | 5495 //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 | 5496 if(last_non_zero <= 27){ |
5497 for(; survivor_count; survivor_count--){ | |
5498 if(score_tab[ survivor[survivor_count-1] ] <= best_score) | |
5499 break; | |
5500 } | |
5501 }else{ | |
5502 for(; survivor_count; survivor_count--){ | |
5503 if(score_tab[ survivor[survivor_count-1] ] <= best_score + lambda) | |
5504 break; | |
5505 } | |
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
|
5506 } |
1718 | 5507 |
5508 survivor[ survivor_count++ ]= i+1; | |
945 | 5509 } |
946 | 5510 |
945 | 5511 if(s->out_format != FMT_H263){ |
946 | 5512 last_score= 256*256*256*120; |
1718 | 5513 for(i= survivor[0]; i<=last_non_zero + 1; i++){ |
946 | 5514 int score= score_tab[i]; |
947 | 5515 if(i) score += lambda*2; //FIXME exacter? |
5516 | |
946 | 5517 if(score < last_score){ |
5518 last_score= score; | |
5519 last_i= i; | |
5520 last_level= level_tab[i]; | |
5521 last_run= run_tab[i]; | |
5522 } | |
945 | 5523 } |
5524 } | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5525 |
1715 | 5526 s->coded_score[n] = last_score; |
945 | 5527 |
1716 | 5528 dc= ABS(block[0]); |
1718 | 5529 last_non_zero= last_i - 1; |
945 | 5530 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM)); |
5531 | |
5532 if(last_non_zero < start_i) | |
5533 return last_non_zero; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5534 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5535 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
|
5536 int best_level= 0; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5537 int best_score= dc * dc; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5538 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5539 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
|
5540 int level= coeff[i][0]; |
1716 | 5541 int alevel= ABS(level); |
5542 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
|
5543 |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5544 if(s->out_format == FMT_H263){ |
1716 | 5545 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
|
5546 }else{ //MPEG1 |
1716 | 5547 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4; |
5548 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
|
5549 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5550 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
|
5551 unquant_coeff<<= 3 + 3; |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5552 |
1716 | 5553 distortion= (unquant_coeff - dc) * (unquant_coeff - dc); |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5554 level+=64; |
1716 | 5555 if((level&(~127)) == 0) score= distortion + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda; |
5556 else score= distortion + esc_length*lambda; | |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5557 |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5558 if(score < best_score){ |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5559 best_score= score; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5560 best_level= level - 64; |
1480
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5561 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5562 } |
8657d6800d15
slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents:
1471
diff
changeset
|
5563 block[0]= best_level; |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5564 s->coded_score[n] = best_score - dc*dc; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5565 if(best_level == 0) return -1; |
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5566 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
|
5567 } |
1490
0355f2b3519a
rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents:
1480
diff
changeset
|
5568 |
946 | 5569 i= last_i; |
5570 assert(last_level); | |
1718 | 5571 |
5572 block[ perm_scantable[last_non_zero] ]= last_level; | |
946 | 5573 i -= last_run + 1; |
945 | 5574 |
1718 | 5575 for(; i>start_i; i -= run_tab[i] + 1){ |
5576 block[ perm_scantable[i-1] ]= level_tab[i]; | |
945 | 5577 } |
5578 | |
5579 return last_non_zero; | |
5580 } | |
5581 | |
1777 | 5582 //#define REFINE_STATS 1 |
5583 static int16_t basis[64][64]; | |
5584 | |
5585 static void build_basis(uint8_t *perm){ | |
5586 int i, j, x, y; | |
5587 emms_c(); | |
5588 for(i=0; i<8; i++){ | |
5589 for(j=0; j<8; j++){ | |
5590 for(y=0; y<8; y++){ | |
5591 for(x=0; x<8; x++){ | |
5592 double s= 0.25*(1<<BASIS_SHIFT); | |
5593 int index= 8*i + j; | |
5594 int perm_index= perm[index]; | |
5595 if(i==0) s*= sqrt(0.5); | |
5596 if(j==0) s*= sqrt(0.5); | |
5597 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))); | |
5598 } | |
5599 } | |
5600 } | |
5601 } | |
5602 } | |
5603 | |
5604 static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? | |
5605 DCTELEM *block, int16_t *weight, DCTELEM *orig, | |
5606 int n, int qscale){ | |
5607 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
|
5608 DCTELEM d1[64] __align16; |
1777 | 5609 const int *qmat; |
5610 const uint8_t *scantable= s->intra_scantable.scantable; | |
5611 const uint8_t *perm_scantable= s->intra_scantable.permutated; | |
5612 // unsigned int threshold1, threshold2; | |
5613 // int bias=0; | |
5614 int run_tab[65]; | |
5615 int prev_run=0; | |
5616 int prev_level=0; | |
5617 int qmul, qadd, start_i, last_non_zero, i, dc; | |
5618 uint8_t * length; | |
5619 uint8_t * last_length; | |
5620 int lambda; | |
5621 int rle_index, run, q, sum; | |
5622 #ifdef REFINE_STATS | |
5623 static int count=0; | |
5624 static int after_last=0; | |
5625 static int to_zero=0; | |
5626 static int from_zero=0; | |
5627 static int raise=0; | |
5628 static int lower=0; | |
5629 static int messed_sign=0; | |
5630 #endif | |
5631 | |
5632 if(basis[0][0] == 0) | |
5633 build_basis(s->dsp.idct_permutation); | |
5634 | |
5635 qmul= qscale*2; | |
5636 qadd= (qscale-1)|1; | |
5637 if (s->mb_intra) { | |
5638 if (!s->h263_aic) { | |
5639 if (n < 4) | |
5640 q = s->y_dc_scale; | |
5641 else | |
5642 q = s->c_dc_scale; | |
5643 } else{ | |
5644 /* For AIC we skip quant/dequant of INTRADC */ | |
5645 q = 1; | |
5646 qadd=0; | |
5647 } | |
5648 q <<= RECON_SHIFT-3; | |
5649 /* note: block[0] is assumed to be positive */ | |
5650 dc= block[0]*q; | |
5651 // block[0] = (block[0] + (q >> 1)) / q; | |
5652 start_i = 1; | |
5653 qmat = s->q_intra_matrix[qscale]; | |
5654 // if(s->mpeg_quant || s->out_format == FMT_MPEG1) | |
5655 // bias= 1<<(QMAT_SHIFT-1); | |
5656 length = s->intra_ac_vlc_length; | |
5657 last_length= s->intra_ac_vlc_last_length; | |
5658 } else { | |
5659 dc= 0; | |
5660 start_i = 0; | |
5661 qmat = s->q_inter_matrix[qscale]; | |
5662 length = s->inter_ac_vlc_length; | |
5663 last_length= s->inter_ac_vlc_last_length; | |
5664 } | |
5665 last_non_zero = s->block_last_index[n]; | |
5666 | |
5667 #ifdef REFINE_STATS | |
5668 {START_TIMER | |
5669 #endif | |
1784 | 5670 dc += (1<<(RECON_SHIFT-1)); |
5671 for(i=0; i<64; i++){ | |
5672 rem[i]= dc - (orig[i]<<RECON_SHIFT); //FIXME use orig dirrectly insteadof copying to rem[] | |
1777 | 5673 } |
5674 #ifdef REFINE_STATS | |
5675 STOP_TIMER("memset rem[]")} | |
5676 #endif | |
5677 sum=0; | |
5678 for(i=0; i<64; i++){ | |
5679 int one= 36; | |
5680 int qns=4; | |
5681 int w; | |
5682 | |
5683 w= ABS(weight[i]) + qns*one; | |
5684 w= 15 + (48*qns*one + w/2)/w; // 16 .. 63 | |
5685 | |
5686 weight[i] = w; | |
5687 // w=weight[i] = (63*qns + (w/2)) / w; | |
5688 | |
5689 assert(w>0); | |
5690 assert(w<(1<<6)); | |
5691 sum += w*w; | |
5692 } | |
5693 lambda= sum*(uint64_t)s->lambda2 >> (FF_LAMBDA_SHIFT - 6 + 6 + 6 + 6); | |
5694 #ifdef REFINE_STATS | |
5695 {START_TIMER | |
5696 #endif | |
5697 run=0; | |
5698 rle_index=0; | |
5699 for(i=start_i; i<=last_non_zero; i++){ | |
5700 int j= perm_scantable[i]; | |
5701 const int level= block[j]; | |
5702 int coeff; | |
5703 | |
5704 if(level){ | |
5705 if(level<0) coeff= qmul*level - qadd; | |
5706 else coeff= qmul*level + qadd; | |
5707 run_tab[rle_index++]=run; | |
5708 run=0; | |
5709 | |
1784 | 5710 s->dsp.add_8x8basis(rem, basis[j], coeff); |
1777 | 5711 }else{ |
5712 run++; | |
5713 } | |
5714 } | |
5715 #ifdef REFINE_STATS | |
5716 if(last_non_zero>0){ | |
5717 STOP_TIMER("init rem[]") | |
5718 } | |
5719 } | |
5720 | |
5721 {START_TIMER | |
5722 #endif | |
5723 for(;;){ | |
1784 | 5724 int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0); |
1777 | 5725 int best_coeff=0; |
5726 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
|
5727 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
|
5728 #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
|
5729 {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
|
5730 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5731 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
|
5732 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5733 if(analyze_gradient){ |
1777 | 5734 #ifdef REFINE_STATS |
5735 {START_TIMER | |
5736 #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
|
5737 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
|
5738 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
|
5739 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5740 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
|
5741 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5742 #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
|
5743 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
|
5744 {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
|
5745 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5746 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
|
5747 #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
|
5748 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
|
5749 #endif |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5750 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5751 |
1777 | 5752 if(start_i){ |
5753 const int level= block[0]; | |
5754 int change, old_coeff; | |
5755 | |
5756 assert(s->mb_intra); | |
5757 | |
5758 old_coeff= q*level; | |
5759 | |
5760 for(change=-1; change<=1; change+=2){ | |
5761 int new_level= level + change; | |
5762 int score, new_coeff; | |
5763 | |
5764 new_coeff= q*new_level; | |
5765 if(new_coeff >= 2048 || new_coeff < 0) | |
5766 continue; | |
5767 | |
1784 | 5768 score= s->dsp.try_8x8basis(rem, weight, basis[0], new_coeff - old_coeff); |
1777 | 5769 if(score<best_score){ |
5770 best_score= score; | |
5771 best_coeff= 0; | |
5772 best_change= change; | |
5773 best_unquant_change= new_coeff - old_coeff; | |
5774 } | |
5775 } | |
5776 } | |
5777 | |
5778 run=0; | |
5779 rle_index=0; | |
5780 run2= run_tab[rle_index++]; | |
5781 prev_level=0; | |
5782 prev_run=0; | |
5783 | |
5784 for(i=start_i; i<64; i++){ | |
5785 int j= perm_scantable[i]; | |
5786 const int level= block[j]; | |
5787 int change, old_coeff; | |
5788 | |
5789 if(s->avctx->quantizer_noise_shaping < 3 && i > last_non_zero + 1) | |
5790 break; | |
5791 | |
5792 if(level){ | |
5793 if(level<0) old_coeff= qmul*level - qadd; | |
5794 else old_coeff= qmul*level + qadd; | |
5795 run2= run_tab[rle_index++]; //FIXME ! maybe after last | |
5796 }else{ | |
5797 old_coeff=0; | |
5798 run2--; | |
5799 assert(run2>=0 || i >= last_non_zero ); | |
5800 } | |
5801 | |
5802 for(change=-1; change<=1; change+=2){ | |
5803 int new_level= level + change; | |
5804 int score, new_coeff, unquant_change; | |
5805 | |
5806 score=0; | |
5807 if(s->avctx->quantizer_noise_shaping < 2 && ABS(new_level) > ABS(level)) | |
5808 continue; | |
5809 | |
5810 if(new_level){ | |
5811 if(new_level<0) new_coeff= qmul*new_level - qadd; | |
5812 else new_coeff= qmul*new_level + qadd; | |
5813 if(new_coeff >= 2048 || new_coeff <= -2048) | |
5814 continue; | |
5815 //FIXME check for overflow | |
5816 | |
5817 if(level){ | |
5818 if(level < 63 && level > -63){ | |
5819 if(i < last_non_zero) | |
5820 score += length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
5821 - length[UNI_AC_ENC_INDEX(run, level+64)]; | |
5822 else | |
5823 score += last_length[UNI_AC_ENC_INDEX(run, new_level+64)] | |
5824 - last_length[UNI_AC_ENC_INDEX(run, level+64)]; | |
5825 } | |
5826 }else{ | |
5827 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
|
5828 |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5829 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
|
5830 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
|
5831 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
|
5832 continue; |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5833 } |
14d918d0ef42
analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents:
1784
diff
changeset
|
5834 |
1777 | 5835 if(i < last_non_zero){ |
5836 int next_i= i + run2 + 1; | |
5837 int next_level= block[ perm_scantable[next_i] ] + 64; | |
5838 | |
5839 if(next_level&(~127)) | |
5840 next_level= 0; | |
5841 | |
5842 if(next_i < last_non_zero) | |
5843 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
5844 + length[UNI_AC_ENC_INDEX(run2, next_level)] | |
5845 - length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
5846 else | |
5847 score += length[UNI_AC_ENC_INDEX(run, 65)] | |
5848 + last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
5849 - last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]; | |
5850 }else{ | |
5851 score += last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
5852 if(prev_level){ | |
5853 score += length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
5854 - last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
5855 } | |
5856 } | |
5857 } | |
5858 }else{ | |
5859 new_coeff=0; | |
5860 assert(ABS(level)==1); | |
5861 | |
5862 if(i < last_non_zero){ | |
5863 int next_i= i + run2 + 1; | |
5864 int next_level= block[ perm_scantable[next_i] ] + 64; | |
5865 | |
5866 if(next_level&(~127)) | |
5867 next_level= 0; | |
5868 | |
5869 if(next_i < last_non_zero) | |
5870 score += length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
5871 - length[UNI_AC_ENC_INDEX(run2, next_level)] | |
5872 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
5873 else | |
5874 score += last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)] | |
5875 - last_length[UNI_AC_ENC_INDEX(run2, next_level)] | |
5876 - length[UNI_AC_ENC_INDEX(run, 65)]; | |
5877 }else{ | |
5878 score += -last_length[UNI_AC_ENC_INDEX(run, 65)]; | |
5879 if(prev_level){ | |
5880 score += last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)] | |
5881 - length[UNI_AC_ENC_INDEX(prev_run, prev_level)]; | |
5882 } | |
5883 } | |
5884 } | |
5885 | |
5886 score *= lambda; | |
5887 | |
5888 unquant_change= new_coeff - old_coeff; | |
5889 assert((score < 100*lambda && score > -100*lambda) || lambda==0); | |
5890 | |
1784 | 5891 score+= s->dsp.try_8x8basis(rem, weight, basis[j], unquant_change); |
1777 | 5892 if(score<best_score){ |
5893 best_score= score; | |
5894 best_coeff= i; | |
5895 best_change= change; | |
5896 best_unquant_change= unquant_change; | |
5897 } | |
5898 } | |
5899 if(level){ | |
5900 prev_level= level + 64; | |
5901 if(prev_level&(~127)) | |
5902 prev_level= 0; | |
5903 prev_run= run; | |
5904 run=0; | |
5905 }else{ | |
5906 run++; | |
5907 } | |
5908 } | |
5909 #ifdef REFINE_STATS | |
5910 STOP_TIMER("iterative step")} | |
5911 #endif | |
5912 | |
5913 if(best_change){ | |
5914 int j= perm_scantable[ best_coeff ]; | |
5915 | |
5916 block[j] += best_change; | |
5917 | |
5918 if(best_coeff > last_non_zero){ | |
5919 last_non_zero= best_coeff; | |
5920 assert(block[j]); | |
5921 #ifdef REFINE_STATS | |
5922 after_last++; | |
5923 #endif | |
5924 }else{ | |
5925 #ifdef REFINE_STATS | |
5926 if(block[j]){ | |
5927 if(block[j] - best_change){ | |
5928 if(ABS(block[j]) > ABS(block[j] - best_change)){ | |
5929 raise++; | |
5930 }else{ | |
5931 lower++; | |
5932 } | |
5933 }else{ | |
5934 from_zero++; | |
5935 } | |
5936 }else{ | |
5937 to_zero++; | |
5938 } | |
5939 #endif | |
5940 for(; last_non_zero>=start_i; last_non_zero--){ | |
5941 if(block[perm_scantable[last_non_zero]]) | |
5942 break; | |
5943 } | |
5944 } | |
5945 #ifdef REFINE_STATS | |
5946 count++; | |
5947 if(256*256*256*64 % count == 0){ | |
5948 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); | |
5949 } | |
5950 #endif | |
5951 run=0; | |
5952 rle_index=0; | |
5953 for(i=start_i; i<=last_non_zero; i++){ | |
5954 int j= perm_scantable[i]; | |
5955 const int level= block[j]; | |
5956 | |
5957 if(level){ | |
5958 run_tab[rle_index++]=run; | |
5959 run=0; | |
5960 }else{ | |
5961 run++; | |
5962 } | |
5963 } | |
5964 | |
1784 | 5965 s->dsp.add_8x8basis(rem, basis[j], best_unquant_change); |
1777 | 5966 }else{ |
5967 break; | |
5968 } | |
5969 } | |
5970 #ifdef REFINE_STATS | |
5971 if(last_non_zero>0){ | |
5972 STOP_TIMER("iterative search") | |
5973 } | |
5974 } | |
5975 #endif | |
5976 | |
5977 return last_non_zero; | |
5978 } | |
5979 | |
220 | 5980 static int dct_quantize_c(MpegEncContext *s, |
0 | 5981 DCTELEM *block, int n, |
344 | 5982 int qscale, int *overflow) |
0 | 5983 { |
1715 | 5984 int i, j, level, last_non_zero, q, start_i; |
0 | 5985 const int *qmat; |
1064 | 5986 const uint8_t *scantable= s->intra_scantable.scantable; |
344 | 5987 int bias; |
5988 int max=0; | |
5989 unsigned int threshold1, threshold2; | |
828
ace3ccd18dd2
Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents:
815
diff
changeset
|
5990 |
1092 | 5991 s->dsp.fdct (block); |
0 | 5992 |
1597 | 5993 if(s->dct_error_sum) |
1719 | 5994 s->denoise_dct(s, block); |
1597 | 5995 |
0 | 5996 if (s->mb_intra) { |
350
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
5997 if (!s->h263_aic) { |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
5998 if (n < 4) |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
5999 q = s->y_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6000 else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6001 q = s->c_dc_scale; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6002 q = q << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6003 } else |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6004 /* 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
|
6005 q = 1 << 3; |
6ebbecc10063
- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents:
347
diff
changeset
|
6006 |
0 | 6007 /* note: block[0] is assumed to be positive */ |
6008 block[0] = (block[0] + (q >> 1)) / q; | |
1715 | 6009 start_i = 1; |
0 | 6010 last_non_zero = 0; |
344 | 6011 qmat = s->q_intra_matrix[qscale]; |
635 | 6012 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 6013 } else { |
1715 | 6014 start_i = 0; |
0 | 6015 last_non_zero = -1; |
344 | 6016 qmat = s->q_inter_matrix[qscale]; |
635 | 6017 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT); |
0 | 6018 } |
635 | 6019 threshold1= (1<<QMAT_SHIFT) - bias - 1; |
6020 threshold2= (threshold1<<1); | |
1715 | 6021 for(i=63;i>=start_i;i--) { |
764 | 6022 j = scantable[i]; |
1715 | 6023 level = block[j] * qmat[j]; |
6024 | |
6025 if(((unsigned)(level+threshold1))>threshold2){ | |
6026 last_non_zero = i; | |
6027 break; | |
6028 }else{ | |
6029 block[j]=0; | |
6030 } | |
6031 } | |
6032 for(i=start_i; i<=last_non_zero; i++) { | |
6033 j = scantable[i]; | |
6034 level = block[j] * qmat[j]; | |
344 | 6035 |
1215 | 6036 // if( bias+level >= (1<<QMAT_SHIFT) |
6037 // || bias-level >= (1<<QMAT_SHIFT)){ | |
344 | 6038 if(((unsigned)(level+threshold1))>threshold2){ |
6039 if(level>0){ | |
635 | 6040 level= (bias + level)>>QMAT_SHIFT; |
344 | 6041 block[j]= level; |
6042 }else{ | |
635 | 6043 level= (bias - level)>>QMAT_SHIFT; |
344 | 6044 block[j]= -level; |
0 | 6045 } |
344 | 6046 max |=level; |
6047 }else{ | |
6048 block[j]=0; | |
0 | 6049 } |
6050 } | |
344 | 6051 *overflow= s->max_qcoeff < max; //overflow might have happend |
6052 | |
764 | 6053 /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */ |
1092 | 6054 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM) |
6055 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero); | |
764 | 6056 |
0 | 6057 return last_non_zero; |
6058 } | |
6059 | |
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
|
6060 #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
|
6061 |
1689 | 6062 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
|
6063 DCTELEM *block, int n, int qscale) |
0 | 6064 { |
200 | 6065 int i, level, nCoeffs; |
1064 | 6066 const uint16_t *quant_matrix; |
0 | 6067 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6068 nCoeffs= s->block_last_index[n]; |
200 | 6069 |
1689 | 6070 if (n < 4) |
6071 block[0] = block[0] * s->y_dc_scale; | |
6072 else | |
6073 block[0] = block[0] * s->c_dc_scale; | |
6074 /* XXX: only mpeg1 */ | |
6075 quant_matrix = s->intra_matrix; | |
6076 for(i=1;i<=nCoeffs;i++) { | |
6077 int j= s->intra_scantable.permutated[i]; | |
6078 level = block[j]; | |
6079 if (level) { | |
6080 if (level < 0) { | |
6081 level = -level; | |
6082 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6083 level = (level - 1) | 1; | |
6084 level = -level; | |
6085 } else { | |
6086 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6087 level = (level - 1) | 1; | |
0 | 6088 } |
1689 | 6089 block[j] = level; |
0 | 6090 } |
6091 } | |
6092 } | |
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
|
6093 |
1689 | 6094 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s, |
6095 DCTELEM *block, int n, int qscale) | |
6096 { | |
6097 int i, level, nCoeffs; | |
6098 const uint16_t *quant_matrix; | |
6099 | |
6100 nCoeffs= s->block_last_index[n]; | |
6101 | |
6102 quant_matrix = s->inter_matrix; | |
6103 for(i=0; i<=nCoeffs; i++) { | |
6104 int j= s->intra_scantable.permutated[i]; | |
6105 level = block[j]; | |
6106 if (level) { | |
6107 if (level < 0) { | |
6108 level = -level; | |
6109 level = (((level << 1) + 1) * qscale * | |
6110 ((int) (quant_matrix[j]))) >> 4; | |
6111 level = (level - 1) | 1; | |
6112 level = -level; | |
6113 } else { | |
6114 level = (((level << 1) + 1) * qscale * | |
6115 ((int) (quant_matrix[j]))) >> 4; | |
6116 level = (level - 1) | 1; | |
6117 } | |
6118 block[j] = level; | |
6119 } | |
6120 } | |
6121 } | |
6122 | |
6123 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s, | |
325 | 6124 DCTELEM *block, int n, int qscale) |
6125 { | |
6126 int i, level, nCoeffs; | |
1064 | 6127 const uint16_t *quant_matrix; |
325 | 6128 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6129 if(s->alternate_scan) nCoeffs= 63; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6130 else nCoeffs= s->block_last_index[n]; |
325 | 6131 |
1689 | 6132 if (n < 4) |
6133 block[0] = block[0] * s->y_dc_scale; | |
6134 else | |
6135 block[0] = block[0] * s->c_dc_scale; | |
6136 quant_matrix = s->intra_matrix; | |
6137 for(i=1;i<=nCoeffs;i++) { | |
6138 int j= s->intra_scantable.permutated[i]; | |
6139 level = block[j]; | |
6140 if (level) { | |
6141 if (level < 0) { | |
6142 level = -level; | |
6143 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6144 level = -level; | |
6145 } else { | |
6146 level = (int)(level * qscale * quant_matrix[j]) >> 3; | |
6147 } | |
6148 block[j] = level; | |
6149 } | |
6150 } | |
6151 } | |
6152 | |
6153 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, | |
6154 DCTELEM *block, int n, int qscale) | |
6155 { | |
6156 int i, level, nCoeffs; | |
6157 const uint16_t *quant_matrix; | |
6158 int sum=-1; | |
6159 | |
6160 if(s->alternate_scan) nCoeffs= 63; | |
6161 else nCoeffs= s->block_last_index[n]; | |
6162 | |
6163 quant_matrix = s->inter_matrix; | |
6164 for(i=0; i<=nCoeffs; i++) { | |
6165 int j= s->intra_scantable.permutated[i]; | |
6166 level = block[j]; | |
6167 if (level) { | |
6168 if (level < 0) { | |
6169 level = -level; | |
6170 level = (((level << 1) + 1) * qscale * | |
6171 ((int) (quant_matrix[j]))) >> 4; | |
6172 level = -level; | |
6173 } else { | |
6174 level = (((level << 1) + 1) * qscale * | |
6175 ((int) (quant_matrix[j]))) >> 4; | |
6176 } | |
6177 block[j] = level; | |
6178 sum+=level; | |
6179 } | |
6180 } | |
6181 block[63]^=sum&1; | |
6182 } | |
6183 | |
6184 static void dct_unquantize_h263_intra_c(MpegEncContext *s, | |
6185 DCTELEM *block, int n, int qscale) | |
6186 { | |
6187 int i, level, qmul, qadd; | |
6188 int nCoeffs; | |
6189 | |
6190 assert(s->block_last_index[n]>=0); | |
6191 | |
6192 qmul = qscale << 1; | |
6193 | |
6194 if (!s->h263_aic) { | |
325 | 6195 if (n < 4) |
6196 block[0] = block[0] * s->y_dc_scale; | |
6197 else | |
6198 block[0] = block[0] * s->c_dc_scale; | |
1689 | 6199 qadd = (qscale - 1) | 1; |
6200 }else{ | |
6201 qadd = 0; | |
6202 } | |
6203 if(s->ac_pred) | |
6204 nCoeffs=63; | |
6205 else | |
6206 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; | |
6207 | |
6208 for(i=1; i<=nCoeffs; i++) { | |
6209 level = block[i]; | |
6210 if (level) { | |
6211 if (level < 0) { | |
6212 level = level * qmul - qadd; | |
6213 } else { | |
6214 level = level * qmul + qadd; | |
325 | 6215 } |
1689 | 6216 block[i] = level; |
325 | 6217 } |
6218 } | |
6219 } | |
6220 | |
1689 | 6221 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
|
6222 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
|
6223 { |
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
|
6224 int i, level, qmul, qadd; |
200 | 6225 int nCoeffs; |
249
42a0b7b16738
- Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents:
248
diff
changeset
|
6226 |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6227 assert(s->block_last_index[n]>=0); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6228 |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6229 qadd = (qscale - 1) | 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6230 qmul = qscale << 1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
704
diff
changeset
|
6231 |
1689 | 6232 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; |
6233 | |
6234 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
|
6235 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
|
6236 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
|
6237 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
|
6238 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
|
6239 } 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
|
6240 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
|
6241 } |
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 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
|
6243 } |
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 } |
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 } |
0 | 6246 |
1059 | 6247 static const AVOption mpeg4_options[] = |
6248 { | |
6249 AVOPTION_CODEC_INT("bitrate", "desired video bitrate", bit_rate, 4, 240000000, 800000), | |
6250 AVOPTION_CODEC_INT("ratetol", "number of bits the bitstream is allowed to diverge from the reference" | |
6251 "the reference can be CBR (for CBR pass1) or VBR (for pass2)", | |
6252 bit_rate_tolerance, 4, 240000000, 8000), | |
6253 AVOPTION_CODEC_INT("qmin", "minimum quantizer", qmin, 1, 31, 2), | |
6254 AVOPTION_CODEC_INT("qmax", "maximum quantizer", qmax, 1, 31, 31), | |
6255 AVOPTION_CODEC_STRING("rc_eq", "rate control equation", | |
6256 rc_eq, "tex^qComp,option1,options2", 0), | |
6257 AVOPTION_CODEC_INT("rc_minrate", "rate control minimum bitrate", | |
6258 rc_min_rate, 4, 24000000, 0), | |
6259 AVOPTION_CODEC_INT("rc_maxrate", "rate control maximum bitrate", | |
6260 rc_max_rate, 4, 24000000, 0), | |
1130 | 6261 AVOPTION_CODEC_DOUBLE("rc_buf_aggresivity", "rate control buffer aggresivity", |
6262 rc_buffer_aggressivity, 4, 24000000, 0), | |
6263 AVOPTION_CODEC_DOUBLE("rc_initial_cplx", "initial complexity for pass1 ratecontrol", | |
6264 rc_initial_cplx, 0., 9999999., 0), | |
6265 AVOPTION_CODEC_DOUBLE("i_quant_factor", "qscale factor between p and i frames", | |
6266 i_quant_factor, 0., 0., 0), | |
6267 AVOPTION_CODEC_DOUBLE("i_quant_offset", "qscale offset between p and i frames", | |
6268 i_quant_factor, -999999., 999999., 0), | |
6269 AVOPTION_CODEC_INT("dct_algo", "dct alghorithm", | |
6270 dct_algo, 0, 5, 0), // fixme - "Auto,FastInt,Int,MMX,MLib,Altivec" | |
6271 AVOPTION_CODEC_DOUBLE("lumi_masking", "luminance masking", | |
6272 lumi_masking, 0., 999999., 0), | |
6273 AVOPTION_CODEC_DOUBLE("temporal_cplx_masking", "temporary complexity masking", | |
6274 temporal_cplx_masking, 0., 999999., 0), | |
6275 AVOPTION_CODEC_DOUBLE("spatial_cplx_masking", "spatial complexity masking", | |
6276 spatial_cplx_masking, 0., 999999., 0), | |
6277 AVOPTION_CODEC_DOUBLE("p_masking", "p block masking", | |
6278 p_masking, 0., 999999., 0), | |
6279 AVOPTION_CODEC_DOUBLE("dark_masking", "darkness masking", | |
6280 dark_masking, 0., 999999., 0), | |
6281 AVOPTION_CODEC_INT("idct_algo", "idct alghorithm", | |
6282 idct_algo, 0, 8, 0), // fixme - "Auto,Int,Simple,SimpleMMX,LibMPEG2MMX,PS2,MLib,ARM,Altivec" | |
6283 | |
6284 AVOPTION_CODEC_INT("mb_qmin", "minimum MB quantizer", | |
6285 mb_qmin, 0, 8, 0), | |
6286 AVOPTION_CODEC_INT("mb_qmax", "maximum MB quantizer", | |
6287 mb_qmin, 0, 8, 0), | |
6288 | |
6289 AVOPTION_CODEC_INT("me_cmp", "ME compare function", | |
6290 me_cmp, 0, 24000000, 0), | |
6291 AVOPTION_CODEC_INT("me_sub_cmp", "subpixel ME compare function", | |
6292 me_sub_cmp, 0, 24000000, 0), | |
6293 | |
6294 | |
6295 AVOPTION_CODEC_INT("dia_size", "ME diamond size & shape", | |
6296 dia_size, 0, 24000000, 0), | |
6297 AVOPTION_CODEC_INT("last_predictor_count", "amount of previous MV predictors", | |
6298 last_predictor_count, 0, 24000000, 0), | |
6299 | |
6300 AVOPTION_CODEC_INT("pre_me", "pre pass for ME", | |
6301 pre_me, 0, 24000000, 0), | |
6302 AVOPTION_CODEC_INT("me_pre_cmp", "ME pre pass compare function", | |
6303 me_pre_cmp, 0, 24000000, 0), | |
6304 | |
6305 AVOPTION_CODEC_INT("me_range", "maximum ME search range", | |
6306 me_range, 0, 24000000, 0), | |
6307 AVOPTION_CODEC_INT("pre_dia_size", "ME pre pass diamod size & shape", | |
6308 pre_dia_size, 0, 24000000, 0), | |
6309 AVOPTION_CODEC_INT("me_subpel_quality", "subpel ME quality", | |
6310 me_subpel_quality, 0, 24000000, 0), | |
6311 AVOPTION_CODEC_INT("me_range", "maximum ME search range", | |
6312 me_range, 0, 24000000, 0), | |
1059 | 6313 AVOPTION_CODEC_FLAG("psnr", "calculate PSNR of compressed frames", |
6314 flags, CODEC_FLAG_PSNR, 0), | |
6315 AVOPTION_CODEC_RCOVERRIDE("rc_override", "ratecontrol override (=startframe,endframe,qscale,quality_factor)", | |
6316 rc_override), | |
1124
64c7c76ed17c
* 'externaly' visible option list begins avoptions_ prefix
kabi
parents:
1116
diff
changeset
|
6317 AVOPTION_SUB(avoptions_common), |
1059 | 6318 AVOPTION_END() |
6319 }; | |
6320 | |
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
|
6321 #ifdef CONFIG_ENCODERS |
1042 | 6322 #ifdef CONFIG_RISKY |
0 | 6323 AVCodec h263_encoder = { |
6324 "h263", | |
6325 CODEC_TYPE_VIDEO, | |
6326 CODEC_ID_H263, | |
6327 sizeof(MpegEncContext), | |
6328 MPV_encode_init, | |
6329 MPV_encode_picture, | |
6330 MPV_encode_end, | |
6331 }; | |
6332 | |
6333 AVCodec h263p_encoder = { | |
6334 "h263p", | |
6335 CODEC_TYPE_VIDEO, | |
6336 CODEC_ID_H263P, | |
6337 sizeof(MpegEncContext), | |
6338 MPV_encode_init, | |
6339 MPV_encode_picture, | |
6340 MPV_encode_end, | |
6341 }; | |
6342 | |
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6343 AVCodec flv_encoder = { |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6344 "flv", |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6345 CODEC_TYPE_VIDEO, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6346 CODEC_ID_FLV1, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6347 sizeof(MpegEncContext), |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6348 MPV_encode_init, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6349 MPV_encode_picture, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6350 MPV_encode_end, |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6351 }; |
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1344
diff
changeset
|
6352 |
0 | 6353 AVCodec rv10_encoder = { |
6354 "rv10", | |
6355 CODEC_TYPE_VIDEO, | |
6356 CODEC_ID_RV10, | |
6357 sizeof(MpegEncContext), | |
6358 MPV_encode_init, | |
6359 MPV_encode_picture, | |
6360 MPV_encode_end, | |
6361 }; | |
6362 | |
71 | 6363 AVCodec mpeg4_encoder = { |
6364 "mpeg4", | |
0 | 6365 CODEC_TYPE_VIDEO, |
71 | 6366 CODEC_ID_MPEG4, |
0 | 6367 sizeof(MpegEncContext), |
6368 MPV_encode_init, | |
6369 MPV_encode_picture, | |
6370 MPV_encode_end, | |
1059 | 6371 .options = mpeg4_options, |
2111 | 6372 .capabilities= CODEC_CAP_DELAY, |
0 | 6373 }; |
6374 | |
307 | 6375 AVCodec msmpeg4v1_encoder = { |
6376 "msmpeg4v1", | |
0 | 6377 CODEC_TYPE_VIDEO, |
307 | 6378 CODEC_ID_MSMPEG4V1, |
0 | 6379 sizeof(MpegEncContext), |
6380 MPV_encode_init, | |
6381 MPV_encode_picture, | |
6382 MPV_encode_end, | |
1130 | 6383 .options = mpeg4_options, |
0 | 6384 }; |
307 | 6385 |
6386 AVCodec msmpeg4v2_encoder = { | |
6387 "msmpeg4v2", | |
6388 CODEC_TYPE_VIDEO, | |
6389 CODEC_ID_MSMPEG4V2, | |
6390 sizeof(MpegEncContext), | |
6391 MPV_encode_init, | |
6392 MPV_encode_picture, | |
6393 MPV_encode_end, | |
1130 | 6394 .options = mpeg4_options, |
307 | 6395 }; |
6396 | |
6397 AVCodec msmpeg4v3_encoder = { | |
6398 "msmpeg4", | |
6399 CODEC_TYPE_VIDEO, | |
6400 CODEC_ID_MSMPEG4V3, | |
6401 sizeof(MpegEncContext), | |
6402 MPV_encode_init, | |
6403 MPV_encode_picture, | |
6404 MPV_encode_end, | |
1130 | 6405 .options = mpeg4_options, |
307 | 6406 }; |
499 | 6407 |
6408 AVCodec wmv1_encoder = { | |
6409 "wmv1", | |
6410 CODEC_TYPE_VIDEO, | |
6411 CODEC_ID_WMV1, | |
6412 sizeof(MpegEncContext), | |
6413 MPV_encode_init, | |
6414 MPV_encode_picture, | |
6415 MPV_encode_end, | |
1130 | 6416 .options = mpeg4_options, |
499 | 6417 }; |
6418 | |
1042 | 6419 #endif |
6420 | |
6421 AVCodec mjpeg_encoder = { | |
6422 "mjpeg", | |
6423 CODEC_TYPE_VIDEO, | |
6424 CODEC_ID_MJPEG, | |
6425 sizeof(MpegEncContext), | |
6426 MPV_encode_init, | |
6427 MPV_encode_picture, | |
6428 MPV_encode_end, | |
6429 }; | |
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
|
6430 |
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
|
6431 #endif //CONFIG_ENCODERS |