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