annotate mpegvideo.c @ 3070:3c32ecc8eefe libavcodec

fix crash on height < 16 pixels.
author lorenm
date Sat, 28 Jan 2006 00:57:59 +0000
parents 1363655b443c
children befacb1cb573
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * The simplest mpeg encoder (well, it was the simplest!)
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
5 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
6 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
8 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
9 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
10 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
11 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
14 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
15 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * License along with this library; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3011
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
19 *
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
20 * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
21 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
22
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
23 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
24 * @file mpegvideo.c
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
25 * The simplest mpeg encoder (well, it was the simplest!).
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
26 */
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
27
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
28 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
30 #include "mpegvideo.h"
1557
5d53c03186a1 floating point AAN DCT
michael
parents: 1556
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
44 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
45 DCTELEM *block, int n, int qscale);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
46 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
47 DCTELEM *block, int n, int qscale);
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
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
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
50 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
51 DCTELEM *block, int n, int qscale);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
52 static void dct_unquantize_h263_intra_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
53 DCTELEM *block, int n, int qscale);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
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
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
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
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
58 static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
59 static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
60 static int dct_quantize_refine(MpegEncContext *s, DCTELEM *block, int16_t *weight, DCTELEM *orig, int n, int qscale);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
61 static int sse_mb(MpegEncContext *s);
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
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
994aa8623443 (commit by michael)
arpi_esp
parents: 200
diff changeset
64
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
65 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
66 extern int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
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
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
69 #endif
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
70
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
71 void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, int w)= draw_edges_c;
206
994aa8623443 (commit by michael)
arpi_esp
parents: 200
diff changeset
72
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
73
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 /* enable all paranoid tests for rounding, overflows, etc... */
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 //#define PARANOID
986e461dc072 Initial revision
glantau
parents:
diff changeset
76
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 //#define DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
78
321
2b00e171b1d4 - ME method compatibility with legacy apps.
pulento
parents: 320
diff changeset
79
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 /* for jpeg fast DCT */
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 #define CONST_BITS 14
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 /* precomputed values scaled up by 14 bits */
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520,
986e461dc072 Initial revision
glantau
parents:
diff changeset
86 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270,
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906,
986e461dc072 Initial revision
glantau
parents:
diff changeset
88 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315,
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520,
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552,
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
91 8867 , 12299, 11585, 10426, 8867, 6967, 4799, 2446,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
92 4520 , 6270, 5906, 5315, 4520, 3552, 2446, 1247
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
96 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
99
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
100 static const uint8_t ff_default_chroma_qscale_table[32]={
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
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
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
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
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
103 };
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
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
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1160
diff changeset
106 static uint8_t (*default_mv_penalty)[MAX_MV*2+1]=NULL;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
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
6129c88a6393 get_format()
michaelni
parents: 956
diff changeset
109 enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1};
6129c88a6393 get_format()
michaelni
parents: 956
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 {
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
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
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
118 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
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 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
130
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
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
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
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
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
141 /* 16 <= qscale * quant_matrix[i] <= 7905 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
142 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
143 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
144 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
145
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
146 qmat[qscale][i] = (int)((uint64_t_C(1) << (QMAT_SHIFT + 14)) /
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
147 (aanscales[i] * qscale * quant_matrix[j]));
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
148 }
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
149 } else {
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
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
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
152 /* We can safely suppose that 16 <= quant_matrix[i] <= 255
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
153 So 16 <= qscale * quant_matrix[i] <= 7905
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
154 so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
155 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
156 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
157 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j]));
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
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
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
163 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
165
2385
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
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
167 int64_t max= 8191;
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
168 if (dsp->fdct == fdct_ifast
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
169 #ifndef FAAN_POSTSCALE
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
170 || dsp->fdct == ff_faandct
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
171 #endif
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
172 ) {
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
173 max= (8191LL*aanscales[i]) >> 14;
ce45e1dd4b09 quantizer overflow warning + AAN dct fix
michael
parents: 2385
diff changeset
174 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
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);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
188
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
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
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
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;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
196
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
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
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
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 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
207
706
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
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
218 void ff_write_quant_matrix(PutBitContext *pb, int16_t *matrix){
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
219 int i;
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
220
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
221 if(matrix){
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
222 put_bits(pb, 1, 1);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
223 for(i=0;i<64;i++) {
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
224 put_bits(pb, 8, matrix[ ff_zigzag_direct[i] ]);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
225 }
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
226 }else
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
227 put_bits(pb, 1, 0);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
228 }
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1523
diff changeset
229 #endif //CONFIG_ENCODERS
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
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
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
234 s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
235 s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
236 s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
237 s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
238 s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
239 s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
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
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
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
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
245
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
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
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 7
diff changeset
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
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
258 #ifdef ARCH_ARMV4L
874
8cc0d241da37 * compilation fix (ARM users please check)
kabi
parents: 862
diff changeset
259 MPV_common_init_armv4l(s);
730
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
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
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
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
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 1002
diff changeset
266 s->fast_dct_quantize= s->dct_quantize;
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 1002
diff changeset
267
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
268 if(s->flags&CODEC_FLAG_TRELLIS_QUANT){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
269 s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_*
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
270 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
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
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
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
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
277 if(s->alternate_scan){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
278 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_alternate_vertical_scan);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
279 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_alternate_vertical_scan);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
280 }else{
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
281 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
282 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
283 }
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
284 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
285 ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, ff_alternate_vertical_scan);
591
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 588
diff changeset
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
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
298 dst->pict_type = src->pict_type;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
299 dst->quality = src->quality;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
300 dst->coded_picture_number = src->coded_picture_number;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
301 dst->display_picture_number = src->display_picture_number;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
302 // dst->reference = src->reference;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
303 dst->pts = src->pts;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
304 dst->interlaced_frame = src->interlaced_frame;
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
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]));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
319
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
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
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1947
diff changeset
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
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
332 }
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
333
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
334 /**
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
335 * allocates a Picture
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
336 * The pixels are allocated/set by calling get_buffer() if shared=0
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
337 */
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
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
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
341 const int b8_array_size= s->b8_stride*s->mb_height*2;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
342 const int b4_array_size= s->b4_stride*s->mb_height*4;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
343 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
344
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
345 if(shared){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
346 assert(pic->data[0]);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
347 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
348 pic->type= FF_BUFFER_TYPE_SHARED;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
349 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
350 int r;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
351
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
352 assert(!pic->data[0]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
353
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
354 r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
355
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
356 if(r<0 || !pic->age || !pic->type || !pic->data[0]){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
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
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
358 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
359 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
360
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
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
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
363 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
364 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
365
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
366 if(pic->linesize[1] != pic->linesize[2]){
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
367 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed (uv stride mismatch)\n");
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
368 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
369 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
370
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
371 s->linesize = pic->linesize[0];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
372 s->uvlinesize= pic->linesize[1];
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
373 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
374
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
375 if(pic->qscale_table==NULL){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
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
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
380 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
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
e39651dd13a9 type fixes, found by Wolfgang Hesseler
michael
parents: 1739
diff changeset
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
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
386 if(s->out_format == FMT_H264){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
387 for(i=0; i<2; i++){
2570
682c57163e60 alignment fix
michael
parents: 2552
diff changeset
388 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+4) * sizeof(int16_t))
682c57163e60 alignment fix
michael
parents: 2552
diff changeset
389 pic->motion_val[i]= pic->motion_val_base[i]+4;
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1947
diff changeset
390 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t))
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
391 }
1669
072666f04bca motion_subsample_log2
michael
parents: 1668
diff changeset
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
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
394 for(i=0; i<2; i++){
2570
682c57163e60 alignment fix
michael
parents: 2552
diff changeset
395 CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b8_array_size+4) * sizeof(int16_t))
682c57163e60 alignment fix
michael
parents: 2552
diff changeset
396 pic->motion_val[i]= pic->motion_val_base[i]+4;
1948
d10578f7fd40 exporting field_select/ref_index values
michael
parents: 1947
diff changeset
397 CHECKED_ALLOCZ(pic->ref_index[i], b8_array_size * sizeof(uint8_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
398 }
1669
072666f04bca motion_subsample_log2
michael
parents: 1668
diff changeset
399 pic->motion_subsample_log2= 3;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
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
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1542
diff changeset
405 CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan))
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
406 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
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
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
413
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
414 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
415 fail: //for the CHECKED_ALLOCZ macro
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
416 return -1;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
417 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
418
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
419 /**
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
420 * deallocates a picture
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
421 */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
422 static void free_picture(MpegEncContext *s, Picture *pic){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
423 int i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
424
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
425 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
426 s->avctx->release_buffer(s->avctx, (AVFrame*)pic);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
427 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
428
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
429 av_freep(&pic->mb_var);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
430 av_freep(&pic->mc_mb_var);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
431 av_freep(&pic->mb_mean);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
432 av_freep(&pic->mbskip_table);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
433 av_freep(&pic->qscale_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
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
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1542
diff changeset
436 av_freep(&pic->pan_scan);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
437 pic->mb_type= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
438 for(i=0; i<2; i++){
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
439 av_freep(&pic->motion_val_base[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
440 av_freep(&pic->ref_index[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
441 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
442
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
443 if(pic->type == FF_BUFFER_TYPE_SHARED){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
444 for(i=0; i<4; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
445 pic->base[i]=
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
446 pic->data[i]= NULL;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
447 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
448 pic->type= 0;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
449 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
450 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
451
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
452 static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
453 int i;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
454
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
455 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
456 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
457 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
458
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
459 //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer()
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
460 CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t))
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
461 s->rd_scratchpad= s->me.scratchpad;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
462 s->b_scratchpad= s->me.scratchpad;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
463 s->obmc_scratchpad= s->me.scratchpad + 16;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
464 if (s->encoding) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
465 CHECKED_ALLOCZ(s->me.map , ME_MAP_SIZE*sizeof(uint32_t))
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
466 CHECKED_ALLOCZ(s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t))
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
467 if(s->avctx->noise_reduction){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
468 CHECKED_ALLOCZ(s->dct_error_sum, 2 * 64 * sizeof(int))
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
469 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
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
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
472 s->block= s->blocks[0];
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
473
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
474 for(i=0;i<12;i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
475 s->pblocks[i] = (short *)(&s->block[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
476 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
477 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
478 fail:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
479 return -1; //free() through MPV_common_end()
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
480 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
481
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
482 static void free_duplicate_context(MpegEncContext *s){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
483 if(s==NULL) return;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
484
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
485 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
486 av_freep(&s->me.scratchpad);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
487 s->rd_scratchpad=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
488 s->b_scratchpad=
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
489 s->obmc_scratchpad= NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
490
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
491 av_freep(&s->dct_error_sum);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
492 av_freep(&s->me.map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
493 av_freep(&s->me.score_map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
494 av_freep(&s->blocks);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
495 s->block= NULL;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
496 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
497
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
498 static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
499 #define COPY(a) bak->a= src->a
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
500 COPY(allocated_edge_emu_buffer);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
501 COPY(edge_emu_buffer);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
502 COPY(me.scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
503 COPY(rd_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
504 COPY(b_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
505 COPY(obmc_scratchpad);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
506 COPY(me.map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
507 COPY(me.score_map);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
508 COPY(blocks);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
509 COPY(block);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
510 COPY(start_mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
511 COPY(end_mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
512 COPY(me.map_generation);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
513 COPY(pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
514 COPY(dct_error_sum);
1810
fc6b38b5dd40 noise reduction with threads bugfix
michael
parents: 1805
diff changeset
515 COPY(dct_count[0]);
fc6b38b5dd40 noise reduction with threads bugfix
michael
parents: 1805
diff changeset
516 COPY(dct_count[1]);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
517 #undef COPY
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
518 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
519
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
520 void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
521 MpegEncContext bak;
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
522 int i;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
523 //FIXME copy only needed parts
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
524 //START_TIMER
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
525 backup_duplicate_context(&bak, dst);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
526 memcpy(dst, src, sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
527 backup_duplicate_context(dst, &bak);
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
528 for(i=0;i<12;i++){
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
529 dst->pblocks[i] = (short *)(&dst->block[i]);
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
530 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
531 //STOP_TIMER("update_duplicate_context") //about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
532 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
533
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
534 static void update_duplicate_context_after_me(MpegEncContext *dst, MpegEncContext *src){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
535 #define COPY(a) dst->a= src->a
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
536 COPY(pict_type);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
537 COPY(current_picture);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
538 COPY(f_code);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
539 COPY(b_code);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
540 COPY(qscale);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
541 COPY(lambda);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
542 COPY(lambda2);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
543 COPY(picture_in_gop_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
544 COPY(gop_picture_number);
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
545 COPY(frame_pred_frame_dct); //FIXME don't set in encode_header
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
546 COPY(progressive_frame); //FIXME don't set in encode_header
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
547 COPY(partitioned_frame); //FIXME don't set in encode_header
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
548 #undef COPY
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
549 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
550
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
551 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
552 * sets the given MpegEncContext to common defaults (same for encoding and decoding).
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
553 * the changed fields will not depend upon the prior state of the MpegEncContext.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
554 */
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
555 static void MPV_common_defaults(MpegEncContext *s){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
556 s->y_dc_scale_table=
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
557 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
558 s->chroma_qscale_table= ff_default_chroma_qscale_table;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
559 s->progressive_frame= 1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
560 s->progressive_sequence= 1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
561 s->picture_structure= PICT_FRAME;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
562
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
563 s->coded_picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
564 s->picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
565 s->input_picture_number = 0;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
566
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
567 s->picture_in_gop_number = 0;
1894
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
568
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
569 s->f_code = 1;
3135de68d556 moving f/b_code init to where it should be
michael
parents: 1892
diff changeset
570 s->b_code = 1;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
571 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
572
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
573 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
574 * sets the given MpegEncContext to defaults for decoding.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
575 * the changed fields will not depend upon the prior state of the MpegEncContext.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
576 */
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
577 void MPV_decode_defaults(MpegEncContext *s){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
578 MPV_common_defaults(s);
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
579 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
580
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
581 /**
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
582 * sets the given MpegEncContext to defaults for encoding.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
583 * the changed fields will not depend upon the prior state of the MpegEncContext.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
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
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
588 static int done=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
589
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
590 MPV_common_defaults(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
591
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
592 if(!done){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
593 int i;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
594 done=1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
595
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
596 default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) );
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
597 memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1));
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
598
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
599 for(i=-16; i<16; i++){
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
600 default_fcode_tab[i + MAX_MV]= 1;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
601 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
602 }
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
603 s->me.mv_penalty= default_mv_penalty;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
604 s->fcode_tab= default_fcode_tab;
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
605 }
1902
a5588762c4fa Compile fix by (Chip <szarlada at freemail dot hu>)
michael
parents: 1894
diff changeset
606 #endif //CONFIG_ENCODERS
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
607
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
608 /**
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
609 * init common structure for both encoder and decoder.
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
610 * this assumes that some variables like width/height are already set
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
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
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
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
3070
3c32ecc8eefe fix crash on height < 16 pixels.
lorenm
parents: 3069
diff changeset
616 s->mb_height = (s->height + 15) / 16;
3c32ecc8eefe fix crash on height < 16 pixels.
lorenm
parents: 3069
diff changeset
617
3c32ecc8eefe fix crash on height < 16 pixels.
lorenm
parents: 3069
diff changeset
618 if(s->avctx->thread_count > MAX_THREADS || (s->avctx->thread_count > s->mb_height && s->mb_height)){
1989
michael
parents: 1988
diff changeset
619 av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
michael
parents: 1988
diff changeset
620 return -1;
michael
parents: 1988
diff changeset
621 }
michael
parents: 1988
diff changeset
622
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
623 if((s->width || s->height) && avcodec_check_dimensions(s->avctx, s->width, s->height))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
624 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
625
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
626 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
627 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
628
754
b2767c9d6455 init flags before using it (found by arpi)
michaelni
parents: 753
diff changeset
629 s->flags= s->avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
630 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
631
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
632 s->mb_width = (s->width + 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
633 s->mb_stride = s->mb_width + 1;
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
634 s->b8_stride = s->mb_width*2 + 1;
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
635 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
636 mb_array_size= s->mb_height * s->mb_stride;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
637 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
638
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
639 /* set chroma shifts */
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
640 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
641 &(s->chroma_y_shift) );
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
642
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
643 /* 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
644 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
645 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
646
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
647 s->mb_num = s->mb_width * s->mb_height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
648
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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[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
650 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
651 s->block_wrap[2]=
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
652 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
653 s->block_wrap[4]=
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
654 s->block_wrap[5]= s->mb_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
655
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
656 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
657 c_size = s->mb_stride * (s->mb_height + 1);
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
658 yc_size = y_size + 2 * c_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
659
701
85b071dfc7e3 ff_get_fourcc() & XVIX support
michaelni
parents: 697
diff changeset
660 /* convert fourcc to upper case */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
661 s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF)
1116
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
662 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 )
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
663 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16)
1116
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
664 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24);
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
665
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
666 s->avctx->stream_codec_tag= toupper( s->avctx->stream_codec_tag &0xFF)
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
667 + (toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 )
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
668 + (toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16)
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
669 + (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
670
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
671 s->avctx->coded_frame= (AVFrame*)&s->current_picture;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
672
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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 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
674 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
675 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
676 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
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 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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 s->mb_index2xy[ s->mb_height*s->mb_width ] = (s->mb_height-1)*s->mb_stride + s->mb_width; //FIXME really needed?
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
680
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
681 if (s->encoding) {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
682 /* 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
683 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
684 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
685 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
686 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
687 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
688 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
689 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
690 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
691 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
692 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
693 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
694 s->b_direct_mv_table = s->b_direct_mv_table_base + s->mb_stride + 1;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
695
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
696 if(s->msmpeg4_version){
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
697 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
698 }
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
699 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
700
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
701 /* Allocate MB type table */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
702 CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint16_t)) //needed for encoding
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
703
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
704 CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int))
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
705
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
706 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
707 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
708 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
709 CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t))
1556
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
710 CHECKED_ALLOCZ(s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*))
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
711 CHECKED_ALLOCZ(s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*))
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
712
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
713 if(s->avctx->noise_reduction){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
714 CHECKED_ALLOCZ(s->dct_offset, 2 * 64 * sizeof(uint16_t))
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
715 }
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
716 }
1552
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
717 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
718
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
719 CHECKED_ALLOCZ(s->error_status_table, mb_array_size*sizeof(uint8_t))
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
720
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
721 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
722 /* interlaced direct mode decoding tables */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
723 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
724 int j, k;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
725 for(j=0; j<2; j++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
726 for(k=0; k<2; k++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
727 CHECKED_ALLOCZ(s->b_field_mv_table_base[i][j][k] , mv_table_size * 2 * sizeof(int16_t))
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
728 s->b_field_mv_table[i][j][k] = s->b_field_mv_table_base[i][j][k] + s->mb_stride + 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
729 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
730 CHECKED_ALLOCZ(s->b_field_select_table[i][j] , mb_array_size * 2 * sizeof(uint8_t))
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
731 CHECKED_ALLOCZ(s->p_field_mv_table_base[i][j] , mv_table_size * 2 * sizeof(int16_t))
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
732 s->p_field_mv_table[i][j] = s->p_field_mv_table_base[i][j] + s->mb_stride + 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
733 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
734 CHECKED_ALLOCZ(s->p_field_select_table[i] , mb_array_size * 2 * sizeof(uint8_t))
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
735 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
736 }
767
c75c3f1bef4b regression test for H263+
michaelni
parents: 766
diff changeset
737 if (s->out_format == FMT_H263) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
738 /* ac values */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
739 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
740 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
741 s->ac_val[1] = s->ac_val_base + y_size + s->mb_stride + 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
742 s->ac_val[2] = s->ac_val[1] + c_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
743
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
744 /* cbp values */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
745 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
746 s->coded_block= s->coded_block_base + s->b8_stride + 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
747
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
748 /* 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
749 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
750 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
751 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
752
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
753 if (s->h263_pred || s->h263_plus || !s->encoding) {
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
754 /* dc values */
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
755 //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
756 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
757 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
758 s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1;
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
759 s->dc_val[2] = s->dc_val[1] + c_size;
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
760 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
761 s->dc_val_base[i] = 1024;
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
762 }
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
763
611
3214d3f4519e error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents: 608
diff changeset
764 /* 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
765 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
766 memset(s->mbintra_table, 1, mb_array_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
767
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
768 /* 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
769 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
770 //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
771 CHECKED_ALLOCZ(s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
772
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 828
diff changeset
773 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
774 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
775 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
776 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
777 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
778 }
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 828
diff changeset
779
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
780 s->context_initialized = 1;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
781
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
782 s->thread_context[0]= s;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
783 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
784 s->thread_context[i]= av_malloc(sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
785 memcpy(s->thread_context[i], s, sizeof(MpegEncContext));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
786 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
787
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
788 for(i=0; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
789 if(init_duplicate_context(s->thread_context[i], s) < 0)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
790 goto fail;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
791 s->thread_context[i]->start_mb_y= (s->mb_height*(i ) + s->avctx->thread_count/2) / s->avctx->thread_count;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
792 s->thread_context[i]->end_mb_y = (s->mb_height*(i+1) + s->avctx->thread_count/2) / s->avctx->thread_count;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
793 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
794
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
795 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
796 fail:
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
797 MPV_common_end(s);
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
798 return -1;
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
799 }
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
800
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
801 /* init common structure for both encoder and decoder */
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
802 void MPV_common_end(MpegEncContext *s)
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
803 {
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
804 int i, j, k;
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
805
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
806 for(i=0; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
807 free_duplicate_context(s->thread_context[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
808 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
809 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
810 av_freep(&s->thread_context[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
811 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
812
1344
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
813 av_freep(&s->parse_context.buffer);
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
814 s->parse_context.buffer_size=0;
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
815
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
816 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
817 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
818 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
819 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
820 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
821 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
822 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
823 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
824 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
825 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
826 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
827 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
828 s->b_direct_mv_table= NULL;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
829 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
830 for(j=0; j<2; j++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
831 for(k=0; k<2; k++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
832 av_freep(&s->b_field_mv_table_base[i][j][k]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
833 s->b_field_mv_table[i][j][k]=NULL;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
834 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
835 av_freep(&s->b_field_select_table[i][j]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
836 av_freep(&s->p_field_mv_table_base[i][j]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
837 s->p_field_mv_table[i][j]=NULL;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
838 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
839 av_freep(&s->p_field_select_table[i]);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
840 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
841
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
842 av_freep(&s->dc_val_base);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
843 av_freep(&s->ac_val_base);
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
844 av_freep(&s->coded_block_base);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
845 av_freep(&s->mbintra_table);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
846 av_freep(&s->cbp_table);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
847 av_freep(&s->pred_dir_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
848
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
849 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
850 av_freep(&s->prev_pict_types);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
851 av_freep(&s->bitstream_buffer);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
852 s->allocated_bitstream_buffer_size=0;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
853
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
854 av_freep(&s->avctx->stats_out);
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
855 av_freep(&s->ac_stats);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
856 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
857 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
858 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
859 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
860 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
861 av_freep(&s->q_intra_matrix16);
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
862 av_freep(&s->q_inter_matrix16);
1556
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
863 av_freep(&s->input_picture);
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
864 av_freep(&s->reordered_input_picture);
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
865 av_freep(&s->dct_offset);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
866
1573
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
867 if(s->picture){
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
868 for(i=0; i<MAX_PICTURE_COUNT; i++){
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
869 free_picture(s, &s->picture[i]);
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
870 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
871 }
1552
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
872 av_freep(&s->picture);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
873 s->context_initialized = 0;
1523
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
874 s->last_picture_ptr=
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
875 s->next_picture_ptr=
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
876 s->current_picture_ptr= NULL;
2231
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
877 s->linesize= s->uvlinesize= 0;
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
878
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
879 for(i=0; i<3; i++)
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
880 av_freep(&s->visualization_buffer[i]);
2231
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
881
c87bab25f89f changing size segfault fix
michael
parents: 2230
diff changeset
882 avcodec_default_free_buffers(s->avctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
883 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
884
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
885 #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
886
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
887 /* init video encoder */
986e461dc072 Initial revision
glantau
parents:
diff changeset
888 int MPV_encode_init(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
889 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
890 MpegEncContext *s = avctx->priv_data;
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2807
diff changeset
891 int i;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
892 int chroma_h_shift, chroma_v_shift;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
893
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
894 MPV_encode_defaults(s);
315
40d8092e2ff0 * using pixtype as enum - by Philip Gladstone
kabi
parents: 312
diff changeset
895
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
896 if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUV420P){
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
897 av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n");
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
898 return -1;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
899 }
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
900
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
901 if(avctx->codec_id == CODEC_ID_MJPEG || avctx->codec_id == CODEC_ID_LJPEG){
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2654
diff changeset
902 if(avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL && avctx->pix_fmt != PIX_FMT_YUVJ420P){
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
903 av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n");
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
904 return -1;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
905 }
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
906 }else{
2658
d1609cfeb1d0 #defines for strict_std_compliance and split between inofficial extensions and non standarized things
michael
parents: 2654
diff changeset
907 if(avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL && avctx->pix_fmt != PIX_FMT_YUV420P){
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
908 av_log(avctx, AV_LOG_ERROR, "colorspace not supported\n");
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
909 return -1;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
910 }
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
911 }
1402
f662e9c86cf2 * fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents: 1397
diff changeset
912
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
913 s->bit_rate = avctx->bit_rate;
986e461dc072 Initial revision
glantau
parents:
diff changeset
914 s->width = avctx->width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
915 s->height = avctx->height;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
916 if(avctx->gop_size > 600){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
917 av_log(avctx, AV_LOG_ERROR, "Warning keyframe interval too large! reducing it ...\n");
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
918 avctx->gop_size=600;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
919 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
920 s->gop_size = avctx->gop_size;
194
27d1773552c9 mpeg4 encoder fix by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents: 191
diff changeset
921 s->avctx = avctx;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
922 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
923 s->flags2= avctx->flags2;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
924 s->max_b_frames= avctx->max_b_frames;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
925 s->codec_id= avctx->codec->id;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
926 s->luma_elim_threshold = avctx->luma_elim_threshold;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
927 s->chroma_elim_threshold= avctx->chroma_elim_threshold;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
928 s->strict_std_compliance= avctx->strict_std_compliance;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
929 s->data_partitioning= avctx->flags & CODEC_FLAG_PART;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
930 s->quarter_sample= (avctx->flags & CODEC_FLAG_QPEL)!=0;
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
931 s->mpeg_quant= avctx->mpeg_quant;
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
932 s->rtp_mode= !!avctx->rtp_payload_size;
1992
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1991
diff changeset
933 s->intra_dc_precision= avctx->intra_dc_precision;
2243
b8bad8bbbc64 check if the user specified timestamps are strictly monotone
michael
parents: 2235
diff changeset
934 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
935
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
936 if (s->gop_size <= 1) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
937 s->intra_only = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
938 s->gop_size = 12;
986e461dc072 Initial revision
glantau
parents:
diff changeset
939 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
940 s->intra_only = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
941 }
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
942
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
943 s->me_method = avctx->me_method;
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
944
320
cda7d0857baf - ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents: 315
diff changeset
945 /* Fixed QSCALE */
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
946 s->fixed_qscale = !!(avctx->flags & CODEC_FLAG_QSCALE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
947
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
948 s->adaptive_quant= ( s->avctx->lumi_masking
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
949 || s->avctx->dark_masking
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
950 || s->avctx->temporal_cplx_masking
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
951 || s->avctx->spatial_cplx_masking
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
952 || s->avctx->p_masking
2493
258120c61eea Border processing adaptive quant patch by (Christophe Massiot |cmassiot freebox fr)
michael
parents: 2492
diff changeset
953 || s->avctx->border_masking
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
954 || (s->flags&CODEC_FLAG_QP_RD))
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
955 && !s->fixed_qscale;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
956
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
957 s->obmc= !!(s->flags & CODEC_FLAG_OBMC);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
958 s->loop_filter= !!(s->flags & CODEC_FLAG_LOOP_FILTER);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
959 s->alternate_scan= !!(s->flags & CODEC_FLAG_ALT_SCAN);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
960
1711
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
961 if(avctx->rc_max_rate && !avctx->rc_buffer_size){
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
962 av_log(avctx, AV_LOG_ERROR, "a vbv buffer size is needed, for encoding with a maximum bitrate\n");
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
963 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
964 }
1711
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
965
f2f8eddf1b13 rate limit tips and checks
michael
parents: 1708
diff changeset
966 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
967 av_log(avctx, AV_LOG_INFO, "Warning min_rate > 0 but min_rate != max_rate isn't recommended!\n");
1907
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
968 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
969
2063
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
970 if(avctx->rc_min_rate && avctx->rc_min_rate > avctx->bit_rate){
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
971 av_log(avctx, AV_LOG_INFO, "bitrate below min bitrate\n");
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
972 return -1;
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
973 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
974
2063
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
975 if(avctx->rc_max_rate && avctx->rc_max_rate < avctx->bit_rate){
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
976 av_log(avctx, AV_LOG_INFO, "bitrate above max bitrate\n");
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
977 return -1;
99556d33f102 sanity checks
michael
parents: 2054
diff changeset
978 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
979
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
980 if( s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate
1907
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
981 && (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO)
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
982 && 90000LL * (avctx->rc_buffer_size-1) > s->avctx->rc_max_rate*0xFFFFLL){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
983
1907
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
984 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");
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
985 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
986
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
987 if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4
1790
be1f5b6137e1 - made --extra-cflags option work on darwin
michael
parents: 1786
diff changeset
988 && 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
989 av_log(avctx, AV_LOG_ERROR, "4MV not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
990 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
991 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
992
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
993 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
994 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with simple mb decision\n");
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
995 return -1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
996 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
997
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
998 if(s->obmc && s->codec_id != CODEC_ID_H263 && s->codec_id != CODEC_ID_H263P){
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
999 av_log(avctx, AV_LOG_ERROR, "OBMC is only supported with H263(+)\n");
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1000 return -1;
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1001 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1002
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1003 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
1004 av_log(avctx, AV_LOG_ERROR, "qpel not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1005 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1006 }
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1007
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1008 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
1009 av_log(avctx, AV_LOG_ERROR, "data partitioning not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1010 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1011 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1012
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1013 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
1014 av_log(avctx, AV_LOG_ERROR, "b frames not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1015 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1016 }
1958
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1017
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1018 if((s->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN))
1958
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1019 && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO){
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1020 av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1021 return -1;
57ffe72703e0 sanity check
michael
parents: 1955
diff changeset
1022 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1023
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1024 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
1025 av_log(avctx, AV_LOG_ERROR, "mpeg2 style quantization not supported by codec\n");
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1026 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
1027 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1028
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
1029 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
1030 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
1031 return -1;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
1032 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
1033
1622
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1034 if((s->flags & CODEC_FLAG_QP_RD) && s->avctx->mb_decision != FF_MB_DECISION_RD){
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1035 av_log(avctx, AV_LOG_ERROR, "QP RD needs mbd=2\n");
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1036 return -1;
f4794fafc4ce qprd needs mbd=2
michael
parents: 1617
diff changeset
1037 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1038
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
1039 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
1040 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
1041 return -1;
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
1042 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1043
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1044 if(s->avctx->thread_count > 1 && s->codec_id != CODEC_ID_MPEG4
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1045 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1046 && (s->codec_id != CODEC_ID_H263P || !(s->flags & CODEC_FLAG_H263P_SLICE_STRUCT))){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1047 av_log(avctx, AV_LOG_ERROR, "multi threaded encoding not supported by codec\n");
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1048 return -1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1049 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1050
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1051 if(s->avctx->thread_count > 1)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1052 s->rtp_mode= 1;
1760
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1053
2637
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
1054 if(!avctx->time_base.den || !avctx->time_base.num){
2450
e248c6250232 framerate check
michael
parents: 2442
diff changeset
1055 av_log(avctx, AV_LOG_ERROR, "framerate not set\n");
e248c6250232 framerate check
michael
parents: 2442
diff changeset
1056 return -1;
e248c6250232 framerate check
michael
parents: 2442
diff changeset
1057 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1058
2576
e237d9bd0f8c check mb/me_threshold range, fixes assertion failure
michael
parents: 2570
diff changeset
1059 i= (INT_MAX/2+128)>>8;
e237d9bd0f8c check mb/me_threshold range, fixes assertion failure
michael
parents: 2570
diff changeset
1060 if(avctx->me_threshold >= i){
e237d9bd0f8c check mb/me_threshold range, fixes assertion failure
michael
parents: 2570
diff changeset
1061 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
1062 return -1;
e237d9bd0f8c check mb/me_threshold range, fixes assertion failure
michael
parents: 2570
diff changeset
1063 }
e237d9bd0f8c check mb/me_threshold range, fixes assertion failure
michael
parents: 2570
diff changeset
1064 if(avctx->mb_threshold >= i){
e237d9bd0f8c check mb/me_threshold range, fixes assertion failure
michael
parents: 2570
diff changeset
1065 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
1066 return -1;
e237d9bd0f8c check mb/me_threshold range, fixes assertion failure
michael
parents: 2570
diff changeset
1067 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1068
2668
b4d7d4d05d95 b_frame_strategy sanity check
michael
parents: 2658
diff changeset
1069 if(avctx->b_frame_strategy && (avctx->flags&CODEC_FLAG_PASS2)){
3069
1363655b443c Add a newline to b_frame_strategy error message.
corey
parents: 3068
diff changeset
1070 av_log(avctx, AV_LOG_ERROR, "b_frame_strategy must be 0 on the second pass\n");
2668
b4d7d4d05d95 b_frame_strategy sanity check
michael
parents: 2658
diff changeset
1071 return -1;
b4d7d4d05d95 b_frame_strategy sanity check
michael
parents: 2658
diff changeset
1072 }
b4d7d4d05d95 b_frame_strategy sanity check
michael
parents: 2658
diff changeset
1073
2637
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
1074 i= ff_gcd(avctx->time_base.den, avctx->time_base.num);
1760
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1075 if(i > 1){
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1076 av_log(avctx, AV_LOG_INFO, "removing common factors from framerate\n");
2637
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
1077 avctx->time_base.den /= i;
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
1078 avctx->time_base.num /= i;
1760
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1079 // return -1;
ebe7fa49ddcc mpeg4 pts fix
michael
parents: 1757
diff changeset
1080 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1081
1150
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1082 if(s->codec_id==CODEC_ID_MJPEG){
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1083 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1084 s->inter_quant_bias= 0;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1085 }else if(s->mpeg_quant || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO){
1150
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1086 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1087 s->inter_quant_bias= 0;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1088 }else{
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1089 s->intra_quant_bias=0;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1090 s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1091 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1092
1150
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1093 if(avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1094 s->intra_quant_bias= avctx->intra_quant_bias;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1095 if(avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
1096 s->inter_quant_bias= avctx->inter_quant_bias;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1097
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1098 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
1099
2653
2515af7d3238 complain about mpeg4 limits only if codec_id == MPEG4
michael
parents: 2639
diff changeset
1100 if(avctx->codec_id == CODEC_ID_MPEG4 && s->avctx->time_base.den > (1<<16)-1){
2637
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
1101 av_log(avctx, AV_LOG_ERROR, "timebase not supported by mpeg 4 standard\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1102 return -1;
2637
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
1103 }
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
1104 s->time_increment_bits = av_log2(s->avctx->time_base.den - 1) + 1;
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
1105
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1106 switch(avctx->codec->id) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1107 case CODEC_ID_MPEG1VIDEO:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1108 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
1109 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
1110 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1111 break;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1112 case CODEC_ID_MPEG2VIDEO:
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1113 s->out_format = FMT_MPEG1;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1114 s->low_delay= 0; //s->max_b_frames ? 0 : 1;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1115 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
1116 s->rtp_mode= 1;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1117 break;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1118 case CODEC_ID_LJPEG:
2973
michael
parents: 2972
diff changeset
1119 case CODEC_ID_JPEGLS:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1120 case CODEC_ID_MJPEG:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1121 s->out_format = FMT_MJPEG;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1122 s->intra_only = 1; /* force intra only for jpeg */
2973
michael
parents: 2972
diff changeset
1123 s->mjpeg_write_tables = avctx->codec->id != CODEC_ID_JPEGLS;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1124 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
1125 s->mjpeg_vsample[0] = 1<<chroma_v_shift;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1126 s->mjpeg_vsample[1] = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1127 s->mjpeg_vsample[2] = 1;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
1128 s->mjpeg_hsample[0] = 1<<chroma_h_shift;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1129 s->mjpeg_hsample[1] = 1;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1130 s->mjpeg_hsample[2] = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1131 if (mjpeg_init(s) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1132 return -1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1133 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1134 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1135 break;
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1136 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
1137 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
1138 avctx->delay=0;
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
1139 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
1140 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1141 case CODEC_ID_H263:
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
1142 if (h263_get_picture_format(s->width, s->height) == 7) {
3011
037518fde4bd H.263: more descriptive error message
diego
parents: 2997
diff changeset
1143 av_log(avctx, AV_LOG_INFO, "The specified picture size of %dx%d is not valid for the H.263 codec.\nValid sizes are 128x96, 176x144, 352x288, 704x576, and 1408x1152. Try H.263+.\n", s->width, s->height);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1144 return -1;
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
1145 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1146 s->out_format = FMT_H263;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1147 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1148 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1149 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1150 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1151 case CODEC_ID_H263P:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1152 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1153 s->h263_plus = 1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1154 /* Fx */
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1155 s->umvplus = (avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1156 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1157 s->modified_quant= s->h263_aic;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1158 s->alt_inter_vlc= (avctx->flags & CODEC_FLAG_H263P_AIV) ? 1:0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1159 s->obmc= (avctx->flags & CODEC_FLAG_OBMC) ? 1:0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1160 s->loop_filter= (avctx->flags & CODEC_FLAG_LOOP_FILTER) ? 1:0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1161 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
1162 s->h263_slice_structured= (s->flags & CODEC_FLAG_H263P_SLICE_STRUCT) ? 1:0;
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
1163
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
1164 /* /Fx */
79
82e579c37bc3 Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents: 78
diff changeset
1165 /* These are just to be sure */
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1166 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1167 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1168 break;
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1169 case CODEC_ID_FLV1:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1170 s->out_format = FMT_H263;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1171 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
1172 s->unrestricted_mv = 1;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1173 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
1174 avctx->delay=0;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1175 s->low_delay=1;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
1176 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1177 case CODEC_ID_RV10:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1178 s->out_format = FMT_H263;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1179 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1180 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1181 break;
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1182 case CODEC_ID_RV20:
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1183 s->out_format = FMT_H263;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1184 avctx->delay=0;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1185 s->low_delay=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1186 s->modified_quant=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1187 s->h263_aic=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1188 s->h263_plus=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1189 s->loop_filter=1;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1190 s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
1191 break;
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
1192 case CODEC_ID_MPEG4:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1193 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1194 s->h263_pred = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1195 s->unrestricted_mv = 1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1196 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
1197 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1198 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1199 case CODEC_ID_MSMPEG4V1:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1200 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1201 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1202 s->h263_pred = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1203 s->unrestricted_mv = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1204 s->msmpeg4_version= 1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1205 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1206 s->low_delay=1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1207 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1208 case CODEC_ID_MSMPEG4V2:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1209 s->out_format = FMT_H263;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1210 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1211 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1212 s->unrestricted_mv = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1213 s->msmpeg4_version= 2;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1214 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1215 s->low_delay=1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1216 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1217 case CODEC_ID_MSMPEG4V3:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1218 s->out_format = FMT_H263;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1219 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1220 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1221 s->unrestricted_mv = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
1222 s->msmpeg4_version= 3;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
1223 s->flipflop_rounding=1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
1224 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1225 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1226 break;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1227 case CODEC_ID_WMV1:
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1228 s->out_format = FMT_H263;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1229 s->h263_msmpeg4 = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1230 s->h263_pred = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1231 s->unrestricted_mv = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1232 s->msmpeg4_version= 4;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
1233 s->flipflop_rounding=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1234 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1235 s->low_delay=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1236 break;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1237 case CODEC_ID_WMV2:
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1238 s->out_format = FMT_H263;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1239 s->h263_msmpeg4 = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1240 s->h263_pred = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1241 s->unrestricted_mv = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1242 s->msmpeg4_version= 5;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
1243 s->flipflop_rounding=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1244 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1245 s->low_delay=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
1246 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1247 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
1248 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1249 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1250
2042
87620c5e2b03 export low_delay for encoding too
michael
parents: 2025
diff changeset
1251 avctx->has_b_frames= !s->low_delay;
1749
7b11032507e2 removing broken framerate conversation hack in mpeg1/2
michael
parents: 1742
diff changeset
1252
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
1253 s->encoding = 1;
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
1254
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1255 /* init */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1256 if (MPV_common_init(s) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1257 return -1;
1678
c962b8db3715 interlaced dct encoding fix
michael
parents: 1676
diff changeset
1258
c962b8db3715 interlaced dct encoding fix
michael
parents: 1676
diff changeset
1259 if(s->modified_quant)
c962b8db3715 interlaced dct encoding fix
michael
parents: 1676
diff changeset
1260 s->chroma_qscale_table= ff_h263_chroma_qscale_table;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1261 s->progressive_frame=
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
1262 s->progressive_sequence= !(avctx->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME));
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
1263 s->quant_precision=5;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1264
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
1265 ff_set_cmp(&s->dsp, s->dsp.ildct_cmp, s->avctx->ildct_cmp);
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
1266 ff_set_cmp(&s->dsp, s->dsp.frame_skip_cmp, s->avctx->frame_skip_cmp);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1267
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
1268 #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
1269 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
1270 ff_h261_encode_init(s);
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
1271 #endif
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1272 if (s->out_format == FMT_H263)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1273 h263_encode_init(s);
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1274 if(s->msmpeg4_version)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1275 ff_msmpeg4_encode_init(s);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1276 if (s->out_format == FMT_MPEG1)
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1277 ff_mpeg1_encode_init(s);
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1278
1892
5ac49e7a1b8f init cleanup
michael
parents: 1885
diff changeset
1279 /* init q matrix */
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
1280 for(i=0;i<64;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
1281 int j= s->dsp.idct_permutation[i];
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
1282 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
1283 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
1284 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
1285 }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
1286 s->intra_matrix[j] =
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1287 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1288 }else
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1289 { /* mpeg1/2 */
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
1290 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
1291 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i];
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
1292 }
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
1293 if(s->avctx->intra_matrix)
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
1294 s->intra_matrix[j] = s->avctx->intra_matrix[i];
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
1295 if(s->avctx->inter_matrix)
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
1296 s->inter_matrix[j] = s->avctx->inter_matrix[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
1297 }
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
1298
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
1299 /* precompute matrix */
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
1300 /* for mjpeg, we do include qscale in the matrix */
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
1301 if (s->out_format != FMT_MJPEG) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1302 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
1303 s->intra_matrix, s->intra_quant_bias, avctx->qmin, 31, 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1304 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
1305 s->inter_matrix, s->inter_quant_bias, avctx->qmin, 31, 0);
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
1306 }
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
1307
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1308 if(ff_rate_control_init(s) < 0)
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1309 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1310
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1311 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1312 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1313
986e461dc072 Initial revision
glantau
parents:
diff changeset
1314 int MPV_encode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1315 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1316 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1317
986e461dc072 Initial revision
glantau
parents:
diff changeset
1318 #ifdef STATS
986e461dc072 Initial revision
glantau
parents:
diff changeset
1319 print_stats();
986e461dc072 Initial revision
glantau
parents:
diff changeset
1320 #endif
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1321
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1322 ff_rate_control_uninit(s);
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1323
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1324 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1325 if (s->out_format == FMT_MJPEG)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1326 mjpeg_close(s);
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
1327
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
1328 av_freep(&avctx->extradata);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1329
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1330 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1331 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1332
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
1333 #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
1334
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1335 void init_rl(RLTable *rl, int use_static)
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1336 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1337 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1338 uint8_t index_run[MAX_RUN+1];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1339 int last, run, level, start, end, i;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1340
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1341 /* 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
1342 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
1343 return;
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1344
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1345 /* compute max_level[], max_run[] and index_run[] */
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1346 for(last=0;last<2;last++) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1347 if (last == 0) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1348 start = 0;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1349 end = rl->last;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1350 } else {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1351 start = rl->last;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1352 end = rl->n;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1353 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1354
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1355 memset(max_level, 0, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1356 memset(max_run, 0, MAX_LEVEL + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1357 memset(index_run, rl->n, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1358 for(i=start;i<end;i++) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1359 run = rl->table_run[i];
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1360 level = rl->table_level[i];
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1361 if (index_run[run] == rl->n)
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1362 index_run[run] = i;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1363 if (level > max_level[run])
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1364 max_level[run] = level;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1365 if (run > max_run[level])
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1366 max_run[level] = run;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1367 }
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1368 if(use_static)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1369 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
1370 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1371 rl->max_level[last] = av_malloc(MAX_RUN + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1372 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
1373 if(use_static)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1374 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
1375 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1376 rl->max_run[last] = av_malloc(MAX_LEVEL + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1377 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
1378 if(use_static)
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1379 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
1380 else
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2364
diff changeset
1381 rl->index_run[last] = av_malloc(MAX_RUN + 1);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1382 memcpy(rl->index_run[last], index_run, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1383 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1384 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
1385
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1386 /* 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
1387 //FIXME check that this is ok for mpeg4 interlaced
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1388 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1389 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1390 uint8_t *ptr, *last_line;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1391 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1392
986e461dc072 Initial revision
glantau
parents:
diff changeset
1393 last_line = buf + (height - 1) * wrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1394 for(i=0;i<w;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1395 /* top and bottom */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1396 memcpy(buf - (i + 1) * wrap, buf, width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1397 memcpy(last_line + (i + 1) * wrap, last_line, width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1398 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1399 /* left and right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1400 ptr = buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1401 for(i=0;i<height;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1402 memset(ptr - w, ptr[0], w);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1403 memset(ptr + width, ptr[width-1], w);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1404 ptr += wrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1405 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1406 /* corners */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1407 for(i=0;i<w;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1408 memset(buf - (i + 1) * wrap - w, buf[0], w); /* top left */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1409 memset(buf - (i + 1) * wrap + width, buf[width-1], w); /* top right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1410 memset(last_line + (i + 1) * wrap - w, last_line[0], w); /* top left */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1411 memset(last_line + (i + 1) * wrap + width, last_line[width-1], w); /* top right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1412 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1413 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1414
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1415 int ff_find_unused_picture(MpegEncContext *s, int shared){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1416 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1417
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1418 if(shared){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1419 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1420 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) return i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1421 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1422 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1423 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1424 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) return i; //FIXME
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1425 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1426 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1427 if(s->picture[i].data[0]==NULL) return i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1428 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1429 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1430
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1431 assert(0);
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1432 return -1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1433 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1434
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1435 static void update_noise_reduction(MpegEncContext *s){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1436 int intra, i;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1437
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1438 for(intra=0; intra<2; intra++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1439 if(s->dct_count[intra] > (1<<16)){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1440 for(i=0; i<64; i++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1441 s->dct_error_sum[intra][i] >>=1;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1442 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1443 s->dct_count[intra] >>= 1;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1444 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1445
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1446 for(i=0; i<64; i++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1447 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);
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1448 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1449 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1450 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1451
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1452 /**
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1453 * generic function for encode/decode called after coding/decoding the header and before a frame is coded/decoded
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1454 */
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1455 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1456 {
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1457 int i;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1458 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
1459 s->mb_skipped = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1460
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1228
diff changeset
1461 assert(s->last_picture_ptr==NULL || s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3);
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1462
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1463 /* mark&release old frames */
1944
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1464 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
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1465 avctx->release_buffer(avctx, (AVFrame*)s->last_picture_ptr);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1466
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1467 /* release forgotten pictures */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1468 /* if(mpeg124/h263) */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1469 if(!s->encoding){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1470 for(i=0; i<MAX_PICTURE_COUNT; i++){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1471 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
1472 av_log(avctx, AV_LOG_ERROR, "releasing zombie picture\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1473 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1474 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1475 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1476 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1477 }
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1478 alloc:
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1479 if(!s->encoding){
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
1480 /* release non reference frames */
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1481 for(i=0; i<MAX_PICTURE_COUNT; i++){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1482 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1483 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]);
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1484 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1485 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1486
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1487 if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL)
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1488 pic= (AVFrame*)s->current_picture_ptr; //we allready have a unused image (maybe it was set before reading the header)
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1489 else{
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1490 i= ff_find_unused_picture(s, 0);
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1491 pic= (AVFrame*)&s->picture[i];
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1492 }
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1493
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2534
diff changeset
1494 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
1495 && !s->dropable ? 3 : 0;
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1496
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
1497 pic->coded_picture_number= s->coded_picture_number++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1498
1384
18cdce49339e make MPV_frame_start fail on get_buffer failer
iive
parents: 1381
diff changeset
1499 if( alloc_picture(s, (Picture*)pic, 0) < 0)
18cdce49339e make MPV_frame_start fail on get_buffer failer
iive
parents: 1381
diff changeset
1500 return -1;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1501
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1502 s->current_picture_ptr= (Picture*)pic;
1658
d4637a0eaab1 export top_field_first & interlaced_frame
michael
parents: 1655
diff changeset
1503 s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic
1659
3075fc11a974 AVFrame.interlaced_frame fixes
michael
parents: 1658
diff changeset
1504 s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1505 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1506
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
1507 s->current_picture_ptr->pict_type= s->pict_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1508 // if(s->flags && CODEC_FLAG_QSCALE)
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
1509 // 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
1510 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE;
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
1511
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
1512 copy_picture(&s->current_picture, s->current_picture_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1513
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1228
diff changeset
1514 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1515 if (s->pict_type != B_TYPE) {
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1516 s->last_picture_ptr= s->next_picture_ptr;
1944
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1517 if(!s->dropable)
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1518 s->next_picture_ptr= s->current_picture_ptr;
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1519 }
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1520 /* 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,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1521 s->last_picture_ptr ? s->last_picture_ptr->data[0] : NULL,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1522 s->next_picture_ptr ? s->next_picture_ptr->data[0] : NULL,
1944
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1523 s->current_picture_ptr ? s->current_picture_ptr->data[0] : NULL,
a3f44c9168aa flv dropable p frame support
michael
parents: 1938
diff changeset
1524 s->pict_type, s->dropable);*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1525
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
1526 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
1527 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1528
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
1529 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
1530 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n");
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
1531 assert(s->pict_type != B_TYPE); //these should have been dropped if we don't have a reference
1393
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1532 goto alloc;
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1533 }
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1534
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1535 assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0]));
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1536
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1537 if(s->picture_structure!=PICT_FRAME){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1538 int i;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1539 for(i=0; i<4; i++){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1540 if(s->picture_structure == PICT_BOTTOM_FIELD){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1541 s->current_picture.data[i] += s->current_picture.linesize[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1542 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1543 s->current_picture.linesize[i] *= 2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1544 s->last_picture.linesize[i] *=2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1545 s->next_picture.linesize[i] *=2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1546 }
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1547 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1548 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1549
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1550 s->hurry_up= s->avctx->hurry_up;
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1551 s->error_resilience= avctx->error_resilience;
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1552
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
1553 /* set dequantizer, we can't do it during init as it might change for mpeg4
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
1554 and we can't do it in the header decode as init isnt called for mpeg4 there yet */
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1555 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1556 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1557 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter;
2345
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
1558 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1559 s->dct_unquantize_intra = s->dct_unquantize_h263_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1560 s->dct_unquantize_inter = s->dct_unquantize_h263_inter;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1561 }else{
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1562 s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1563 s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
1564 }
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1565
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1566 if(s->dct_error_sum){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1567 assert(s->avctx->noise_reduction && s->encoding);
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1568
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1569 update_noise_reduction(s);
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
1570 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1571
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1572 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1573 if(s->avctx->xvmc_acceleration)
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1574 return XVMC_field_start(s, avctx);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1575 #endif
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1576 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1577 }
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
1578
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1579 /* generic function for encode/decode called after a frame has been coded/decoded */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1580 void MPV_frame_end(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1581 {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1582 int i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1583 /* draw edge for correct motion prediction if outside */
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1584 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1585 //just to make sure that all data is rendered.
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1586 if(s->avctx->xvmc_acceleration){
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1587 XVMC_field_end(s);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1588 }else
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1589 #endif
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2534
diff changeset
1590 if(s->unrestricted_mv && s->current_picture.reference && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1591 draw_edges(s->current_picture.data[0], s->linesize , s->h_edge_pos , s->v_edge_pos , EDGE_WIDTH );
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1592 draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1593 draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, s->v_edge_pos>>1, EDGE_WIDTH/2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1594 }
207
6954f2830e4a (commit by michael)
arpi_esp
parents: 206
diff changeset
1595 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1596
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
1597 s->last_pict_type = s->pict_type;
2997
188f4ef688f2 second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents: 2990
diff changeset
1598 s->last_lambda_for[s->pict_type]= s->current_picture_ptr->quality;
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1599 if(s->pict_type!=B_TYPE){
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1600 s->last_non_b_pict_type= s->pict_type;
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1601 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1602 #if 0
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1603 /* copy back current_picture variables */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1604 for(i=0; i<MAX_PICTURE_COUNT; i++){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1605 if(s->picture[i].data[0] == s->current_picture.data[0]){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1606 s->picture[i]= s->current_picture;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1607 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1608 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1609 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1610 assert(i<MAX_PICTURE_COUNT);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1611 #endif
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1612
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1613 if(s->encoding){
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
1614 /* release non-reference frames */
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1615 for(i=0; i<MAX_PICTURE_COUNT; i++){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1616 if(s->picture[i].data[0] && !s->picture[i].reference /*&& s->picture[i].type!=FF_BUFFER_TYPE_SHARED*/){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1617 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]);
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1618 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1619 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1620 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1621 // clear copies, to avoid confusion
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1622 #if 0
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1623 memset(&s->last_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1624 memset(&s->next_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1625 memset(&s->current_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1626 #endif
2213
c17d0cbbdf66 10l (wrong coded_picture)
michael
parents: 2168
diff changeset
1627 s->avctx->coded_frame= (AVFrame*)s->current_picture_ptr;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1628 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1629
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1630 /**
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1631 * draws an line from (ex, ey) -> (sx, sy).
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1632 * @param w width of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1633 * @param h height of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1634 * @param stride stride/linesize of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1635 * @param color color of the arrow
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1636 */
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1637 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
1638 int t, x, y, fr, f;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1639
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1640 sx= clip(sx, 0, w-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1641 sy= clip(sy, 0, h-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1642 ex= clip(ex, 0, w-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1643 ey= clip(ey, 0, h-1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1644
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1645 buf[sy*stride + sx]+= color;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1646
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1647 if(ABS(ex - sx) > ABS(ey - sy)){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1648 if(sx > ex){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1649 t=sx; sx=ex; ex=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1650 t=sy; sy=ey; ey=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1651 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1652 buf+= sx + sy*stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1653 ex-= sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1654 f= ((ey-sy)<<16)/ex;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1655 for(x= 0; x <= ex; x++){
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1656 y = (x*f)>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1657 fr= (x*f)&0xFFFF;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1658 buf[ y *stride + x]+= (color*(0x10000-fr))>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1659 buf[(y+1)*stride + x]+= (color* fr )>>16;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1660 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1661 }else{
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1662 if(sy > ey){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1663 t=sx; sx=ex; ex=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1664 t=sy; sy=ey; ey=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1665 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1666 buf+= sx + sy*stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1667 ey-= sy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1668 if(ey) f= ((ex-sx)<<16)/ey;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1669 else f= 0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1670 for(y= 0; y <= ey; y++){
1918
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1671 x = (y*f)>>16;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1672 fr= (y*f)&0xFFFF;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1673 buf[y*stride + x ]+= (color*(0x10000-fr))>>16;;
ea20f38b8d57 nicer looking arrows for the motion vector vissualization
michael
parents: 1916
diff changeset
1674 buf[y*stride + x+1]+= (color* fr )>>16;;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1675 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1676 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1677 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1678
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1679 /**
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1680 * draws an arrow from (ex, ey) -> (sx, sy).
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1681 * @param w width of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1682 * @param h height of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1683 * @param stride stride/linesize of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1684 * @param color color of the arrow
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1685 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1686 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1687 int dx,dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1688
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1689 sx= clip(sx, -100, w+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1690 sy= clip(sy, -100, h+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1691 ex= clip(ex, -100, w+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1692 ey= clip(ey, -100, h+100);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1693
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1694 dx= ex - sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1695 dy= ey - sy;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1696
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1697 if(dx*dx + dy*dy > 3*3){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1698 int rx= dx + dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1699 int ry= -dx + dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1700 int length= ff_sqrt((rx*rx + ry*ry)<<8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1701
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1702 //FIXME subpixel accuracy
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1703 rx= ROUNDED_DIV(rx*3<<4, length);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1704 ry= ROUNDED_DIV(ry*3<<4, length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1705
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1706 draw_line(buf, sx, sy, sx + rx, sy + ry, w, h, stride, color);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1707 draw_line(buf, sx, sy, sx - ry, sy + rx, w, h, stride, color);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1708 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1709 draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1710 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1711
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1712 /**
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1713 * 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
1714 */
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1715 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
1716
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1717 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
1718
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1719 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
1720 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1721
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1722 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
1723 switch (pict->pict_type) {
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1724 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
1725 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
1726 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
1727 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
1728 case FF_SI_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SI\n"); break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1729 case FF_SP_TYPE: av_log(s->avctx,AV_LOG_DEBUG,"SP\n"); break;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1730 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1731 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
1732 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
1733 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
1734 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
1735 if(count>9) count=9;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1736 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
1737 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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 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
1739 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
1740 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1741 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
1742 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
1743 //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
1744 if(IS_PCM(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, "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
1746 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
1747 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
1748 else if(IS_INTRA4x4(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, "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
1750 else if(IS_INTRA16x16(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, "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
1752 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
1753 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
1754 else if(IS_DIRECT(mb_type))
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, "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
1756 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
1757 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
1758 else if(IS_GMC(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1759 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
1760 else if(IS_SKIP(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1761 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
1762 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
1763 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
1764 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
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{
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1767 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
1768 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
1769 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1770
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1771 //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
1772 if(IS_8X8(mb_type))
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 else if(IS_16X8(mb_type))
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1775 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
1776 else if(IS_8X16(mb_type))
2677
7b7613020f2c remove/replace non-ascii characters
mru
parents: 2668
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 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
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 else
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, "?");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1782
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1783
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead 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 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
1785 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
1786 else
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1787 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
1788 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1789 // 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
1790 }
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
1791 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
1792 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1793 }
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
1794
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1795 if((s->avctx->debug&(FF_DEBUG_VIS_QP|FF_DEBUG_VIS_MB_TYPE)) || (s->avctx->debug_mv)){
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1796 const int shift= 1 + s->quarter_sample;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1797 int mb_y;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1798 uint8_t *ptr;
1707
027545a2fdbe 100000l
michael
parents: 1706
diff changeset
1799 int i;
1723
033d889d7c2c non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1722
diff changeset
1800 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
1801 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
1802 const int height= s->avctx->height;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1803 const int mv_sample_log2= 4 - pict->motion_subsample_log2;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1804 const int mv_stride= (s->mb_width << mv_sample_log2) + 1;
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1805 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
1806
1723
033d889d7c2c non YV12 vissualization fix by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1722
diff changeset
1807 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
1808 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
1809 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
1810 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
1811 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1812 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
1813 ptr= pict->data[0];
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1814
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1815 for(mb_y=0; mb_y<s->mb_height; mb_y++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1816 int mb_x;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1817 for(mb_x=0; mb_x<s->mb_width; mb_x++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1818 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
1819 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
1820 int type;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1821 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
1822 int direction = 0;
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1823 switch (type) {
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1824 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
1825 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1826 direction = 0;
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 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
1829 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1830 direction = 0;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1831 break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1832 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
1833 continue;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1834 direction = 1;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1835 break;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1836 }
1712
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1837 if(!USES_LIST(pict->mb_type[mb_index], direction))
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1838 continue;
5175116a97e8 dont show uninitalized motion vectors
michael
parents: 1711
diff changeset
1839
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1840 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
1841 int i;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1842 for(i=0; i<4; i++){
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1843 int sx= mb_x*16 + 4 + 8*(i&1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1844 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
1845 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
1846 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
1847 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
1848 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
1849 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1850 }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
1851 int i;
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1852 for(i=0; i<2; i++){
1629
74685a0ec851 16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1628
diff changeset
1853 int sx=mb_x*16 + 8;
74685a0ec851 16x8 MV vissualization by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1628
diff changeset
1854 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
1855 int xy= (mb_x*2 + (mb_y*2 + i)*mv_stride) << (mv_sample_log2-1);
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1856 int mx=(pict->motion_val[direction][xy][0]>>shift);
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1857 int my=(pict->motion_val[direction][xy][1]>>shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1858
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1859 if(IS_INTERLACED(pict->mb_type[mb_index]))
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1860 my*=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1861
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1862 draw_arrow(ptr, sx, sy, mx+sx, my+sy, width, height, s->linesize, 100);
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1863 }
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1864 }else if(IS_8X16(pict->mb_type[mb_index])){
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1865 int i;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1866 for(i=0; i<2; i++){
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1867 int sx=mb_x*16 + 4 + 8*i;
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1868 int sy=mb_y*16 + 8;
2522
e25782262d7d kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2514
diff changeset
1869 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
1870 int mx=(pict->motion_val[direction][xy][0]>>shift);
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1871 int my=(pict->motion_val[direction][xy][1]>>shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1872
1947
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1873 if(IS_INTERLACED(pict->mb_type[mb_index]))
b306574523ad fix y scale of mv vissualization of interlaced MVs
michael
parents: 1945
diff changeset
1874 my*=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1875
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+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
1877 }
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1878 }else{
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1705
diff changeset
1879 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
1880 int sy= mb_y*16 + 8;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2390
diff changeset
1881 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
1882 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
1883 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
1884 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
1885 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1886 }
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1887 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1888 if((s->avctx->debug&FF_DEBUG_VIS_QP) && pict->motion_val){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1889 uint64_t c= (pict->qscale_table[mb_index]*128/31) * 0x0101010101010101ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1890 int y;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1891 for(y=0; y<8; y++){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1892 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= c;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1893 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= c;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1894 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1895 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1896 if((s->avctx->debug&FF_DEBUG_VIS_MB_TYPE) && pict->motion_val){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1897 int mb_type= pict->mb_type[mb_index];
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1898 uint64_t u,v;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1899 int y;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1900 #define COLOR(theta, r)\
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1901 u= (int)(128 + r*cos(theta*3.141592/180));\
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1902 v= (int)(128 + r*sin(theta*3.141592/180));
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1903
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1904
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1905 u=v=128;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1906 if(IS_PCM(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1907 COLOR(120,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1908 }else if((IS_INTRA(mb_type) && IS_ACPRED(mb_type)) || IS_INTRA16x16(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1909 COLOR(30,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1910 }else if(IS_INTRA4x4(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1911 COLOR(90,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1912 }else if(IS_DIRECT(mb_type) && IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1913 // COLOR(120,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1914 }else if(IS_DIRECT(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1915 COLOR(150,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1916 }else if(IS_GMC(mb_type) && IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1917 COLOR(170,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1918 }else if(IS_GMC(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1919 COLOR(190,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1920 }else if(IS_SKIP(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1921 // COLOR(180,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1922 }else if(!USES_LIST(mb_type, 1)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1923 COLOR(240,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1924 }else if(!USES_LIST(mb_type, 0)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1925 COLOR(0,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1926 }else{
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1927 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1));
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1928 COLOR(300,48)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1929 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1930
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1931 u*= 0x0101010101010101ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1932 v*= 0x0101010101010101ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1933 for(y=0; y<8; y++){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1934 *(uint64_t*)(pict->data[1] + 8*mb_x + (8*mb_y + y)*pict->linesize[1])= u;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1935 *(uint64_t*)(pict->data[2] + 8*mb_x + (8*mb_y + y)*pict->linesize[2])= v;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1936 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1937
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1938 //segmentation
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1939 if(IS_8X8(mb_type) || IS_16X8(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1940 *(uint64_t*)(pict->data[0] + 16*mb_x + 0 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1941 *(uint64_t*)(pict->data[0] + 16*mb_x + 8 + (16*mb_y + 8)*pict->linesize[0])^= 0x8080808080808080ULL;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1942 }
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1943 if(IS_8X8(mb_type) || IS_8X16(mb_type)){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1944 for(y=0; y<16; y++)
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1945 pict->data[0][16*mb_x + 8 + (16*mb_y + y)*pict->linesize[0]]^= 0x80;
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1946 }
2534
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1947 if(IS_8X8(mb_type) && mv_sample_log2 >= 2){
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1948 int dm= 1 << (mv_sample_log2-2);
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1949 for(i=0; i<4; i++){
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1950 int sx= mb_x*16 + 8*(i&1);
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1951 int sy= mb_y*16 + 8*(i>>1);
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1952 int xy= (mb_x*2 + (i&1) + (mb_y*2 + (i>>1))*mv_stride) << (mv_sample_log2-1);
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1953 //FIXME bidir
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1954 int32_t *mv = (int32_t*)&pict->motion_val[0][xy];
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1955 if(mv[0] != mv[dm] || mv[dm*mv_stride] != mv[dm*(mv_stride+1)])
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1956 for(y=0; y<8; y++)
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1957 pict->data[0][sx + 4 + (sy + y)*pict->linesize[0]]^= 0x80;
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1958 if(mv[0] != mv[dm*mv_stride] || mv[dm] != mv[dm*(mv_stride+1)])
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1959 *(uint64_t*)(pict->data[0] + sx + (sy + 4)*pict->linesize[0])^= 0x8080808080808080ULL;
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1960 }
0420f228ebb6 vismb: display 4x4 partition boundaries in H.264
lorenm
parents: 2524
diff changeset
1961 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1962
1685
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1963 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264){
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1964 // hmm
cb09cf265a87 mb type & qp vissualization
michael
parents: 1684
diff changeset
1965 }
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1966 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1967 s->mbskip_table[mb_index]=0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1968 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1969 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1970 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1971 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1972
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
1973 #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
1974
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1975 static int get_sae(uint8_t *src, int ref, int stride){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1976 int x,y;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1977 int acc=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1978
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1979 for(y=0; y<16; y++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1980 for(x=0; x<16; x++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1981 acc+= ABS(src[x+y*stride] - ref);
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1982 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1983 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1984
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1985 return acc;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1986 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1987
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1988 static int get_intra_count(MpegEncContext *s, uint8_t *src, uint8_t *ref, int stride){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1989 int x, y, w, h;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1990 int acc=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1991
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1992 w= s->width &~15;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1993 h= s->height&~15;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1994
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1995 for(y=0; y<h; y+=16){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1996 for(x=0; x<w; x+=16){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1997 int offset= x + y*stride;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
1998 int sad = s->dsp.sad[0](NULL, src + offset, ref + offset, stride, 16);
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1999 int mean= (s->dsp.pix_sum(src + offset, stride) + 128)>>8;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2000 int sae = get_sae(src + offset, mean, stride);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2001
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2002 acc+= sae + 500 < sad;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2003 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2004 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2005 return acc;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2006 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2007
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2008
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2009 static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2010 AVFrame *pic=NULL;
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
2011 int64_t pts;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2012 int i;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2013 const int encoding_delay= s->max_b_frames;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2014 int direct=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2015
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2016 if(pic_arg){
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
2017 pts= pic_arg->pts;
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
2018 pic_arg->display_picture_number= s->input_picture_number++;
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
2019
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2020 if(pts != AV_NOPTS_VALUE){
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2021 if(s->user_specified_pts != AV_NOPTS_VALUE){
2637
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
2022 int64_t time= pts;
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
2023 int64_t last= s->user_specified_pts;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2024
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2025 if(time <= last){
2962
fde28cb7e3d5 use PRIxN, %zd, %td formats where needed
mru
parents: 2955
diff changeset
2026 av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%"PRId64", last=%"PRId64"\n", pts, s->user_specified_pts);
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2027 return -1;
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2028 }
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2029 }
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
2030 s->user_specified_pts= pts;
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2031 }else{
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2032 if(s->user_specified_pts != AV_NOPTS_VALUE){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2033 s->user_specified_pts=
2637
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
2034 pts= s->user_specified_pts + 1;
2962
fde28cb7e3d5 use PRIxN, %zd, %td formats where needed
mru
parents: 2955
diff changeset
2035 av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%"PRId64")\n", pts);
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2036 }else{
2637
ef44d24680d1 switch to native time bases
michael
parents: 2628
diff changeset
2037 pts= pic_arg->display_picture_number;
2419
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2038 }
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2039 }
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2040 }
0c5ceb97815d picture heap corruption fix
michael
parents: 2395
diff changeset
2041
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2042 if(pic_arg){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2043 if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2044 if(pic_arg->linesize[0] != s->linesize) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2045 if(pic_arg->linesize[1] != s->uvlinesize) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2046 if(pic_arg->linesize[2] != s->uvlinesize) direct=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2047
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
2048 // av_log(AV_LOG_DEBUG, "%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2049
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2050 if(direct){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
2051 i= ff_find_unused_picture(s, 1);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2052
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2053 pic= (AVFrame*)&s->picture[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
2054 pic->reference= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2055
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2056 for(i=0; i<4; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2057 pic->data[i]= pic_arg->data[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2058 pic->linesize[i]= pic_arg->linesize[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2059 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2060 alloc_picture(s, (Picture*)pic, 1);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2061 }else{
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
2062 i= ff_find_unused_picture(s, 0);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2063
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2064 pic= (AVFrame*)&s->picture[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
2065 pic->reference= 3;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2066
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2067 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
2068
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2069 if( pic->data[0] + INPLACE_OFFSET == pic_arg->data[0]
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2070 && pic->data[1] + INPLACE_OFFSET == pic_arg->data[1]
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2071 && pic->data[2] + INPLACE_OFFSET == pic_arg->data[2]){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2072 // empty
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2073 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2074 int h_chroma_shift, v_chroma_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2075 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2076
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2077 for(i=0; i<3; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2078 int src_stride= pic_arg->linesize[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2079 int dst_stride= i ? s->uvlinesize : s->linesize;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2080 int h_shift= i ? h_chroma_shift : 0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2081 int v_shift= i ? v_chroma_shift : 0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2082 int w= s->width >>h_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2083 int h= s->height>>v_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2084 uint8_t *src= pic_arg->data[i];
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2085 uint8_t *dst= pic->data[i] + INPLACE_OFFSET;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2086
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2087 if(src_stride==dst_stride)
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2088 memcpy(dst, src, src_stride*h);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2089 else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2090 while(h--){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2091 memcpy(dst, src, w);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2092 dst += dst_stride;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2093 src += src_stride;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2094 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2095 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2096 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2097 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2098 }
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
2099 copy_picture_attributes(s, pic, pic_arg);
2427
d1b1a6258930 10l (dont modify the input picture pts)
michael
parents: 2426
diff changeset
2100 pic->pts= pts; //we set this here to avoid modifiying pic_arg
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2101 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2102
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2103 /* shift buffer entries */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2104 for(i=1; i<MAX_PICTURE_COUNT /*s->encoding_delay+1*/; i++)
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2105 s->input_picture[i-1]= s->input_picture[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2106
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2107 s->input_picture[encoding_delay]= (Picture*)pic;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2108
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2109 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2110 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2111
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2112 static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2113 int x, y, plane;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2114 int score=0;
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2115 int64_t score64=0;
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2116
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2117 for(plane=0; plane<3; plane++){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2118 const int stride= p->linesize[plane];
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2119 const int bw= plane ? 1 : 2;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2120 for(y=0; y<s->mb_height*bw; y++){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2121 for(x=0; x<s->mb_width*bw; x++){
2931
27359d425eb1 frame skip fixes
michael
parents: 2834
diff changeset
2122 int off= p->type == FF_BUFFER_TYPE_SHARED ? 0: 16;
27359d425eb1 frame skip fixes
michael
parents: 2834
diff changeset
2123 int v= s->dsp.frame_skip_cmp[1](s, p->data[plane] + 8*(x + y*stride)+off, ref->data[plane] + 8*(x + y*stride), stride, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2124
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2125 switch(s->avctx->frame_skip_exp){
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2126 case 0: score= FFMAX(score, v); break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2127 case 1: score+= ABS(v);break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2128 case 2: score+= v*v;break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2129 case 3: score64+= ABS(v*v*(int64_t)v);break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2130 case 4: score64+= v*v*(int64_t)(v*v);break;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2131 }
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2132 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2133 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2134 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2135
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2136 if(score) score64= score;
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2137
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2138 if(score64 < s->avctx->frame_skip_threshold)
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2139 return 1;
2382
23e7af611c34 more flexible frame skip decission
michael
parents: 2381
diff changeset
2140 if(score64 < ((s->avctx->frame_skip_factor * (int64_t)s->lambda)>>8))
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2141 return 1;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2142 return 0;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2143 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2144
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2145 static int estimate_best_b_count(MpegEncContext *s){
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2146 AVCodec *codec= avcodec_find_encoder(s->avctx->codec_id);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2147 AVCodecContext *c= avcodec_alloc_context();
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2148 AVFrame input[FF_MAX_B_FRAMES+2];
2990
0300c2647bc3 support downscaling frames for dynamic b frame decission
michael
parents: 2988
diff changeset
2149 const int scale= s->avctx->brd_scale;
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2150 int i, j, out_size, p_lambda, b_lambda, lambda2;
2990
0300c2647bc3 support downscaling frames for dynamic b frame decission
michael
parents: 2988
diff changeset
2151 int outbuf_size= s->width * s->height; //FIXME
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2152 uint8_t *outbuf= av_malloc(outbuf_size);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2153 ImgReSampleContext *resample;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2154 int64_t best_rd= INT64_MAX;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2155 int best_b_count= -1;
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2156
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2157 // emms_c();
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2158 p_lambda= s->last_lambda_for[P_TYPE]; //s->next_picture_ptr->quality;
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2159 b_lambda= s->last_lambda_for[B_TYPE]; //p_lambda *ABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset;
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2160 if(!b_lambda) b_lambda= p_lambda; //FIXME we should do this somewhere else
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2161 lambda2= (b_lambda*b_lambda + (1<<FF_LAMBDA_SHIFT)/2 ) >> FF_LAMBDA_SHIFT;
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2162
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2163 c->width = s->width >> scale;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2164 c->height= s->height>> scale;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2165 c->flags= CODEC_FLAG_QSCALE | CODEC_FLAG_PSNR | CODEC_FLAG_INPUT_PRESERVED /*| CODEC_FLAG_EMU_EDGE*/;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2166 c->flags|= s->avctx->flags & CODEC_FLAG_QPEL;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2167 c->mb_decision= s->avctx->mb_decision;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2168 c->me_cmp= s->avctx->me_cmp;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2169 c->mb_cmp= s->avctx->mb_cmp;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2170 c->me_sub_cmp= s->avctx->me_sub_cmp;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2171 c->pix_fmt = PIX_FMT_YUV420P;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2172 c->time_base= s->avctx->time_base;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2173 c->max_b_frames= s->max_b_frames;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2174
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2175 if (avcodec_open(c, codec) < 0)
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2176 return -1;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2177
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2178 resample= img_resample_init(c->width, c->height, s->width, s->height); //FIXME use sws
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2179
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2180 for(i=0; i<s->max_b_frames+2; i++){
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2181 int ysize= c->width*c->height;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2182 int csize= (c->width/2)*(c->height/2);
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2183 Picture pre_input, *pre_input_ptr= i ? s->input_picture[i-1] : s->next_picture_ptr;
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2184
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2185 if(pre_input_ptr)
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2186 pre_input= *pre_input_ptr;
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2187
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2188 if(pre_input.type != FF_BUFFER_TYPE_SHARED && i){
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2189 pre_input.data[0]+=INPLACE_OFFSET;
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2190 pre_input.data[1]+=INPLACE_OFFSET;
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2191 pre_input.data[2]+=INPLACE_OFFSET;
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2192 }
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2193
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2194 avcodec_get_frame_defaults(&input[i]);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2195 input[i].data[0]= av_malloc(ysize + 2*csize);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2196 input[i].data[1]= input[i].data[0] + ysize;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2197 input[i].data[2]= input[i].data[1] + csize;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2198 input[i].linesize[0]= c->width;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2199 input[i].linesize[1]=
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2200 input[i].linesize[2]= c->width/2;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2201
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2202 if(!i || s->input_picture[i-1])
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2203 img_resample(resample, &input[i], &pre_input);
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2204 }
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2205
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2206 for(j=0; j<s->max_b_frames+1; j++){
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2207 int64_t rd=0;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2208
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2209 if(!s->input_picture[j])
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2210 break;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2211
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2212 c->error[0]= c->error[1]= c->error[2]= 0;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2213
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2214 input[0].pict_type= I_TYPE;
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2215 input[0].quality= 1 * FF_QP2LAMBDA;
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2216 out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[0]);
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2217 // rd += (out_size * lambda2) >> FF_LAMBDA_SHIFT;
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2218
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2219 for(i=0; i<s->max_b_frames+1; i++){
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2220 int is_p= i % (j+1) == j || i==s->max_b_frames;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2221
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2222 input[i+1].pict_type= is_p ? P_TYPE : B_TYPE;
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2223 input[i+1].quality= is_p ? p_lambda : b_lambda;
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2224 out_size = avcodec_encode_video(c, outbuf, outbuf_size, &input[i+1]);
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2225 rd += (out_size * lambda2) >> (FF_LAMBDA_SHIFT - 3);
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2226 }
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2227
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2228 /* get the delayed frames */
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2229 while(out_size){
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2230 out_size = avcodec_encode_video(c, outbuf, outbuf_size, NULL);
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2231 rd += (out_size * lambda2) >> (FF_LAMBDA_SHIFT - 3);
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2232 }
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2233
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2234 rd += c->error[0] + c->error[1] + c->error[2];
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2235
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2236 if(rd < best_rd){
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2237 best_rd= rd;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2238 best_b_count= j;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2239 }
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2240 }
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2241
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2242 av_freep(&outbuf);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2243 avcodec_close(c);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2244 av_freep(&c);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2245 img_resample_close(resample);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2246
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2247 for(i=0; i<s->max_b_frames+2; i++){
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2248 av_freep(&input[i].data[0]);
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2249 }
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2250
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2251 return best_b_count;
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2252 }
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2253
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2254 static void select_input_picture(MpegEncContext *s){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2255 int i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2256
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2257 for(i=1; i<MAX_PICTURE_COUNT; i++)
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2258 s->reordered_input_picture[i-1]= s->reordered_input_picture[i];
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2259 s->reordered_input_picture[MAX_PICTURE_COUNT-1]= NULL;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2260
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
2261 /* set next picture type & ordering */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2262 if(s->reordered_input_picture[0]==NULL && s->input_picture[0]){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2263 if(/*s->picture_in_gop_number >= s->gop_size ||*/ s->next_picture_ptr==NULL || s->intra_only){
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2264 s->reordered_input_picture[0]= s->input_picture[0];
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2265 s->reordered_input_picture[0]->pict_type= I_TYPE;
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
2266 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2267 }else{
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2268 int b_frames;
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2269
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2270 if(s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor){
2931
27359d425eb1 frame skip fixes
michael
parents: 2834
diff changeset
2271 if(s->picture_in_gop_number < s->gop_size && skip_check(s, s->input_picture[0], s->next_picture_ptr)){
27359d425eb1 frame skip fixes
michael
parents: 2834
diff changeset
2272 //FIXME check that te gop check above is +-1 correct
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2273 //av_log(NULL, AV_LOG_DEBUG, "skip %p %Ld\n", s->input_picture[0]->data[0], s->input_picture[0]->pts);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2274
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2275 if(s->input_picture[0]->type == FF_BUFFER_TYPE_SHARED){
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2276 for(i=0; i<4; i++)
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2277 s->input_picture[0]->data[i]= NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2278 s->input_picture[0]->type= 0;
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2279 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2280 assert( s->input_picture[0]->type==FF_BUFFER_TYPE_USER
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2281 || s->input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2282
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2283 s->avctx->release_buffer(s->avctx, (AVFrame*)s->input_picture[0]);
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2284 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2285
2931
27359d425eb1 frame skip fixes
michael
parents: 2834
diff changeset
2286 emms_c();
27359d425eb1 frame skip fixes
michael
parents: 2834
diff changeset
2287 ff_vbv_update(s, 0);
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2288
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2289 goto no_output_pic;
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2290 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2291 }
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2292
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2293 if(s->flags&CODEC_FLAG_PASS2){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2294 for(i=0; i<s->max_b_frames+1; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2295 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
2296
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2297 if(pict_num >= s->rc_context.num_entries)
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
2298 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
2299 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
2300 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
2301 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
2302 }
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
2303
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2304 s->input_picture[i]->pict_type=
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
2305 s->rc_context.entry[pict_num].new_pict_type;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2306 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2307 }
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2308
2297
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2309 if(s->avctx->b_frame_strategy==0){
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2310 b_frames= s->max_b_frames;
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2311 while(b_frames && !s->input_picture[b_frames]) b_frames--;
1687
cdc3d4106fb6 cleanup
michael
parents: 1686
diff changeset
2312 }else if(s->avctx->b_frame_strategy==1){
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2313 for(i=1; i<s->max_b_frames+1; i++){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2314 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2315 s->input_picture[i]->b_frame_score=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2316 get_intra_count(s, s->input_picture[i ]->data[0],
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2317 s->input_picture[i-1]->data[0], s->linesize) + 1;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2318 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2319 }
2728
9994e07cd45f fix max b frames with b frame strategy 1
michael
parents: 2677
diff changeset
2320 for(i=0; i<s->max_b_frames+1; i++){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
2321 if(s->input_picture[i]==NULL || s->input_picture[i]->b_frame_score - 1 > s->mb_num/40) break;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2322 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2323
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2324 b_frames= FFMAX(0, i-1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2325
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2326 /* reset scores */
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2327 for(i=0; i<b_frames+1; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2328 s->input_picture[i]->b_frame_score=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2329 }
2988
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2330 }else if(s->avctx->b_frame_strategy==2){
538eed481f62 b frame strategy 2
michael
parents: 2981
diff changeset
2331 b_frames= estimate_best_b_count(s);
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2332 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
2333 av_log(s->avctx, AV_LOG_ERROR, "illegal b frame strategy\n");
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2334 b_frames=0;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
2335 }
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2336
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2337 emms_c();
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2338 //static int b_count=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2339 //b_count+= b_frames;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1597
diff changeset
2340 //av_log(s->avctx, AV_LOG_DEBUG, "b_frames: %d\n", b_count);
2297
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2341
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2342 for(i= b_frames - 1; i>=0; i--){
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2343 int type= s->input_picture[i]->pict_type;
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2344 if(type && type != B_TYPE)
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2345 b_frames= i;
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2346 }
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2347 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
2348 av_log(s->avctx, AV_LOG_ERROR, "warning, too many b frames in a row\n");
2297
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2349 }
41b5a7bd9a96 fix forcing of individual frame types
michael
parents: 2292
diff changeset
2350
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2351 if(s->picture_in_gop_number + b_frames >= s->gop_size){
2298
3a8e557a8226 support strictly enforcing gop size
michael
parents: 2297
diff changeset
2352 if((s->flags2 & CODEC_FLAG2_STRICT_GOP) && s->gop_size > s->picture_in_gop_number){
3a8e557a8226 support strictly enforcing gop size
michael
parents: 2297
diff changeset
2353 b_frames= s->gop_size - s->picture_in_gop_number - 1;
3a8e557a8226 support strictly enforcing gop size
michael
parents: 2297
diff changeset
2354 }else{
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2355 if(s->flags & CODEC_FLAG_CLOSED_GOP)
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2356 b_frames=0;
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2357 s->input_picture[b_frames]->pict_type= I_TYPE;
2298
3a8e557a8226 support strictly enforcing gop size
michael
parents: 2297
diff changeset
2358 }
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2359 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2360
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2361 if( (s->flags & CODEC_FLAG_CLOSED_GOP)
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2362 && b_frames
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2363 && 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
2364 b_frames--;
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1751
diff changeset
2365
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2366 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
2367 if(s->reordered_input_picture[0]->pict_type != I_TYPE)
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2368 s->reordered_input_picture[0]->pict_type= P_TYPE;
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
2369 s->reordered_input_picture[0]->coded_picture_number= s->coded_picture_number++;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2370 for(i=0; i<b_frames; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2371 s->reordered_input_picture[i+1]= s->input_picture[i];
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
2372 s->reordered_input_picture[i+1]->pict_type= B_TYPE;
1705
954593137d37 picture number fixes
michael
parents: 1703
diff changeset
2373 s->reordered_input_picture[i+1]->coded_picture_number= s->coded_picture_number++;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2374 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2375 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2376 }
2381
cfc9e0489859 frame skip support
michael
parents: 2380
diff changeset
2377 no_output_pic:
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2378 if(s->reordered_input_picture[0]){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
2379 s->reordered_input_picture[0]->reference= s->reordered_input_picture[0]->pict_type!=B_TYPE ? 3 : 0;
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2380
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
2381 copy_picture(&s->new_picture, s->reordered_input_picture[0]);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2382
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2383 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
2384 // input is a shared pix, so we can't modifiy it -> alloc a new one & ensure that the shared one is reuseable
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2385
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
2386 int i= ff_find_unused_picture(s, 0);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2387 Picture *pic= &s->picture[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2388
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2389 /* mark us unused / free shared pic */
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2390 for(i=0; i<4; i++)
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2391 s->reordered_input_picture[0]->data[i]= NULL;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2392 s->reordered_input_picture[0]->type= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2393
1702
fbab59f03144 10l (forgot to copy top_field_first flag)
michael
parents: 1697
diff changeset
2394 pic->reference = s->reordered_input_picture[0]->reference;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2395
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2396 alloc_picture(s, pic, 0);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2397
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
2398 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
2399
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2400 s->current_picture_ptr= pic;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2401 }else{
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2402 // input is not a shared pix -> reuse buffer for current_pix
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2403
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2404 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2405 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2406
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2407 s->current_picture_ptr= s->reordered_input_picture[0];
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2408 for(i=0; i<4; i++){
3068
9aa8d8587bea fixing bframe strategy 2
michael
parents: 3036
diff changeset
2409 s->new_picture.data[i]+= INPLACE_OFFSET;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
2410 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2411 }
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
2412 copy_picture(&s->current_picture, s->current_picture_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2413
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2414 s->picture_number= s->new_picture.display_picture_number;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2415 //printf("dpn:%d\n", s->picture_number);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2416 }else{
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2417 memset(&s->new_picture, 0, sizeof(Picture));
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2418 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2419 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2420
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2421 int MPV_encode_picture(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
2422 unsigned char *buf, int buf_size, void *data)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2423 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2424 MpegEncContext *s = avctx->priv_data;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
2425 AVFrame *pic_arg = data;
1684
19e781619e3f stuffing to stay above min_bitrate
michael
parents: 1682
diff changeset
2426 int i, stuffing_count;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2427
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2428
diff changeset
2428 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
2429 av_log(avctx, AV_LOG_ERROR, "this codec supports only YUV420P\n");
1397
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
2430 return -1;
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
2431 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2432
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2433 for(i=0; i<avctx->thread_count; i++){
1838
8cdbb74c2f4b 10l (vdpart fix)
michael
parents: 1834
diff changeset
2434 int start_y= s->thread_context[i]->start_mb_y;
8cdbb74c2f4b 10l (vdpart fix)
michael
parents: 1834
diff changeset
2435 int end_y= s->thread_context[i]-> end_mb_y;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2436 int h= s->mb_height;
2807
3137aae854c9 Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de)
michael
parents: 2792
diff changeset
2437 uint8_t *start= buf + (size_t)(((int64_t) buf_size)*start_y/h);
3137aae854c9 Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de)
michael
parents: 2792
diff changeset
2438 uint8_t *end = buf + (size_t)(((int64_t) buf_size)* end_y/h);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2439
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2440 init_put_bits(&s->thread_context[i]->pb, start, end - start);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
2441 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2442
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2443 s->picture_in_gop_number++;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2444
2243
b8bad8bbbc64 check if the user specified timestamps are strictly monotone
michael
parents: 2235
diff changeset
2445 if(load_input_picture(s, pic_arg) < 0)
b8bad8bbbc64 check if the user specified timestamps are strictly monotone
michael
parents: 2235
diff changeset
2446 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2447
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2448 select_input_picture(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2449
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2450 /* output? */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2451 if(s->new_picture.data[0]){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2452 s->pict_type= s->new_picture.pict_type;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2453 //emms_c();
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2454 //printf("qs:%f %f %d\n", s->new_picture.quality, s->current_picture.quality, s->qscale);
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2455 MPV_frame_start(s, avctx);
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
2456
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2457 encode_picture(s, s->picture_number);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2458
376
ba9c3b8088c0 - pict_type exported to AVCodecContext
pulento
parents: 370
diff changeset
2459 avctx->real_pict_num = s->picture_number;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2460 avctx->header_bits = s->header_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2461 avctx->mv_bits = s->mv_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2462 avctx->misc_bits = s->misc_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2463 avctx->i_tex_bits = s->i_tex_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2464 avctx->p_tex_bits = s->p_tex_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2465 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
2466 avctx->p_count = s->mb_num - s->i_count - s->skip_count; //FIXME f/b_count in avctx
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2467 avctx->skip_count = s->skip_count;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2468
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2469 MPV_frame_end(s);
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2470
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2471 if (s->out_format == FMT_MJPEG)
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2472 mjpeg_picture_trailer(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2473
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
2474 if(s->flags&CODEC_FLAG_PASS1)
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
2475 ff_write_pass1_stats(s);
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2476
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2477 for(i=0; i<4; i++){
2955
64f38f1be88f psnr calculation with threads>1 fix
michael
parents: 2931
diff changeset
2478 s->current_picture_ptr->error[i]= s->current_picture.error[i];
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2479 avctx->error[i] += s->current_picture_ptr->error[i];
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2480 }
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2481
2428
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
2482 if(s->flags&CODEC_FLAG_PASS1)
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
2483 assert(avctx->header_bits + avctx->mv_bits + avctx->misc_bits + avctx->i_tex_bits + avctx->p_tex_bits == put_bits_count(&s->pb));
1684
19e781619e3f stuffing to stay above min_bitrate
michael
parents: 1682
diff changeset
2484 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
2485 s->frame_bits = put_bits_count(&s->pb);
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2486
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2487 stuffing_count= ff_vbv_update(s, s->frame_bits);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2488 if(stuffing_count){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2489 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < stuffing_count + 50){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2490 av_log(s->avctx, AV_LOG_ERROR, "stuffing too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2491 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2492 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
2493
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2494 switch(s->codec_id){
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2495 case CODEC_ID_MPEG1VIDEO:
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2496 case CODEC_ID_MPEG2VIDEO:
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2497 while(stuffing_count--){
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2498 put_bits(&s->pb, 8, 0);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2499 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2500 break;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2501 case CODEC_ID_MPEG4:
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2502 put_bits(&s->pb, 16, 0);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2503 put_bits(&s->pb, 16, 0x1C3);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2504 stuffing_count -= 4;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2505 while(stuffing_count--){
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2506 put_bits(&s->pb, 8, 0xFF);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2507 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2508 break;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2509 default:
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2510 av_log(s->avctx, AV_LOG_ERROR, "vbv buffer overflow\n");
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2511 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2512 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
2513 s->frame_bits = put_bits_count(&s->pb);
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2514 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2515
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2516 /* update mpeg1/2 vbv_delay for CBR */
1907
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
2517 if(s->avctx->rc_max_rate && s->avctx->rc_min_rate == s->avctx->rc_max_rate && s->out_format == FMT_MPEG1
7ff22288289e huge vbv buffer size + CBR fix
michael
parents: 1904
diff changeset
2518 && 90000LL * (avctx->rc_buffer_size-1) <= s->avctx->rc_max_rate*0xFFFFLL){
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2519 int vbv_delay;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2520
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2521 assert(s->repeat_first_field==0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2522
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2523 vbv_delay= lrintf(90000 * s->rc_context.buffer_index / s->avctx->rc_max_rate);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2524 assert(vbv_delay < 0xFFFF);
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2525
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2526 s->vbv_delay_ptr[0] &= 0xF8;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2527 s->vbv_delay_ptr[0] |= vbv_delay>>13;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2528 s->vbv_delay_ptr[1] = vbv_delay>>5;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2529 s->vbv_delay_ptr[2] &= 0x07;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2530 s->vbv_delay_ptr[2] |= vbv_delay<<3;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2531 }
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2532 s->total_bits += s->frame_bits;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2533 avctx->frame_bits = s->frame_bits;
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2534 }else{
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2535 assert((pbBufPtr(&s->pb) == s->pb.buf));
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2536 s->frame_bits=0;
1684
19e781619e3f stuffing to stay above min_bitrate
michael
parents: 1682
diff changeset
2537 }
1766
95c7b69f37f3 b frames + cbr fix
michael
parents: 1760
diff changeset
2538 assert((s->frame_bits&7)==0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2539
1684
19e781619e3f stuffing to stay above min_bitrate
michael
parents: 1682
diff changeset
2540 return s->frame_bits/8;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2541 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2542
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
2543 #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
2544
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2545 static inline void gmc1_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2546 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
2547 uint8_t **ref_picture)
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2548 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2549 uint8_t *ptr;
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
2550 int offset, src_x, src_y, linesize, uvlinesize;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2551 int motion_x, motion_y;
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2552 int emu=0;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2553
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2554 motion_x= s->sprite_offset[0][0];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2555 motion_y= s->sprite_offset[0][1];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2556 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2557 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2558 motion_x<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2559 motion_y<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2560 src_x = clip(src_x, -16, s->width);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2561 if (src_x == s->width)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2562 motion_x =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2563 src_y = clip(src_y, -16, s->height);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2564 if (src_y == s->height)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2565 motion_y =0;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2566
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2567 linesize = s->linesize;
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
2568 uvlinesize = s->uvlinesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2569
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2570 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
2571
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2572 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
2573 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
2574 || (unsigned)src_y >= s->v_edge_pos - 17){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2575 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
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2576 ptr= s->edge_emu_buffer;
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2577 }
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2578 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2579
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2580 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
2581 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
2582 s->dsp.gmc1(dest_y+8, ptr+8, linesize, 16, motion_x&15, motion_y&15, 128 - s->no_rounding);
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2583 }else{
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2584 int dxy;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2585
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2586 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2587 if (s->no_rounding){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
2588 s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16);
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2589 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2590 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
2591 }
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2592 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2593
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2594 if(s->flags&CODEC_FLAG_GRAY) return;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2595
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2596 motion_x= s->sprite_offset[1][0];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2597 motion_y= s->sprite_offset[1][1];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2598 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2599 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2600 motion_x<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2601 motion_y<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2602 src_x = clip(src_x, -8, s->width>>1);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2603 if (src_x == s->width>>1)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2604 motion_x =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2605 src_y = clip(src_y, -8, s->height>>1);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2606 if (src_y == s->height>>1)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2607 motion_y =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2608
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2609 offset = (src_y * uvlinesize) + src_x;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2610 ptr = ref_picture[1] + offset;
1002
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
2611 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
2612 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
2613 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2614 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
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
2615 ptr= s->edge_emu_buffer;
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
2616 emu=1;
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
2617 }
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2618 }
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2619 s->dsp.gmc1(dest_cb, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2620
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2621 ptr = ref_picture[2] + offset;
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2622 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2623 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
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2624 ptr= s->edge_emu_buffer;
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2625 }
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2626 s->dsp.gmc1(dest_cr, ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2627
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2628 return;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2629 }
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2630
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2631 static inline void gmc_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2632 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
2633 uint8_t **ref_picture)
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2634 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2635 uint8_t *ptr;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2636 int linesize, uvlinesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2637 const int a= s->sprite_warping_accuracy;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2638 int ox, oy;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2639
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2640 linesize = s->linesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2641 uvlinesize = s->uvlinesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2642
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2643 ptr = ref_picture[0];
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2644
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2645 ox= s->sprite_offset[0][0] + s->sprite_delta[0][0]*s->mb_x*16 + s->sprite_delta[0][1]*s->mb_y*16;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2646 oy= s->sprite_offset[0][1] + s->sprite_delta[1][0]*s->mb_x*16 + s->sprite_delta[1][1]*s->mb_y*16;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2647
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2648 s->dsp.gmc(dest_y, ptr, linesize, 16,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2649 ox,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2650 oy,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2651 s->sprite_delta[0][0], s->sprite_delta[0][1],
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2652 s->sprite_delta[1][0], s->sprite_delta[1][1],
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2653 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2654 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
2655 s->dsp.gmc(dest_y+8, ptr, linesize, 16,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2656 ox + s->sprite_delta[0][0]*8,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2657 oy + s->sprite_delta[1][0]*8,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2658 s->sprite_delta[0][0], s->sprite_delta[0][1],
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2659 s->sprite_delta[1][0], s->sprite_delta[1][1],
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2660 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2661 s->h_edge_pos, s->v_edge_pos);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2662
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2663 if(s->flags&CODEC_FLAG_GRAY) return;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2664
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2665 ox= s->sprite_offset[1][0] + s->sprite_delta[0][0]*s->mb_x*8 + s->sprite_delta[0][1]*s->mb_y*8;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2666 oy= s->sprite_offset[1][1] + s->sprite_delta[1][0]*s->mb_x*8 + s->sprite_delta[1][1]*s->mb_y*8;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2667
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2668 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
2669 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2670 ox,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2671 oy,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2672 s->sprite_delta[0][0], s->sprite_delta[0][1],
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2673 s->sprite_delta[1][0], s->sprite_delta[1][1],
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2674 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2675 s->h_edge_pos>>1, s->v_edge_pos>>1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2676
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2677 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
2678 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2679 ox,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2680 oy,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2681 s->sprite_delta[0][0], s->sprite_delta[0][1],
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2682 s->sprite_delta[1][0], s->sprite_delta[1][1],
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2683 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2684 s->h_edge_pos>>1, s->v_edge_pos>>1);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2685 }
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2686
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2687 /**
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2688 * 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
2689 * @param buf destination buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2690 * @param src source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2691 * @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
2692 * @param block_w width of block
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2693 * @param block_h height of block
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2694 * @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
2695 * @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
2696 * @param w width of the source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2697 * @param h height of the source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2698 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2699 void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h,
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2700 int src_x, int src_y, int w, int h){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2701 int x, y;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2702 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
2703
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2704 if(src_y>= h){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2705 src+= (h-1-src_y)*linesize;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2706 src_y=h-1;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2707 }else if(src_y<=-block_h){
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2708 src+= (1-block_h-src_y)*linesize;
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2709 src_y=1-block_h;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2710 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2711 if(src_x>= w){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2712 src+= (w-1-src_x);
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2713 src_x=w-1;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2714 }else if(src_x<=-block_w){
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2715 src+= (1-block_w-src_x);
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2716 src_x=1-block_w;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2717 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2718
847
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
2719 start_y= FFMAX(0, -src_y);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
2720 start_x= FFMAX(0, -src_x);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
2721 end_y= FFMIN(block_h, h-src_y);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
2722 end_x= FFMIN(block_w, w-src_x);
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
2723
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2724 // copy existing part
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2725 for(y=start_y; y<end_y; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2726 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2727 buf[x + y*linesize]= src[x + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2728 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2729 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2730
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2731 //top
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2732 for(y=0; y<start_y; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2733 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2734 buf[x + y*linesize]= buf[x + start_y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2735 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2736 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2737
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2738 //bottom
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2739 for(y=end_y; y<block_h; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2740 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2741 buf[x + y*linesize]= buf[x + (end_y-1)*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2742 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2743 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2744
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2745 for(y=0; y<block_h; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2746 //left
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2747 for(x=0; x<start_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2748 buf[x + y*linesize]= buf[start_x + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2749 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2750
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2751 //right
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2752 for(x=end_x; x<block_w; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2753 buf[x + y*linesize]= buf[end_x - 1 + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2754 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2755 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2756 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2757
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2758 static inline int hpel_motion(MpegEncContext *s,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2759 uint8_t *dest, uint8_t *src,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2760 int field_based, int field_select,
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2761 int src_x, int src_y,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2762 int width, int height, int stride,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2763 int h_edge_pos, int v_edge_pos,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2764 int w, int h, op_pixels_func *pix_op,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2765 int motion_x, int motion_y)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2766 {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2767 int dxy;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2768 int emu=0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2769
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2770 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2771 src_x += motion_x >> 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2772 src_y += motion_y >> 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2773
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2774 /* WARNING: do no forget half pels */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2775 src_x = clip(src_x, -16, width); //FIXME unneeded for emu?
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2776 if (src_x == width)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2777 dxy &= ~1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2778 src_y = clip(src_y, -16, height);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2779 if (src_y == height)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2780 dxy &= ~2;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2781 src += src_y * stride + src_x;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2782
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2783 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2784 if( (unsigned)src_x > h_edge_pos - (motion_x&1) - w
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2785 || (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
2786 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
2787 src_x, src_y<<field_based, h_edge_pos, s->v_edge_pos);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2788 src= s->edge_emu_buffer;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2789 emu=1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2790 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2791 }
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2792 if(field_select)
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
2793 src += s->linesize;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2794 pix_op[dxy](dest, src, stride, h);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2795 return emu;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2796 }
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2797
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2798 static inline int hpel_motion_lowres(MpegEncContext *s,
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2799 uint8_t *dest, uint8_t *src,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2800 int field_based, int field_select,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2801 int src_x, int src_y,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2802 int width, int height, int stride,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2803 int h_edge_pos, int v_edge_pos,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2804 int w, int h, h264_chroma_mc_func *pix_op,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2805 int motion_x, int motion_y)
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2806 {
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2807 const int lowres= s->avctx->lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2808 const int s_mask= (2<<lowres)-1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2809 int emu=0;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2810 int sx, sy;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2811
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2812 if(s->quarter_sample){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2813 motion_x/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2814 motion_y/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2815 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2816
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2817 sx= motion_x & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2818 sy= motion_y & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2819 src_x += motion_x >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2820 src_y += motion_y >> (lowres+1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2821
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2822 src += src_y * stride + src_x;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2823
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2824 if( (unsigned)src_x > h_edge_pos - (!!sx) - w
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2825 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2826 ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, w+1, (h+1)<<field_based,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2827 src_x, src_y<<field_based, h_edge_pos, v_edge_pos);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2828 src= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2829 emu=1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2830 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2831
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2832 sx <<= 2 - lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2833 sy <<= 2 - lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2834 if(field_select)
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2835 src += s->linesize;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2836 pix_op[lowres](dest, src, stride, h, sx, sy);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2837 return emu;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2838 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
2839
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2840 /* 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
2841 static always_inline void mpeg_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2842 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
2843 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
2844 uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2845 int motion_x, int motion_y, int h)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2846 {
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2847 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2848 int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2849
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2850 #if 0
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2851 if(s->quarter_sample)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2852 {
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2853 motion_x>>=1;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2854 motion_y>>=1;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2855 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2856 #endif
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2857
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
2858 v_edge_pos = s->v_edge_pos >> field_based;
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2859 linesize = s->current_picture.linesize[0] << field_based;
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2860 uvlinesize = s->current_picture.linesize[1] << field_based;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
2861
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2862 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2863 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
2864 src_y =(s->mb_y<<(4-field_based)) + (motion_y >> 1);
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2865
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2866 if (s->out_format == FMT_H263) {
1916
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2867 if((s->workaround_bugs & FF_BUG_HPEL_CHROMA) && field_based){
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2868 mx = (motion_x>>1)|(motion_x&1);
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2869 my = motion_y >>1;
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2870 uvdxy = ((my & 1) << 1) | (mx & 1);
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2871 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
2872 uvsrc_y = (s->mb_y<<(3-field_based)) + (my >> 1);
1916
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2873 }else{
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2874 uvdxy = dxy | (motion_y & 2) | ((motion_x & 2) >> 1);
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2875 uvsrc_x = src_x>>1;
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2876 uvsrc_y = src_y>>1;
f2d134308a70 interlaced chroma MC divx-bug workaround
michael
parents: 1907
diff changeset
2877 }
2044
b6f2add2511e h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 2042
diff changeset
2878 }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
2879 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
2880 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
2881 uvdxy = 0;
b6f2add2511e h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>)
michael
parents: 2042
diff changeset
2882 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
2883 uvsrc_y = s->mb_y*8 + my;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2884 } else {
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2885 if(s->chroma_y_shift){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2886 mx = motion_x / 2;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2887 my = motion_y / 2;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2888 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
2889 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
2890 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
2891 } else {
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2892 if(s->chroma_x_shift){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2893 //Chroma422
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2894 mx = motion_x / 2;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2895 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
2896 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
2897 uvsrc_y = src_y;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2898 } else {
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2899 //Chroma444
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2900 uvdxy = dxy;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2901 uvsrc_x = src_x;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2902 uvsrc_y = src_y;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2903 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2904 }
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2905 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2906
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2907 ptr_y = ref_picture[0] + src_y * linesize + src_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2908 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2909 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2910
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2911 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2912 || (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
2913 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
2914 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
2915 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
2916 return ;
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
2917 }
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2918 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2919 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2920 ptr_y = s->edge_emu_buffer;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2921 if(!(s->flags&CODEC_FLAG_GRAY)){
1874
michael
parents: 1863
diff changeset
2922 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2923 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based,
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2924 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2925 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based,
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2926 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2927 ptr_cb= uvbuf;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2928 ptr_cr= uvbuf+16;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2929 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2930 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2931
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2932 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2933 dest_y += s->linesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2934 dest_cb+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2935 dest_cr+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2936 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2937
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2938 if(field_select){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2939 ptr_y += s->linesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2940 ptr_cb+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2941 ptr_cr+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2942 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2943
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2944 pix_op[0][dxy](dest_y, ptr_y, linesize, h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2945
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2946 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
2947 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
2948 pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift);
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
2949 }
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
2950 #if defined(CONFIG_H261_ENCODER) || defined(CONFIG_H261_DECODER)
2291
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
2951 if(s->out_format == FMT_H261){
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
2952 ff_h261_loop_filter(s);
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
2953 }
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
2954 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2955 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2956
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2957 /* apply one mpeg motion vector to the three components */
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2958 static always_inline void mpeg_motion_lowres(MpegEncContext *s,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2959 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2960 int field_based, int bottom_field, int field_select,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2961 uint8_t **ref_picture, h264_chroma_mc_func *pix_op,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2962 int motion_x, int motion_y, int h)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2963 {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2964 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2965 int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, uvlinesize, linesize, sx, sy, uvsx, uvsy;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2966 const int lowres= s->avctx->lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2967 const int block_s= 8>>lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2968 const int s_mask= (2<<lowres)-1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2969 const int h_edge_pos = s->h_edge_pos >> lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2970 const int v_edge_pos = s->v_edge_pos >> lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2971 linesize = s->current_picture.linesize[0] << field_based;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2972 uvlinesize = s->current_picture.linesize[1] << field_based;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2973
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2974 if(s->quarter_sample){ //FIXME obviously not perfect but qpel wont work in lowres anyway
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2975 motion_x/=2;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2976 motion_y/=2;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2977 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2978
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2979 if(field_based){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2980 motion_y += (bottom_field - field_select)*((1<<lowres)-1);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2981 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2982
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2983 sx= motion_x & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2984 sy= motion_y & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2985 src_x = s->mb_x*2*block_s + (motion_x >> (lowres+1));
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
2986 src_y =(s->mb_y*2*block_s>>field_based) + (motion_y >> (lowres+1));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2987
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2988 if (s->out_format == FMT_H263) {
2265
c93da911905e lowres chroma fix
michael
parents: 2264
diff changeset
2989 uvsx = ((motion_x>>1) & s_mask) | (sx&1);
c93da911905e lowres chroma fix
michael
parents: 2264
diff changeset
2990 uvsy = ((motion_y>>1) & s_mask) | (sy&1);
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2991 uvsrc_x = src_x>>1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2992 uvsrc_y = src_y>>1;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2993 }else if(s->out_format == FMT_H261){//even chroma mv's are full pel in H261
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2994 mx = motion_x / 4;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2995 my = motion_y / 4;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2996 uvsx = (2*mx) & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2997 uvsy = (2*my) & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2998 uvsrc_x = s->mb_x*block_s + (mx >> lowres);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
2999 uvsrc_y = s->mb_y*block_s + (my >> lowres);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3000 } else {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3001 mx = motion_x / 2;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3002 my = motion_y / 2;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3003 uvsx = mx & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3004 uvsy = my & s_mask;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3005 uvsrc_x = s->mb_x*block_s + (mx >> (lowres+1));
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3006 uvsrc_y =(s->mb_y*block_s>>field_based) + (my >> (lowres+1));
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3007 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3008
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3009 ptr_y = ref_picture[0] + src_y * linesize + src_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3010 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3011 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3012
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3013 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3014 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3015 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3016 src_x, src_y<<field_based, h_edge_pos, v_edge_pos);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3017 ptr_y = s->edge_emu_buffer;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3018 if(!(s->flags&CODEC_FLAG_GRAY)){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3019 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3020 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3021 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3022 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3023 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3024 ptr_cb= uvbuf;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3025 ptr_cr= uvbuf+16;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3026 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3027 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3028
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3029 if(bottom_field){ //FIXME use this for field pix too instead of the obnoxious hack which changes picture.data
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3030 dest_y += s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3031 dest_cb+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3032 dest_cr+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3033 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3034
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3035 if(field_select){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3036 ptr_y += s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3037 ptr_cb+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3038 ptr_cr+= s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3039 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3040
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3041 sx <<= 2 - lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3042 sy <<= 2 - lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3043 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3044
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3045 if(!(s->flags&CODEC_FLAG_GRAY)){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3046 uvsx <<= 2 - lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3047 uvsy <<= 2 - lowres;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3048 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3049 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3050 }
2291
c4e882a7c07c h.261 loop filter fix
michael
parents: 2289
diff changeset
3051 //FIXME h261 lowres loop filter
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3052 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3053
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3054 //FIXME move to dsputil, avg variant, 16x16 version
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3055 static inline void put_obmc(uint8_t *dst, uint8_t *src[5], int stride){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3056 int x;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3057 uint8_t * const top = src[1];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3058 uint8_t * const left = src[2];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3059 uint8_t * const mid = src[0];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3060 uint8_t * const right = src[3];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3061 uint8_t * const bottom= src[4];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3062 #define OBMC_FILTER(x, t, l, m, r, b)\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3063 dst[x]= (t*top[x] + l*left[x] + m*mid[x] + r*right[x] + b*bottom[x] + 4)>>3
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3064 #define OBMC_FILTER4(x, t, l, m, r, b)\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3065 OBMC_FILTER(x , t, l, m, r, b);\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3066 OBMC_FILTER(x+1 , t, l, m, r, b);\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3067 OBMC_FILTER(x +stride, t, l, m, r, b);\
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3068 OBMC_FILTER(x+1+stride, t, l, m, r, b);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3069
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3070 x=0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3071 OBMC_FILTER (x , 2, 2, 4, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3072 OBMC_FILTER (x+1, 2, 1, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3073 OBMC_FILTER4(x+2, 2, 1, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3074 OBMC_FILTER4(x+4, 2, 0, 5, 1, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3075 OBMC_FILTER (x+6, 2, 0, 5, 1, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3076 OBMC_FILTER (x+7, 2, 0, 4, 2, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3077 x+= stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3078 OBMC_FILTER (x , 1, 2, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3079 OBMC_FILTER (x+1, 1, 2, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3080 OBMC_FILTER (x+6, 1, 0, 5, 2, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3081 OBMC_FILTER (x+7, 1, 0, 5, 2, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3082 x+= stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3083 OBMC_FILTER4(x , 1, 2, 5, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3084 OBMC_FILTER4(x+2, 1, 1, 6, 0, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3085 OBMC_FILTER4(x+4, 1, 0, 6, 1, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3086 OBMC_FILTER4(x+6, 1, 0, 5, 2, 0);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3087 x+= 2*stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3088 OBMC_FILTER4(x , 0, 2, 5, 0, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3089 OBMC_FILTER4(x+2, 0, 1, 6, 0, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3090 OBMC_FILTER4(x+4, 0, 0, 6, 1, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3091 OBMC_FILTER4(x+6, 0, 0, 5, 2, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3092 x+= 2*stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3093 OBMC_FILTER (x , 0, 2, 5, 0, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3094 OBMC_FILTER (x+1, 0, 2, 5, 0, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3095 OBMC_FILTER4(x+2, 0, 1, 5, 0, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3096 OBMC_FILTER4(x+4, 0, 0, 5, 1, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3097 OBMC_FILTER (x+6, 0, 0, 5, 2, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3098 OBMC_FILTER (x+7, 0, 0, 5, 2, 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3099 x+= stride;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3100 OBMC_FILTER (x , 0, 2, 4, 0, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3101 OBMC_FILTER (x+1, 0, 1, 5, 0, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3102 OBMC_FILTER (x+6, 0, 0, 5, 1, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3103 OBMC_FILTER (x+7, 0, 0, 4, 2, 2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3104 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3105
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3106 /* obmc for 1 8x8 luma block */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3107 static inline void obmc_motion(MpegEncContext *s,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3108 uint8_t *dest, uint8_t *src,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3109 int src_x, int src_y,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3110 op_pixels_func *pix_op,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3111 int16_t mv[5][2]/* mid top left right bottom*/)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3112 #define MID 0
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3113 {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3114 int i;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3115 uint8_t *ptr[5];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3116
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3117 assert(s->quarter_sample==0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3118
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3119 for(i=0; i<5; i++){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3120 if(i && mv[i][0]==mv[MID][0] && mv[i][1]==mv[MID][1]){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3121 ptr[i]= ptr[MID];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3122 }else{
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
3123 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
3124 hpel_motion(s, ptr[i], src, 0, 0,
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3125 src_x, src_y,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3126 s->width, s->height, s->linesize,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3127 s->h_edge_pos, s->v_edge_pos,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3128 8, 8, pix_op,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3129 mv[i][0], mv[i][1]);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3130 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3131 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3132
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3133 put_obmc(dest, ptr, s->linesize);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3134 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3135
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3136 static inline void qpel_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3137 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
3138 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
3139 uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3140 qpel_mc_func (*qpix_op)[16],
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3141 int motion_x, int motion_y, int h)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3142 {
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3143 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3144 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
3145
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3146 dxy = ((motion_y & 3) << 2) | (motion_x & 3);
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3147 src_x = s->mb_x * 16 + (motion_x >> 2);
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3148 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3149
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
3150 v_edge_pos = s->v_edge_pos >> field_based;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3151 linesize = s->linesize << field_based;
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3152 uvlinesize = s->uvlinesize << field_based;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3153
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3154 if(field_based){
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3155 mx= motion_x/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3156 my= motion_y>>1;
1048
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3157 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3158 static const int rtab[8]= {0,0,1,1,0,0,0,1};
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3159 mx= (motion_x>>1) + rtab[motion_x&7];
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3160 my= (motion_y>>1) + rtab[motion_y&7];
760
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 756
diff changeset
3161 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3162 mx= (motion_x>>1)|(motion_x&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3163 my= (motion_y>>1)|(motion_y&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3164 }else{
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3165 mx= motion_x/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3166 my= motion_y/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3167 }
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3168 mx= (mx>>1)|(mx&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3169 my= (my>>1)|(my&1);
1048
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
3170
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3171 uvdxy= (mx&1) | ((my&1)<<1);
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3172 mx>>=1;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3173 my>>=1;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3174
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3175 uvsrc_x = s->mb_x * 8 + mx;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3176 uvsrc_y = s->mb_y * (8 >> field_based) + my;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3177
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3178 ptr_y = ref_picture[0] + src_y * linesize + src_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3179 ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3180 ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3181
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3182 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3183 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3184 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3185 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3186 ptr_y= s->edge_emu_buffer;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3187 if(!(s->flags&CODEC_FLAG_GRAY)){
1874
michael
parents: 1863
diff changeset
3188 uint8_t *uvbuf= s->edge_emu_buffer + 18*s->linesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3189 ff_emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, 9, 9 + field_based,
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3190 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3191 ff_emulated_edge_mc(uvbuf + 16, ptr_cr, s->uvlinesize, 9, 9 + field_based,
1846
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3192 uvsrc_x, uvsrc_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3193 ptr_cb= uvbuf;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3194 ptr_cr= uvbuf + 16;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3195 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3196 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3197
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3198 if(!field_based)
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3199 qpix_op[0][dxy](dest_y, ptr_y, linesize);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3200 else{
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3201 if(bottom_field){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3202 dest_y += s->linesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3203 dest_cb+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3204 dest_cr+= s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3205 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3206
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3207 if(field_select){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3208 ptr_y += s->linesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3209 ptr_cb += s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3210 ptr_cr += s->uvlinesize;
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3211 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3212 //damn interlaced mode
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3213 //FIXME boundary mirroring is not exactly correct here
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3214 qpix_op[1][dxy](dest_y , ptr_y , linesize);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3215 qpix_op[1][dxy](dest_y+8, ptr_y+8, linesize);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3216 }
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3217 if(!(s->flags&CODEC_FLAG_GRAY)){
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3218 pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3219 pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1);
cea4f1a80059 optimizing/cleanup of mpeg/qpel_motion()
michael
parents: 1843
diff changeset
3220 }
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3221 }
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3222
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3223 inline int ff_h263_round_chroma(int x){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3224 if (x >= 0)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3225 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1));
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3226 else {
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3227 x = -x;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3228 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1));
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3229 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3230 }
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3231
1225
michaelni
parents: 1218
diff changeset
3232 /**
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3233 * h263 chorma 4mv motion compensation.
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3234 */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3235 static inline void chroma_4mv_motion(MpegEncContext *s,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3236 uint8_t *dest_cb, uint8_t *dest_cr,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3237 uint8_t **ref_picture,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3238 op_pixels_func *pix_op,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3239 int mx, int my){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3240 int dxy, emu=0, src_x, src_y, offset;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3241 uint8_t *ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3242
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3243 /* In case of 8X8, we construct a single chroma motion vector
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3244 with a special rounding */
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3245 mx= ff_h263_round_chroma(mx);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3246 my= ff_h263_round_chroma(my);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3247
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3248 dxy = ((my & 1) << 1) | (mx & 1);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3249 mx >>= 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3250 my >>= 1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3251
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3252 src_x = s->mb_x * 8 + mx;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3253 src_y = s->mb_y * 8 + my;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3254 src_x = clip(src_x, -8, s->width/2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3255 if (src_x == s->width/2)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3256 dxy &= ~1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3257 src_y = clip(src_y, -8, s->height/2);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3258 if (src_y == s->height/2)
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3259 dxy &= ~2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3260
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3261 offset = (src_y * (s->uvlinesize)) + src_x;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3262 ptr = ref_picture[1] + offset;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3263 if(s->flags&CODEC_FLAG_EMU_EDGE){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3264 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3265 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3266 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);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3267 ptr= s->edge_emu_buffer;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3268 emu=1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3269 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3270 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3271 pix_op[dxy](dest_cb, ptr, s->uvlinesize, 8);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3272
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3273 ptr = ref_picture[2] + offset;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3274 if(emu){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3275 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);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3276 ptr= s->edge_emu_buffer;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3277 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3278 pix_op[dxy](dest_cr, ptr, s->uvlinesize, 8);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3279 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3280
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3281 static inline void chroma_4mv_motion_lowres(MpegEncContext *s,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3282 uint8_t *dest_cb, uint8_t *dest_cr,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3283 uint8_t **ref_picture,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3284 h264_chroma_mc_func *pix_op,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3285 int mx, int my){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3286 const int lowres= s->avctx->lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3287 const int block_s= 8>>lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3288 const int s_mask= (2<<lowres)-1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3289 const int h_edge_pos = s->h_edge_pos >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3290 const int v_edge_pos = s->v_edge_pos >> (lowres+1);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3291 int emu=0, src_x, src_y, offset, sx, sy;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3292 uint8_t *ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3293
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3294 if(s->quarter_sample){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3295 mx/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3296 my/=2;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3297 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3298
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3299 /* In case of 8X8, we construct a single chroma motion vector
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3300 with a special rounding */
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3301 mx= ff_h263_round_chroma(mx);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3302 my= ff_h263_round_chroma(my);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3303
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3304 sx= mx & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3305 sy= my & s_mask;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3306 src_x = s->mb_x*block_s + (mx >> (lowres+1));
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3307 src_y = s->mb_y*block_s + (my >> (lowres+1));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3308
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3309 offset = src_y * s->uvlinesize + src_x;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3310 ptr = ref_picture[1] + offset;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3311 if(s->flags&CODEC_FLAG_EMU_EDGE){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3312 if( (unsigned)src_x > h_edge_pos - (!!sx) - block_s
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3313 || (unsigned)src_y > v_edge_pos - (!!sy) - block_s){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3314 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3315 ptr= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3316 emu=1;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3317 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3318 }
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3319 sx <<= 2 - lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3320 sy <<= 2 - lowres;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3321 pix_op[lowres](dest_cb, ptr, s->uvlinesize, block_s, sx, sy);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3322
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3323 ptr = ref_picture[2] + offset;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3324 if(emu){
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3325 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9, src_x, src_y, h_edge_pos, v_edge_pos);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3326 ptr= s->edge_emu_buffer;
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3327 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3328 pix_op[lowres](dest_cr, ptr, s->uvlinesize, block_s, sx, sy);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3329 }
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3330
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3331 /**
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
3332 * motion compensation of a single macroblock
1225
michaelni
parents: 1218
diff changeset
3333 * @param s context
michaelni
parents: 1218
diff changeset
3334 * @param dest_y luma destination pointer
michaelni
parents: 1218
diff changeset
3335 * @param dest_cb chroma cb/u destination pointer
michaelni
parents: 1218
diff changeset
3336 * @param dest_cr chroma cr/v destination pointer
michaelni
parents: 1218
diff changeset
3337 * @param dir direction (0->forward, 1->backward)
michaelni
parents: 1218
diff changeset
3338 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture
michaelni
parents: 1218
diff changeset
3339 * @param pic_op halfpel motion compensation function (average or put normally)
michaelni
parents: 1218
diff changeset
3340 * @param pic_op qpel motion compensation function (average or put normally)
michaelni
parents: 1218
diff changeset
3341 * the motion vectors are taken from s->mv and the MV type from s->mv_type
michaelni
parents: 1218
diff changeset
3342 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3343 static inline void MPV_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3344 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3345 int dir, uint8_t **ref_picture,
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3346 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16])
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3347 {
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3348 int dxy, mx, my, src_x, src_y, motion_x, motion_y;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3349 int mb_x, mb_y, i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3350 uint8_t *ptr, *dest;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3351
986e461dc072 Initial revision
glantau
parents:
diff changeset
3352 mb_x = s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3353 mb_y = s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3354
1655
c92147a61d97 rv20 (h263) b frame decoding support
michael
parents: 1652
diff changeset
3355 if(s->obmc && s->pict_type != B_TYPE){
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3356 int16_t mv_cache[4][4][2];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3357 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
3358 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
3359 const int mot_xy= mb_x*2 + mb_y*2*mot_stride;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3360
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
3361 assert(!s->mb_skipped);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3362
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3363 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
3364 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
3365 memcpy(mv_cache[3][1], s->current_picture.motion_val[0][mot_xy+mot_stride], sizeof(int16_t)*4);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3366
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3367 if(mb_y==0 || IS_INTRA(s->current_picture.mb_type[xy-s->mb_stride])){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3368 memcpy(mv_cache[0][1], mv_cache[1][1], sizeof(int16_t)*4);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3369 }else{
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3370 memcpy(mv_cache[0][1], s->current_picture.motion_val[0][mot_xy-mot_stride], sizeof(int16_t)*4);
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3371 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3372
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3373 if(mb_x==0 || IS_INTRA(s->current_picture.mb_type[xy-1])){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3374 *(int32_t*)mv_cache[1][0]= *(int32_t*)mv_cache[1][1];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3375 *(int32_t*)mv_cache[2][0]= *(int32_t*)mv_cache[2][1];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3376 }else{
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3377 *(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
3378 *(int32_t*)mv_cache[2][0]= *(int32_t*)s->current_picture.motion_val[0][mot_xy-1+mot_stride];
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3379 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3380
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3381 if(mb_x+1>=s->mb_width || IS_INTRA(s->current_picture.mb_type[xy+1])){
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3382 *(int32_t*)mv_cache[1][3]= *(int32_t*)mv_cache[1][2];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3383 *(int32_t*)mv_cache[2][3]= *(int32_t*)mv_cache[2][2];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3384 }else{
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1662
diff changeset
3385 *(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
3386 *(int32_t*)mv_cache[2][3]= *(int32_t*)s->current_picture.motion_val[0][mot_xy+2+mot_stride];
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3387 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3388
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3389 mx = 0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3390 my = 0;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3391 for(i=0;i<4;i++) {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3392 const int x= (i&1)+1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3393 const int y= (i>>1)+1;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3394 int16_t mv[5][2]= {
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3395 {mv_cache[y][x ][0], mv_cache[y][x ][1]},
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3396 {mv_cache[y-1][x][0], mv_cache[y-1][x][1]},
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3397 {mv_cache[y][x-1][0], mv_cache[y][x-1][1]},
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3398 {mv_cache[y][x+1][0], mv_cache[y][x+1][1]},
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3399 {mv_cache[y+1][x][0], mv_cache[y+1][x][1]}};
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3400 //FIXME cleanup
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3401 obmc_motion(s, dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3402 ref_picture[0],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3403 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3404 pix_op[1],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3405 mv);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3406
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3407 mx += mv[0][0];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3408 my += mv[0][1];
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3409 }
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3410 if(!(s->flags&CODEC_FLAG_GRAY))
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3411 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my);
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3412
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3413 return;
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3414 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3415
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3416 switch(s->mv_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3417 case MV_TYPE_16X16:
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3418 if(s->mcsel){
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
3419 if(s->real_sprite_warping_points==1){
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3420 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
3421 ref_picture);
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
3422 }else{
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3423 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
3424 ref_picture);
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
3425 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3426 }else if(s->quarter_sample){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3427 qpel_motion(s, dest_y, dest_cb, dest_cr,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3428 0, 0, 0,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3429 ref_picture, pix_op, qpix_op,
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3430 s->mv[dir][0][0], s->mv[dir][0][1], 16);
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3431 }else if(s->mspel){
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3432 ff_mspel_motion(s, dest_y, dest_cb, dest_cr,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3433 ref_picture, pix_op,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3434 s->mv[dir][0][0], s->mv[dir][0][1], 16);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3435 }else
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3436 {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3437 mpeg_motion(s, dest_y, dest_cb, dest_cr,
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3438 0, 0, 0,
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3439 ref_picture, pix_op,
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
3440 s->mv[dir][0][0], s->mv[dir][0][1], 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3441 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3442 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3443 case MV_TYPE_8X8:
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3444 mx = 0;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3445 my = 0;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3446 if(s->quarter_sample){
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3447 for(i=0;i<4;i++) {
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3448 motion_x = s->mv[dir][i][0];
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3449 motion_y = s->mv[dir][i][1];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3450
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3451 dxy = ((motion_y & 3) << 2) | (motion_x & 3);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3452 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3453 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3454
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3455 /* WARNING: do no forget half pels */
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3456 src_x = clip(src_x, -16, s->width);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3457 if (src_x == s->width)
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3458 dxy &= ~3;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3459 src_y = clip(src_y, -16, s->height);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3460 if (src_y == s->height)
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3461 dxy &= ~12;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3462
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3463 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3464 if(s->flags&CODEC_FLAG_EMU_EDGE){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3465 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 8
1542
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
3466 || (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
3467 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
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3468 ptr= s->edge_emu_buffer;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3469 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3470 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3471 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3472 qpix_op[1][dxy](dest, ptr, s->linesize);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3473
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3474 mx += s->mv[dir][i][0]/2;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3475 my += s->mv[dir][i][1]/2;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3476 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3477 }else{
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3478 for(i=0;i<4;i++) {
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3479 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
3480 ref_picture[0], 0, 0,
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3481 mb_x * 16 + (i & 1) * 8, mb_y * 16 + (i >>1) * 8,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3482 s->width, s->height, s->linesize,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3483 s->h_edge_pos, s->v_edge_pos,
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3484 8, 8, pix_op[1],
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3485 s->mv[dir][i][0], s->mv[dir][i][1]);
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3486
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3487 mx += s->mv[dir][i][0];
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3488 my += s->mv[dir][i][1];
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
3489 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3490 }
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
3491
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3492 if(!(s->flags&CODEC_FLAG_GRAY))
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3493 chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3494 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3495 case MV_TYPE_FIELD:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3496 if (s->picture_structure == PICT_FRAME) {
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3497 if(s->quarter_sample){
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3498 for(i=0; i<2; i++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3499 qpel_motion(s, dest_y, dest_cb, dest_cr,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3500 1, i, s->field_select[dir][i],
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3501 ref_picture, pix_op, qpix_op,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3502 s->mv[dir][i][0], s->mv[dir][i][1], 8);
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3503 }
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3504 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3505 /* top field */
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3506 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
3507 1, 0, s->field_select[dir][0],
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3508 ref_picture, pix_op,
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3509 s->mv[dir][0][0], s->mv[dir][0][1], 8);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3510 /* bottom field */
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3511 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
3512 1, 1, s->field_select[dir][1],
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3513 ref_picture, pix_op,
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3514 s->mv[dir][1][0], s->mv[dir][1][1], 8);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
3515 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3516 } else {
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3517 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
3518 ref_picture= s->current_picture_ptr->data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3519 }
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
3520
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3521 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
3522 0, 0, s->field_select[dir][0],
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3523 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
3524 s->mv[dir][0][0], s->mv[dir][0][1], 16);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3525 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3526 break;
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3527 case MV_TYPE_16X8:
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3528 for(i=0; i<2; i++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3529 uint8_t ** ref2picture;
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3530
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3531 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
3532 ref2picture= ref_picture;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
3533 }else{
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3534 ref2picture= s->current_picture_ptr->data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3535 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3536
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3537 mpeg_motion(s, dest_y, dest_cb, dest_cr,
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3538 0, 0, s->field_select[dir][i],
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3539 ref2picture, pix_op,
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3540 s->mv[dir][i][0], s->mv[dir][i][1] + 16*i, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3541
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3542 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
3543 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
3544 dest_cr+= (16>>s->chroma_y_shift)*s->uvlinesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3545 }
1339
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
3546 break;
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3547 case MV_TYPE_DMV:
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3548 if(s->picture_structure == PICT_FRAME){
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3549 for(i=0; i<2; i++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3550 int j;
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3551 for(j=0; j<2; j++){
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3552 mpeg_motion(s, dest_y, dest_cb, dest_cr,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3553 1, j, j^i,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3554 ref_picture, pix_op,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3555 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], 8);
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3556 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3557 pix_op = s->dsp.avg_pixels_tab;
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3558 }
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3559 }else{
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3560 for(i=0; i<2; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3561 mpeg_motion(s, dest_y, dest_cb, dest_cr,
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3562 0, 0, s->picture_structure != i+1,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3563 ref_picture, pix_op,
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3564 s->mv[dir][2*i][0],s->mv[dir][2*i][1],16);
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3565
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3566 // after put we make avg of the same block
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3567 pix_op=s->dsp.avg_pixels_tab;
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3568
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3569 //opposite parity is always in the same frame if this is second field
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3570 if(!s->first_field){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3571 ref_picture = s->current_picture_ptr->data;
1843
2b488cb389b6 simplify MPV_motion()
michael
parents: 1842
diff changeset
3572 }
1842
0d82db458a3c interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi)
michael
parents: 1838
diff changeset
3573 }
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3574 }
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
3575 break;
1633
27806cccec2a h263 OBMC & 4MV support
michael
parents: 1632
diff changeset
3576 default: assert(0);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3577 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3578 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3579
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3580 /**
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
3581 * motion compensation of a single macroblock
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3582 * @param s context
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3583 * @param dest_y luma destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3584 * @param dest_cb chroma cb/u destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3585 * @param dest_cr chroma cr/v destination pointer
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3586 * @param dir direction (0->forward, 1->backward)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3587 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3588 * @param pic_op halfpel motion compensation function (average or put normally)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3589 * the motion vectors are taken from s->mv and the MV type from s->mv_type
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3590 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3591 static inline void MPV_motion_lowres(MpegEncContext *s,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3592 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3593 int dir, uint8_t **ref_picture,
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3594 h264_chroma_mc_func *pix_op)
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3595 {
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3596 int mx, my;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3597 int mb_x, mb_y, i;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3598 const int lowres= s->avctx->lowres;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3599 const int block_s= 8>>lowres;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3600
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3601 mb_x = s->mb_x;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3602 mb_y = s->mb_y;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3603
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3604 switch(s->mv_type) {
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3605 case MV_TYPE_16X16:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3606 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3607 0, 0, 0,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3608 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3609 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3610 break;
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3611 case MV_TYPE_8X8:
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3612 mx = 0;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3613 my = 0;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3614 for(i=0;i<4;i++) {
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3615 hpel_motion_lowres(s, dest_y + ((i & 1) + (i >> 1) * s->linesize)*block_s,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3616 ref_picture[0], 0, 0,
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3617 (2*mb_x + (i & 1))*block_s, (2*mb_y + (i >>1))*block_s,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3618 s->width, s->height, s->linesize,
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3619 s->h_edge_pos >> lowres, s->v_edge_pos >> lowres,
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3620 block_s, block_s, pix_op,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3621 s->mv[dir][i][0], s->mv[dir][i][1]);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3622
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3623 mx += s->mv[dir][i][0];
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3624 my += s->mv[dir][i][1];
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3625 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3626
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3627 if(!(s->flags&CODEC_FLAG_GRAY))
2292
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3628 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my);
8556f080fcc2 lowres 4mv
michael
parents: 2291
diff changeset
3629 break;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3630 case MV_TYPE_FIELD:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3631 if (s->picture_structure == PICT_FRAME) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3632 /* top field */
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3633 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3634 1, 0, s->field_select[dir][0],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3635 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3636 s->mv[dir][0][0], s->mv[dir][0][1], block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3637 /* bottom field */
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3638 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3639 1, 1, s->field_select[dir][1],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3640 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3641 s->mv[dir][1][0], s->mv[dir][1][1], block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3642 } else {
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3643 if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3644 ref_picture= s->current_picture_ptr->data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3645 }
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3646
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3647 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3648 0, 0, s->field_select[dir][0],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3649 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3650 s->mv[dir][0][0], s->mv[dir][0][1], 2*block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3651 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3652 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3653 case MV_TYPE_16X8:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3654 for(i=0; i<2; i++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3655 uint8_t ** ref2picture;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3656
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3657 if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3658 ref2picture= ref_picture;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3659 }else{
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3660 ref2picture= s->current_picture_ptr->data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3661 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3662
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3663 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3664 0, 0, s->field_select[dir][i],
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3665 ref2picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3666 s->mv[dir][i][0], s->mv[dir][i][1] + 2*block_s*i, block_s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3667
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3668 dest_y += 2*block_s*s->linesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3669 dest_cb+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3670 dest_cr+= (2*block_s>>s->chroma_y_shift)*s->uvlinesize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3671 }
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3672 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3673 case MV_TYPE_DMV:
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3674 if(s->picture_structure == PICT_FRAME){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3675 for(i=0; i<2; i++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3676 int j;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3677 for(j=0; j<2; j++){
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3678 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3679 1, j, j^i,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3680 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3681 s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3682 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3683 pix_op = s->dsp.avg_h264_chroma_pixels_tab;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3684 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3685 }else{
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3686 for(i=0; i<2; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3687 mpeg_motion_lowres(s, dest_y, dest_cb, dest_cr,
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3688 0, 0, s->picture_structure != i+1,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3689 ref_picture, pix_op,
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3690 s->mv[dir][2*i][0],s->mv[dir][2*i][1],2*block_s);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3691
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3692 // after put we make avg of the same block
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3693 pix_op = s->dsp.avg_h264_chroma_pixels_tab;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3694
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3695 //opposite parity is always in the same frame if this is second field
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3696 if(!s->first_field){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3697 ref_picture = s->current_picture_ptr->data;
2260
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3698 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3699 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3700 }
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3701 break;
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3702 default: assert(0);
33835650f5b6 low resolution interlaced support
michael
parents: 2256
diff changeset
3703 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3704 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3705
986e461dc072 Initial revision
glantau
parents:
diff changeset
3706 /* put block[] to dest[] */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3707 static inline void put_dct(MpegEncContext *s,
1651
ccf7c96a630f h263 modified quantization fix
michael
parents: 1644
diff changeset
3708 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3709 {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
3710 s->dct_unquantize_intra(s, block, i, qscale);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
3711 s->dsp.idct_put (dest, line_size, block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3712 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3713
986e461dc072 Initial revision
glantau
parents:
diff changeset
3714 /* add block[] to dest[] */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3715 static inline void add_dct(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3716 DCTELEM *block, int i, uint8_t *dest, int line_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3717 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3718 if (s->block_last_index[i] >= 0) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
3719 s->dsp.idct_add (dest, line_size, block);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3720 }
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3721 }
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3722
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3723 static inline void add_dequant_dct(MpegEncContext *s,
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
3724 DCTELEM *block, int i, uint8_t *dest, int line_size, int qscale)
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3725 {
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3726 if (s->block_last_index[i] >= 0) {
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
3727 s->dct_unquantize_inter(s, block, i, qscale);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3728
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
3729 s->dsp.idct_add (dest, line_size, block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3730 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3731 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3732
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3733 /**
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3734 * cleans dc, ac, coded_block for the current non intra MB
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3735 */
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3736 void ff_clean_intra_table_entries(MpegEncContext *s)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3737 {
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3738 int wrap = s->b8_stride;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3739 int xy = s->block_index[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3740
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3741 s->dc_val[0][xy ] =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3742 s->dc_val[0][xy + 1 ] =
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3743 s->dc_val[0][xy + wrap] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3744 s->dc_val[0][xy + 1 + wrap] = 1024;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3745 /* ac pred */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3746 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3747 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t));
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3748 if (s->msmpeg4_version>=3) {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3749 s->coded_block[xy ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3750 s->coded_block[xy + 1 ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3751 s->coded_block[xy + wrap] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3752 s->coded_block[xy + 1 + wrap] = 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3753 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3754 /* chroma */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3755 wrap = s->mb_stride;
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3756 xy = s->mb_x + s->mb_y * wrap;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3757 s->dc_val[1][xy] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3758 s->dc_val[2][xy] = 1024;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3759 /* ac pred */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3760 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3761 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3762
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
3763 s->mbintra_table[xy]= 0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3764 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3765
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3766 /* generic function called after a macroblock has been parsed by the
986e461dc072 Initial revision
glantau
parents:
diff changeset
3767 decoder or after it has been encoded by the encoder.
986e461dc072 Initial revision
glantau
parents:
diff changeset
3768
986e461dc072 Initial revision
glantau
parents:
diff changeset
3769 Important variables used:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3770 s->mb_intra : true if intra macroblock
986e461dc072 Initial revision
glantau
parents:
diff changeset
3771 s->mv_dir : motion vector direction
986e461dc072 Initial revision
glantau
parents:
diff changeset
3772 s->mv_type : motion vector type
986e461dc072 Initial revision
glantau
parents:
diff changeset
3773 s->mv : motion vector
986e461dc072 Initial revision
glantau
parents:
diff changeset
3774 s->interlaced_dct : true if interlaced dct used (mpeg2)
986e461dc072 Initial revision
glantau
parents:
diff changeset
3775 */
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3776 static always_inline void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], int lowres_flag)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3777 {
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
3778 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
3779 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3780 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3781 if(s->avctx->xvmc_acceleration){
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
3782 XVMC_decode_mb(s);//xvmc uses pblocks
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3783 return;
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3784 }
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
3785 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3786
986e461dc072 Initial revision
glantau
parents:
diff changeset
3787 mb_x = s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3788 mb_y = s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3789
1833
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3790 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
3791 /* save DCT coefficients */
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3792 int i,j;
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3793 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
3794 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
3795 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
3796 *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
3797 }
ba27ce284d07 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>)
michael
parents: 1831
diff changeset
3798
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3799 s->current_picture.qscale_table[mb_xy]= s->qscale;
108
1e4a4af694d1 exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents: 79
diff changeset
3800
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3801 /* update DC predictors for P macroblocks */
986e461dc072 Initial revision
glantau
parents:
diff changeset
3802 if (!s->mb_intra) {
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
3803 if (s->h263_pred || s->h263_aic) {
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3804 if(s->mbintra_table[mb_xy])
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3805 ff_clean_intra_table_entries(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3806 } else {
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3807 s->last_dc[0] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3808 s->last_dc[1] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3809 s->last_dc[2] = 128 << s->intra_dc_precision;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3810 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3811 }
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
3812 else if (s->h263_pred || s->h263_aic)
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3813 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
3814
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3815 if ((s->flags&CODEC_FLAG_PSNR) || !(s->encoding && (s->intra_only || s->pict_type==B_TYPE))) { //FIXME precalc
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3816 uint8_t *dest_y, *dest_cb, *dest_cr;
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3817 int dct_linesize, dct_offset;
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3818 op_pixels_func (*op_pix)[4];
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
3819 qpel_mc_func (*op_qpix)[16];
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
3820 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this would be wrong for field pics
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
3821 const int uvlinesize= s->current_picture.linesize[1];
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3822 const int readable= s->pict_type != B_TYPE || s->encoding || s->avctx->draw_horiz_band || lowres_flag;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3823 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
3824
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3825 /* avoid copy if macroblock skipped in last frame too */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3826 /* skip only during decoding as we might trash the buffers during encoding a bit */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3827 if(!s->encoding){
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3828 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy];
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3829 const int age= s->current_picture.age;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3830
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3831 assert(age);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3832
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
3833 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
3834 s->mb_skipped= 0;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3835 assert(s->pict_type!=I_TYPE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3836
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
3837 (*mbskip_ptr) ++; /* indicate that this time we skipped it */
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
3838 if(*mbskip_ptr >99) *mbskip_ptr= 99;
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
3839
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3840 /* 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
3841 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
3842 return;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3843 }
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
3844 } 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
3845 (*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
3846 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
3847 } else{
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
3848 *mbskip_ptr = 0; /* not skipped */
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
3849 }
717
6cba3b6196f0 optimization
michaelni
parents: 711
diff changeset
3850 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3851
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3852 dct_linesize = linesize << s->interlaced_dct;
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3853 dct_offset =(s->interlaced_dct)? linesize : linesize*block_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3854
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3855 if(readable){
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3856 dest_y= s->dest[0];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3857 dest_cb= s->dest[1];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3858 dest_cr= s->dest[2];
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3859 }else{
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
3860 dest_y = s->b_scratchpad;
1834
41c324b09fcc 100l (field picture decoding fix)
michael
parents: 1833
diff changeset
3861 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
3862 dest_cr= s->b_scratchpad+32*linesize;
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3863 }
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3864
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3865 if (!s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3866 /* motion handling */
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
3867 /* decoding or more than one mb_type (MC was already done otherwise) */
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3868 if(!s->encoding){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3869 if(lowres_flag){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3870 h264_chroma_mc_func *op_pix = s->dsp.put_h264_chroma_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3871
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3872 if (s->mv_dir & MV_DIR_FORWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3873 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3874 op_pix = s->dsp.avg_h264_chroma_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3875 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3876 if (s->mv_dir & MV_DIR_BACKWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3877 MPV_motion_lowres(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3878 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3879 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3880 if ((!s->no_rounding) || s->pict_type==B_TYPE){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3881 op_pix = s->dsp.put_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3882 op_qpix= s->dsp.put_qpel_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3883 }else{
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3884 op_pix = s->dsp.put_no_rnd_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3885 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3886 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3887 if (s->mv_dir & MV_DIR_FORWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3888 MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.data, op_pix, op_qpix);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3889 op_pix = s->dsp.avg_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3890 op_qpix= s->dsp.avg_qpel_pixels_tab;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3891 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3892 if (s->mv_dir & MV_DIR_BACKWARD) {
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3893 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3894 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3895 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3896 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3897
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3898 /* skip dequant / idct if we are really late ;) */
2792
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
3899 if(s->hurry_up>1) goto skip_idct;
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
3900 if(s->avctx->skip_idct){
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
3901 if( (s->avctx->skip_idct >= AVDISCARD_NONREF && s->pict_type == B_TYPE)
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
3902 ||(s->avctx->skip_idct >= AVDISCARD_NONKEY && s->pict_type != I_TYPE)
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
3903 || s->avctx->skip_idct >= AVDISCARD_ALL)
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
3904 goto skip_idct;
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
3905 }
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3906
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3907 /* add dct residue */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3908 if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3909 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3910 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3911 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3912 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3913 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3914
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
3915 if(!(s->flags&CODEC_FLAG_GRAY)){
1644
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
3916 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
835cf346975e h263 loop filter
michael
parents: 1641
diff changeset
3917 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
3918 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3919 } else if(s->codec_id != CODEC_ID_WMV2){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3920 add_dct(s, block[0], 0, dest_y , dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3921 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3922 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3923 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3924
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
3925 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
3926 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
3927 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
3928 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
3929 }else{
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3930 //chroma422
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3931 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
3932 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
3933
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3934 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
3935 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
3936 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
3937 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
3938 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
3939 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
3940 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
3941 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
3942 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
3943 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3944 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3945 }//fi gray
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3946 }
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3947 else{
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3948 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
3949 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3950 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3951 /* dct only in intra block */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3952 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3953 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3954 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3955 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3956 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3957
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3958 if(!(s->flags&CODEC_FLAG_GRAY)){
1651
ccf7c96a630f h263 modified quantization fix
michael
parents: 1644
diff changeset
3959 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
ccf7c96a630f h263 modified quantization fix
michael
parents: 1644
diff changeset
3960 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3961 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3962 }else{
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3963 s->dsp.idct_put(dest_y , dct_linesize, block[0]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3964 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3965 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
3966 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3967
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
3968 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
3969 if(s->chroma_y_shift){
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3970 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
3971 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
3972 }else{
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3973
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3974 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
3975 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
3976
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3977 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
3978 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
3979 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
3980 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
3981 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
3982 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
3983 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
3984 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
3985 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
3986 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3987 }
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
3988 }//gray
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
3989 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3990 }
2792
0a8c847ad5e7 skip_idct
michael
parents: 2764
diff changeset
3991 skip_idct:
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3992 if(!readable){
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3993 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
3994 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
3995 s->dsp.put_pixels_tab[s->chroma_x_shift][0](s->dest[2], dest_cr, uvlinesize,16 >> s->chroma_y_shift);
1632
4c0469b79010 dont read from b frames if draw_horiz_band==NULL
michael
parents: 1629
diff changeset
3996 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3997 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3998 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3999
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4000 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[12][64]){
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4001 if(s->avctx->lowres) MPV_decode_mb_internal(s, block, 1);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4002 else MPV_decode_mb_internal(s, block, 0);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4003 }
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4004
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
4005 #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
4006
605
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
4007 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold)
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4008 {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4009 static const char tab[64]=
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4010 {3,2,2,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4011 1,1,1,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4012 1,1,1,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4013 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4014 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4015 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4016 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4017 0,0,0,0,0,0,0,0};
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4018 int score=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4019 int run=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4020 int i;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4021 DCTELEM *block= s->block[n];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4022 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
4023 int skip_dc;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4024
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
4025 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
4026 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
4027 threshold= -threshold;
605
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
4028 }else
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
4029 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
4030
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4031 /* are all which we could set to zero are allready zero? */
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4032 if(last_index<=skip_dc - 1) return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4033
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4034 for(i=0; i<=last_index; i++){
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4035 const int j = s->intra_scantable.permutated[i];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4036 const int level = ABS(block[j]);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4037 if(level==1){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4038 if(skip_dc && i==0) continue;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4039 score+= tab[run];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4040 run=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4041 }else if(level>1){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4042 return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4043 }else{
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4044 run++;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4045 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4046 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4047 if(score >= threshold) return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4048 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
4049 const int j = s->intra_scantable.permutated[i];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4050 block[j]=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4051 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4052 if(block[0]) s->block_last_index[n]= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4053 else s->block_last_index[n]= -1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4054 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4055
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4056 static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index)
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4057 {
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4058 int i;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4059 const int maxlevel= s->max_qcoeff;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4060 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
4061 int overflow=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4062
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4063 if(s->mb_intra){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4064 i=1; //skip clipping of intra dc
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4065 }else
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4066 i=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4067
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4068 for(;i<=last_index; i++){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4069 const int j= s->intra_scantable.permutated[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4070 int level = block[j];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4071
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
4072 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
4073 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
4074 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
4075 }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
4076 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
4077 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
4078 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4079
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4080 block[j]= level;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4081 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4082
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
4083 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
4084 av_log(s->avctx, AV_LOG_INFO, "warning, clipping %d dct coefficients to %d..%d\n", overflow, minlevel, maxlevel);
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4085 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4086
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
4087 #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
4088
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
4089 /**
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
4090 *
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
4091 * @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
4092 */
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
4093 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4094 if (s->avctx->draw_horiz_band) {
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4095 AVFrame *src;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4096 int offset[4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4097
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4098 if(s->picture_structure != PICT_FRAME){
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4099 h <<= 1;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4100 y <<= 1;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4101 if(s->first_field && !(s->avctx->slice_flags&SLICE_FLAG_ALLOW_FIELD)) return;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4102 }
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4103
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
4104 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
4105
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4106 if(s->pict_type==B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER))
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4107 src= (AVFrame*)s->current_picture_ptr;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4108 else if(s->last_picture_ptr)
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4109 src= (AVFrame*)s->last_picture_ptr;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4110 else
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4111 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4112
1369
8a150a66d2d9 svq3 b frame slices fix
michaelni
parents: 1368
diff changeset
4113 if(s->pict_type==B_TYPE && s->picture_structure == PICT_FRAME && s->out_format != FMT_H264){
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4114 offset[0]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4115 offset[1]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4116 offset[2]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4117 offset[3]= 0;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4118 }else{
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4119 offset[0]= y * s->linesize;;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4120 offset[1]=
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
4121 offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4122 offset[3]= 0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4123 }
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4124
813
dfaa1c45bd27 cleanup
michaelni
parents: 809
diff changeset
4125 emms_c();
dfaa1c45bd27 cleanup
michaelni
parents: 809
diff changeset
4126
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4127 s->avctx->draw_horiz_band(s->avctx, src, offset,
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
4128 y, s->picture_structure, h);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4129 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4130 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4131
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4132 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename
2764
2b37bcabe608 spelling fixes
diego
parents: 2728
diff changeset
4133 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this would be wrong for field pics
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4134 const int uvlinesize= s->current_picture.linesize[1];
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4135 const int mb_size= 4 - s->avctx->lowres;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4136
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1918
diff changeset
4137 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
4138 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
4139 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
4140 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
4141 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
4142 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
4143 //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
4144
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4145 s->dest[0] = s->current_picture.data[0] + ((s->mb_x - 1) << mb_size);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4146 s->dest[1] = s->current_picture.data[1] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift));
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4147 s->dest[2] = s->current_picture.data[2] + ((s->mb_x - 1) << (mb_size - s->chroma_x_shift));
2168
f3f5dabef677 minor optimization
michael
parents: 2165
diff changeset
4148
2074
2faafe7a3db6 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs
iive
parents: 2066
diff changeset
4149 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
4150 {
2256
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4151 s->dest[0] += s->mb_y * linesize << mb_size;
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4152 s->dest[1] += s->mb_y * uvlinesize << (mb_size - s->chroma_y_shift);
7e0b2e86afa9 1/2 resolution decoding
michael
parents: 2251
diff changeset
4153 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
4154 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4155 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4156
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
4157 #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
4158
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4159 static void get_vissual_weight(int16_t *weight, uint8_t *ptr, int stride){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4160 int x, y;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4161 //FIXME optimize
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4162 for(y=0; y<8; y++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4163 for(x=0; x<8; x++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4164 int x2, y2;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4165 int sum=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4166 int sqr=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4167 int count=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4168
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4169 for(y2= FFMAX(y-1, 0); y2 < FFMIN(8, y+2); y2++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4170 for(x2= FFMAX(x-1, 0); x2 < FFMIN(8, x+2); x2++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4171 int v= ptr[x2 + y2*stride];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4172 sum += v;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4173 sqr += v*v;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4174 count++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4175 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4176 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4177 weight[x + 8*y]= (36*ff_sqrt(count*sqr - sum*sum)) / count;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4178 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4179 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4180 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4181
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4182 static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4183 {
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4184 int16_t weight[6][64];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4185 DCTELEM orig[6][64];
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4186 const int mb_x= s->mb_x;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4187 const int mb_y= s->mb_y;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4188 int i;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4189 int skip_dct[6];
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4190 int dct_offset = s->linesize*8; //default for progressive frames
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4191 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
34466835920f simplify
michael
parents: 1777
diff changeset
4192 int wrap_y, wrap_c;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4193
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4194 for(i=0; i<6; i++) skip_dct[i]=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4195
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
4196 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
4197 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
4198 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
4199
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
4200 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
4201 update_qscale(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4202
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4203 if(!(s->flags&CODEC_FLAG_QP_RD)){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4204 s->dquant= s->qscale - last_qp;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4205
1805
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4206 if(s->out_format==FMT_H263){
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4207 s->dquant= clip(s->dquant, -2, 2); //FIXME RD
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4208
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4209 if(s->codec_id==CODEC_ID_MPEG4){
1805
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4210 if(!s->mb_intra){
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4211 if(s->pict_type == B_TYPE){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4212 if(s->dquant&1)
1805
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4213 s->dquant= (s->dquant/2)*2;
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4214 if(s->mv_dir&MV_DIRECT)
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4215 s->dquant= 0;
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4216 }
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4217 if(s->mv_type==MV_TYPE_8X8)
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4218 s->dquant=0;
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4219 }
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4220 }
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
4221 }
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
4222 }
1652
834922115010 cleanup
michael
parents: 1651
diff changeset
4223 ff_set_qscale(s, last_qp + s->dquant);
2054
06d6a6bade18 qscale + qprd fix
michael
parents: 2053
diff changeset
4224 }else if(s->flags&CODEC_FLAG_QP_RD)
06d6a6bade18 qscale + qprd fix
michael
parents: 2053
diff changeset
4225 ff_set_qscale(s, s->qscale + s->dquant);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4226
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4227 wrap_y = s->linesize;
34466835920f simplify
michael
parents: 1777
diff changeset
4228 wrap_c = s->uvlinesize;
34466835920f simplify
michael
parents: 1777
diff changeset
4229 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16;
34466835920f simplify
michael
parents: 1777
diff changeset
4230 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8;
34466835920f simplify
michael
parents: 1777
diff changeset
4231 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8;
34466835920f simplify
michael
parents: 1777
diff changeset
4232
34466835920f simplify
michael
parents: 1777
diff changeset
4233 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
4234 uint8_t *ebuf= s->edge_emu_buffer + 32;
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4235 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
4236 ptr_y= ebuf;
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4237 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
4238 ptr_cb= ebuf+18*wrap_y;
5ca07515a309 10l (dont store 2 different things at the same place ...)
michael
parents: 2132
diff changeset
4239 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
4240 ptr_cr= ebuf+18*wrap_y+8;
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4241 }
34466835920f simplify
michael
parents: 1777
diff changeset
4242
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4243 if (s->mb_intra) {
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4244 if(s->flags&CODEC_FLAG_INTERLACED_DCT){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4245 int progressive_score, interlaced_score;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4246
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4247 s->interlaced_dct=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4248 progressive_score= s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y, 8)
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4249 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y*8, NULL, wrap_y, 8) - 400;
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4250
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4251 if(progressive_score > 0){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4252 interlaced_score = s->dsp.ildct_cmp[4](s, ptr_y , NULL, wrap_y*2, 8)
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4253 +s->dsp.ildct_cmp[4](s, ptr_y + wrap_y , NULL, wrap_y*2, 8);
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4254 if(progressive_score > interlaced_score){
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4255 s->interlaced_dct=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4256
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4257 dct_offset= wrap_y;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4258 wrap_y<<=1;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4259 }
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4260 }
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4261 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4262
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
4263 s->dsp.get_pixels(s->block[0], ptr_y , wrap_y);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4264 s->dsp.get_pixels(s->block[1], ptr_y + 8, wrap_y);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4265 s->dsp.get_pixels(s->block[2], ptr_y + dct_offset , wrap_y);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4266 s->dsp.get_pixels(s->block[3], ptr_y + dct_offset + 8, wrap_y);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4267
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4268 if(s->flags&CODEC_FLAG_GRAY){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4269 skip_dct[4]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4270 skip_dct[5]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4271 }else{
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
4272 s->dsp.get_pixels(s->block[4], ptr_cb, wrap_c);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4273 s->dsp.get_pixels(s->block[5], ptr_cr, wrap_c);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4274 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4275 }else{
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
4276 op_pixels_func (*op_pix)[4];
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
4277 qpel_mc_func (*op_qpix)[16];
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
4278 uint8_t *dest_y, *dest_cb, *dest_cr;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4279
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4280 dest_y = s->dest[0];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4281 dest_cb = s->dest[1];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4282 dest_cr = s->dest[2];
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4283
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4284 if ((!s->no_rounding) || s->pict_type==B_TYPE){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
4285 op_pix = s->dsp.put_pixels_tab;
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
4286 op_qpix= s->dsp.put_qpel_pixels_tab;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4287 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
4288 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
4289 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4290 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4291
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4292 if (s->mv_dir & MV_DIR_FORWARD) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
4293 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
4294 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
4295 op_qpix= s->dsp.avg_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4296 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4297 if (s->mv_dir & MV_DIR_BACKWARD) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
4298 MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.data, op_pix, op_qpix);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4299 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4300
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4301 if(s->flags&CODEC_FLAG_INTERLACED_DCT){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4302 int progressive_score, interlaced_score;
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4303
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4304 s->interlaced_dct=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4305 progressive_score= s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y, 8)
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4306 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y*8, ptr_y + wrap_y*8, wrap_y, 8) - 400;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4307
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4308 if(s->avctx->ildct_cmp == FF_CMP_VSSE) progressive_score -= 400;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4309
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4310 if(progressive_score>0){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4311 interlaced_score = s->dsp.ildct_cmp[0](s, dest_y , ptr_y , wrap_y*2, 8)
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4312 +s->dsp.ildct_cmp[0](s, dest_y + wrap_y , ptr_y + wrap_y , wrap_y*2, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4313
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4314 if(progressive_score > interlaced_score){
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4315 s->interlaced_dct=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4316
1729
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4317 dct_offset= wrap_y;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4318 wrap_y<<=1;
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4319 }
a4a5e7521339 interlaced dct decision cleanup
michael
parents: 1723
diff changeset
4320 }
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4321 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4322
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
4323 s->dsp.diff_pixels(s->block[0], ptr_y , dest_y , wrap_y);
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
4324 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
4325 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
4326 s->dsp.diff_pixels(s->block[3], ptr_y + dct_offset + 8, dest_y + dct_offset + 8, wrap_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4327
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4328 if(s->flags&CODEC_FLAG_GRAY){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4329 skip_dct[4]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4330 skip_dct[5]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4331 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
4332 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
4333 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c);
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4334 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4335 /* 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
4336 if(s->current_picture.mc_mb_var[s->mb_stride*mb_y+ mb_x]<2*s->qscale*s->qscale){
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
4337 //FIXME optimize
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
4338 if(s->dsp.sad[1](NULL, ptr_y , dest_y , wrap_y, 8) < 20*s->qscale) skip_dct[0]= 1;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4339 if(s->dsp.sad[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20*s->qscale) skip_dct[1]= 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4340 if(s->dsp.sad[1](NULL, ptr_y +dct_offset , dest_y +dct_offset , wrap_y, 8) < 20*s->qscale) skip_dct[2]= 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4341 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;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4342 if(s->dsp.sad[1](NULL, ptr_cb , dest_cb , wrap_c, 8) < 20*s->qscale) skip_dct[4]= 1;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4343 if(s->dsp.sad[1](NULL, ptr_cr , dest_cr , wrap_c, 8) < 20*s->qscale) skip_dct[5]= 1;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4344 }
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4345 }
34466835920f simplify
michael
parents: 1777
diff changeset
4346
34466835920f simplify
michael
parents: 1777
diff changeset
4347 if(s->avctx->quantizer_noise_shaping){
34466835920f simplify
michael
parents: 1777
diff changeset
4348 if(!skip_dct[0]) get_vissual_weight(weight[0], ptr_y , wrap_y);
34466835920f simplify
michael
parents: 1777
diff changeset
4349 if(!skip_dct[1]) get_vissual_weight(weight[1], ptr_y + 8, wrap_y);
34466835920f simplify
michael
parents: 1777
diff changeset
4350 if(!skip_dct[2]) get_vissual_weight(weight[2], ptr_y + dct_offset , wrap_y);
34466835920f simplify
michael
parents: 1777
diff changeset
4351 if(!skip_dct[3]) get_vissual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y);
34466835920f simplify
michael
parents: 1777
diff changeset
4352 if(!skip_dct[4]) get_vissual_weight(weight[4], ptr_cb , wrap_c);
34466835920f simplify
michael
parents: 1777
diff changeset
4353 if(!skip_dct[5]) get_vissual_weight(weight[5], ptr_cr , wrap_c);
34466835920f simplify
michael
parents: 1777
diff changeset
4354 memcpy(orig[0], s->block[0], sizeof(DCTELEM)*64*6);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4355 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4356
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4357 /* DCT & quantize */
1778
34466835920f simplify
michael
parents: 1777
diff changeset
4358 assert(s->out_format!=FMT_MJPEG || s->qscale==8);
34466835920f simplify
michael
parents: 1777
diff changeset
4359 {
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4360 for(i=0;i<6;i++) {
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4361 if(!skip_dct[i]){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4362 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
4363 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, s->qscale, &overflow);
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4364 // 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
4365 // 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
4366 // of improve it. Just INTRADC clipping deserves changes in quantizer
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4367 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4368 }else
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4369 s->block_last_index[i]= -1;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4370 }
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4371 if(s->avctx->quantizer_noise_shaping){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4372 for(i=0;i<6;i++) {
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4373 if(!skip_dct[i]){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4374 s->block_last_index[i] = dct_quantize_refine(s, s->block[i], weight[i], orig[i], i, s->qscale);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4375 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4376 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
4377 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4378
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4379 if(s->luma_elim_threshold && !s->mb_intra)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4380 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
4381 dct_single_coeff_elimination(s, i, s->luma_elim_threshold);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4382 if(s->chroma_elim_threshold && !s->mb_intra)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4383 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
4384 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold);
1497
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4385
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4386 if(s->flags & CODEC_FLAG_CBP_RD){
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4387 for(i=0;i<6;i++) {
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4388 if(s->block_last_index[i] == -1)
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4389 s->coded_score[i]= INT_MAX/256;
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4390 }
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
4391 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4392 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4393
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4394 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4395 s->block_last_index[4]=
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4396 s->block_last_index[5]= 0;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4397 s->block[4][0]=
1011
michaelni
parents: 1007
diff changeset
4398 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale;
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4399 }
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
4400
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4401 //non c quantize code returns incorrect block_last_index FIXME
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4402 if(s->alternate_scan && s->dct_quantize != dct_quantize_c){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4403 for(i=0; i<6; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4404 int j;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4405 if(s->block_last_index[i]>0){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4406 for(j=63; j>0; j--){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4407 if(s->block[i][ s->intra_scantable.permutated[j] ]) break;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4408 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4409 s->block_last_index[i]= j;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4410 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4411 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4412 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4413
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4414 /* huffman encode */
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4415 switch(s->codec_id){ //FIXME funct ptr could be slightly faster
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4416 case CODEC_ID_MPEG1VIDEO:
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4417 case CODEC_ID_MPEG2VIDEO:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4418 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4419 case CODEC_ID_MPEG4:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4420 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4421 case CODEC_ID_MSMPEG4V2:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4422 case CODEC_ID_MSMPEG4V3:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4423 case CODEC_ID_WMV1:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4424 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4425 case CODEC_ID_WMV2:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4426 ff_wmv2_encode_mb(s, s->block, motion_x, motion_y); break;
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
4427 #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
4428 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
4429 ff_h261_encode_mb(s, s->block, motion_x, motion_y); break;
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
4430 #endif
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4431 case CODEC_ID_H263:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4432 case CODEC_ID_H263P:
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4433 case CODEC_ID_FLV1:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4434 case CODEC_ID_RV10:
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
4435 case CODEC_ID_RV20:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4436 h263_encode_mb(s, s->block, motion_x, motion_y); break;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4437 case CODEC_ID_MJPEG:
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4438 mjpeg_encode_mb(s, s->block); break;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4439 default:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4440 assert(0);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4441 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4442 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4443
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
4444 #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
4445
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4446 void ff_mpeg_flush(AVCodecContext *avctx){
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4447 int i;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4448 MpegEncContext *s = avctx->priv_data;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4449
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4450 if(s==NULL || s->picture==NULL)
1751
3f1125adbc84 avcodec_flush_buffers() fix
michael
parents: 1749
diff changeset
4451 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4452
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4453 for(i=0; i<MAX_PICTURE_COUNT; i++){
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4454 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4455 || s->picture[i].type == FF_BUFFER_TYPE_USER))
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4456 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4457 }
1601
a70c07e13e8e flush fix (untested)
michael
parents: 1599
diff changeset
4458 s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4459
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
4460 s->mb_x= s->mb_y= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4461
1395
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4462 s->parse_context.state= -1;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4463 s->parse_context.frame_start_found= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4464 s->parse_context.overread= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4465 s->parse_context.overread_index= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4466 s->parse_context.index= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
4467 s->parse_context.last_index= 0;
1851
07a4c1c4b929 100l (divx5 b frame + seeking + flush fix)
michael
parents: 1848
diff changeset
4468 s->bitstream_buffer_size=0;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4469 }
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
4470
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
4471 #ifdef CONFIG_ENCODERS
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
4472 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length)
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4473 {
1810
fc6b38b5dd40 noise reduction with threads bugfix
michael
parents: 1805
diff changeset
4474 const uint16_t *srcw= (uint16_t*)src;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4475 int words= length>>4;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4476 int bits= length&15;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4477 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4478
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4479 if(length==0) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4480
1803
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4481 if(words < 16){
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4482 for(i=0; i<words; i++) put_bits(pb, 16, be2me_16(srcw[i]));
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4483 }else if(put_bits_count(pb)&7){
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4484 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
4485 }else{
1803
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4486 for(i=0; put_bits_count(pb)&31; i++)
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4487 put_bits(pb, 8, src[i]);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4488 flush_put_bits(pb);
1803
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4489 memcpy(pbBufPtr(pb), src+i, 2*words-i);
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4490 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
4491 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4492
1803
f100993b9b5a ff_copy_bits() optimization
michael
parents: 1802
diff changeset
4493 put_bits(pb, bits, be2me_16(srcw[words])>>(16-bits));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4494 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4495
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4496 static inline void copy_context_before_encode(MpegEncContext *d, MpegEncContext *s, int type){
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4497 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4498
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4499 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop?
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4500
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4501 /* mpeg1 */
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
4502 d->mb_skip_run= s->mb_skip_run;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4503 for(i=0; i<3; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4504 d->last_dc[i]= s->last_dc[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4505
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4506 /* statistics */
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4507 d->mv_bits= s->mv_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4508 d->i_tex_bits= s->i_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4509 d->p_tex_bits= s->p_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4510 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
4511 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
4512 d->b_count= s->b_count;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4513 d->skip_count= s->skip_count;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4514 d->misc_bits= s->misc_bits;
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
4515 d->last_bits= 0;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4516
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
4517 d->mb_skipped= 0;
912
4a1e6bb1f41c fixing hq + adaptive quant
michaelni
parents: 910
diff changeset
4518 d->qscale= s->qscale;
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4519 d->dquant= s->dquant;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4520 }
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4521
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4522 static inline void copy_context_after_encode(MpegEncContext *d, MpegEncContext *s, int type){
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4523 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4524
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4525 memcpy(d->mv, s->mv, 2*4*2*sizeof(int));
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4526 memcpy(d->last_mv, s->last_mv, 2*2*2*sizeof(int)); //FIXME is memcpy faster then a loop?
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4527
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4528 /* mpeg1 */
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
4529 d->mb_skip_run= s->mb_skip_run;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4530 for(i=0; i<3; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4531 d->last_dc[i]= s->last_dc[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4532
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4533 /* statistics */
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4534 d->mv_bits= s->mv_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4535 d->i_tex_bits= s->i_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4536 d->p_tex_bits= s->p_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4537 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
4538 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
4539 d->b_count= s->b_count;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4540 d->skip_count= s->skip_count;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4541 d->misc_bits= s->misc_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4542
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4543 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
4544 d->mb_skipped= s->mb_skipped;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4545 d->mv_type= s->mv_type;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4546 d->mv_dir= s->mv_dir;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4547 d->pb= s->pb;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4548 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4549 d->pb2= s->pb2;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4550 d->tex_pb= s->tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4551 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4552 d->block= s->block;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4553 for(i=0; i<6; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4554 d->block_last_index[i]= s->block_last_index[i];
755
d17846a6c164 fixing interlaced dct + hq mode
michaelni
parents: 754
diff changeset
4555 d->interlaced_dct= s->interlaced_dct;
912
4a1e6bb1f41c fixing hq + adaptive quant
michaelni
parents: 910
diff changeset
4556 d->qscale= s->qscale;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4557 }
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4558
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4559 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4560 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2],
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4561 int *dmin, int *next_block, int motion_x, int motion_y)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4562 {
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4563 int score;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4564 uint8_t *dest_backup[3];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4565
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4566 copy_context_before_encode(s, backup, type);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4567
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4568 s->block= s->blocks[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4569 s->pb= pb[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4570 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4571 s->pb2 = pb2 [*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4572 s->tex_pb= tex_pb[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4573 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4574
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4575 if(*next_block){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4576 memcpy(dest_backup, s->dest, sizeof(s->dest));
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4577 s->dest[0] = s->rd_scratchpad;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4578 s->dest[1] = s->rd_scratchpad + 16*s->linesize;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4579 s->dest[2] = s->rd_scratchpad + 16*s->linesize + 8;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4580 assert(s->linesize >= 32); //FIXME
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4581 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4582
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4583 encode_mb(s, motion_x, motion_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4584
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4585 score= put_bits_count(&s->pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4586 if(s->data_partitioning){
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4587 score+= put_bits_count(&s->pb2);
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4588 score+= put_bits_count(&s->tex_pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4589 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4590
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4591 if(s->avctx->mb_decision == FF_MB_DECISION_RD){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4592 MPV_decode_mb(s, s->block);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4593
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
4594 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
4595 score += sse_mb(s) << FF_LAMBDA_SHIFT;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4596 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4597
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4598 if(*next_block){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4599 memcpy(s->dest, dest_backup, sizeof(s->dest));
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4600 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4601
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4602 if(score<*dmin){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4603 *dmin= score;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4604 *next_block^=1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4605
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4606 copy_context_after_encode(best, s, type);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4607 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4608 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4609
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4610 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
4611 uint32_t *sq = squareTbl + 256;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4612 int acc=0;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4613 int x,y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4614
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4615 if(w==16 && h==16)
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4616 return s->dsp.sse[0](NULL, src1, src2, stride, 16);
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4617 else if(w==8 && h==8)
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4618 return s->dsp.sse[1](NULL, src1, src2, stride, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4619
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4620 for(y=0; y<h; y++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4621 for(x=0; x<w; x++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4622 acc+= sq[src1[x + y*stride] - src2[x + y*stride]];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4623 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4624 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4625
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4626 assert(acc>=0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4627
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4628 return acc;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4629 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4630
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4631 static int sse_mb(MpegEncContext *s){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4632 int w= 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4633 int h= 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4634
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4635 if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4636 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4637
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4638 if(w==16 && h==16)
2065
9e4bebc39ade noise preserving sum of squares comparission function
michael
parents: 2063
diff changeset
4639 if(s->avctx->mb_cmp == FF_CMP_NSSE){
2066
4bfb146e701b nsse weight
michael
parents: 2065
diff changeset
4640 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)
4bfb146e701b nsse weight
michael
parents: 2065
diff changeset
4641 +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)
4bfb146e701b nsse weight
michael
parents: 2065
diff changeset
4642 +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
4643 }else{
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4644 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)
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4645 +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)
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4646 +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
4647 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4648 else
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4649 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)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4650 +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)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4651 +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);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4652 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4653
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4654 static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4655 MpegEncContext *s= arg;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4656
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4657
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4658 s->me.pre_pass=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4659 s->me.dia_size= s->avctx->pre_dia_size;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4660 s->first_slice_line=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4661 for(s->mb_y= s->end_mb_y-1; s->mb_y >= s->start_mb_y; s->mb_y--) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4662 for(s->mb_x=s->mb_width-1; s->mb_x >=0 ;s->mb_x--) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4663 ff_pre_estimate_p_frame_motion(s, s->mb_x, s->mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4664 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4665 s->first_slice_line=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4666 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4667
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4668 s->me.pre_pass=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4669
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4670 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4671 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4672
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4673 static int estimate_motion_thread(AVCodecContext *c, void *arg){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4674 MpegEncContext *s= arg;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4675
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4676 s->me.dia_size= s->avctx->dia_size;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4677 s->first_slice_line=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4678 for(s->mb_y= s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4679 s->mb_x=0; //for block init below
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4680 ff_init_block_index(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4681 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4682 s->block_index[0]+=2;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4683 s->block_index[1]+=2;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4684 s->block_index[2]+=2;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4685 s->block_index[3]+=2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4686
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4687 /* compute motion vector & mb_type and store in context */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4688 if(s->pict_type==B_TYPE)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4689 ff_estimate_b_frame_motion(s, s->mb_x, s->mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4690 else
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4691 ff_estimate_p_frame_motion(s, s->mb_x, s->mb_y);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4692 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4693 s->first_slice_line=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4694 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4695 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4696 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4697
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4698 static int mb_var_thread(AVCodecContext *c, void *arg){
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4699 MpegEncContext *s= arg;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4700 int mb_x, mb_y;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4701
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4702 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
4703 for(mb_x=0; mb_x < s->mb_width; mb_x++) {
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4704 int xx = mb_x * 16;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4705 int yy = mb_y * 16;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4706 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
4707 int varc;
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4708 int sum = s->dsp.pix_sum(pix, s->linesize);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4709
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4710 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
4711
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4712 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
4713 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
4714 s->me.mb_var_sum_temp += varc;
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4715 }
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4716 }
1805
5dd5b2052f5b mpeg4 b frame + adaptive quantization assertion failure fix
michael
parents: 1804
diff changeset
4717 return 0;
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4718 }
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
4719
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4720 static void write_slice_end(MpegEncContext *s){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4721 if(s->codec_id==CODEC_ID_MPEG4){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4722 if(s->partitioned_frame){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4723 ff_mpeg4_merge_partitions(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4724 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4725
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4726 ff_mpeg4_stuffing(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4727 }else if(s->out_format == FMT_MJPEG){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4728 ff_mjpeg_stuffing(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4729 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4730
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4731 align_put_bits(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4732 flush_put_bits(&s->pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4733
2428
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
4734 if((s->flags&CODEC_FLAG_PASS1) && !s->partitioned_frame)
548c87c06dbb assertion about bits statistic and minor bits stat fix
michael
parents: 2427
diff changeset
4735 s->misc_bits+= get_bits_diff(s);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4736 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4737
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4738 static int encode_thread(AVCodecContext *c, void *arg){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4739 MpegEncContext *s= arg;
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4740 int mb_x, mb_y, pdif = 0;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4741 int i, j;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4742 MpegEncContext best_s, backup_s;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4743 uint8_t bit_buf[2][MAX_MB_BYTES];
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4744 uint8_t bit_buf2[2][MAX_MB_BYTES];
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4745 uint8_t bit_buf_tex[2][MAX_MB_BYTES];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4746 PutBitContext pb[2], pb2[2], tex_pb[2];
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4747 //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4748
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4749 for(i=0; i<2; i++){
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4750 init_put_bits(&pb [i], bit_buf [i], MAX_MB_BYTES);
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4751 init_put_bits(&pb2 [i], bit_buf2 [i], MAX_MB_BYTES);
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4752 init_put_bits(&tex_pb[i], bit_buf_tex[i], MAX_MB_BYTES);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4753 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4754
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4755 s->last_bits= put_bits_count(&s->pb);
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4756 s->mv_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4757 s->misc_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4758 s->i_tex_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4759 s->p_tex_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4760 s->i_count=0;
656
e47fa3e3f2d5 statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents: 652
diff changeset
4761 s->f_count=0;
e47fa3e3f2d5 statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents: 652
diff changeset
4762 s->b_count=0;
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4763 s->skip_count=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4764
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4765 for(i=0; i<3; i++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4766 /* init last dc values */
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4767 /* note: quant matrix value (8) is implied here */
1992
938e47c809b0 intra_dc_precission>0 encoding support
michael
parents: 1991
diff changeset
4768 s->last_dc[i] = 128 << s->intra_dc_precision;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4769
2955
64f38f1be88f psnr calculation with threads>1 fix
michael
parents: 2931
diff changeset
4770 s->current_picture.error[i] = 0;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4771 }
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
4772 s->mb_skip_run = 0;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4773 memset(s->last_mv, 0, sizeof(s->last_mv));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4774
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
4775 s->last_mv_dir = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4776
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4777 switch(s->codec_id){
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4778 case CODEC_ID_H263:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4779 case CODEC_ID_H263P:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4780 case CODEC_ID_FLV1:
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4781 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
4782 break;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4783 case CODEC_ID_MPEG4:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4784 if(s->partitioned_frame)
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4785 ff_mpeg4_init_partitions(s);
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4786 break;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4787 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4788
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4789 s->resync_mb_x=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4790 s->resync_mb_y=0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4791 s->first_slice_line = 1;
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4792 s->ptr_lastgob = s->pb.buf;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4793 for(mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4794 // printf("row %d at %X\n", s->mb_y, (int)s);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4795 s->mb_x=0;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4796 s->mb_y= mb_y;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4797
1652
834922115010 cleanup
michael
parents: 1651
diff changeset
4798 ff_set_qscale(s, s->qscale);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4799 ff_init_block_index(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4800
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
4801 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
4802 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
4803 int mb_type= s->mb_type[xy];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4804 // int d;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4805 int dmin= INT_MAX;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4806 int dir;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4807
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4808 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < MAX_MB_BYTES){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4809 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4810 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4811 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4812 if(s->data_partitioning){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4813 if( s->pb2 .buf_end - s->pb2 .buf - (put_bits_count(&s-> pb2)>>3) < MAX_MB_BYTES
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4814 || s->tex_pb.buf_end - s->tex_pb.buf - (put_bits_count(&s->tex_pb )>>3) < MAX_MB_BYTES){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4815 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4816 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4817 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4818 }
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2419
diff changeset
4819
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
4820 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
4821 s->mb_y = mb_y; // moved into loop, can get changed by H.261
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4822 ff_update_block_index(s);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4823
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
4824 #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
4825 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
4826 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
4827 xy= s->mb_y*s->mb_stride + s->mb_x;
2345
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
4828 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
4829 }
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
4830 #endif
2327
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
4831
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4832 /* write gob / video packet header */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4833 if(s->rtp_mode){
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4834 int current_packet_size, is_gob_start;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4835
1801
3f26dfb3eba4 replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong
michael
parents: 1799
diff changeset
4836 current_packet_size= ((put_bits_count(&s->pb)+7)>>3) - (s->ptr_lastgob - s->pb.buf);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4837
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4838 is_gob_start= s->avctx->rtp_payload_size && current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x>0;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4839
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4840 if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0) is_gob_start=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4841
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4842 switch(s->codec_id){
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4843 case CODEC_ID_H263:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4844 case CODEC_ID_H263P:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4845 if(!s->h263_slice_structured)
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4846 if(s->mb_x || s->mb_y%s->gob_index) is_gob_start=0;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4847 break;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4848 case CODEC_ID_MPEG2VIDEO:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4849 if(s->mb_x==0 && s->mb_y!=0) is_gob_start=1;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4850 case CODEC_ID_MPEG1VIDEO:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4851 if(s->mb_skip_run) is_gob_start=0;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4852 break;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4853 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4854
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4855 if(is_gob_start){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4856 if(s->start_mb_y != mb_y || mb_x!=0){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4857 write_slice_end(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4858
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4859 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4860 ff_mpeg4_init_partitions(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
4861 }
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4862 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4863
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4864 assert((put_bits_count(&s->pb)&7) == 0);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4865 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4866
1688
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4867 if(s->avctx->error_rate && s->resync_mb_x + s->resync_mb_y > 0){
2371
949f84ce470a 10l (dont use codec_id for error simulation)
michael
parents: 2370
diff changeset
4868 int r= put_bits_count(&s->pb)/8 + s->picture_number + 16 + s->mb_x + s->mb_y;
1688
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4869 int d= 100 / s->avctx->error_rate;
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4870 if(r % d == 0){
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4871 current_packet_size=0;
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4872 #ifndef ALT_BITSTREAM_WRITER
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4873 s->pb.buf_ptr= s->ptr_lastgob;
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4874 #endif
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4875 assert(pbBufPtr(&s->pb) == s->ptr_lastgob);
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4876 }
04b759af8bd4 error concealment regression test
michael
parents: 1687
diff changeset
4877 }
2492
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
4878
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
4879 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
4880 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
4881 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
4882 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4883
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4884 switch(s->codec_id){
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4885 case CODEC_ID_MPEG4:
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4886 ff_mpeg4_encode_video_packet_header(s);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4887 ff_mpeg4_clean_buffers(s);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4888 break;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4889 case CODEC_ID_MPEG1VIDEO:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4890 case CODEC_ID_MPEG2VIDEO:
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4891 ff_mpeg1_encode_slice_header(s);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4892 ff_mpeg1_clean_buffers(s);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4893 break;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4894 case CODEC_ID_H263:
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4895 case CODEC_ID_H263P:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4896 h263_encode_gob_header(s, mb_y);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4897 break;
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
4898 }
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4899
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4900 if(s->flags&CODEC_FLAG_PASS1){
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
4901 int bits= put_bits_count(&s->pb);
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4902 s->misc_bits+= bits - s->last_bits;
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
4903 s->last_bits= bits;
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
4904 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4905
1662
64c370fe6e88 slice flush / position fix
michael
parents: 1661
diff changeset
4906 s->ptr_lastgob += current_packet_size;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4907 s->first_slice_line=1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4908 s->resync_mb_x=mb_x;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4909 s->resync_mb_y=mb_y;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4910 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4911 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4912
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4913 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
4914 && s->resync_mb_y+1 == s->mb_y){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4915 s->first_slice_line=0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4916 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4917
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
4918 s->mb_skipped=0;
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4919 s->dquant=0; //only for QP_RD
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
4920
2230
53f407cf1f18 comment fix
michael
parents: 2229
diff changeset
4921 if(mb_type & (mb_type-1) || (s->flags & CODEC_FLAG_QP_RD)){ // more than 1 MB type possible or CODEC_FLAG_QP_RD
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4922 int next_block=0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4923 int pb_bits_count, pb2_bits_count, tex_pb_bits_count;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4924
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4925 copy_context_before_encode(&backup_s, s, -1);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4926 backup_s.pb= s->pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4927 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
4928 best_s.partitioned_frame= s->partitioned_frame;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4929 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4930 backup_s.pb2= s->pb2;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4931 backup_s.tex_pb= s->tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4932 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
4933
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4934 if(mb_type&CANDIDATE_MB_TYPE_INTER){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4935 s->mv_dir = MV_DIR_FORWARD;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4936 s->mv_type = MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4937 s->mb_intra= 0;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4938 s->mv[0][0][0] = s->p_mv_table[xy][0];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
4939 s->mv[0][0][1] = s->p_mv_table[xy][1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4940 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4941 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4942 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4943 if(mb_type&CANDIDATE_MB_TYPE_INTER_I){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4944 s->mv_dir = MV_DIR_FORWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4945 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4946 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4947 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4948 j= s->field_select[0][i] = s->p_field_select_table[i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4949 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4950 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4951 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4952 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb,
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4953 &dmin, &next_block, 0, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4954 }
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
4955 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
4956 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
4957 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
4958 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
4959 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
4960 s->mv[0][0][1] = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4961 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
4962 &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
4963 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4964 if(mb_type&CANDIDATE_MB_TYPE_INTER4V){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4965 s->mv_dir = MV_DIR_FORWARD;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4966 s->mv_type = MV_TYPE_8X8;
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4967 s->mb_intra= 0;
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4968 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
4969 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
4970 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1];
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
4971 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4972 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4973 &dmin, &next_block, 0, 0);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4974 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4975 if(mb_type&CANDIDATE_MB_TYPE_FORWARD){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4976 s->mv_dir = MV_DIR_FORWARD;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4977 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4978 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4979 s->mv[0][0][0] = s->b_forw_mv_table[xy][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4980 s->mv[0][0][1] = s->b_forw_mv_table[xy][1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4981 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4982 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4983 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4984 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4985 s->mv_dir = MV_DIR_BACKWARD;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4986 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4987 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4988 s->mv[1][0][0] = s->b_back_mv_table[xy][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4989 s->mv[1][0][1] = s->b_back_mv_table[xy][1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4990 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4991 &dmin, &next_block, s->mv[1][0][0], s->mv[1][0][1]);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4992 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
4993 if(mb_type&CANDIDATE_MB_TYPE_BIDIR){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4994 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4995 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4996 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4997 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4998 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
4999 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5000 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5001 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5002 &dmin, &next_block, 0, 0);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5003 }
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5004 if(mb_type&CANDIDATE_MB_TYPE_DIRECT){
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
5005 int mx= s->b_direct_mv_table[xy][0];
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
5006 int my= s->b_direct_mv_table[xy][1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5007
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5008 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5009 s->mb_intra= 0;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
5010 ff_mpeg4_set_direct_mv(s, mx, my);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5011 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb,
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
5012 &dmin, &next_block, mx, my);
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
5013 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5014 if(mb_type&CANDIDATE_MB_TYPE_FORWARD_I){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5015 s->mv_dir = MV_DIR_FORWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5016 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5017 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5018 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5019 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5020 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5021 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5022 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5023 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb,
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5024 &dmin, &next_block, 0, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5025 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5026 if(mb_type&CANDIDATE_MB_TYPE_BACKWARD_I){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5027 s->mv_dir = MV_DIR_BACKWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5028 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5029 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5030 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5031 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5032 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5033 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5034 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5035 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb,
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5036 &dmin, &next_block, 0, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5037 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5038 if(mb_type&CANDIDATE_MB_TYPE_BIDIR_I){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5039 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5040 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5041 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5042 for(dir=0; dir<2; dir++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5043 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5044 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5045 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5046 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5047 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5048 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5049 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb,
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5050 &dmin, &next_block, 0, 0);
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5051 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5052 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
5053 s->mv_dir = 0;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
5054 s->mv_type = MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5055 s->mb_intra= 1;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5056 s->mv[0][0][0] = 0;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5057 s->mv[0][0][1] = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5058 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb,
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5059 &dmin, &next_block, 0, 0);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5060 if(s->h263_pred || s->h263_aic){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5061 if(best_s.mb_intra)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5062 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5063 else
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5064 ff_clean_intra_table_entries(s); //old mode?
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5065 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
5066 }
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5067
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5068 if(s->flags & CODEC_FLAG_QP_RD){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5069 if(best_s.mv_type==MV_TYPE_16X16 && !(best_s.mv_dir&MV_DIRECT)){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5070 const int last_qp= backup_s.qscale;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5071 int dquant, dir, qp, dc[6];
1617
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5072 DCTELEM ac[6][16];
1623
1dd437affd27 qprd with b frames fix
michael
parents: 1622
diff changeset
5073 const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5074
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5075 assert(backup_s.dquant == 0);
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5076
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5077 //FIXME intra
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5078 s->mv_dir= best_s.mv_dir;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5079 s->mv_type = MV_TYPE_16X16;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5080 s->mb_intra= best_s.mb_intra;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5081 s->mv[0][0][0] = best_s.mv[0][0][0];
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5082 s->mv[0][0][1] = best_s.mv[0][0][1];
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5083 s->mv[1][0][0] = best_s.mv[1][0][0];
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5084 s->mv[1][0][1] = best_s.mv[1][0][1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5085
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5086 dir= s->pict_type == B_TYPE ? 2 : 1;
1623
1dd437affd27 qprd with b frames fix
michael
parents: 1622
diff changeset
5087 if(last_qp + dir > s->avctx->qmax) dir= -dir;
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5088 for(dquant= dir; dquant<=2 && dquant>=-2; dquant += dir){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5089 qp= last_qp + dquant;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5090 if(qp < s->avctx->qmin || qp > s->avctx->qmax)
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5091 break;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5092 backup_s.dquant= dquant;
2229
5ca45491294b qprd + mpeg2 segfault fix
michael
parents: 2213
diff changeset
5093 if(s->mb_intra && s->dc_val[0]){
1617
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5094 for(i=0; i<6; i++){
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5095 dc[i]= s->dc_val[0][ s->block_index[i] ];
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5096 memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(DCTELEM)*16);
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5097 }
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5098 }
1617
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5099
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5100 encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb,
1623
1dd437affd27 qprd with b frames fix
michael
parents: 1622
diff changeset
5101 &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]);
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5102 if(best_s.qscale != qp){
2229
5ca45491294b qprd + mpeg2 segfault fix
michael
parents: 2213
diff changeset
5103 if(s->mb_intra && s->dc_val[0]){
1617
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5104 for(i=0; i<6; i++){
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5105 s->dc_val[0][ s->block_index[i] ]= dc[i];
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5106 memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM)*16);
8b31f3a3e9fa ac prediction with rate distorted qp fix
michael
parents: 1616
diff changeset
5107 }
1616
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5108 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5109 if(dir > 0 && dquant==dir){
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5110 dquant= 0;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5111 dir= -dir;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5112 }else
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5113 break;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5114 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5115 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5116 qp= best_s.qscale;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5117 s->current_picture.qscale_table[xy]= qp;
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5118 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5119 }
13a20c0594f2 rate distored optimal lambda->qp support
michael
parents: 1601
diff changeset
5120
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
5121 copy_context_after_encode(s, &best_s, -1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5122
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
5123 pb_bits_count= put_bits_count(&s->pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5124 flush_put_bits(&s->pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5125 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5126 s->pb= backup_s.pb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5127
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5128 if(s->data_partitioning){
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
5129 pb2_bits_count= put_bits_count(&s->pb2);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5130 flush_put_bits(&s->pb2);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5131 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5132 s->pb2= backup_s.pb2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5133
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
5134 tex_pb_bits_count= put_bits_count(&s->tex_pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5135 flush_put_bits(&s->tex_pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5136 ff_copy_bits(&backup_s.tex_pb, bit_buf_tex[next_block^1], tex_pb_bits_count);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5137 s->tex_pb= backup_s.tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5138 }
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
5139 s->last_bits= put_bits_count(&s->pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5140
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5141 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5142 ff_h263_update_motion_val(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5143
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5144 if(next_block==0){ //FIXME 16 vs linesize16
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5145 s->dsp.put_pixels_tab[0][0](s->dest[0], s->rd_scratchpad , s->linesize ,16);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5146 s->dsp.put_pixels_tab[1][0](s->dest[1], s->rd_scratchpad + 16*s->linesize , s->uvlinesize, 8);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5147 s->dsp.put_pixels_tab[1][0](s->dest[2], s->rd_scratchpad + 16*s->linesize + 8, s->uvlinesize, 8);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5148 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5149
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5150 if(s->avctx->mb_decision == FF_MB_DECISION_BITS)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5151 MPV_decode_mb(s, s->block);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5152 } else {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5153 int motion_x, motion_y;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5154 s->mv_type=MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5155 // only one MB-Type possible
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5156
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5157 switch(mb_type){
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5158 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
5159 s->mv_dir = 0;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5160 s->mb_intra= 1;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5161 motion_x= s->mv[0][0][0] = 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5162 motion_y= s->mv[0][0][1] = 0;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5163 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5164 case CANDIDATE_MB_TYPE_INTER:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5165 s->mv_dir = MV_DIR_FORWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5166 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5167 motion_x= s->mv[0][0][0] = s->p_mv_table[xy][0];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5168 motion_y= s->mv[0][0][1] = s->p_mv_table[xy][1];
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5169 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5170 case CANDIDATE_MB_TYPE_INTER_I:
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5171 s->mv_dir = MV_DIR_FORWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5172 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5173 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5174 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5175 j= s->field_select[0][i] = s->p_field_select_table[i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5176 s->mv[0][i][0] = s->p_field_mv_table[i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5177 s->mv[0][i][1] = s->p_field_mv_table[i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5178 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5179 motion_x = motion_y = 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5180 break;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5181 case CANDIDATE_MB_TYPE_INTER4V:
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5182 s->mv_dir = MV_DIR_FORWARD;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5183 s->mv_type = MV_TYPE_8X8;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5184 s->mb_intra= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5185 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
5186 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
5187 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5188 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5189 motion_x= motion_y= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5190 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5191 case CANDIDATE_MB_TYPE_DIRECT:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5192 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5193 s->mb_intra= 0;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5194 motion_x=s->b_direct_mv_table[xy][0];
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5195 motion_y=s->b_direct_mv_table[xy][1];
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
5196 ff_mpeg4_set_direct_mv(s, motion_x, motion_y);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5197 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5198 case CANDIDATE_MB_TYPE_BIDIR:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5199 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5200 s->mb_intra= 0;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5201 motion_x=0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5202 motion_y=0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5203 s->mv[0][0][0] = s->b_bidir_forw_mv_table[xy][0];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5204 s->mv[0][0][1] = s->b_bidir_forw_mv_table[xy][1];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5205 s->mv[1][0][0] = s->b_bidir_back_mv_table[xy][0];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5206 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1];
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5207 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5208 case CANDIDATE_MB_TYPE_BACKWARD:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5209 s->mv_dir = MV_DIR_BACKWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5210 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5211 motion_x= s->mv[1][0][0] = s->b_back_mv_table[xy][0];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5212 motion_y= s->mv[1][0][1] = s->b_back_mv_table[xy][1];
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5213 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5214 case CANDIDATE_MB_TYPE_FORWARD:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5215 s->mv_dir = MV_DIR_FORWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5216 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5217 motion_x= s->mv[0][0][0] = s->b_forw_mv_table[xy][0];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5218 motion_y= s->mv[0][0][1] = s->b_forw_mv_table[xy][1];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5219 // printf(" %d %d ", motion_x, motion_y);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5220 break;
1708
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5221 case CANDIDATE_MB_TYPE_FORWARD_I:
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5222 s->mv_dir = MV_DIR_FORWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5223 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5224 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5225 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5226 j= s->field_select[0][i] = s->b_field_select_table[0][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5227 s->mv[0][i][0] = s->b_field_mv_table[0][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5228 s->mv[0][i][1] = s->b_field_mv_table[0][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5229 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5230 motion_x=motion_y=0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5231 break;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5232 case CANDIDATE_MB_TYPE_BACKWARD_I:
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5233 s->mv_dir = MV_DIR_BACKWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5234 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5235 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5236 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5237 j= s->field_select[1][i] = s->b_field_select_table[1][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5238 s->mv[1][i][0] = s->b_field_mv_table[1][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5239 s->mv[1][i][1] = s->b_field_mv_table[1][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5240 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5241 motion_x=motion_y=0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5242 break;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5243 case CANDIDATE_MB_TYPE_BIDIR_I:
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5244 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5245 s->mv_type = MV_TYPE_FIELD;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5246 s->mb_intra= 0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5247 for(dir=0; dir<2; dir++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5248 for(i=0; i<2; i++){
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5249 j= s->field_select[dir][i] = s->b_field_select_table[dir][i][xy];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5250 s->mv[dir][i][0] = s->b_field_mv_table[dir][i][j][xy][0];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5251 s->mv[dir][i][1] = s->b_field_mv_table[dir][i][j][xy][1];
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5252 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5253 }
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5254 motion_x=motion_y=0;
dea5b2946999 interlaced motion estimation
michael
parents: 1707
diff changeset
5255 break;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5256 default:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5257 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
5258 av_log(s->avctx, AV_LOG_ERROR, "illegal MB type\n");
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
5259 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
5260
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
5261 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
5262
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
5263 // 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
5264 s->last_mv_dir = s->mv_dir;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5265
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5266 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5267 ff_h263_update_motion_val(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5268
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5269 MPV_decode_mb(s, s->block);
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 244
diff changeset
5270 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
5271
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5272 /* clean the MV table in IPS frames for direct mode in B frames */
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5273 if(s->mb_intra /* && I,P,S_TYPE */){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5274 s->p_mv_table[xy][0]=0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5275 s->p_mv_table[xy][1]=0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
5276 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5277
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5278 if(s->flags&CODEC_FLAG_PSNR){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5279 int w= 16;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5280 int h= 16;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5281
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
5282 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
5283 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
5284
2955
64f38f1be88f psnr calculation with threads>1 fix
michael
parents: 2931
diff changeset
5285 s->current_picture.error[0] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5286 s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16,
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5287 s->dest[0], w, h, s->linesize);
2955
64f38f1be88f psnr calculation with threads>1 fix
michael
parents: 2931
diff changeset
5288 s->current_picture.error[1] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5289 s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5290 s->dest[1], w>>1, h>>1, s->uvlinesize);
2955
64f38f1be88f psnr calculation with threads>1 fix
michael
parents: 2931
diff changeset
5291 s->current_picture.error[2] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5292 s, s->new_picture .data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
5293 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
5294 }
2345
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
5295 if(s->loop_filter){
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
5296 if(s->out_format == FMT_H263)
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
5297 ff_h263_loop_filter(s);
ada3891b859d H261 fixing and cleaning:
michael
parents: 2327
diff changeset
5298 }
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1785
diff changeset
5299 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, put_bits_count(&s->pb));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5300 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
5301 }
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
5302
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
5303 //not beautiful here but we must write it before flushing so it has to be here
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5304 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE)
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 207
diff changeset
5305 msmpeg4_encode_ext_header(s);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
5306
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5307 write_slice_end(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5308
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5309 /* Send the last GOB if RTP */
1661
4c9fd29f1606 h263 slice structured mode
michael
parents: 1659
diff changeset
5310 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
5311 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
5312 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob;
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
5313 /* Call the RTP callback to send the last GOB */
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5314 emms_c();
2492
57ba17bd3924 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr)
michael
parents: 2450
diff changeset
5315 s->avctx->rtp_callback(s->avctx, s->ptr_lastgob, pdif, number_mb);
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
5316 }
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5317
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5318 return 0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5319 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5320
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5321 #define MERGE(field) dst->field += src->field; src->field=0
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5322 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
5323 MERGE(me.scene_change_score);
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5324 MERGE(me.mc_mb_var_sum_temp);
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5325 MERGE(me.mb_var_sum_temp);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5326 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5327
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5328 static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5329 int i;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5330
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5331 MERGE(dct_count[0]); //note, the other dct vars are not part of the context
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5332 MERGE(dct_count[1]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5333 MERGE(mv_bits);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5334 MERGE(i_tex_bits);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5335 MERGE(p_tex_bits);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5336 MERGE(i_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5337 MERGE(f_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5338 MERGE(b_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5339 MERGE(skip_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5340 MERGE(misc_bits);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5341 MERGE(error_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5342 MERGE(padding_bug_score);
2955
64f38f1be88f psnr calculation with threads>1 fix
michael
parents: 2931
diff changeset
5343 MERGE(current_picture.error[0]);
64f38f1be88f psnr calculation with threads>1 fix
michael
parents: 2931
diff changeset
5344 MERGE(current_picture.error[1]);
64f38f1be88f psnr calculation with threads>1 fix
michael
parents: 2931
diff changeset
5345 MERGE(current_picture.error[2]);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5346
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5347 if(dst->avctx->noise_reduction){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5348 for(i=0; i<64; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5349 MERGE(dct_error_sum[0][i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5350 MERGE(dct_error_sum[1][i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5351 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5352 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5353
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5354 assert(put_bits_count(&src->pb) % 8 ==0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5355 assert(put_bits_count(&dst->pb) % 8 ==0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5356 ff_copy_bits(&dst->pb, src->pb.buf, put_bits_count(&src->pb));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5357 flush_put_bits(&dst->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5358 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5359
2974
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5360 static void estimate_qp(MpegEncContext *s, int dry_run){
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5361 if (!s->fixed_qscale)
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5362 s->current_picture_ptr->quality=
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5363 s->current_picture.quality = ff_rate_estimate_qscale(s, dry_run);
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5364
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5365 if(s->adaptive_quant){
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5366 switch(s->codec_id){
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5367 case CODEC_ID_MPEG4:
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5368 ff_clean_mpeg4_qscales(s);
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5369 break;
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5370 case CODEC_ID_H263:
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5371 case CODEC_ID_H263P:
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5372 case CODEC_ID_FLV1:
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5373 ff_clean_h263_qscales(s);
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5374 break;
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5375 }
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5376
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5377 s->lambda= s->lambda_table[0];
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5378 //FIXME broken
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5379 }else
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5380 s->lambda= s->current_picture.quality;
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5381 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality);
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5382 update_qscale(s);
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5383 }
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5384
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5385 static void encode_picture(MpegEncContext *s, int picture_number)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5386 {
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 2015
diff changeset
5387 int i;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5388 int bits;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5389
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5390 s->picture_number = picture_number;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5391
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5392 /* Reset the average MB variance */
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5393 s->me.mb_var_sum_temp =
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5394 s->me.mc_mb_var_sum_temp = 0;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5395
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5396 /* we need to initialize some time vars before we can encode b-frames */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5397 // RAL: Condition added for MPEG1VIDEO
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5398 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4))
1834
41c324b09fcc 100l (field picture decoding fix)
michael
parents: 1833
diff changeset
5399 ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5400
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5401 s->me.scene_change_score=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5402
2053
c46e203dd698 change qscale -> lambda for the motion estimation
michael
parents: 2048
diff changeset
5403 // s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5404
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5405 if(s->pict_type==I_TYPE){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5406 if(s->msmpeg4_version >= 3) s->no_rounding=1;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5407 else s->no_rounding=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5408 }else if(s->pict_type!=B_TYPE){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5409 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5410 s->no_rounding ^= 1;
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5411 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5412
2981
33d4fb0df0d3 better f_code guessing in 2nd pass
michael
parents: 2980
diff changeset
5413 if(s->flags & CODEC_FLAG_PASS2){
2974
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5414 estimate_qp(s, 1);
2981
33d4fb0df0d3 better f_code guessing in 2nd pass
michael
parents: 2980
diff changeset
5415 ff_get_2pass_fcode(s);
33d4fb0df0d3 better f_code guessing in 2nd pass
michael
parents: 2980
diff changeset
5416 }else if(!(s->flags & CODEC_FLAG_QSCALE)){
2980
529163f99474 improved lambda/qp guessing for motion estimation RD in first pass
michael
parents: 2979
diff changeset
5417 if(s->pict_type==B_TYPE)
2997
188f4ef688f2 second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents: 2990
diff changeset
5418 s->lambda= s->last_lambda_for[s->pict_type];
2980
529163f99474 improved lambda/qp guessing for motion estimation RD in first pass
michael
parents: 2979
diff changeset
5419 else
2997
188f4ef688f2 second try of improved lambda/qp guessing for motion estimation RD in first pass
michael
parents: 2990
diff changeset
5420 s->lambda= s->last_lambda_for[s->last_non_b_pict_type];
2980
529163f99474 improved lambda/qp guessing for motion estimation RD in first pass
michael
parents: 2979
diff changeset
5421 update_qscale(s);
529163f99474 improved lambda/qp guessing for motion estimation RD in first pass
michael
parents: 2979
diff changeset
5422 }
2974
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5423
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
5424 s->mb_intra=0; //for the rate distortion & bit compare functions
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5425 for(i=1; i<s->avctx->thread_count; i++){
1827
fcbf31baa1af multithreaded mpeg2 decoding
michael
parents: 1820
diff changeset
5426 ff_update_duplicate_context(s->thread_context[i], s);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5427 }
1962
1d5abf80fa41 minor motion estimation cleanup
michael
parents: 1958
diff changeset
5428
1d5abf80fa41 minor motion estimation cleanup
michael
parents: 1958
diff changeset
5429 ff_init_me(s);
1d5abf80fa41 minor motion estimation cleanup
michael
parents: 1958
diff changeset
5430
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5431 /* Estimate motion for every MB */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5432 if(s->pict_type != I_TYPE){
2584
c07be5590462 motion estimation bitrate penalty compensation
michael
parents: 2576
diff changeset
5433 s->lambda = (s->lambda * s->avctx->me_penalty_compensation + 128)>>8;
c07be5590462 motion estimation bitrate penalty compensation
michael
parents: 2576
diff changeset
5434 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
5435 if(s->pict_type != B_TYPE && s->avctx->me_threshold==0){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5436 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5437 s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5438 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5439 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5440
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5441 s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5442 }else /* if(s->pict_type == I_TYPE) */{
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5443 /* I-Frame */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5444 for(i=0; i<s->mb_stride*s->mb_height; i++)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5445 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5446
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5447 if(!s->fixed_qscale){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5448 /* finding spatial complexity for I-frame rate control */
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
5449 s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5450 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5451 }
1804
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
5452 for(i=1; i<s->avctx->thread_count; i++){
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
5453 merge_context_after_me(s, s->thread_context[i]);
cc0a15943a87 multithreaded spatial complexity calculation for i frames
michael
parents: 1803
diff changeset
5454 }
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5455 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
5456 s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5457 emms_c();
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5458
2015
3ab8f3e2ae6a moving motion estimation specific variables from MpegEncContext -> MotionEstContext
michael
parents: 1994
diff changeset
5459 if(s->me.scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5460 s->pict_type= I_TYPE;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5461 for(i=0; i<s->mb_stride*s->mb_height; i++)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5462 s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5463 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5464 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5465
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5466 if(!s->umvplus){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5467 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5468 s->f_code= ff_get_best_fcode(s, s->p_mv_table, CANDIDATE_MB_TYPE_INTER);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5469
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5470 if(s->flags & CODEC_FLAG_INTERLACED_ME){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5471 int a,b;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5472 a= ff_get_best_fcode(s, s->p_field_mv_table[0][0], CANDIDATE_MB_TYPE_INTER_I); //FIXME field_select
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5473 b= ff_get_best_fcode(s, s->p_field_mv_table[1][1], CANDIDATE_MB_TYPE_INTER_I);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5474 s->f_code= FFMAX(s->f_code, FFMAX(a,b));
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5475 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5476
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5477 ff_fix_long_p_mvs(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5478 ff_fix_long_mvs(s, NULL, 0, s->p_mv_table, s->f_code, CANDIDATE_MB_TYPE_INTER, 0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5479 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
5480 int j;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5481 for(i=0; i<2; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5482 for(j=0; j<2; j++)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5483 ff_fix_long_mvs(s, s->p_field_select_table[i], j,
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5484 s->p_field_mv_table[i][j], s->f_code, CANDIDATE_MB_TYPE_INTER_I, 0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5485 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5486 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5487 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5488
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5489 if(s->pict_type==B_TYPE){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5490 int a, b;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5491
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5492 a = ff_get_best_fcode(s, s->b_forw_mv_table, CANDIDATE_MB_TYPE_FORWARD);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5493 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, CANDIDATE_MB_TYPE_BIDIR);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5494 s->f_code = FFMAX(a, b);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5495
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5496 a = ff_get_best_fcode(s, s->b_back_mv_table, CANDIDATE_MB_TYPE_BACKWARD);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5497 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, CANDIDATE_MB_TYPE_BIDIR);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5498 s->b_code = FFMAX(a, b);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5499
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5500 ff_fix_long_mvs(s, NULL, 0, s->b_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_FORWARD, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5501 ff_fix_long_mvs(s, NULL, 0, s->b_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BACKWARD, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5502 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_forw_mv_table, s->f_code, CANDIDATE_MB_TYPE_BIDIR, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5503 ff_fix_long_mvs(s, NULL, 0, s->b_bidir_back_mv_table, s->b_code, CANDIDATE_MB_TYPE_BIDIR, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5504 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
5505 int dir, j;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5506 for(dir=0; dir<2; dir++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5507 for(i=0; i<2; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5508 for(j=0; j<2; j++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5509 int type= dir ? (CANDIDATE_MB_TYPE_BACKWARD_I|CANDIDATE_MB_TYPE_BIDIR_I)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5510 : (CANDIDATE_MB_TYPE_FORWARD_I |CANDIDATE_MB_TYPE_BIDIR_I);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5511 ff_fix_long_mvs(s, s->b_field_select_table[dir][i], j,
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5512 s->b_field_mv_table[dir][i][j], dir ? s->b_code : s->f_code, type, 1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5513 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5514 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5515 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5516 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5517 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5518 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5519
2974
e7189a8c22ed use correct qp & lambda for ME on the second pass
michael
parents: 2973
diff changeset
5520 estimate_qp(s, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5521
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5522 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
5523 s->qscale= 3; //reduce clipping problems
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5524
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5525 if (s->out_format == FMT_MJPEG) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5526 /* for mjpeg, we do include qscale in the matrix */
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5527 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0];
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5528 for(i=1;i<64;i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5529 int j= s->dsp.idct_permutation[i];
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5530
2654
ec2b0cba6764 overflow fix
michael
parents: 2653
diff changeset
5531 s->intra_matrix[j] = clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3) & 0xFF;
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5532 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5533 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
5534 s->intra_matrix, s->intra_quant_bias, 8, 8, 1);
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5535 s->qscale= 8;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5536 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5537
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5538 //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
5539 s->current_picture_ptr->key_frame=
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5540 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
5541 s->current_picture_ptr->pict_type=
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5542 s->current_picture.pict_type= s->pict_type;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5543
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5544 if(s->current_picture.key_frame)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5545 s->picture_in_gop_number=0;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5546
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5547 s->last_bits= put_bits_count(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5548 switch(s->out_format) {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5549 case FMT_MJPEG:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5550 mjpeg_picture_header(s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5551 break;
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
5552 #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
5553 case FMT_H261:
5e5cf598a48b H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents: 2298
diff changeset
5554 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
5555 break;
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
5556 #endif
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5557 case FMT_H263:
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5558 if (s->codec_id == CODEC_ID_WMV2)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5559 ff_wmv2_encode_picture_header(s, picture_number);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5560 else if (s->h263_msmpeg4)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5561 msmpeg4_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5562 else if (s->h263_pred)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5563 mpeg4_encode_picture_header(s, picture_number);
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
5564 #ifdef CONFIG_RV10_ENCODER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5565 else if (s->codec_id == CODEC_ID_RV10)
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5566 rv10_encode_picture_header(s, picture_number);
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
5567 #endif
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
5568 #ifdef CONFIG_RV20_ENCODER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5569 else if (s->codec_id == CODEC_ID_RV20)
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
5570 rv20_encode_picture_header(s, picture_number);
2639
e2780f828440 put most codecs under ifdefs
michael
parents: 2637
diff changeset
5571 #endif
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5572 else if (s->codec_id == CODEC_ID_FLV1)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5573 ff_flv_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5574 else
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5575 h263_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5576 break;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5577 case FMT_MPEG1:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5578 mpeg1_encode_picture_header(s, picture_number);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5579 break;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5580 case FMT_H264:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5581 break;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5582 default:
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5583 assert(0);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5584 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5585 bits= put_bits_count(&s->pb);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5586 s->header_bits= bits - s->last_bits;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5587
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5588 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5589 update_duplicate_context_after_me(s->thread_context[i], s);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5590 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5591 s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5592 for(i=1; i<s->avctx->thread_count; i++){
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5593 merge_context_after_encode(s, s->thread_context[i]);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5594 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1790
diff changeset
5595 emms_c();
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
5596 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
5597
1686
68abbec33289 Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents: 1685
diff changeset
5598 #endif //CONFIG_ENCODERS
68abbec33289 Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents: 1685
diff changeset
5599
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
5600 static void denoise_dct_c(MpegEncContext *s, DCTELEM *block){
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5601 const int intra= s->mb_intra;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5602 int i;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5603
1599
079239998a38 10l (fixes dct coeff noise reduction)
michael
parents: 1598
diff changeset
5604 s->dct_count[intra]++;
079239998a38 10l (fixes dct coeff noise reduction)
michael
parents: 1598
diff changeset
5605
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5606 for(i=0; i<64; i++){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5607 int level= block[i];
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5608
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5609 if(level){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5610 if(level>0){
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5611 s->dct_error_sum[intra][i] += level;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5612 level -= s->dct_offset[intra][i];
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5613 if(level<0) level=0;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5614 }else{
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5615 s->dct_error_sum[intra][i] -= level;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5616 level += s->dct_offset[intra][i];
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5617 if(level>0) level=0;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5618 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5619 block[i]= level;
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5620 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5621 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5622 }
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5623
1686
68abbec33289 Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents: 1685
diff changeset
5624 #ifdef CONFIG_ENCODERS
68abbec33289 Here are juste two added #ifdef CONFIG_ENCODERS to allow
michael
parents: 1685
diff changeset
5625
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5626 static int dct_quantize_trellis_c(MpegEncContext *s,
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5627 DCTELEM *block, int n,
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5628 int qscale, int *overflow){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5629 const int *qmat;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
5630 const uint8_t *scantable= s->intra_scantable.scantable;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5631 const uint8_t *perm_scantable= s->intra_scantable.permutated;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5632 int max=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5633 unsigned int threshold1, threshold2;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5634 int bias=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5635 int run_tab[65];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5636 int level_tab[65];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5637 int score_tab[65];
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5638 int survivor[65];
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5639 int survivor_count;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5640 int last_run=0;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5641 int last_level=0;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5642 int last_score= 0;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5643 int last_i;
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5644 int coeff[2][64];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5645 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
5646 int qmul, qadd, start_i, last_non_zero, i, dc;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5647 const int esc_length= s->ac_esc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5648 uint8_t * length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5649 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
5650 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5651
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
5652 s->dsp.fdct (block);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5653
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
5654 if(s->dct_error_sum)
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
5655 s->denoise_dct(s, block);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5656 qmul= qscale*16;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5657 qadd= ((qscale-1)|1)*8;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5658
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5659 if (s->mb_intra) {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5660 int q;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5661 if (!s->h263_aic) {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5662 if (n < 4)
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5663 q = s->y_dc_scale;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5664 else
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5665 q = s->c_dc_scale;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5666 q = q << 3;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5667 } else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5668 /* For AIC we skip quant/dequant of INTRADC */
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5669 q = 1 << 3;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5670 qadd=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5671 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5672
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5673 /* note: block[0] is assumed to be positive */
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5674 block[0] = (block[0] + (q >> 1)) / q;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5675 start_i = 1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5676 last_non_zero = 0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5677 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
5678 if(s->mpeg_quant || s->out_format == FMT_MPEG1)
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5679 bias= 1<<(QMAT_SHIFT-1);
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5680 length = s->intra_ac_vlc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5681 last_length= s->intra_ac_vlc_last_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5682 } else {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5683 start_i = 0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5684 last_non_zero = -1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5685 qmat = s->q_inter_matrix[qscale];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5686 length = s->inter_ac_vlc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5687 last_length= s->inter_ac_vlc_last_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5688 }
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5689 last_i= start_i;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5690
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5691 threshold1= (1<<QMAT_SHIFT) - bias - 1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5692 threshold2= (threshold1<<1);
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5693
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5694 for(i=63; i>=start_i; i--) {
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5695 const int j = scantable[i];
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5696 int level = block[j] * qmat[j];
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5697
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5698 if(((unsigned)(level+threshold1))>threshold2){
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5699 last_non_zero = i;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5700 break;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5701 }
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5702 }
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5703
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5704 for(i=start_i; i<=last_non_zero; i++) {
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5705 const int j = scantable[i];
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5706 int level = block[j] * qmat[j];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5707
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5708 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5709 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5710 if(((unsigned)(level+threshold1))>threshold2){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5711 if(level>0){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5712 level= (bias + level)>>QMAT_SHIFT;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5713 coeff[0][i]= level;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5714 coeff[1][i]= level-1;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5715 // coeff[2][k]= level-2;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5716 }else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5717 level= (bias - level)>>QMAT_SHIFT;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5718 coeff[0][i]= -level;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5719 coeff[1][i]= -level+1;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5720 // coeff[2][k]= -level+2;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5721 }
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5722 coeff_count[i]= FFMIN(level, 2);
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5723 assert(coeff_count[i]);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5724 max |=level;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5725 }else{
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5726 coeff[0][i]= (level>>31)|1;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5727 coeff_count[i]= 1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5728 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5729 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5730
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
5731 *overflow= s->max_qcoeff < max; //overflow might have happened
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5732
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5733 if(last_non_zero < start_i){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5734 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM));
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5735 return last_non_zero;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5736 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5737
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5738 score_tab[start_i]= 0;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5739 survivor[0]= start_i;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5740 survivor_count= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5741
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5742 for(i=start_i; i<=last_non_zero; i++){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5743 int level_index, j;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5744 const int dct_coeff= ABS(block[ scantable[i] ]);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5745 const int zero_distoration= dct_coeff*dct_coeff;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5746 int best_score=256*256*256*120;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5747 for(level_index=0; level_index < coeff_count[i]; level_index++){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5748 int distoration;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5749 int level= coeff[level_index][i];
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5750 const int alevel= ABS(level);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5751 int unquant_coeff;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5752
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5753 assert(level);
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5754
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5755 if(s->out_format == FMT_H263){
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5756 unquant_coeff= alevel*qmul + qadd;
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5757 }else{ //MPEG1
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5758 j= s->dsp.idct_permutation[ scantable[i] ]; //FIXME optimize
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5759 if(s->mb_intra){
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5760 unquant_coeff = (int)( alevel * qscale * s->intra_matrix[j]) >> 3;
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5761 unquant_coeff = (unquant_coeff - 1) | 1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5762 }else{
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5763 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4;
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5764 unquant_coeff = (unquant_coeff - 1) | 1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5765 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5766 unquant_coeff<<= 3;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5767 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5768
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5769 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5770 level+=64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5771 if((level&(~127)) == 0){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5772 for(j=survivor_count-1; j>=0; j--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5773 int run= i - survivor[j];
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5774 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5775 score += score_tab[i-run];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5776
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5777 if(score < best_score){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5778 best_score= score;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5779 run_tab[i+1]= run;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5780 level_tab[i+1]= level-64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5781 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5782 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5783
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5784 if(s->out_format == FMT_H263){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5785 for(j=survivor_count-1; j>=0; j--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5786 int run= i - survivor[j];
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5787 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5788 score += score_tab[i-run];
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5789 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5790 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5791 last_run= run;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5792 last_level= level-64;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5793 last_i= i+1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5794 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5795 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5796 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5797 }else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5798 distoration += esc_length*lambda;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5799 for(j=survivor_count-1; j>=0; j--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5800 int run= i - survivor[j];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5801 int score= distoration + score_tab[i-run];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5802
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5803 if(score < best_score){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5804 best_score= score;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5805 run_tab[i+1]= run;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5806 level_tab[i+1]= level-64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5807 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5808 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5809
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5810 if(s->out_format == FMT_H263){
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5811 for(j=survivor_count-1; j>=0; j--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5812 int run= i - survivor[j];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5813 int score= distoration + score_tab[i-run];
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5814 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5815 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5816 last_run= run;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5817 last_level= level-64;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5818 last_i= i+1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5819 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5820 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5821 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5822 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5823 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5824
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5825 score_tab[i+1]= best_score;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5826
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5827 //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
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5828 if(last_non_zero <= 27){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5829 for(; survivor_count; survivor_count--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5830 if(score_tab[ survivor[survivor_count-1] ] <= best_score)
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5831 break;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5832 }
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5833 }else{
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5834 for(; survivor_count; survivor_count--){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5835 if(score_tab[ survivor[survivor_count-1] ] <= best_score + lambda)
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5836 break;
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5837 }
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
5838 }
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5839
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5840 survivor[ survivor_count++ ]= i+1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5841 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5842
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5843 if(s->out_format != FMT_H263){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5844 last_score= 256*256*256*120;
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5845 for(i= survivor[0]; i<=last_non_zero + 1; i++){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5846 int score= score_tab[i];
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5847 if(i) score += lambda*2; //FIXME exacter?
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
5848
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5849 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5850 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5851 last_i= i;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5852 last_level= level_tab[i];
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5853 last_run= run_tab[i];
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5854 }
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5855 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5856 }
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5857
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
5858 s->coded_score[n] = last_score;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5859
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5860 dc= ABS(block[0]);
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5861 last_non_zero= last_i - 1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5862 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5863
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5864 if(last_non_zero < start_i)
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5865 return last_non_zero;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5866
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5867 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
5868 int best_level= 0;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5869 int best_score= dc * dc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5870
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5871 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
5872 int level= coeff[i][0];
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5873 int alevel= ABS(level);
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5874 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
5875
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5876 if(s->out_format == FMT_H263){
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5877 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
5878 }else{ //MPEG1
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5879 unquant_coeff = ((( alevel << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4;
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5880 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
5881 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5882 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
5883 unquant_coeff<<= 3 + 3;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5884
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5885 distortion= (unquant_coeff - dc) * (unquant_coeff - dc);
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5886 level+=64;
1716
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5887 if((level&(~127)) == 0) score= distortion + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda;
da5d64a0fa02 cleanup
michael
parents: 1715
diff changeset
5888 else score= distortion + esc_length*lambda;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5889
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5890 if(score < best_score){
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5891 best_score= score;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5892 best_level= level - 64;
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5893 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5894 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
5895 block[0]= best_level;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5896 s->coded_score[n] = best_score - dc*dc;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5897 if(best_level == 0) return -1;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5898 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
5899 }
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
5900
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5901 i= last_i;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5902 assert(last_level);
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5903
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5904 block[ perm_scantable[last_non_zero] ]= last_level;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
5905 i -= last_run + 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5906
1718
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5907 for(; i>start_i; i -= run_tab[i] + 1){
fdd1bc71da55 more trellis quant optimizations
michael
parents: 1716
diff changeset
5908 block[ perm_scantable[i-1] ]= level_tab[i];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5909 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5910
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5911 return last_non_zero;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5912 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
5913
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5914 //#define REFINE_STATS 1
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5915 static int16_t basis[64][64];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5916
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5917 static void build_basis(uint8_t *perm){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5918 int i, j, x, y;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5919 emms_c();
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5920 for(i=0; i<8; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5921 for(j=0; j<8; j++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5922 for(y=0; y<8; y++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5923 for(x=0; x<8; x++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5924 double s= 0.25*(1<<BASIS_SHIFT);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5925 int index= 8*i + j;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5926 int perm_index= perm[index];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5927 if(i==0) s*= sqrt(0.5);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5928 if(j==0) s*= sqrt(0.5);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5929 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)));
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5930 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5931 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5932 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5933 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5934 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5935
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5936 static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise?
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5937 DCTELEM *block, int16_t *weight, DCTELEM *orig,
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5938 int n, int qscale){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5939 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
5940 DCTELEM d1[64] __align16;
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5941 const int *qmat;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5942 const uint8_t *scantable= s->intra_scantable.scantable;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5943 const uint8_t *perm_scantable= s->intra_scantable.permutated;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5944 // unsigned int threshold1, threshold2;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5945 // int bias=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5946 int run_tab[65];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5947 int prev_run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5948 int prev_level=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5949 int qmul, qadd, start_i, last_non_zero, i, dc;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5950 uint8_t * length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5951 uint8_t * last_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5952 int lambda;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5953 int rle_index, run, q, sum;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5954 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5955 static int count=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5956 static int after_last=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5957 static int to_zero=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5958 static int from_zero=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5959 static int raise=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5960 static int lower=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5961 static int messed_sign=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5962 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5963
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5964 if(basis[0][0] == 0)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5965 build_basis(s->dsp.idct_permutation);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5966
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5967 qmul= qscale*2;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5968 qadd= (qscale-1)|1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5969 if (s->mb_intra) {
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5970 if (!s->h263_aic) {
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5971 if (n < 4)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5972 q = s->y_dc_scale;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5973 else
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5974 q = s->c_dc_scale;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5975 } else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5976 /* For AIC we skip quant/dequant of INTRADC */
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5977 q = 1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5978 qadd=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5979 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5980 q <<= RECON_SHIFT-3;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5981 /* note: block[0] is assumed to be positive */
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5982 dc= block[0]*q;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5983 // block[0] = (block[0] + (q >> 1)) / q;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5984 start_i = 1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5985 qmat = s->q_intra_matrix[qscale];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5986 // if(s->mpeg_quant || s->out_format == FMT_MPEG1)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5987 // bias= 1<<(QMAT_SHIFT-1);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5988 length = s->intra_ac_vlc_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5989 last_length= s->intra_ac_vlc_last_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5990 } else {
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5991 dc= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5992 start_i = 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5993 qmat = s->q_inter_matrix[qscale];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5994 length = s->inter_ac_vlc_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5995 last_length= s->inter_ac_vlc_last_length;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5996 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5997 last_non_zero = s->block_last_index[n];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5998
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
5999 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6000 {START_TIMER
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6001 #endif
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6002 dc += (1<<(RECON_SHIFT-1));
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6003 for(i=0; i<64; i++){
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
6004 rem[i]= dc - (orig[i]<<RECON_SHIFT); //FIXME use orig dirrectly instead of copying to rem[]
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6005 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6006 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6007 STOP_TIMER("memset rem[]")}
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6008 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6009 sum=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6010 for(i=0; i<64; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6011 int one= 36;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6012 int qns=4;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6013 int w;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6014
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6015 w= ABS(weight[i]) + qns*one;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6016 w= 15 + (48*qns*one + w/2)/w; // 16 .. 63
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6017
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6018 weight[i] = w;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6019 // w=weight[i] = (63*qns + (w/2)) / w;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6020
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6021 assert(w>0);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6022 assert(w<(1<<6));
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6023 sum += w*w;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6024 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6025 lambda= sum*(uint64_t)s->lambda2 >> (FF_LAMBDA_SHIFT - 6 + 6 + 6 + 6);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6026 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6027 {START_TIMER
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6028 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6029 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6030 rle_index=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6031 for(i=start_i; i<=last_non_zero; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6032 int j= perm_scantable[i];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6033 const int level= block[j];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6034 int coeff;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6035
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6036 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6037 if(level<0) coeff= qmul*level - qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6038 else coeff= qmul*level + qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6039 run_tab[rle_index++]=run;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6040 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6041
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6042 s->dsp.add_8x8basis(rem, basis[j], coeff);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6043 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6044 run++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6045 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6046 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6047 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6048 if(last_non_zero>0){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6049 STOP_TIMER("init rem[]")
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6050 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6051 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6052
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6053 {START_TIMER
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6054 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6055 for(;;){
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6056 int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6057 int best_coeff=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6058 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
6059 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
6060 #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
6061 {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
6062 #endif
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6063 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
6064
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6065 if(analyze_gradient){
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6066 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6067 {START_TIMER
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6068 #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
6069 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
6070 int w= weight[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6071
1785
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6072 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
6073 }
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6074 #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
6075 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
6076 {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
6077 #endif
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6078 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
6079 #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
6080 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
6081 #endif
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6082 }
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6083
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6084 if(start_i){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6085 const int level= block[0];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6086 int change, old_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6087
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6088 assert(s->mb_intra);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6089
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6090 old_coeff= q*level;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6091
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6092 for(change=-1; change<=1; change+=2){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6093 int new_level= level + change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6094 int score, new_coeff;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6095
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6096 new_coeff= q*new_level;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6097 if(new_coeff >= 2048 || new_coeff < 0)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6098 continue;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6099
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6100 score= s->dsp.try_8x8basis(rem, weight, basis[0], new_coeff - old_coeff);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6101 if(score<best_score){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6102 best_score= score;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6103 best_coeff= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6104 best_change= change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6105 best_unquant_change= new_coeff - old_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6106 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6107 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6108 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6109
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6110 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6111 rle_index=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6112 run2= run_tab[rle_index++];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6113 prev_level=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6114 prev_run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6115
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6116 for(i=start_i; i<64; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6117 int j= perm_scantable[i];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6118 const int level= block[j];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6119 int change, old_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6120
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6121 if(s->avctx->quantizer_noise_shaping < 3 && i > last_non_zero + 1)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6122 break;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6123
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6124 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6125 if(level<0) old_coeff= qmul*level - qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6126 else old_coeff= qmul*level + qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6127 run2= run_tab[rle_index++]; //FIXME ! maybe after last
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6128 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6129 old_coeff=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6130 run2--;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6131 assert(run2>=0 || i >= last_non_zero );
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6132 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6133
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6134 for(change=-1; change<=1; change+=2){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6135 int new_level= level + change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6136 int score, new_coeff, unquant_change;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6137
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6138 score=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6139 if(s->avctx->quantizer_noise_shaping < 2 && ABS(new_level) > ABS(level))
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6140 continue;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6141
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6142 if(new_level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6143 if(new_level<0) new_coeff= qmul*new_level - qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6144 else new_coeff= qmul*new_level + qadd;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6145 if(new_coeff >= 2048 || new_coeff <= -2048)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6146 continue;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6147 //FIXME check for overflow
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6148
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6149 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6150 if(level < 63 && level > -63){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6151 if(i < last_non_zero)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6152 score += length[UNI_AC_ENC_INDEX(run, new_level+64)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6153 - length[UNI_AC_ENC_INDEX(run, level+64)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6154 else
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6155 score += last_length[UNI_AC_ENC_INDEX(run, new_level+64)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6156 - last_length[UNI_AC_ENC_INDEX(run, level+64)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6157 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6158 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6159 assert(ABS(new_level)==1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6160
1785
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6161 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
6162 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
6163 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
6164 continue;
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6165 }
14d918d0ef42 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper
michael
parents: 1784
diff changeset
6166
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6167 if(i < last_non_zero){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6168 int next_i= i + run2 + 1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6169 int next_level= block[ perm_scantable[next_i] ] + 64;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6170
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6171 if(next_level&(~127))
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6172 next_level= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6173
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6174 if(next_i < last_non_zero)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6175 score += length[UNI_AC_ENC_INDEX(run, 65)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6176 + length[UNI_AC_ENC_INDEX(run2, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6177 - length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6178 else
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6179 score += length[UNI_AC_ENC_INDEX(run, 65)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6180 + last_length[UNI_AC_ENC_INDEX(run2, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6181 - last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6182 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6183 score += last_length[UNI_AC_ENC_INDEX(run, 65)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6184 if(prev_level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6185 score += length[UNI_AC_ENC_INDEX(prev_run, prev_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6186 - last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6187 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6188 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6189 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6190 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6191 new_coeff=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6192 assert(ABS(level)==1);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6193
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6194 if(i < last_non_zero){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6195 int next_i= i + run2 + 1;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6196 int next_level= block[ perm_scantable[next_i] ] + 64;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6197
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6198 if(next_level&(~127))
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6199 next_level= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6200
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6201 if(next_i < last_non_zero)
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6202 score += length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6203 - length[UNI_AC_ENC_INDEX(run2, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6204 - length[UNI_AC_ENC_INDEX(run, 65)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6205 else
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6206 score += last_length[UNI_AC_ENC_INDEX(run + run2 + 1, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6207 - last_length[UNI_AC_ENC_INDEX(run2, next_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6208 - length[UNI_AC_ENC_INDEX(run, 65)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6209 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6210 score += -last_length[UNI_AC_ENC_INDEX(run, 65)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6211 if(prev_level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6212 score += last_length[UNI_AC_ENC_INDEX(prev_run, prev_level)]
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6213 - length[UNI_AC_ENC_INDEX(prev_run, prev_level)];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6214 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6215 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6216 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6217
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6218 score *= lambda;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6219
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6220 unquant_change= new_coeff - old_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6221 assert((score < 100*lambda && score > -100*lambda) || lambda==0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6222
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6223 score+= s->dsp.try_8x8basis(rem, weight, basis[j], unquant_change);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6224 if(score<best_score){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6225 best_score= score;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6226 best_coeff= i;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6227 best_change= change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6228 best_unquant_change= unquant_change;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6229 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6230 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6231 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6232 prev_level= level + 64;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6233 if(prev_level&(~127))
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6234 prev_level= 0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6235 prev_run= run;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6236 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6237 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6238 run++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6239 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6240 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6241 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6242 STOP_TIMER("iterative step")}
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6243 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6244
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6245 if(best_change){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6246 int j= perm_scantable[ best_coeff ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6247
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6248 block[j] += best_change;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6249
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6250 if(best_coeff > last_non_zero){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6251 last_non_zero= best_coeff;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6252 assert(block[j]);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6253 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6254 after_last++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6255 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6256 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6257 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6258 if(block[j]){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6259 if(block[j] - best_change){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6260 if(ABS(block[j]) > ABS(block[j] - best_change)){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6261 raise++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6262 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6263 lower++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6264 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6265 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6266 from_zero++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6267 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6268 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6269 to_zero++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6270 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6271 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6272 for(; last_non_zero>=start_i; last_non_zero--){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6273 if(block[perm_scantable[last_non_zero]])
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6274 break;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6275 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6276 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6277 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6278 count++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6279 if(256*256*256*64 % count == 0){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6280 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);
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6281 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6282 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6283 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6284 rle_index=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6285 for(i=start_i; i<=last_non_zero; i++){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6286 int j= perm_scantable[i];
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6287 const int level= block[j];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6288
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6289 if(level){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6290 run_tab[rle_index++]=run;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6291 run=0;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6292 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6293 run++;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6294 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6295 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6296
1784
65f7bd09f37b quantizer noise shaping optimization
michael
parents: 1778
diff changeset
6297 s->dsp.add_8x8basis(rem, basis[j], best_unquant_change);
1777
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6298 }else{
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6299 break;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6300 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6301 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6302 #ifdef REFINE_STATS
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6303 if(last_non_zero>0){
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6304 STOP_TIMER("iterative search")
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6305 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6306 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6307 #endif
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6308
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6309 return last_non_zero;
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6310 }
d183026acdfa quantizer noise shaping
michael
parents: 1766
diff changeset
6311
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6312 static int dct_quantize_c(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6313 DCTELEM *block, int n,
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6314 int qscale, int *overflow)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6315 {
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6316 int i, j, level, last_non_zero, q, start_i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6317 const int *qmat;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
6318 const uint8_t *scantable= s->intra_scantable.scantable;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6319 int bias;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6320 int max=0;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6321 unsigned int threshold1, threshold2;
828
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
6322
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
6323 s->dsp.fdct (block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6324
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
6325 if(s->dct_error_sum)
1719
4e72fb256b25 denoise_dct_mmx()
michael
parents: 1718
diff changeset
6326 s->denoise_dct(s, block);
1597
4c9165372ab3 noise reduction of dct coefficients
michael
parents: 1586
diff changeset
6327
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6328 if (s->mb_intra) {
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6329 if (!s->h263_aic) {
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6330 if (n < 4)
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6331 q = s->y_dc_scale;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6332 else
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6333 q = s->c_dc_scale;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6334 q = q << 3;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6335 } else
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
6336 /* 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
6337 q = 1 << 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6338
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6339 /* note: block[0] is assumed to be positive */
986e461dc072 Initial revision
glantau
parents:
diff changeset
6340 block[0] = (block[0] + (q >> 1)) / q;
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6341 start_i = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6342 last_non_zero = 0;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6343 qmat = s->q_intra_matrix[qscale];
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6344 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6345 } else {
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6346 start_i = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6347 last_non_zero = -1;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6348 qmat = s->q_inter_matrix[qscale];
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6349 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6350 }
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6351 threshold1= (1<<QMAT_SHIFT) - bias - 1;
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6352 threshold2= (threshold1<<1);
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6353 for(i=63;i>=start_i;i--) {
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
6354 j = scantable[i];
1715
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6355 level = block[j] * qmat[j];
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6356
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6357 if(((unsigned)(level+threshold1))>threshold2){
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6358 last_non_zero = i;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6359 break;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6360 }else{
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6361 block[j]=0;
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6362 }
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6363 }
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6364 for(i=start_i; i<=last_non_zero; i++) {
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6365 j = scantable[i];
88a2c6cc45f4 optimizing (trellis) quantizer
michael
parents: 1712
diff changeset
6366 level = block[j] * qmat[j];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6367
1215
9182f5e70e9b typo in a comment ...
michaelni
parents: 1214
diff changeset
6368 // if( bias+level >= (1<<QMAT_SHIFT)
9182f5e70e9b typo in a comment ...
michaelni
parents: 1214
diff changeset
6369 // || bias-level >= (1<<QMAT_SHIFT)){
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6370 if(((unsigned)(level+threshold1))>threshold2){
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6371 if(level>0){
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6372 level= (bias + level)>>QMAT_SHIFT;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6373 block[j]= level;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6374 }else{
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
6375 level= (bias - level)>>QMAT_SHIFT;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6376 block[j]= -level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6377 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6378 max |=level;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6379 }else{
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
6380 block[j]=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6381 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
6382 }
2627
bf158d23bbcc Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com)
michael
parents: 2620
diff changeset
6383 *overflow= s->max_qcoeff < max; //overflow might have happened
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6384
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
6385 /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
6386 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2974
diff changeset
6387 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero);
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
6388
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6389 return last_non_zero;
986e461dc072 Initial revision
glantau
parents:
diff changeset
6390 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
6391
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
6392 #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
6393
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6394 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
6395 DCTELEM *block, int n, int qscale)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6396 {
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
6397 int i, level, nCoeffs;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
6398 const uint16_t *quant_matrix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6399
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6400 nCoeffs= s->block_last_index[n];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6401
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6402 if (n < 4)
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6403 block[0] = block[0] * s->y_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6404 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6405 block[0] = block[0] * s->c_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6406 /* XXX: only mpeg1 */
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6407 quant_matrix = s->intra_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6408 for(i=1;i<=nCoeffs;i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6409 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6410 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6411 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6412 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6413 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6414 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6415 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6416 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6417 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6418 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6419 level = (level - 1) | 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6420 }
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6421 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6422 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
6423 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
6424 }
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
6425
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6426 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6427 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6428 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6429 int i, level, nCoeffs;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6430 const uint16_t *quant_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6431
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6432 nCoeffs= s->block_last_index[n];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6433
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6434 quant_matrix = s->inter_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6435 for(i=0; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6436 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6437 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6438 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6439 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6440 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6441 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6442 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6443 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6444 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6445 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6446 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6447 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6448 level = (level - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6449 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6450 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6451 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6452 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6453 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6454
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6455 static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6456 DCTELEM *block, int n, int qscale)
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6457 {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6458 int i, level, nCoeffs;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
6459 const uint16_t *quant_matrix;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6460
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6461 if(s->alternate_scan) nCoeffs= 63;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6462 else nCoeffs= s->block_last_index[n];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6463
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6464 if (n < 4)
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6465 block[0] = block[0] * s->y_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6466 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6467 block[0] = block[0] * s->c_dc_scale;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6468 quant_matrix = s->intra_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6469 for(i=1;i<=nCoeffs;i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6470 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6471 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6472 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6473 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6474 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6475 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6476 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6477 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6478 level = (int)(level * qscale * quant_matrix[j]) >> 3;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6479 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6480 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6481 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6482 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6483 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6484
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6485 static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6486 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6487 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6488 int i, level, nCoeffs;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6489 const uint16_t *quant_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6490 int sum=-1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6491
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6492 if(s->alternate_scan) nCoeffs= 63;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6493 else nCoeffs= s->block_last_index[n];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6494
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6495 quant_matrix = s->inter_matrix;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6496 for(i=0; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6497 int j= s->intra_scantable.permutated[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6498 level = block[j];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6499 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6500 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6501 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6502 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6503 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6504 level = -level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6505 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6506 level = (((level << 1) + 1) * qscale *
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6507 ((int) (quant_matrix[j]))) >> 4;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6508 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6509 block[j] = level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6510 sum+=level;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6511 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6512 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6513 block[63]^=sum&1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6514 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6515
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6516 static void dct_unquantize_h263_intra_c(MpegEncContext *s,
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6517 DCTELEM *block, int n, int qscale)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6518 {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6519 int i, level, qmul, qadd;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6520 int nCoeffs;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6521
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6522 assert(s->block_last_index[n]>=0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6523
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6524 qmul = qscale << 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6525
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6526 if (!s->h263_aic) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6527 if (n < 4)
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6528 block[0] = block[0] * s->y_dc_scale;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6529 else
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6530 block[0] = block[0] * s->c_dc_scale;
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6531 qadd = (qscale - 1) | 1;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6532 }else{
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6533 qadd = 0;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6534 }
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6535 if(s->ac_pred)
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6536 nCoeffs=63;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6537 else
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6538 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6539
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6540 for(i=1; i<=nCoeffs; i++) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6541 level = block[i];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6542 if (level) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6543 if (level < 0) {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6544 level = level * qmul - qadd;
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6545 } else {
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6546 level = level * qmul + qadd;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6547 }
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6548 block[i] = level;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6549 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6550 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6551 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
6552
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6553 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
6554 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
6555 {
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
6556 int i, level, qmul, qadd;
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
6557 int nCoeffs;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6558
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6559 assert(s->block_last_index[n]>=0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6560
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6561 qadd = (qscale - 1) | 1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
6562 qmul = qscale << 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6563
1689
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6564 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6565
1a2db2073848 split intra / inter dequantization
michael
parents: 1688
diff changeset
6566 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
6567 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
6568 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
6569 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
6570 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
6571 } 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
6572 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
6573 }
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
6574 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
6575 }
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
6576 }
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
6577 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6578
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
6579 #ifdef CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6580 AVCodec h263_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
6581 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
6582 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6583 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6584 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6585 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6586 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6587 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6588 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6589 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
6590
986e461dc072 Initial revision
glantau
parents:
diff changeset
6591 AVCodec h263p_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
6592 "h263p",
986e461dc072 Initial revision
glantau
parents:
diff changeset
6593 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6594 CODEC_ID_H263P,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6595 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6596 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6597 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6598 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6599 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6600 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
6601
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6602 AVCodec flv_encoder = {
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6603 "flv",
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6604 CODEC_TYPE_VIDEO,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6605 CODEC_ID_FLV1,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6606 sizeof(MpegEncContext),
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6607 MPV_encode_init,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6608 MPV_encode_picture,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6609 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6610 .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
6611 };
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
6612
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6613 AVCodec rv10_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
6614 "rv10",
986e461dc072 Initial revision
glantau
parents:
diff changeset
6615 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6616 CODEC_ID_RV10,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6617 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6618 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6619 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6620 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6621 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6622 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
6623
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6624 AVCodec rv20_encoder = {
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6625 "rv20",
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6626 CODEC_TYPE_VIDEO,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6627 CODEC_ID_RV20,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6628 sizeof(MpegEncContext),
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6629 MPV_encode_init,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6630 MPV_encode_picture,
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6631 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6632 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
2380
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6633 };
3daf36fd1999 rv20 encoding
michael
parents: 2371
diff changeset
6634
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
6635 AVCodec mpeg4_encoder = {
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
6636 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6637 CODEC_TYPE_VIDEO,
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
6638 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6639 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6640 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6641 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6642 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6643 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
2111
3c1dba53954e 10l (fixes delayed frames during encoding)
michael
parents: 2074
diff changeset
6644 .capabilities= CODEC_CAP_DELAY,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6645 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
6646
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6647 AVCodec msmpeg4v1_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6648 "msmpeg4v1",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6649 CODEC_TYPE_VIDEO,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6650 CODEC_ID_MSMPEG4V1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6651 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
6652 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6653 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
6654 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6655 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6656 };
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6657
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6658 AVCodec msmpeg4v2_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6659 "msmpeg4v2",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6660 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6661 CODEC_ID_MSMPEG4V2,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6662 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6663 MPV_encode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6664 MPV_encode_picture,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6665 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6666 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6667 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6668
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6669 AVCodec msmpeg4v3_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6670 "msmpeg4",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6671 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6672 CODEC_ID_MSMPEG4V3,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6673 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6674 MPV_encode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6675 MPV_encode_picture,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6676 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6677 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
6678 };
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6679
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6680 AVCodec wmv1_encoder = {
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6681 "wmv1",
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6682 CODEC_TYPE_VIDEO,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6683 CODEC_ID_WMV1,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6684 sizeof(MpegEncContext),
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6685 MPV_encode_init,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6686 MPV_encode_picture,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6687 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6688 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6689 };
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
6690
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6691 AVCodec mjpeg_encoder = {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6692 "mjpeg",
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6693 CODEC_TYPE_VIDEO,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6694 CODEC_ID_MJPEG,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6695 sizeof(MpegEncContext),
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6696 MPV_encode_init,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6697 MPV_encode_picture,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6698 MPV_encode_end,
2524
673d048d48dc set supported pix_fmts
michael
parents: 2522
diff changeset
6699 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, -1},
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
6700 };
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
6701
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
6702 #endif //CONFIG_ENCODERS