annotate mpegvideo.c @ 1586:3d1d0490e5a6 libavcodec

pts fix and related fixes
author michael
date Thu, 30 Oct 2003 16:58:49 +0000
parents 628bf341e099
children 4c9165372ab3
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.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
5 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
7 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
16 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
18 *
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
19 * 4MV & hq & b-frame encoding stuff by Michael Niedermayer <michaelni@gmx.at>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 */
701
85b071dfc7e3 ff_get_fourcc() & XVIX support
michaelni
parents: 697
diff changeset
21
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
22 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
23 * @file mpegvideo.c
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
24 * The simplest mpeg encoder (well, it was the simplest!).
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
25 */
1e39f273ecd6 per file doxy
michaelni
parents: 1099
diff changeset
26
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
27 #include <limits.h>
0
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"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
32
17
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 13
diff changeset
33 #ifdef USE_FASTMEMCPY
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 13
diff changeset
34 #include "fastmemcpy.h"
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 13
diff changeset
35 #endif
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 13
diff changeset
36
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
37 //#undef NDEBUG
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
38 //#include <assert.h>
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
39
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
40 #ifdef CONFIG_ENCODERS
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
41 static void encode_picture(MpegEncContext *s, int picture_number);
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
42 #endif //CONFIG_ENCODERS
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
43 static void dct_unquantize_mpeg1_c(MpegEncContext *s,
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
44 DCTELEM *block, int n, int qscale);
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
45 static void dct_unquantize_mpeg2_c(MpegEncContext *s,
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
46 DCTELEM *block, int n, int qscale);
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
47 static void dct_unquantize_h263_c(MpegEncContext *s,
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
48 DCTELEM *block, int n, int qscale);
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
49 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w);
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
50 #ifdef CONFIG_ENCODERS
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
51 static int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
52 static int dct_quantize_trellis_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
53 static int sse_mb(MpegEncContext *s);
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
54 #endif //CONFIG_ENCODERS
206
994aa8623443 (commit by michael)
arpi_esp
parents: 200
diff changeset
55
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
56 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
57 extern int XVMC_field_start(MpegEncContext*s, AVCodecContext *avctx);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
58 extern void XVMC_field_end(MpegEncContext *s);
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
59 extern void XVMC_decode_mb(MpegEncContext *s);
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
60 #endif
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
61
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
62 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
63
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
64
986e461dc072 Initial revision
glantau
parents:
diff changeset
65 /* enable all paranoid tests for rounding, overflows, etc... */
986e461dc072 Initial revision
glantau
parents:
diff changeset
66 //#define PARANOID
986e461dc072 Initial revision
glantau
parents:
diff changeset
67
986e461dc072 Initial revision
glantau
parents:
diff changeset
68 //#define DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
69
321
2b00e171b1d4 - ME method compatibility with legacy apps.
pulento
parents: 320
diff changeset
70
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
71 /* for jpeg fast DCT */
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 #define CONST_BITS 14
986e461dc072 Initial revision
glantau
parents:
diff changeset
73
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
74 static const uint16_t aanscales[64] = {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 /* precomputed values scaled up by 14 bits */
986e461dc072 Initial revision
glantau
parents:
diff changeset
76 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520,
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 22725, 31521, 29692, 26722, 22725, 17855, 12299, 6270,
986e461dc072 Initial revision
glantau
parents:
diff changeset
78 21407, 29692, 27969, 25172, 21407, 16819, 11585, 5906,
986e461dc072 Initial revision
glantau
parents:
diff changeset
79 19266, 26722, 25172, 22654, 19266, 15137, 10426, 5315,
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520,
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552,
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
82 8867 , 12299, 11585, 10426, 8867, 6967, 4799, 2446,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
83 4520 , 6270, 5906, 5315, 4520, 3552, 2446, 1247
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
85
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
86 static const uint8_t h263_chroma_roundtab[16] = {
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
87 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
88 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
90
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
91 #ifdef CONFIG_ENCODERS
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1160
diff changeset
92 static uint8_t (*default_mv_penalty)[MAX_MV*2+1]=NULL;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
93 static uint8_t default_fcode_tab[MAX_MV*2+1];
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
94
998
6129c88a6393 get_format()
michaelni
parents: 956
diff changeset
95 enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1};
6129c88a6393 get_format()
michaelni
parents: 956
diff changeset
96
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
97 static void convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64],
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
98 const uint16_t *quant_matrix, int bias, int qmin, int qmax)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 {
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
100 int qscale;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
101
709
afeff6ccb7f5 convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents: 706
diff changeset
102 for(qscale=qmin; qscale<=qmax; qscale++){
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
103 int i;
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
104 if (dsp->fdct == ff_jpeg_fdct_islow
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
105 #ifdef FAAN_POSTSCALE
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
106 || dsp->fdct == ff_faandct
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
107 #endif
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
108 ) {
625
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
109 for(i=0;i<64;i++) {
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
110 const int j= dsp->idct_permutation[i];
625
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
111 /* 16 <= qscale * quant_matrix[i] <= 7905 */
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
112 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
113 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
114 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
115
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
116 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) /
625
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
117 (qscale * quant_matrix[j]));
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
118 }
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
119 } else if (dsp->fdct == fdct_ifast
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
120 #ifndef FAAN_POSTSCALE
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
121 || dsp->fdct == ff_faandct
1562
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
122 #endif
bf452704100f optionally merge postscale into quantization table for the float aan dct
michael
parents: 1557
diff changeset
123 ) {
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
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];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
126 /* 16 <= qscale * quant_matrix[i] <= 7905 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
127 /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
128 /* (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
129 /* 3444240 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
130
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
131 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
132 (aanscales[i] * qscale * quant_matrix[j]));
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
133 }
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
134 } else {
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
135 for(i=0;i<64;i++) {
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
136 const int j= dsp->idct_permutation[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
137 /* We can safely suppose that 16 <= quant_matrix[i] <= 255
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
138 So 16 <= qscale * quant_matrix[i] <= 7905
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
139 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
140 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
141 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
142 qmat[qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j]));
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
143 // qmat [qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]);
1554
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
144 qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]);
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
145
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
146 if(qmat16[qscale][0][i]==0 || qmat16[qscale][0][i]==128*256) qmat16[qscale][0][i]=128*256-1;
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
147 qmat16[qscale][1][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][0][i]);
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
148 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
149 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 }
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
152
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
153 static inline void update_qscale(MpegEncContext *s){
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
154 s->qscale= (s->lambda*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7);
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
155 s->qscale= clip(s->qscale, s->avctx->qmin, s->avctx->qmax);
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
156
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
157 s->lambda2= (s->lambda*s->lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT;
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
158 }
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
159 #endif //CONFIG_ENCODERS
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
160
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
161 void ff_init_scantable(uint8_t *permutation, ScanTable *st, const uint8_t *src_scantable){
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
162 int i;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
163 int end;
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
164
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
165 st->scantable= src_scantable;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
166
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
167 for(i=0; i<64; i++){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
168 int j;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
169 j = src_scantable[i];
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
170 st->permutated[i] = permutation[j];
828
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
171 #ifdef ARCH_POWERPC
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
172 st->inverse[j] = i;
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
173 #endif
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
174 }
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
175
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
176 end=-1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
177 for(i=0; i<64; i++){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
178 int j;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
179 j = st->permutated[i];
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
180 if(j>end) end=j;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
181 st->raster_end[i]= end;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
182 }
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
183 }
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
184
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1523
diff changeset
185 #ifdef CONFIG_ENCODERS
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
186 void ff_write_quant_matrix(PutBitContext *pb, int16_t *matrix){
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
187 int i;
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
188
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
189 if(matrix){
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
190 put_bits(pb, 1, 1);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
191 for(i=0;i<64;i++) {
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
192 put_bits(pb, 8, matrix[ ff_zigzag_direct[i] ]);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
193 }
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
194 }else
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
195 put_bits(pb, 1, 0);
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
196 }
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1523
diff changeset
197 #endif //CONFIG_ENCODERS
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
198
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
199 /* init common dct for both encoder and decoder */
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
200 int DCT_common_init(MpegEncContext *s)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 {
312
8cf5507e6ca5 mpeg4 mpeg quantizer support
michaelni
parents: 311
diff changeset
202 s->dct_unquantize_h263 = dct_unquantize_h263_c;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
203 s->dct_unquantize_mpeg1 = dct_unquantize_mpeg1_c;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
204 s->dct_unquantize_mpeg2 = dct_unquantize_mpeg2_c;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
205
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
206 #ifdef CONFIG_ENCODERS
625
bb6a69f9d409 slow but accurate integer dct from IJG (should be ok with the LGPL as the old DCT is the fast integer DCT from IJG)
michaelni
parents: 619
diff changeset
207 s->dct_quantize= dct_quantize_c;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
208 #endif
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
209
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
210 #ifdef HAVE_MMX
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
211 MPV_common_init_mmx(s);
8
1b4461b5a7fb Sync with mplayer's stuff
nickols_k
parents: 7
diff changeset
212 #endif
514
c9f724e3a797 Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents: 506
diff changeset
213 #ifdef ARCH_ALPHA
c9f724e3a797 Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents: 506
diff changeset
214 MPV_common_init_axp(s);
c9f724e3a797 Update and activate dct_unquantize_h263_mvi. Thanks to M«©ns Rullg«©rd
mellum
parents: 506
diff changeset
215 #endif
628
f596db4aa871 sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents: 625
diff changeset
216 #ifdef HAVE_MLIB
f596db4aa871 sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents: 625
diff changeset
217 MPV_common_init_mlib(s);
f596db4aa871 sun solaris compilation bugfix, patch by (Martin Olschewski <olschewski at zpr dot uni-koeln dot de>)
michaelni
parents: 625
diff changeset
218 #endif
721
71f669e9f633 ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents: 717
diff changeset
219 #ifdef HAVE_MMI
71f669e9f633 ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents: 717
diff changeset
220 MPV_common_init_mmi(s);
71f669e9f633 ps2 optimizations update patch by (Leon van Stuivenberg <leonvs at iae dot nl>)
michaelni
parents: 717
diff changeset
221 #endif
730
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
222 #ifdef ARCH_ARMV4L
874
8cc0d241da37 * compilation fix (ARM users please check)
kabi
parents: 862
diff changeset
223 MPV_common_init_armv4l(s);
730
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
224 #endif
828
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
225 #ifdef ARCH_POWERPC
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
226 MPV_common_init_ppc(s);
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
227 #endif
730
b24ea84b23e2 trying to fix the non-x86 IDCTs (untested)
michaelni
parents: 726
diff changeset
228
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
229 #ifdef CONFIG_ENCODERS
1007
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 1002
diff changeset
230 s->fast_dct_quantize= s->dct_quantize;
b2cf2a1d9a51 more compare functions (rd & bit)
michaelni
parents: 1002
diff changeset
231
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
232 if(s->flags&CODEC_FLAG_TRELLIS_QUANT){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
233 s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_*
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
234 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
235
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
236 #endif //CONFIG_ENCODERS
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
237
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
238 /* load & permutate scantables
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
239 note: only wmv uses differnt ones
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
240 */
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
241 ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable , ff_zigzag_direct);
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
242 ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable , ff_zigzag_direct);
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
243 ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, ff_alternate_horizontal_scan);
a979fab41ed8 ASV1 codec
michaelni
parents: 1264
diff changeset
244 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
245
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
246 s->picture_structure= PICT_FRAME;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
247
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
248 return 0;
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
249 }
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
250
1539
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
251 static void copy_picture(Picture *dst, Picture *src){
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
252 *dst = *src;
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
253 dst->type= FF_BUFFER_TYPE_COPY;
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
254 }
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
255
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
256 /**
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
257 * allocates a Picture
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
258 * The pixels are allocated/set by calling get_buffer() if shared=0
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
259 */
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
260 static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
261 const int big_mb_num= s->mb_stride*(s->mb_height+1) + 1; //the +1 is needed so memset(,,stride*height) doesnt sig11
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
262 const int mb_array_size= s->mb_stride*s->mb_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
263 int i;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
264
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
265 if(shared){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
266 assert(pic->data[0]);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
267 assert(pic->type == 0 || pic->type == FF_BUFFER_TYPE_SHARED);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
268 pic->type= FF_BUFFER_TYPE_SHARED;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
269 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
270 int r;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
271
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
272 assert(!pic->data[0]);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
273
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
274 r= s->avctx->get_buffer(s->avctx, (AVFrame*)pic);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
275
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
276 if(r<0 || !pic->age || !pic->type || !pic->data[0]){
1014
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M«©ns Rullg«©rd))
michaelni
parents: 1013
diff changeset
277 fprintf(stderr, "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
278 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
279 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
280
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
281 if(s->linesize && (s->linesize != pic->linesize[0] || s->uvlinesize != pic->linesize[1])){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
282 fprintf(stderr, "get_buffer() failed (stride changed)\n");
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
283 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
284 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
285
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
286 if(pic->linesize[1] != pic->linesize[2]){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
287 fprintf(stderr, "get_buffer() failed (uv stride missmatch)\n");
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
288 return -1;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
289 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
290
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
291 s->linesize = pic->linesize[0];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
292 s->uvlinesize= pic->linesize[1];
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
293 }
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
294
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
295 if(pic->qscale_table==NULL){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
296 if (s->encoding) {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
297 CHECKED_ALLOCZ(pic->mb_var , mb_array_size * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
298 CHECKED_ALLOCZ(pic->mc_mb_var, mb_array_size * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
299 CHECKED_ALLOCZ(pic->mb_mean , mb_array_size * sizeof(int8_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
300 CHECKED_ALLOCZ(pic->mb_cmp_score, mb_array_size * sizeof(int32_t))
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
301 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
302
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
303 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
304 CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t))
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
305 CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(int))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
306 pic->mb_type= pic->mb_type_base + s->mb_stride+1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
307 if(s->out_format == FMT_H264){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
308 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
309 CHECKED_ALLOCZ(pic->motion_val[i], 2 * 16 * s->mb_num * sizeof(uint16_t))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
310 CHECKED_ALLOCZ(pic->ref_index[i] , 4 * s->mb_num * sizeof(uint8_t))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
311 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
312 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
313 pic->qstride= s->mb_stride;
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1542
diff changeset
314 CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan))
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
315 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
316
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
317 //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
318 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
319 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
320 if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == B_TYPE)
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
321 pic->age= INT_MAX; // skiped MBs in b frames are quite rare in mpeg1/2 and its a bit tricky to skip them anyway
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
322
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
323 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
324 fail: //for the CHECKED_ALLOCZ macro
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
325 return -1;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
326 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
327
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
328 /**
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
329 * deallocates a picture
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
330 */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
331 static void free_picture(MpegEncContext *s, Picture *pic){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
332 int i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
333
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
334 if(pic->data[0] && pic->type!=FF_BUFFER_TYPE_SHARED){
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
335 s->avctx->release_buffer(s->avctx, (AVFrame*)pic);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
336 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
337
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
338 av_freep(&pic->mb_var);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
339 av_freep(&pic->mc_mb_var);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
340 av_freep(&pic->mb_mean);
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
341 av_freep(&pic->mb_cmp_score);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
342 av_freep(&pic->mbskip_table);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
343 av_freep(&pic->qscale_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
344 av_freep(&pic->mb_type_base);
1546
5d06823e2ee9 export mpeg2 active display area / pan scan
michael
parents: 1542
diff changeset
345 av_freep(&pic->pan_scan);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
346 pic->mb_type= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
347 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
348 av_freep(&pic->motion_val[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
349 av_freep(&pic->ref_index[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
350 }
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
351
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
352 if(pic->type == FF_BUFFER_TYPE_SHARED){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
353 for(i=0; i<4; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
354 pic->base[i]=
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
355 pic->data[i]= NULL;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
356 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
357 pic->type= 0;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
358 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
359 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
360
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
361 /* init common structure for both encoder and decoder */
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
362 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
363 {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
364 int y_size, c_size, yc_size, i, mb_array_size, x, y;
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
365
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
366 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
367 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
368
754
b2767c9d6455 init flags before using it (found by arpi)
michaelni
parents: 753
diff changeset
369 s->flags= s->avctx->flags;
726
a91203b34e71 moved dct init out from mpv_common_init to dct_common_init (for less-uglier way for dv)
al3x
parents: 721
diff changeset
370
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
371 s->mb_width = (s->width + 15) / 16;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
372 s->mb_height = (s->height + 15) / 16;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
373 s->mb_stride = s->mb_width + 1;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
374 mb_array_size= s->mb_height * s->mb_stride;
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
375
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
376 /* 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
377 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
378 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
379
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
380 s->mb_num = s->mb_width * s->mb_height;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
381
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
382 s->block_wrap[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
383 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
384 s->block_wrap[2]=
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
385 s->block_wrap[3]= s->mb_width*2 + 2;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
386 s->block_wrap[4]=
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
387 s->block_wrap[5]= s->mb_width + 2;
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
388
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
389 y_size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2);
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
390 c_size = (s->mb_width + 2) * (s->mb_height + 2);
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
391 yc_size = y_size + 2 * c_size;
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
392
701
85b071dfc7e3 ff_get_fourcc() & XVIX support
michaelni
parents: 697
diff changeset
393 /* convert fourcc to upper case */
1116
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
394 s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF)
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
395 + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 )
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
396 + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16)
86a5d0ce86bf merging fourcc with codec_tag
michaelni
parents: 1106
diff changeset
397 + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24);
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
398
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
399 s->avctx->stream_codec_tag= toupper( s->avctx->stream_codec_tag &0xFF)
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
400 + (toupper((s->avctx->stream_codec_tag>>8 )&0xFF)<<8 )
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
401 + (toupper((s->avctx->stream_codec_tag>>16)&0xFF)<<16)
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
402 + (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
403
956
45bd748e305f negative linesize support (so mplayer -flip works)
michaelni
parents: 955
diff changeset
404 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance
45bd748e305f negative linesize support (so mplayer -flip works)
michaelni
parents: 955
diff changeset
405 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
406
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
407 s->avctx->coded_frame= (AVFrame*)&s->current_picture;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
408
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
409 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
410 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
411 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
412 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
413 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
414 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
415 s->mb_index2xy[ s->mb_height*s->mb_width ] = (s->mb_height-1)*s->mb_stride + s->mb_width; //FIXME really needed?
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
416
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
417 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
418 int mv_table_size= s->mb_stride * (s->mb_height+2) + 1;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
419
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
420 /* 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
421 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
422 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
423 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
424 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
425 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
426 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
427 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
428 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
429 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
430 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
431 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
432 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
433
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
434 //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer()
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
435 CHECKED_ALLOCZ(s->me.scratchpad, s->width*2*16*3*sizeof(uint8_t))
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
436
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
437 CHECKED_ALLOCZ(s->me.map , ME_MAP_SIZE*sizeof(uint32_t))
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
438 CHECKED_ALLOCZ(s->me.score_map, ME_MAP_SIZE*sizeof(uint32_t))
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
439
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
440 if(s->codec_id==CODEC_ID_MPEG4){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
441 CHECKED_ALLOCZ(s->tex_pb_buffer, PB_BUFFER_SIZE);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
442 CHECKED_ALLOCZ( s->pb2_buffer, PB_BUFFER_SIZE);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
443 }
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
444
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
445 if(s->msmpeg4_version){
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
446 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
447 }
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
448 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
449
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
450 /* Allocate MB type table */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
451 CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint8_t)) //needed for encoding
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
452
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
453 CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int))
1553
541681146f83 move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...
michael
parents: 1552
diff changeset
454
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
455 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
456 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
457 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
458 CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t))
1556
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
459 CHECKED_ALLOCZ(s->input_picture, MAX_PICTURE_COUNT * sizeof(Picture*))
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
460 CHECKED_ALLOCZ(s->reordered_input_picture, MAX_PICTURE_COUNT * sizeof(Picture*))
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
461 }
1555
27073c5532dc move blocks away MpegEncContext (7.4 -> 5.8k)
michael
parents: 1554
diff changeset
462 CHECKED_ALLOCZ(s->blocks, 64*6*2 * sizeof(DCTELEM))
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
463
1552
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
464 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
465
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
466 CHECKED_ALLOCZ(s->error_status_table, mb_array_size*sizeof(uint8_t))
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
467
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
468 if (s->out_format == FMT_H263 || s->encoding) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
469 int size;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
470
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
471 /* MV prediction */
986e461dc072 Initial revision
glantau
parents:
diff changeset
472 size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2);
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
473 CHECKED_ALLOCZ(s->motion_val, size * 2 * sizeof(int16_t));
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 661
diff changeset
474 }
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 661
diff changeset
475
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 661
diff changeset
476 if(s->codec_id==CODEC_ID_MPEG4){
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
477 /* interlaced direct mode decoding tables */
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
478 CHECKED_ALLOCZ(s->field_mv_table, mb_array_size*2*2 * sizeof(int16_t))
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
479 CHECKED_ALLOCZ(s->field_select_table, mb_array_size*2* sizeof(int8_t))
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
480 }
767
c75c3f1bef4b regression test for H263+
michaelni
parents: 766
diff changeset
481 if (s->out_format == FMT_H263) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
482 /* ac values */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
483 CHECKED_ALLOCZ(s->ac_val[0], yc_size * sizeof(int16_t) * 16);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
484 s->ac_val[1] = s->ac_val[0] + y_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
485 s->ac_val[2] = s->ac_val[1] + c_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
486
986e461dc072 Initial revision
glantau
parents:
diff changeset
487 /* cbp values */
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
488 CHECKED_ALLOCZ(s->coded_block, y_size);
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 329
diff changeset
489
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 329
diff changeset
490 /* divx501 bitstream reorder buffer */
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
491 CHECKED_ALLOCZ(s->bitstream_buffer, BITSTREAM_BUFFER_SIZE);
843
8c81f1ee9271 cleanup
michaelni
parents: 842
diff changeset
492
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
493 /* 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
494 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
495 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
496 }
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
497
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
498 if (s->h263_pred || s->h263_plus || !s->encoding) {
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
499 /* dc values */
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
500 //MN: we need these for error resilience of intra-frames
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
501 CHECKED_ALLOCZ(s->dc_val[0], yc_size * sizeof(int16_t));
756
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
502 s->dc_val[1] = s->dc_val[0] + y_size;
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
503 s->dc_val[2] = s->dc_val[1] + c_size;
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
504 for(i=0;i<yc_size;i++)
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
505 s->dc_val[0][i] = 1024;
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
506 }
f2644bb12a43 fixing h263 decoding (did segfault)
michaelni
parents: 755
diff changeset
507
611
3214d3f4519e error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents: 608
diff changeset
508 /* 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
509 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
510 memset(s->mbintra_table, 1, mb_array_size);
611
3214d3f4519e error concealment needs the mbintra_table so it should allways be allocated
michaelni
parents: 608
diff changeset
511
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
512 /* default structure is frame */
986e461dc072 Initial revision
glantau
parents:
diff changeset
513 s->picture_structure = PICT_FRAME;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
514
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
515 /* 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
516 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
517 //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
518 CHECKED_ALLOCZ(s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
519
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
520 s->block= s->blocks[0];
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
521
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
522 for(i=0;i<12;i++){
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
523 s->pblocks[i] = (short *)(&s->block[i]);
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
524 }
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
525
842
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 828
diff changeset
526 s->parse_context.state= -1;
e460775adb38 cleanup (breaks compatibility, requested by fabrice)
michaelni
parents: 828
diff changeset
527
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
528 s->context_initialized = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
529 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
530 fail:
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
531 MPV_common_end(s);
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
532 return -1;
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
533 }
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
534
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
535
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
536 //extern int sads;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
537
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
538 /* init common structure for both encoder and decoder */
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
539 void MPV_common_end(MpegEncContext *s)
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
540 {
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
541 int i;
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
542
1344
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
543 av_freep(&s->parse_context.buffer);
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
544 s->parse_context.buffer_size=0;
447b88b784ee memleak fix by (Jake Page <jake at CS dot Stanford dot EDU>)
michaelni
parents: 1339
diff changeset
545
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
546 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
547 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
548 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
549 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
550 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
551 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
552 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
553 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
554 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
555 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
556 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
557 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
558 s->b_direct_mv_table= NULL;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
559
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
560 av_freep(&s->motion_val);
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
561 av_freep(&s->dc_val[0]);
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
562 av_freep(&s->ac_val[0]);
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
563 av_freep(&s->coded_block);
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
564 av_freep(&s->mbintra_table);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
565 av_freep(&s->cbp_table);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
566 av_freep(&s->pred_dir_table);
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
567 av_freep(&s->me.scratchpad);
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
568 av_freep(&s->me.map);
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
569 av_freep(&s->me.score_map);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
570
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
571 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
572 av_freep(&s->prev_pict_types);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 376
diff changeset
573 av_freep(&s->bitstream_buffer);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
574 av_freep(&s->tex_pb_buffer);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
575 av_freep(&s->pb2_buffer);
956
45bd748e305f negative linesize support (so mplayer -flip works)
michaelni
parents: 955
diff changeset
576 av_freep(&s->allocated_edge_emu_buffer); s->edge_emu_buffer= NULL;
664
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 661
diff changeset
577 av_freep(&s->field_mv_table);
00a882f626bd interlaced mpeg4 b frame decoding
michaelni
parents: 661
diff changeset
578 av_freep(&s->field_select_table);
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
579 av_freep(&s->avctx->stats_out);
650
ef4a33aad86e reducing sizeof MpegEncContext to avoid stack overflow on crap M$ windo$
michaelni
parents: 635
diff changeset
580 av_freep(&s->ac_stats);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
581 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
582 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
583 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
584 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
585 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
586 av_freep(&s->q_intra_matrix16);
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
587 av_freep(&s->q_inter_matrix16);
1555
27073c5532dc move blocks away MpegEncContext (7.4 -> 5.8k)
michael
parents: 1554
diff changeset
588 av_freep(&s->blocks);
1556
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
589 av_freep(&s->input_picture);
5ebb4ae753d3 112 bytes smaller MpegEncContext
michael
parents: 1555
diff changeset
590 av_freep(&s->reordered_input_picture);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
591
1573
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
592 if(s->picture){
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
593 for(i=0; i<MAX_PICTURE_COUNT; i++){
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
594 free_picture(s, &s->picture[i]);
a4aa536938b8 segfault fix
michael
parents: 1562
diff changeset
595 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
596 }
1552
26c6ecba99a1 dynamic alloc of picture structs instead of putting them in MpegEncContext
michael
parents: 1546
diff changeset
597 av_freep(&s->picture);
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
598 avcodec_default_free_buffers(s->avctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
599 s->context_initialized = 0;
1523
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
600 s->last_picture_ptr=
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
601 s->next_picture_ptr=
925bcd748f4b fix decoding if the aspect ratio changes
michael
parents: 1522
diff changeset
602 s->current_picture_ptr= NULL;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
603 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
604
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
605 #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
606
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
607 /* init video encoder */
986e461dc072 Initial revision
glantau
parents:
diff changeset
608 int MPV_encode_init(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
609 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
610 MpegEncContext *s = avctx->priv_data;
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
611 int i, dummy;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
612 int chroma_h_shift, chroma_v_shift;
315
40d8092e2ff0 * using pixtype as enum - by Philip Gladstone
kabi
parents: 312
diff changeset
613
1402
f662e9c86cf2 * fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents: 1397
diff changeset
614 avctx->pix_fmt = PIX_FMT_YUV420P; // FIXME
f662e9c86cf2 * fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents: 1397
diff changeset
615
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
616 s->bit_rate = avctx->bit_rate;
268
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
617 s->bit_rate_tolerance = avctx->bit_rate_tolerance;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
618 s->width = avctx->width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
619 s->height = avctx->height;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
620 if(avctx->gop_size > 600){
462
3fdd0627f6bd typo (found by Bohdan Horst <nexus at hoth.amu.edu.pl>)
michaelni
parents: 461
diff changeset
621 fprintf(stderr, "Warning keyframe interval too large! reducing it ...\n");
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
622 avctx->gop_size=600;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
623 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
624 s->gop_size = avctx->gop_size;
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 108
diff changeset
625 s->rtp_mode = avctx->rtp_mode;
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 108
diff changeset
626 s->rtp_payload_size = avctx->rtp_payload_size;
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
627 if (avctx->rtp_callback)
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
628 s->rtp_callback = avctx->rtp_callback;
268
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
629 s->max_qdiff= avctx->max_qdiff;
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
630 s->qcompress= avctx->qcompress;
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
631 s->qblur= avctx->qblur;
194
27d1773552c9 mpeg4 encoder fix by Michael Niedermayer <michaelni@gmx.at>
arpi_esp
parents: 191
diff changeset
632 s->avctx = avctx;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
633 s->flags= avctx->flags;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
634 s->max_b_frames= avctx->max_b_frames;
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
635 s->b_frame_strategy= avctx->b_frame_strategy;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
636 s->codec_id= avctx->codec->id;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
637 s->luma_elim_threshold = avctx->luma_elim_threshold;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
638 s->chroma_elim_threshold= avctx->chroma_elim_threshold;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
639 s->strict_std_compliance= avctx->strict_std_compliance;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
640 s->data_partitioning= avctx->flags & CODEC_FLAG_PART;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
641 s->quarter_sample= (avctx->flags & CODEC_FLAG_QPEL)!=0;
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
642 s->mpeg_quant= avctx->mpeg_quant;
1422
efeed6e29f9b oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
michaelni
parents: 1421
diff changeset
643
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
644 if (s->gop_size <= 1) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
645 s->intra_only = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
646 s->gop_size = 12;
986e461dc072 Initial revision
glantau
parents:
diff changeset
647 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
648 s->intra_only = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
649 }
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
650
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
651 s->me_method = avctx->me_method;
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
652
320
cda7d0857baf - ME setting moved to AVCodecContext/MpegEncContext, no longer a global.
pulento
parents: 315
diff changeset
653 /* Fixed QSCALE */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
654 s->fixed_qscale = (avctx->flags & CODEC_FLAG_QSCALE);
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
655
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
656 s->adaptive_quant= ( s->avctx->lumi_masking
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
657 || s->avctx->dark_masking
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
658 || s->avctx->temporal_cplx_masking
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
659 || s->avctx->spatial_cplx_masking
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
660 || s->avctx->p_masking)
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
661 && !s->fixed_qscale;
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
662
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
663 s->progressive_sequence= !(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
693
b6a7ff92df57 darkness masking (lumi masking does only bright stuff now)
michaelni
parents: 690
diff changeset
664
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
665 if((s->flags & CODEC_FLAG_4MV) && s->codec_id != CODEC_ID_MPEG4){
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
666 fprintf(stderr, "4MV not supporetd by codec\n");
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
667 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
668 }
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
669
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
670 if(s->quarter_sample && s->codec_id != CODEC_ID_MPEG4){
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
671 fprintf(stderr, "qpel not supporetd by codec\n");
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
672 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
673 }
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
674
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
675 if(s->data_partitioning && s->codec_id != CODEC_ID_MPEG4){
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
676 fprintf(stderr, "data partitioning not supporetd by codec\n");
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
677 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
678 }
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
679
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
680 if(s->max_b_frames && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG1VIDEO && s->codec_id != CODEC_ID_MPEG2VIDEO){
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
681 fprintf(stderr, "b frames not supporetd by codec\n");
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
682 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
683 }
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
684
1188
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
685 if(s->mpeg_quant && s->codec_id != CODEC_ID_MPEG4){ //FIXME mpeg2 uses that too
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
686 fprintf(stderr, "mpeg2 style quantization not supporetd by codec\n");
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
687 return -1;
c5f239397e90 check validity of some flags
michaelni
parents: 1177
diff changeset
688 }
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
689
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
690 if((s->flags & CODEC_FLAG_CBP_RD) && !(s->flags & CODEC_FLAG_TRELLIS_QUANT)){
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
691 fprintf(stderr, "CBP RD needs trellis quant\n");
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
692 return -1;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
693 }
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
694
1150
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
695 if(s->codec_id==CODEC_ID_MJPEG){
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
696 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
697 s->inter_quant_bias= 0;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
698 }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
699 s->intra_quant_bias= 3<<(QUANT_BIAS_SHIFT-3); //(a + x*3/8)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
700 s->inter_quant_bias= 0;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
701 }else{
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
702 s->intra_quant_bias=0;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
703 s->inter_quant_bias=-(1<<(QUANT_BIAS_SHIFT-2)); //(a - x/4)/x
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
704 }
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
705
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
706 if(avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
707 s->intra_quant_bias= avctx->intra_quant_bias;
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
708 if(avctx->inter_quant_bias != FF_DEFAULT_QUANT_BIAS)
dde68a430ba9 user setable quantizer bias
michaelni
parents: 1148
diff changeset
709 s->inter_quant_bias= avctx->inter_quant_bias;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
710
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
711 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
712
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
713 av_reduce(&s->time_increment_resolution, &dummy, s->avctx->frame_rate, s->avctx->frame_rate_base, (1<<16)-1);
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
714 s->time_increment_bits = av_log2(s->time_increment_resolution - 1) + 1;
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
715
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
716 switch(avctx->codec->id) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
717 case CODEC_ID_MPEG1VIDEO:
986e461dc072 Initial revision
glantau
parents:
diff changeset
718 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
719 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
720 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
721 break;
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
722 case CODEC_ID_MPEG2VIDEO:
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
723 s->out_format = FMT_MPEG1;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
724 s->low_delay= 0; //s->max_b_frames ? 0 : 1;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
725 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
726 s->rtp_mode= 1; // mpeg2 must have slices
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
727 if(s->rtp_payload_size == 0) s->rtp_payload_size= 256*256*256;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
728 break;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
729 case CODEC_ID_LJPEG:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
730 case CODEC_ID_MJPEG:
986e461dc072 Initial revision
glantau
parents:
diff changeset
731 s->out_format = FMT_MJPEG;
986e461dc072 Initial revision
glantau
parents:
diff changeset
732 s->intra_only = 1; /* force intra only for jpeg */
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
733 s->mjpeg_write_tables = 1; /* write all tables */
370
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 365
diff changeset
734 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
735 s->mjpeg_vsample[0] = 1<<chroma_v_shift;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
736 s->mjpeg_vsample[1] = 1;
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
737 s->mjpeg_vsample[2] = 1;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1288
diff changeset
738 s->mjpeg_hsample[0] = 1<<chroma_h_shift;
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
739 s->mjpeg_hsample[1] = 1;
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
740 s->mjpeg_hsample[2] = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
741 if (mjpeg_init(s) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
742 return -1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
743 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
744 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
745 break;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
746 #ifdef CONFIG_RISKY
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
747 case CODEC_ID_H263:
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
748 if (h263_get_picture_format(s->width, s->height) == 7) {
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
749 printf("Input picture size isn't suitable for h263 codec! try h263+\n");
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
750 return -1;
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
751 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
752 s->out_format = FMT_H263;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
753 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
754 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
755 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
756 case CODEC_ID_H263P:
986e461dc072 Initial revision
glantau
parents:
diff changeset
757 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
758 s->h263_plus = 1;
1095
c7604e6291c5 extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents: 1094
diff changeset
759 /* Fx */
c7604e6291c5 extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents: 1094
diff changeset
760 s->unrestricted_mv=(avctx->flags & CODEC_FLAG_H263P_UMV) ? 1:0;
c7604e6291c5 extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents: 1094
diff changeset
761 s->h263_aic= (avctx->flags & CODEC_FLAG_H263P_AIC) ? 1:0;
c7604e6291c5 extended option for h263+ patch by (fixounet at free dot fr) with some minor modifications
michaelni
parents: 1094
diff changeset
762 /* /Fx */
79
82e579c37bc3 Moved some H.263+ variables to MpegEncContext to be thread-safe.
pulento
parents: 78
diff changeset
763 /* These are just to be sure */
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1086
diff changeset
764 s->umvplus = 1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
765 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
766 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
767 break;
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
768 case CODEC_ID_FLV1:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
769 s->out_format = FMT_H263;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
770 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
771 s->unrestricted_mv = 1;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
772 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
773 avctx->delay=0;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
774 s->low_delay=1;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
775 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
776 case CODEC_ID_RV10:
986e461dc072 Initial revision
glantau
parents:
diff changeset
777 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
778 s->h263_rv10 = 1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
779 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
780 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
781 break;
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
782 case CODEC_ID_MPEG4:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
783 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
784 s->h263_pred = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
785 s->unrestricted_mv = 1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
786 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
787 avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
788 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
789 case CODEC_ID_MSMPEG4V1:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
790 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
791 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
792 s->h263_pred = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
793 s->unrestricted_mv = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
794 s->msmpeg4_version= 1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
795 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
796 s->low_delay=1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
797 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
798 case CODEC_ID_MSMPEG4V2:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
799 s->out_format = FMT_H263;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
800 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
801 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
802 s->unrestricted_mv = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
803 s->msmpeg4_version= 2;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
804 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
805 s->low_delay=1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
806 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
807 case CODEC_ID_MSMPEG4V3:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
808 s->out_format = FMT_H263;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
809 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
810 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
811 s->unrestricted_mv = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
812 s->msmpeg4_version= 3;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
813 s->flipflop_rounding=1;
336
c56b45669214 export delay info
michaelni
parents: 333
diff changeset
814 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
815 s->low_delay=1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
816 break;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
817 case CODEC_ID_WMV1:
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
818 s->out_format = FMT_H263;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
819 s->h263_msmpeg4 = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
820 s->h263_pred = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
821 s->unrestricted_mv = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
822 s->msmpeg4_version= 4;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
823 s->flipflop_rounding=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
824 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
825 s->low_delay=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
826 break;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
827 case CODEC_ID_WMV2:
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
828 s->out_format = FMT_H263;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
829 s->h263_msmpeg4 = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
830 s->h263_pred = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
831 s->unrestricted_mv = 1;
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
832 s->msmpeg4_version= 5;
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
833 s->flipflop_rounding=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
834 avctx->delay=0;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
835 s->low_delay=1;
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
836 break;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
837 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
838 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
839 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
840 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
841
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
842 { /* set up some save defaults, some codecs might override them later */
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
843 static int done=0;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
844 if(!done){
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
845 int i;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
846 done=1;
815
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 814
diff changeset
847
1162
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1160
diff changeset
848 default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) );
8c15d82c1893 some static -> dynamic alloc & 16->8 bit
michaelni
parents: 1160
diff changeset
849 memset(default_mv_penalty, 0, sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1));
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
850 memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1));
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
851
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
852 for(i=-16; i<16; i++){
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
853 default_fcode_tab[i + MAX_MV]= 1;
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
854 }
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
855 }
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
856 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
857 s->me.mv_penalty= default_mv_penalty;
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
858 s->fcode_tab= default_fcode_tab;
506
b9ed0ae72d51 init dc_scale tables to defaults (fixes mjpeg sig11)
michaelni
parents: 499
diff changeset
859 s->y_dc_scale_table=
b9ed0ae72d51 init dc_scale tables to defaults (fixes mjpeg sig11)
michaelni
parents: 499
diff changeset
860 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
b9ed0ae72d51 init dc_scale tables to defaults (fixes mjpeg sig11)
michaelni
parents: 499
diff changeset
861
287
32a3dcce2e9b fixing motion estimation with h263p hopefully
michaelni
parents: 286
diff changeset
862 /* dont use mv_penalty table for crap MV as it would be confused */
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
863 //FIXME remove after fixing / removing old ME
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
864 if (s->me_method < ME_EPZS) s->me.mv_penalty = default_mv_penalty;
287
32a3dcce2e9b fixing motion estimation with h263p hopefully
michaelni
parents: 286
diff changeset
865
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
866 s->encoding = 1;
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
867
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
868 /* init */
986e461dc072 Initial revision
glantau
parents:
diff changeset
869 if (MPV_common_init(s) < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
870 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
871
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
872 ff_init_me(s);
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
873
815
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 814
diff changeset
874 #ifdef CONFIG_ENCODERS
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
875 #ifdef CONFIG_RISKY
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
876 if (s->out_format == FMT_H263)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
877 h263_encode_init(s);
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
878 if(s->msmpeg4_version)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
879 ff_msmpeg4_encode_init(s);
815
78accc54493b put a few large tables under #ifdef CONFIG_ENCODERS or dynamically allocate them
michaelni
parents: 814
diff changeset
880 #endif
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
881 if (s->out_format == FMT_MPEG1)
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
882 ff_mpeg1_encode_init(s);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
883 #endif
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
884
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
885 /* init default q matrix */
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
886 for(i=0;i<64;i++) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
887 int j= s->dsp.idct_permutation[i];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
888 #ifdef CONFIG_RISKY
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
889 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
890 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
891 s->inter_matrix[j] = ff_mpeg4_default_non_intra_matrix[i];
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
892 }else if(s->out_format == FMT_H263){
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
893 s->intra_matrix[j] =
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
894 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
895 }else
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
896 #endif
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
897 { /* mpeg1/2 */
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
898 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
899 s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i];
599
b1a191202f96 mpeg4 mpeg quantizer encoding
michaelni
parents: 598
diff changeset
900 }
1411
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
901 if(s->avctx->intra_matrix)
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
902 s->intra_matrix[j] = s->avctx->intra_matrix[i];
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
903 if(s->avctx->inter_matrix)
c2e63cb94d06 custom quant matrix encoding support
michaelni
parents: 1402
diff changeset
904 s->inter_matrix[j] = s->avctx->inter_matrix[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
905 }
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
906
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
907 /* precompute matrix */
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
908 /* for mjpeg, we do include qscale in the matrix */
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
909 if (s->out_format != FMT_MJPEG) {
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
910 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16,
709
afeff6ccb7f5 convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents: 706
diff changeset
911 s->intra_matrix, s->intra_quant_bias, 1, 31);
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
912 convert_matrix(&s->dsp, s->q_inter_matrix, s->q_inter_matrix16,
709
afeff6ccb7f5 convert only needed matrixes in convert_matrix() (mjpeg calls it for every frame)
michaelni
parents: 706
diff changeset
913 s->inter_matrix, s->inter_quant_bias, 1, 31);
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
914 }
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 57
diff changeset
915
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
916 if(ff_rate_control_init(s) < 0)
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
917 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
918
986e461dc072 Initial revision
glantau
parents:
diff changeset
919 s->picture_number = 0;
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
920 s->picture_in_gop_number = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
921 s->fake_picture_number = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
922 /* motion detector init */
986e461dc072 Initial revision
glantau
parents:
diff changeset
923 s->f_code = 1;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
924 s->b_code = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
925
986e461dc072 Initial revision
glantau
parents:
diff changeset
926 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
927 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
928
986e461dc072 Initial revision
glantau
parents:
diff changeset
929 int MPV_encode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
930 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
931 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
932
986e461dc072 Initial revision
glantau
parents:
diff changeset
933 #ifdef STATS
986e461dc072 Initial revision
glantau
parents:
diff changeset
934 print_stats();
986e461dc072 Initial revision
glantau
parents:
diff changeset
935 #endif
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
936
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
937 ff_rate_control_uninit(s);
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
938
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
939 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
940 if (s->out_format == FMT_MJPEG)
986e461dc072 Initial revision
glantau
parents:
diff changeset
941 mjpeg_close(s);
1458
40b69d238beb AVI stream header FCC / more reliable detection of old xvid files
michaelni
parents: 1451
diff changeset
942
1424
39ebefd82728 fixing CODEC_FLAG_GLOBAL_HEADER
michaelni
parents: 1422
diff changeset
943 av_freep(&avctx->extradata);
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
944
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
945 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
946 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
947
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
948 #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
949
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
950 void init_rl(RLTable *rl)
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
951 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
952 int8_t max_level[MAX_RUN+1], max_run[MAX_LEVEL+1];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
953 uint8_t index_run[MAX_RUN+1];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
954 int last, run, level, start, end, i;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
955
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
956 /* compute max_level[], max_run[] and index_run[] */
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
957 for(last=0;last<2;last++) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
958 if (last == 0) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
959 start = 0;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
960 end = rl->last;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
961 } else {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
962 start = rl->last;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
963 end = rl->n;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
964 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
965
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
966 memset(max_level, 0, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
967 memset(max_run, 0, MAX_LEVEL + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
968 memset(index_run, rl->n, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
969 for(i=start;i<end;i++) {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
970 run = rl->table_run[i];
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
971 level = rl->table_level[i];
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
972 if (index_run[run] == rl->n)
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
973 index_run[run] = i;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
974 if (level > max_level[run])
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
975 max_level[run] = level;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
976 if (run > max_run[level])
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
977 max_run[level] = run;
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
978 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
979 rl->max_level[last] = av_malloc(MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
980 memcpy(rl->max_level[last], max_level, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
981 rl->max_run[last] = av_malloc(MAX_LEVEL + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
982 memcpy(rl->max_run[last], max_run, MAX_LEVEL + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
983 rl->index_run[last] = av_malloc(MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
984 memcpy(rl->index_run[last], index_run, MAX_RUN + 1);
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
985 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
986 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
987
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
988 /* 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
989 //FIXME check that this is ok for mpeg4 interlaced
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
990 static void draw_edges_c(uint8_t *buf, int wrap, int width, int height, int w)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
991 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
992 uint8_t *ptr, *last_line;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
993 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
994
986e461dc072 Initial revision
glantau
parents:
diff changeset
995 last_line = buf + (height - 1) * wrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
996 for(i=0;i<w;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
997 /* top and bottom */
986e461dc072 Initial revision
glantau
parents:
diff changeset
998 memcpy(buf - (i + 1) * wrap, buf, width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
999 memcpy(last_line + (i + 1) * wrap, last_line, width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1000 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1001 /* left and right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1002 ptr = buf;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1003 for(i=0;i<height;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1004 memset(ptr - w, ptr[0], w);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1005 memset(ptr + width, ptr[width-1], w);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1006 ptr += wrap;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1007 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1008 /* corners */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1009 for(i=0;i<w;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1010 memset(buf - (i + 1) * wrap - w, buf[0], w); /* top left */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1011 memset(buf - (i + 1) * wrap + width, buf[width-1], w); /* top right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1012 memset(last_line + (i + 1) * wrap - w, last_line[0], w); /* top left */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1013 memset(last_line + (i + 1) * wrap + width, last_line[width-1], w); /* top right */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1014 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1015 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1016
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1017 int ff_find_unused_picture(MpegEncContext *s, int shared){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1018 int i;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1019
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1020 if(shared){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1021 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1022 if(s->picture[i].data[0]==NULL && s->picture[i].type==0) return i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1023 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1024 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1025 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1026 if(s->picture[i].data[0]==NULL && s->picture[i].type!=0) return i; //FIXME
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1027 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1028 for(i=0; i<MAX_PICTURE_COUNT; i++){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1029 if(s->picture[i].data[0]==NULL) return i;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1030 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1031 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1032
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1033 assert(0);
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1034 return -1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1035 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1036
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1037 /**
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1038 * 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
1039 */
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1040 int MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1041 {
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1042 int i;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1043 AVFrame *pic;
46
931417475f5b fixed mpeg1 first block bug (pb with black picture optimisation for B frames)
glantau
parents: 40
diff changeset
1044 s->mb_skiped = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1045
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1228
diff changeset
1046 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
1047
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1048 /* mark&release old frames */
1396
e380ac39024a cleanup / fixes
michaelni
parents: 1395
diff changeset
1049 if (s->pict_type != B_TYPE && s->last_picture_ptr && s->last_picture_ptr->data[0]) {
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1050 avctx->release_buffer(avctx, (AVFrame*)s->last_picture_ptr);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1051
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1052 /* release forgotten pictures */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1053 /* if(mpeg124/h263) */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1054 if(!s->encoding){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1055 for(i=0; i<MAX_PICTURE_COUNT; i++){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1056 if(s->picture[i].data[0] && &s->picture[i] != s->next_picture_ptr && s->picture[i].reference){
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1057 fprintf(stderr, "releasing zombie picture\n");
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1058 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1059 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1060 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1061 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1062 }
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1063 alloc:
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1064 if(!s->encoding){
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1065 /* release non refernce frames */
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1066 for(i=0; i<MAX_PICTURE_COUNT; i++){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1067 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
1068 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]);
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1069 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1070 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1071
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1072 if(s->current_picture_ptr && s->current_picture_ptr->data[0]==NULL)
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1073 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
1074 else{
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1075 i= ff_find_unused_picture(s, 0);
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1076 pic= (AVFrame*)&s->picture[i];
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1077 }
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1078
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1079 pic->reference= s->pict_type != B_TYPE ? 3 : 0;
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1080
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1081 if(s->current_picture_ptr) //FIXME broken, we need a coded_picture_number in MpegEncContext
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1082 pic->coded_picture_number= s->current_picture_ptr->coded_picture_number+1;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1083
1384
18cdce49339e make MPV_frame_start fail on get_buffer failer
iive
parents: 1381
diff changeset
1084 if( alloc_picture(s, (Picture*)pic, 0) < 0)
18cdce49339e make MPV_frame_start fail on get_buffer failer
iive
parents: 1381
diff changeset
1085 return -1;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1086
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1087 s->current_picture_ptr= (Picture*)pic;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1088 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
1089
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
1090 s->current_picture_ptr->pict_type= s->pict_type;
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
1091 // if(s->flags && CODEC_FLAG_QSCALE)
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
1092 // 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
1093 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE;
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
1094
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
1095 copy_picture(&s->current_picture, s->current_picture_ptr);
1173
86d5a33eaec8 pict_type & quality fix
michaelni
parents: 1168
diff changeset
1096
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1228
diff changeset
1097 if(s->out_format != FMT_H264 || s->codec_id == CODEC_ID_SVQ3){
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1098 if (s->pict_type != B_TYPE) {
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1099 s->last_picture_ptr= s->next_picture_ptr;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1100 s->next_picture_ptr= s->current_picture_ptr;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1101 }
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1189
diff changeset
1102
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
1103 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
1104 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr);
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1105
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
1106 if(s->pict_type != I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL)){
1393
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1107 fprintf(stderr, "warning: first frame is no keyframe\n");
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1108 assert(s->pict_type != B_TYPE); //these should have been dropped if we dont have a reference
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1109 goto alloc;
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1110 }
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1111
ba99a78bcb37 make the h263 decoder more error tolerant
michaelni
parents: 1389
diff changeset
1112 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
1113
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1114 if(s->picture_structure!=PICT_FRAME){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1115 int i;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1116 for(i=0; i<4; i++){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1117 if(s->picture_structure == PICT_BOTTOM_FIELD){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1118 s->current_picture.data[i] += s->current_picture.linesize[i];
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1119 }
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1120 s->current_picture.linesize[i] *= 2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1121 s->last_picture.linesize[i] *=2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1122 s->next_picture.linesize[i] *=2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1123 }
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1124 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1125 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1126
910
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1127 s->hurry_up= s->avctx->hurry_up;
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1128 s->error_resilience= avctx->error_resilience;
eb448df811be fixing files where the first frame isn a keyframe
michaelni
parents: 909
diff changeset
1129
591
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 588
diff changeset
1130 /* set dequantizer, we cant do it during init as it might change for mpeg4
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 588
diff changeset
1131 and we cant do it in the header decode as init isnt called for mpeg4 there yet */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1132 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO)
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1133 s->dct_unquantize = s->dct_unquantize_mpeg2;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1134 else if(s->out_format == FMT_H263)
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1135 s->dct_unquantize = s->dct_unquantize_h263;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
1136 else
591
d3f374218030 fixing mpeg4 mpeg quantizers
michaelni
parents: 588
diff changeset
1137 s->dct_unquantize = s->dct_unquantize_mpeg1;
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1138
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1139 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1140 if(s->avctx->xvmc_acceleration)
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1141 return XVMC_field_start(s, avctx);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1142 #endif
771
d4cc92144266 handle direct rendering buffer allocation failure
michaelni
parents: 768
diff changeset
1143 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1144 }
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
1145
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1146 /* generic function for encode/decode called after a frame has been coded/decoded */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1147 void MPV_frame_end(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1148 {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1149 int i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1150 /* draw edge for correct motion prediction if outside */
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1151 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1152 //just to make sure that all data is rendered.
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1153 if(s->avctx->xvmc_acceleration){
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1154 XVMC_field_end(s);
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1155 }else
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
1156 #endif
1542
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
1157 if(s->unrestricted_mv && s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1158 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
1159 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
1160 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
1161 }
207
6954f2830e4a (commit by michael)
arpi_esp
parents: 206
diff changeset
1162 emms_c();
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1163
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
1164 s->last_pict_type = s->pict_type;
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1165 if(s->pict_type!=B_TYPE){
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1166 s->last_non_b_pict_type= s->pict_type;
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1167 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1168 #if 0
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1169 /* copy back current_picture variables */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1170 for(i=0; i<MAX_PICTURE_COUNT; i++){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1171 if(s->picture[i].data[0] == s->current_picture.data[0]){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1172 s->picture[i]= s->current_picture;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1173 break;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1174 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1175 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1176 assert(i<MAX_PICTURE_COUNT);
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1177 #endif
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1178
1228
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1179 if(s->encoding){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1180 /* release non refernce frames */
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1181 for(i=0; i<MAX_PICTURE_COUNT; i++){
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1182 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
1183 s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[i]);
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1184 }
d63e0185a90f release buffer cleanup
michaelni
parents: 1225
diff changeset
1185 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1186 }
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1187 // clear copies, to avoid confusion
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1188 #if 0
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1189 memset(&s->last_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1190 memset(&s->next_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1191 memset(&s->current_picture, 0, sizeof(Picture));
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1192 #endif
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1193 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1194
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1195 /**
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1196 * draws an line from (ex, ey) -> (sx, sy).
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1197 * @param w width of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1198 * @param h height of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1199 * @param stride stride/linesize of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1200 * @param color color of the arrow
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1201 */
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1202 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1203 int t, x, y, f;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1204
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1205 sx= clip(sx, 0, w-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1206 sy= clip(sy, 0, h-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1207 ex= clip(ex, 0, w-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1208 ey= clip(ey, 0, h-1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1209
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1210 buf[sy*stride + sx]+= color;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1211
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1212 if(ABS(ex - sx) > ABS(ey - sy)){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1213 if(sx > ex){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1214 t=sx; sx=ex; ex=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1215 t=sy; sy=ey; ey=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1216 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1217 buf+= sx + sy*stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1218 ex-= sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1219 f= ((ey-sy)<<16)/ex;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1220 for(x= 0; x <= ex; x++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1221 y= ((x*f) + (1<<15))>>16;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1222 buf[y*stride + x]+= color;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1223 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1224 }else{
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1225 if(sy > ey){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1226 t=sx; sx=ex; ex=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1227 t=sy; sy=ey; ey=t;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1228 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1229 buf+= sx + sy*stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1230 ey-= sy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1231 if(ey) f= ((ex-sx)<<16)/ey;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1232 else f= 0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1233 for(y= 0; y <= ey; y++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1234 x= ((y*f) + (1<<15))>>16;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1235 buf[y*stride + x]+= color;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1236 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1237 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1238 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1239
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1240 /**
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1241 * draws an arrow from (ex, ey) -> (sx, sy).
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1242 * @param w width of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1243 * @param h height of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1244 * @param stride stride/linesize of the image
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1245 * @param color color of the arrow
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1246 */
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1247 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h, int stride, int color){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1248 int dx,dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1249
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1250 sx= clip(sx, -100, w+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1251 sy= clip(sy, -100, h+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1252 ex= clip(ex, -100, w+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1253 ey= clip(ey, -100, h+100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1254
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1255 dx= ex - sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1256 dy= ey - sy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1257
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1258 if(dx*dx + dy*dy > 3*3){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1259 int rx= dx + dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1260 int ry= -dx + dy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1261 int length= ff_sqrt((rx*rx + ry*ry)<<8);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1262
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1263 //FIXME subpixel accuracy
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1264 rx= ROUNDED_DIV(rx*3<<4, length);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1265 ry= ROUNDED_DIV(ry*3<<4, length);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1266
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1267 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
1268 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
1269 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1270 draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1271 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1272
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1273 /**
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1274 * 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
1275 */
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1276 void ff_print_debug_info(MpegEncContext *s, Picture *pict){
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1277
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1278 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
1279
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1280 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
1281 int x,y;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1282
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1283 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
1284 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
1285 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
1286 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
1287 if(count>9) count=9;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1288 printf("%1d", count);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1289 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1290 if(s->avctx->debug&FF_DEBUG_QP){
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1291 printf("%2d", pict->qscale_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
1292 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1293 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
1294 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
1295
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1296 //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
1297 if(IS_PCM(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
1298 printf("P");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1299 else if(IS_INTRA(mb_type) && IS_ACPRED(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
1300 printf("A");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1301 else if(IS_INTRA4x4(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
1302 printf("i");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1303 else if(IS_INTRA16x16(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
1304 printf("I");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1305 else if(IS_DIRECT(mb_type) && IS_SKIP(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
1306 printf("d");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1307 else if(IS_DIRECT(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
1308 printf("D");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1309 else if(IS_GMC(mb_type) && IS_SKIP(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
1310 printf("g");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1311 else if(IS_GMC(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
1312 printf("G");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1313 else if(IS_SKIP(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
1314 printf("S");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1315 else if(!USES_LIST(mb_type, 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
1316 printf(">");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1317 else if(!USES_LIST(mb_type, 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
1318 printf("<");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1319 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
1320 assert(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 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
1321 printf("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
1322 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1323
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1324 //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
1325 if(IS_8X8(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
1326 printf("+");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1327 else if(IS_16X8(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
1328 printf("-");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1329 else if(IS_8X16(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
1330 printf("¦");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1331 else if(IS_INTRA(mb_type) || IS_16X16(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
1332 printf(" ");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1333 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
1334 printf("?");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1335
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1336
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1337 if(IS_INTERLACED(mb_type) && s->codec_id == CODEC_ID_H264)
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1338 printf("=");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1339 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
1340 printf(" ");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1341 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1342 // printf(" ");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1343 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1344 printf("\n");
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1345 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1346 }
1285
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1347
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1348 if((s->avctx->debug&FF_DEBUG_VIS_MV) && s->motion_val){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1349 const int shift= 1 + s->quarter_sample;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1350 int mb_y;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1351 uint8_t *ptr= pict->data[0];
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1352 s->low_delay=0; //needed to see the vectors without trashing the buffers
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1353
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1354 for(mb_y=0; mb_y<s->mb_height; mb_y++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1355 int mb_x;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1356 for(mb_x=0; mb_x<s->mb_width; mb_x++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1357 const int mb_index= mb_x + mb_y*s->mb_stride;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1358 if(IS_8X8(s->current_picture.mb_type[mb_index])){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1359 int i;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1360 for(i=0; i<4; i++){
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1361 int sx= mb_x*16 + 4 + 8*(i&1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1362 int sy= mb_y*16 + 4 + 8*(i>>1);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1363 int xy= 1 + mb_x*2 + (i&1) + (mb_y*2 + 1 + (i>>1))*(s->mb_width*2 + 2);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1364 int mx= (s->motion_val[xy][0]>>shift) + sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1365 int my= (s->motion_val[xy][1]>>shift) + sy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1366 draw_arrow(ptr, sx, sy, mx, my, s->width, s->height, s->linesize, 100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1367 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1368 }else{
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1369 int sx= mb_x*16 + 8;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1370 int sy= mb_y*16 + 8;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1371 int xy= 1 + mb_x*2 + (mb_y*2 + 1)*(s->mb_width*2 + 2);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1372 int mx= (s->motion_val[xy][0]>>shift) + sx;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1373 int my= (s->motion_val[xy][1]>>shift) + sy;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1374 draw_arrow(ptr, sx, sy, mx, my, s->width, s->height, s->linesize, 100);
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1375 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1376 s->mbskip_table[mb_index]=0;
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1377 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1378 }
6e039762d5cb motion vector vissualization for mpeg1/2
michaelni
parents: 1273
diff changeset
1379 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1380 }
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
1381
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
1382 #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
1383
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1384 static int get_sae(uint8_t *src, int ref, int stride){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1385 int x,y;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1386 int acc=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1387
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1388 for(y=0; y<16; y++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1389 for(x=0; x<16; x++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1390 acc+= ABS(src[x+y*stride] - ref);
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1391 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1392 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1393
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1394 return acc;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1395 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1396
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1397 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
1398 int x, y, w, h;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1399 int acc=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1400
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1401 w= s->width &~15;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1402 h= s->height&~15;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1403
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1404 for(y=0; y<h; y+=16){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1405 for(x=0; x<w; x+=16){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1406 int offset= x + y*stride;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1407 int sad = s->dsp.pix_abs16x16(src + offset, ref + offset, stride);
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1408 int mean= (s->dsp.pix_sum(src + offset, stride) + 128)>>8;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1409 int sae = get_sae(src + offset, mean, stride);
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1410
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1411 acc+= sae + 500 < sad;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1412 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1413 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1414 return acc;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1415 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1416
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1417
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1418 static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1419 AVFrame *pic=NULL;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1420 int i;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1421 const int encoding_delay= s->max_b_frames;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1422 int direct=1;
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1423
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1424 if(pic_arg){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1425 if(encoding_delay && !(s->flags&CODEC_FLAG_INPUT_PRESERVED)) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1426 if(pic_arg->linesize[0] != s->linesize) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1427 if(pic_arg->linesize[1] != s->uvlinesize) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1428 if(pic_arg->linesize[2] != s->uvlinesize) direct=0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1429
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1430 // printf("%d %d %d %d\n",pic_arg->linesize[0], pic_arg->linesize[1], s->linesize, s->uvlinesize);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1431
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1432 if(direct){
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1433 i= ff_find_unused_picture(s, 1);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1434
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1435 pic= (AVFrame*)&s->picture[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1436 pic->reference= 3;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1437
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1438 for(i=0; i<4; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1439 pic->data[i]= pic_arg->data[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1440 pic->linesize[i]= pic_arg->linesize[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1441 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1442 alloc_picture(s, (Picture*)pic, 1);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1443 }else{
1539
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
1444 int offset= 16;
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1445 i= ff_find_unused_picture(s, 0);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1446
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1447 pic= (AVFrame*)&s->picture[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1448 pic->reference= 3;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1449
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1450 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
1451
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
1452 if( pic->data[0] + offset == pic_arg->data[0]
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
1453 && pic->data[1] + offset == pic_arg->data[1]
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
1454 && pic->data[2] + offset == pic_arg->data[2]){
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1455 // empty
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1456 }else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1457 int h_chroma_shift, v_chroma_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1458 avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1459
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1460 for(i=0; i<3; i++){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1461 int src_stride= pic_arg->linesize[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1462 int dst_stride= i ? s->uvlinesize : s->linesize;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1463 int h_shift= i ? h_chroma_shift : 0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1464 int v_shift= i ? v_chroma_shift : 0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1465 int w= s->width >>h_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1466 int h= s->height>>v_shift;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1467 uint8_t *src= pic_arg->data[i];
1539
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
1468 uint8_t *dst= pic->data[i] + offset;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1469
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1470 if(src_stride==dst_stride)
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1471 memcpy(dst, src, src_stride*h);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1472 else{
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1473 while(h--){
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1474 memcpy(dst, src, w);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1475 dst += dst_stride;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1476 src += src_stride;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1477 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1478 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1479 }
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1480 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1481 }
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1482 pic->quality= pic_arg->quality;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1483 pic->pict_type= pic_arg->pict_type;
955
8f5d4c666806 pts encoding fix patch by (Thomas Jarosch <tomj at simonv dot com>)
michaelni
parents: 954
diff changeset
1484 pic->pts = pic_arg->pts;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1485
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1486 if(s->input_picture[encoding_delay])
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1487 pic->display_picture_number= s->input_picture[encoding_delay]->display_picture_number + 1;
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1488
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1489 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1490
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1491 /* shift buffer entries */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1492 for(i=1; i<MAX_PICTURE_COUNT /*s->encoding_delay+1*/; i++)
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1493 s->input_picture[i-1]= s->input_picture[i];
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1494
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1495 s->input_picture[encoding_delay]= (Picture*)pic;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1496
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1497 return 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1498 }
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1499
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1500 static void select_input_picture(MpegEncContext *s){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1501 int i;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1502 int coded_pic_num=0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1503
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1504 if(s->reordered_input_picture[0])
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1505 coded_pic_num= s->reordered_input_picture[0]->coded_picture_number + 1;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1506
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1507 for(i=1; i<MAX_PICTURE_COUNT; i++)
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1508 s->reordered_input_picture[i-1]= s->reordered_input_picture[i];
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1509 s->reordered_input_picture[MAX_PICTURE_COUNT-1]= NULL;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1510
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1511 /* set next picture types & ordering */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1512 if(s->reordered_input_picture[0]==NULL && s->input_picture[0]){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1513 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
1514 s->reordered_input_picture[0]= s->input_picture[0];
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1515 s->reordered_input_picture[0]->pict_type= I_TYPE;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1516 s->reordered_input_picture[0]->coded_picture_number= coded_pic_num;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1517 }else{
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1518 int b_frames;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1519
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1520 if(s->flags&CODEC_FLAG_PASS2){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1521 for(i=0; i<s->max_b_frames+1; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1522 int pict_num= s->input_picture[0]->display_picture_number + i;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1523 int pict_type= s->rc_context.entry[pict_num].new_pict_type;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1524 s->input_picture[i]->pict_type= pict_type;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1525
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1526 if(i + 1 >= s->rc_context.num_entries) break;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1527 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1528 }
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1529
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1530 if(s->input_picture[0]->pict_type){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1531 /* user selected pict_type */
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1532 for(b_frames=0; b_frames<s->max_b_frames+1; b_frames++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1533 if(s->input_picture[b_frames]->pict_type!=B_TYPE) break;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1534 }
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1535
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1536 if(b_frames > s->max_b_frames){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1537 fprintf(stderr, "warning, too many bframes in a row\n");
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1538 b_frames = s->max_b_frames;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1539 }
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1540 }else if(s->b_frame_strategy==0){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1541 b_frames= s->max_b_frames;
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1542 while(b_frames && !s->input_picture[b_frames]) b_frames--;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1543 }else if(s->b_frame_strategy==1){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1544 for(i=1; i<s->max_b_frames+1; i++){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1545 if(s->input_picture[i] && s->input_picture[i]->b_frame_score==0){
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1546 s->input_picture[i]->b_frame_score=
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1547 get_intra_count(s, s->input_picture[i ]->data[0],
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1548 s->input_picture[i-1]->data[0], s->linesize) + 1;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1549 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1550 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1551 for(i=0; i<s->max_b_frames; i++){
1373
b47a402bbe7f last frames & b frames encoding fix
michaelni
parents: 1370
diff changeset
1552 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
1553 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1554
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1555 b_frames= FFMAX(0, i-1);
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1556
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1557 /* reset scores */
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1558 for(i=0; i<b_frames+1; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1559 s->input_picture[i]->b_frame_score=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1560 }
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1561 }else{
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1562 fprintf(stderr, "illegal b frame strategy\n");
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1563 b_frames=0;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1564 }
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1565
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1566 emms_c();
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1567 //static int b_count=0;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1568 //b_count+= b_frames;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1569 //printf("b_frames: %d\n", b_count);
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1570
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1571 s->reordered_input_picture[0]= s->input_picture[b_frames];
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1572 if( s->picture_in_gop_number + b_frames >= s->gop_size
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1573 || s->reordered_input_picture[0]->pict_type== I_TYPE)
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1574 s->reordered_input_picture[0]->pict_type= I_TYPE;
915
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1575 else
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1576 s->reordered_input_picture[0]->pict_type= P_TYPE;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1577 s->reordered_input_picture[0]->coded_picture_number= coded_pic_num;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1578 for(i=0; i<b_frames; i++){
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1579 coded_pic_num++;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1580 s->reordered_input_picture[i+1]= s->input_picture[i];
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1581 s->reordered_input_picture[i+1]->pict_type= B_TYPE;
75ee49a4a516 fixing 2pass assert failure
michaelni
parents: 912
diff changeset
1582 s->reordered_input_picture[i+1]->coded_picture_number= coded_pic_num;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1583 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1584 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1585 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1586
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1587 if(s->reordered_input_picture[0]){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents: 1165
diff changeset
1588 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
1589
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
1590 copy_picture(&s->new_picture, s->reordered_input_picture[0]);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1591
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1592 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_SHARED){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1593 // input is a shared pix, so we cant modifiy it -> alloc a new one & ensure that the shared one is reuseable
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1594
1586
3d1d0490e5a6 pts fix and related fixes
michael
parents: 1580
diff changeset
1595 int i= ff_find_unused_picture(s, 0);
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1596 Picture *pic= &s->picture[i];
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1597
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1598 /* mark us unused / free shared pic */
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1599 for(i=0; i<4; i++)
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1600 s->reordered_input_picture[0]->data[i]= NULL;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1601 s->reordered_input_picture[0]->type= 0;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1602
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1603 //FIXME bad, copy * except
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1604 pic->pict_type = s->reordered_input_picture[0]->pict_type;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1605 pic->quality = s->reordered_input_picture[0]->quality;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1606 pic->coded_picture_number = s->reordered_input_picture[0]->coded_picture_number;
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1607 pic->reference = s->reordered_input_picture[0]->reference;
1402
f662e9c86cf2 * fixing a regression in mpeg encoder (not setting pix_fmt),
romansh
parents: 1397
diff changeset
1608 pic->pts = s->reordered_input_picture[0]->pts;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1609
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1610 alloc_picture(s, pic, 0);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1611
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1612 s->current_picture_ptr= pic;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1613 }else{
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1614 // input is not a shared pix -> reuse buffer for current_pix
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1615
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1616 assert( s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_USER
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1617 || s->reordered_input_picture[0]->type==FF_BUFFER_TYPE_INTERNAL);
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1618
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1619 s->current_picture_ptr= s->reordered_input_picture[0];
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1620 for(i=0; i<4; i++){
1539
14d01ccc0081 picture buffer cleanup, this fixes a assertion failure (if assertion checking was manualy enabled for utils.c) and a memleak at least
michael
parents: 1530
diff changeset
1621 s->new_picture.data[i]+=16;
924
3814e9115672 cleanup / messup?
michaelni
parents: 915
diff changeset
1622 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1623 }
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
1624 copy_picture(&s->current_picture, s->current_picture_ptr);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1625
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1626 s->picture_number= s->new_picture.display_picture_number;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1627 //printf("dpn:%d\n", s->picture_number);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1628 }else{
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1629 memset(&s->new_picture, 0, sizeof(Picture));
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1630 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1631 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1632
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1633 int MPV_encode_picture(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
1634 unsigned char *buf, int buf_size, void *data)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1635 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1636 MpegEncContext *s = avctx->priv_data;
925
7fccaa0d699d AVVideoFrame -> AVFrame
michaelni
parents: 924
diff changeset
1637 AVFrame *pic_arg = data;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1638 int i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1639
1397
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
1640 if(avctx->pix_fmt != PIX_FMT_YUV420P){
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
1641 fprintf(stderr, "this codec supports only YUV420P\n");
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
1642 return -1;
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
1643 }
2e43c9bdc982 check input pix_fmt
michaelni
parents: 1396
diff changeset
1644
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1505
diff changeset
1645 init_put_bits(&s->pb, buf, buf_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1646
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1647 s->picture_in_gop_number++;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1648
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1649 load_input_picture(s, pic_arg);
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1650
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1651 select_input_picture(s);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1652
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1653 /* output? */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1654 if(s->new_picture.data[0]){
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1655
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1656 s->pict_type= s->new_picture.pict_type;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1657 //emms_c();
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
1658 //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
1659 MPV_frame_start(s, avctx);
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
1660
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1661 encode_picture(s, s->picture_number);
652
c7647afc3ce5 set pict_type & key_frame on decoding too
michaelni
parents: 651
diff changeset
1662
376
ba9c3b8088c0 - pict_type exported to AVCodecContext
pulento
parents: 370
diff changeset
1663 avctx->real_pict_num = s->picture_number;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1664 avctx->header_bits = s->header_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1665 avctx->mv_bits = s->mv_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1666 avctx->misc_bits = s->misc_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1667 avctx->i_tex_bits = s->i_tex_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1668 avctx->p_tex_bits = s->p_tex_bits;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1669 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
1670 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
1671 avctx->skip_count = s->skip_count;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1672
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1673 MPV_frame_end(s);
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1674
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1675 if (s->out_format == FMT_MJPEG)
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1676 mjpeg_picture_trailer(s);
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1677
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1678 if(s->flags&CODEC_FLAG_PASS1)
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
1679 ff_write_pass1_stats(s);
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1680
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1681 for(i=0; i<4; i++){
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1682 avctx->error[i] += s->current_picture_ptr->error[i];
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1683 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1684 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1685
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
1686 s->input_picture_number++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1687
986e461dc072 Initial revision
glantau
parents:
diff changeset
1688 flush_put_bits(&s->pb);
268
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
1689 s->frame_bits = (pbBufPtr(&s->pb) - s->pb.buf) * 8;
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
1690
268
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
1691 s->total_bits += s->frame_bits;
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
1692 avctx->frame_bits = s->frame_bits;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
1693
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
1694 return pbBufPtr(&s->pb) - s->pb.buf;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1695 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1696
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
1697 #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
1698
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1699 static inline void gmc1_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1700 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1701 int dest_offset,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1702 uint8_t **ref_picture, int src_offset)
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1703 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1704 uint8_t *ptr;
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
1705 int offset, src_x, src_y, linesize, uvlinesize;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1706 int motion_x, motion_y;
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1707 int emu=0;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1708
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1709 motion_x= s->sprite_offset[0][0];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1710 motion_y= s->sprite_offset[0][1];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1711 src_x = s->mb_x * 16 + (motion_x >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1712 src_y = s->mb_y * 16 + (motion_y >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1713 motion_x<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1714 motion_y<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1715 src_x = clip(src_x, -16, s->width);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1716 if (src_x == s->width)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1717 motion_x =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1718 src_y = clip(src_y, -16, s->height);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1719 if (src_y == s->height)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1720 motion_y =0;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1721
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1722 linesize = s->linesize;
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
1723 uvlinesize = s->uvlinesize;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1724
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1725 ptr = ref_picture[0] + (src_y * linesize) + src_x + src_offset;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1726
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1727 dest_y+=dest_offset;
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1728 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
1729 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
1730 || (unsigned)src_y >= s->v_edge_pos - 17){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1731 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
1732 ptr= s->edge_emu_buffer;
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1733 }
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1734 }
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1735
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1736 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
1737 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
1738 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
1739 }else{
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1740 int dxy;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1741
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1742 dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1743 if (s->no_rounding){
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1744 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
1745 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1746 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
1747 }
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1748 }
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1749
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1750 if(s->flags&CODEC_FLAG_GRAY) return;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1751
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1752 motion_x= s->sprite_offset[1][0];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1753 motion_y= s->sprite_offset[1][1];
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1754 src_x = s->mb_x * 8 + (motion_x >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1755 src_y = s->mb_y * 8 + (motion_y >> (s->sprite_warping_accuracy+1));
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1756 motion_x<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1757 motion_y<<=(3-s->sprite_warping_accuracy);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1758 src_x = clip(src_x, -8, s->width>>1);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1759 if (src_x == s->width>>1)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1760 motion_x =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1761 src_y = clip(src_y, -8, s->height>>1);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1762 if (src_y == s->height>>1)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1763 motion_y =0;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1764
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
1765 offset = (src_y * uvlinesize) + src_x + (src_offset>>1);
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1766 ptr = ref_picture[1] + offset;
1002
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
1767 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
1768 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
1769 || (unsigned)src_y >= (s->v_edge_pos>>1) - 9){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1770 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
1771 ptr= s->edge_emu_buffer;
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
1772 emu=1;
e89b11e07ee7 gmc1 segfault fix (found by kabi)
michaelni
parents: 998
diff changeset
1773 }
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1774 }
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1775 s->dsp.gmc1(dest_cb + (dest_offset>>1), ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding);
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1776
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1777 ptr = ref_picture[2] + offset;
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1778 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1779 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
1780 ptr= s->edge_emu_buffer;
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1781 }
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1782 s->dsp.gmc1(dest_cr + (dest_offset>>1), ptr, uvlinesize, 8, motion_x&15, motion_y&15, 128 - s->no_rounding);
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1783
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1784 return;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1785 }
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1786
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1787 static inline void gmc_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1788 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1789 int dest_offset,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1790 uint8_t **ref_picture, int src_offset)
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1791 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1792 uint8_t *ptr;
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1793 int linesize, uvlinesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1794 const int a= s->sprite_warping_accuracy;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1795 int ox, oy;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1796
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1797 linesize = s->linesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1798 uvlinesize = s->uvlinesize;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1799
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1800 ptr = ref_picture[0] + src_offset;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1801
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1802 dest_y+=dest_offset;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1803
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1804 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
1805 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
1806
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1807 s->dsp.gmc(dest_y, ptr, linesize, 16,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1808 ox,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1809 oy,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1810 s->sprite_delta[0][0], s->sprite_delta[0][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1811 s->sprite_delta[1][0], s->sprite_delta[1][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1812 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1813 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
1814 s->dsp.gmc(dest_y+8, ptr, linesize, 16,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1815 ox + s->sprite_delta[0][0]*8,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1816 oy + s->sprite_delta[1][0]*8,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1817 s->sprite_delta[0][0], s->sprite_delta[0][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1818 s->sprite_delta[1][0], s->sprite_delta[1][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1819 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1820 s->h_edge_pos, s->v_edge_pos);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1821
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1822 if(s->flags&CODEC_FLAG_GRAY) return;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1823
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1824
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1825 dest_cb+=dest_offset>>1;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1826 dest_cr+=dest_offset>>1;
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1827
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1828 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
1829 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
1830
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1831 ptr = ref_picture[1] + (src_offset>>1);
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1832 s->dsp.gmc(dest_cb, ptr, uvlinesize, 8,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1833 ox,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1834 oy,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1835 s->sprite_delta[0][0], s->sprite_delta[0][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1836 s->sprite_delta[1][0], s->sprite_delta[1][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1837 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1838 s->h_edge_pos>>1, s->v_edge_pos>>1);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1839
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1840 ptr = ref_picture[2] + (src_offset>>1);
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
1841 s->dsp.gmc(dest_cr, ptr, uvlinesize, 8,
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1842 ox,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1843 oy,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1844 s->sprite_delta[0][0], s->sprite_delta[0][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1845 s->sprite_delta[1][0], s->sprite_delta[1][1],
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1846 a+1, (1<<(2*a+1)) - s->no_rounding,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1847 s->h_edge_pos>>1, s->v_edge_pos>>1);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1848 }
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
1849
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1850 /**
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1851 * 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
1852 * @param buf destination buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1853 * @param src source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1854 * @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
1855 * @param block_w width of block
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1856 * @param block_h height of block
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1857 * @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
1858 * @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
1859 * @param w width of the source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1860 * @param h height of the source buffer
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1861 */
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1862 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
1863 int src_x, int src_y, int w, int h){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1864 int x, y;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1865 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
1866
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1867 if(src_y>= h){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1868 src+= (h-1-src_y)*linesize;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1869 src_y=h-1;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
1870 }else if(src_y<=-block_h){
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
1871 src+= (1-block_h-src_y)*linesize;
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
1872 src_y=1-block_h;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1873 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1874 if(src_x>= w){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1875 src+= (w-1-src_x);
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1876 src_x=w-1;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
1877 }else if(src_x<=-block_w){
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
1878 src+= (1-block_w-src_x);
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
1879 src_x=1-block_w;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1880 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1881
847
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
1882 start_y= FFMAX(0, -src_y);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
1883 start_x= FFMAX(0, -src_x);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
1884 end_y= FFMIN(block_h, h-src_y);
f3c369b8ddca reversing header game
michaelni
parents: 843
diff changeset
1885 end_x= FFMIN(block_w, w-src_x);
566
c376a0b290cf fixing gmc with emu edges
michaelni
parents: 565
diff changeset
1886
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1887 // copy existing part
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1888 for(y=start_y; y<end_y; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1889 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1890 buf[x + y*linesize]= src[x + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1891 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1892 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1893
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1894 //top
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1895 for(y=0; y<start_y; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1896 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1897 buf[x + y*linesize]= buf[x + start_y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1898 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1899 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1900
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1901 //bottom
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1902 for(y=end_y; y<block_h; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1903 for(x=start_x; x<end_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1904 buf[x + y*linesize]= buf[x + (end_y-1)*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1905 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1906 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1907
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1908 for(y=0; y<block_h; y++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1909 //left
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1910 for(x=0; x<start_x; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1911 buf[x + y*linesize]= buf[start_x + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1912 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1913
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1914 //right
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1915 for(x=end_x; x<block_w; x++){
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1916 buf[x + y*linesize]= buf[end_x - 1 + y*linesize];
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1917 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1918 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1919 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1920
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1921
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1922 /* apply one mpeg motion vector to the three components */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1923 static inline void mpeg_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1924 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1925 int dest_offset,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1926 uint8_t **ref_picture, int src_offset,
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
1927 int field_based, op_pixels_func (*pix_op)[4],
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1928 int motion_x, int motion_y, int h)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1929 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
1930 uint8_t *ptr;
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
1931 int dxy, offset, mx, my, src_x, src_y, height, v_edge_pos, linesize, uvlinesize;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1932 int emu=0;
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
1933 #if 0
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1934 if(s->quarter_sample)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1935 {
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1936 motion_x>>=1;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1937 motion_y>>=1;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
1938 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
1939 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1940 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1941 src_x = s->mb_x * 16 + (motion_x >> 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1942 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1943
986e461dc072 Initial revision
glantau
parents:
diff changeset
1944 /* WARNING: do no forget half pels */
986e461dc072 Initial revision
glantau
parents:
diff changeset
1945 height = s->height >> field_based;
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
1946 v_edge_pos = s->v_edge_pos >> field_based;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1947 src_x = clip(src_x, -16, s->width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1948 if (src_x == s->width)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1949 dxy &= ~1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1950 src_y = clip(src_y, -16, height);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1951 if (src_y == height)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1952 dxy &= ~2;
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1953 linesize = s->current_picture.linesize[0] << field_based;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
1954 uvlinesize = s->current_picture.linesize[1] << field_based;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1955 ptr = ref_picture[0] + (src_y * linesize) + (src_x) + src_offset;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1956 dest_y += dest_offset;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1957
1542
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
1958 if(s->unrestricted_mv && (s->flags&CODEC_FLAG_EMU_EDGE)){
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
1959 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 16
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
1960 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1961 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - src_offset, s->linesize, 17, 17+field_based, //FIXME linesize? and uv below
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
1962 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
1963 ptr= s->edge_emu_buffer + src_offset;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1964 emu=1;
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1965 }
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1966 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
1967 pix_op[0][dxy](dest_y, ptr, linesize, h);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1968
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
1969 if(s->flags&CODEC_FLAG_GRAY) return;
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
1970
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1971 if (s->out_format == FMT_H263) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1972 dxy = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1973 if ((motion_x & 3) != 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1974 dxy |= 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1975 if ((motion_y & 3) != 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1976 dxy |= 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1977 mx = motion_x >> 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1978 my = motion_y >> 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1979 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
1980 mx = motion_x / 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1981 my = motion_y / 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1982 dxy = ((my & 1) << 1) | (mx & 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1983 mx >>= 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1984 my >>= 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1985 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
1986
986e461dc072 Initial revision
glantau
parents:
diff changeset
1987 src_x = s->mb_x * 8 + mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1988 src_y = s->mb_y * (8 >> field_based) + my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1989 src_x = clip(src_x, -8, s->width >> 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1990 if (src_x == (s->width >> 1))
986e461dc072 Initial revision
glantau
parents:
diff changeset
1991 dxy &= ~1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
1992 src_y = clip(src_y, -8, height >> 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
1993 if (src_y == (height >> 1))
986e461dc072 Initial revision
glantau
parents:
diff changeset
1994 dxy &= ~2;
565
44d744901ded interlaced mpeg2 fix ... replacing linesize>>1 by uvlinesize brainlessly wasnt a good idea
michaelni
parents: 562
diff changeset
1995 offset = (src_y * uvlinesize) + src_x + (src_offset >> 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1996 ptr = ref_picture[1] + offset;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
1997 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
1998 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - (src_offset >> 1), s->uvlinesize, 9, 9+field_based,
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
1999 src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2000 ptr= s->edge_emu_buffer + (src_offset >> 1);
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2001 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2002 pix_op[1][dxy](dest_cb + (dest_offset >> 1), ptr, uvlinesize, h >> 1);
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2003
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2004 ptr = ref_picture[2] + offset;
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2005 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2006 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - (src_offset >> 1), s->uvlinesize, 9, 9+field_based,
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2007 src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2008 ptr= s->edge_emu_buffer + (src_offset >> 1);
553
18ad513d92fe direct rendering method 1 support
michaelni
parents: 549
diff changeset
2009 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2010 pix_op[1][dxy](dest_cr + (dest_offset >> 1), ptr, uvlinesize, h >> 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2011 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2012
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2013 static inline void qpel_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2014 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2015 int dest_offset,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2016 uint8_t **ref_picture, int src_offset,
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2017 int field_based, op_pixels_func (*pix_op)[4],
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2018 qpel_mc_func (*qpix_op)[16],
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2019 int motion_x, int motion_y, int h)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2020 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2021 uint8_t *ptr;
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2022 int dxy, offset, mx, my, src_x, src_y, height, v_edge_pos, linesize, uvlinesize;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2023 int emu=0;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2024
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2025 dxy = ((motion_y & 3) << 2) | (motion_x & 3);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2026 src_x = s->mb_x * 16 + (motion_x >> 2);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2027 src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2028
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2029 height = s->height >> field_based;
582
5132a4ee50cd different edge positions fixed with edge emu / dr1
michaelni
parents: 575
diff changeset
2030 v_edge_pos = s->v_edge_pos >> field_based;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2031 src_x = clip(src_x, -16, s->width);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2032 if (src_x == s->width)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2033 dxy &= ~3;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2034 src_y = clip(src_y, -16, height);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2035 if (src_y == height)
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2036 dxy &= ~12;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2037 linesize = s->linesize << field_based;
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2038 uvlinesize = s->uvlinesize << field_based;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2039 ptr = ref_picture[0] + (src_y * linesize) + src_x + src_offset;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2040 dest_y += dest_offset;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2041 //printf("%d %d %d\n", src_x, src_y, dxy);
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2042
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2043 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
2044 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 16
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
2045 || (unsigned)src_y > v_edge_pos - (motion_y&3) - h ){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2046 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - src_offset, s->linesize, 17, 17+field_based,
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2047 src_x, src_y<<field_based, s->h_edge_pos, s->v_edge_pos);
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2048 ptr= s->edge_emu_buffer + src_offset;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2049 emu=1;
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2050 }
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2051 }
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2052 if(!field_based)
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2053 qpix_op[0][dxy](dest_y, ptr, linesize);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2054 else{
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2055 //damn interlaced mode
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2056 //FIXME boundary mirroring is not exactly correct here
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2057 qpix_op[1][dxy](dest_y , ptr , linesize);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2058 qpix_op[1][dxy](dest_y+8, ptr+8, linesize);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2059 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2060
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2061 if(s->flags&CODEC_FLAG_GRAY) return;
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2062
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2063 if(field_based){
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2064 mx= motion_x/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2065 my= motion_y>>1;
1048
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
2066 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA2){
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
2067 static const int rtab[8]= {0,0,1,1,0,0,0,1};
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
2068 mx= (motion_x>>1) + rtab[motion_x&7];
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
2069 my= (motion_y>>1) + rtab[motion_y&7];
760
e858fe220ce0 xvid qpel bug workaround
michaelni
parents: 756
diff changeset
2070 }else if(s->workaround_bugs&FF_BUG_QPEL_CHROMA){
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2071 mx= (motion_x>>1)|(motion_x&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2072 my= (motion_y>>1)|(motion_y&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2073 }else{
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2074 mx= motion_x/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2075 my= motion_y/2;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2076 }
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2077 mx= (mx>>1)|(mx&1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2078 my= (my>>1)|(my&1);
1048
75a659fae7e0 divx503 decoding fix
michaelni
parents: 1042
diff changeset
2079
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2080 dxy= (mx&1) | ((my&1)<<1);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2081 mx>>=1;
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2082 my>>=1;
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2083
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2084 src_x = s->mb_x * 8 + mx;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2085 src_y = s->mb_y * (8 >> field_based) + my;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2086 src_x = clip(src_x, -8, s->width >> 1);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2087 if (src_x == (s->width >> 1))
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2088 dxy &= ~1;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2089 src_y = clip(src_y, -8, height >> 1);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2090 if (src_y == (height >> 1))
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2091 dxy &= ~2;
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2092
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2093 offset = (src_y * uvlinesize) + src_x + (src_offset >> 1);
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2094 ptr = ref_picture[1] + offset;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2095 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2096 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - (src_offset >> 1), s->uvlinesize, 9, 9 + field_based,
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2097 src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2098 ptr= s->edge_emu_buffer + (src_offset >> 1);
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2099 }
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2100 pix_op[1][dxy](dest_cb + (dest_offset >> 1), ptr, uvlinesize, h >> 1);
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2101
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2102 ptr = ref_picture[2] + offset;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2103 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2104 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - (src_offset >> 1), s->uvlinesize, 9, 9 + field_based,
763
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2105 src_x, src_y<<field_based, s->h_edge_pos>>1, s->v_edge_pos>>1);
339db642859d fixing interlaced MC & edge-emu
michaelni
parents: 760
diff changeset
2106 ptr= s->edge_emu_buffer + (src_offset >> 1);
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2107 }
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2108 pix_op[1][dxy](dest_cr + (dest_offset >> 1), ptr, uvlinesize, h >> 1);
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2109 }
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2110
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2111 inline int ff_h263_round_chroma(int x){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2112 if (x >= 0)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2113 return (h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1));
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2114 else {
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2115 x = -x;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2116 return -(h263_chroma_roundtab[x & 0xf] + ((x >> 3) & ~1));
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2117 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2118 }
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2119
1225
michaelni
parents: 1218
diff changeset
2120 /**
michaelni
parents: 1218
diff changeset
2121 * motion compesation of a single macroblock
michaelni
parents: 1218
diff changeset
2122 * @param s context
michaelni
parents: 1218
diff changeset
2123 * @param dest_y luma destination pointer
michaelni
parents: 1218
diff changeset
2124 * @param dest_cb chroma cb/u destination pointer
michaelni
parents: 1218
diff changeset
2125 * @param dest_cr chroma cr/v destination pointer
michaelni
parents: 1218
diff changeset
2126 * @param dir direction (0->forward, 1->backward)
michaelni
parents: 1218
diff changeset
2127 * @param ref_picture array[3] of pointers to the 3 planes of the reference picture
michaelni
parents: 1218
diff changeset
2128 * @param pic_op halfpel motion compensation function (average or put normally)
michaelni
parents: 1218
diff changeset
2129 * @param pic_op qpel motion compensation function (average or put normally)
michaelni
parents: 1218
diff changeset
2130 * the motion vectors are taken from s->mv and the MV type from s->mv_type
michaelni
parents: 1218
diff changeset
2131 */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2132 static inline void MPV_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2133 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2134 int dir, uint8_t **ref_picture,
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2135 op_pixels_func (*pix_op)[4], qpel_mc_func (*qpix_op)[16])
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2136 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2137 int dxy, offset, mx, my, src_x, src_y, motion_x, motion_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2138 int mb_x, mb_y, i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2139 uint8_t *ptr, *dest;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2140 int emu=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2141
986e461dc072 Initial revision
glantau
parents:
diff changeset
2142 mb_x = s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2143 mb_y = s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2144
986e461dc072 Initial revision
glantau
parents:
diff changeset
2145 switch(s->mv_type) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2146 case MV_TYPE_16X16:
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
2147 #ifdef CONFIG_RISKY
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2148 if(s->mcsel){
753
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2149 if(s->real_sprite_warping_points==1){
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2150 gmc1_motion(s, dest_y, dest_cb, dest_cr, 0,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2151 ref_picture, 0);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2152 }else{
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2153 gmc_motion(s, dest_y, dest_cb, dest_cr, 0,
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2154 ref_picture, 0);
8e1f0939d15d complete mpeg4 GMC decoding support
michaelni
parents: 745
diff changeset
2155 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2156 }else if(s->quarter_sample){
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2157 qpel_motion(s, dest_y, dest_cb, dest_cr, 0,
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2158 ref_picture, 0,
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2159 0, pix_op, qpix_op,
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2160 s->mv[dir][0][0], s->mv[dir][0][1], 16);
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
2161 }else if(s->mspel){
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
2162 ff_mspel_motion(s, dest_y, dest_cb, dest_cr,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
2163 ref_picture, pix_op,
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
2164 s->mv[dir][0][0], s->mv[dir][0][1], 16);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
2165 }else
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
2166 #endif
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
2167 {
255
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2168 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2169 ref_picture, 0,
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2170 0, pix_op,
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2171 s->mv[dir][0][0], s->mv[dir][0][1], 16);
db20b987c32d divx5-gmc support
michaelni
parents: 252
diff changeset
2172 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2173 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2174 case MV_TYPE_8X8:
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2175 mx = 0;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2176 my = 0;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2177 if(s->quarter_sample){
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2178 for(i=0;i<4;i++) {
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2179 motion_x = s->mv[dir][i][0];
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2180 motion_y = s->mv[dir][i][1];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2181
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2182 dxy = ((motion_y & 3) << 2) | (motion_x & 3);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2183 src_x = mb_x * 16 + (motion_x >> 2) + (i & 1) * 8;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2184 src_y = mb_y * 16 + (motion_y >> 2) + (i >>1) * 8;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2185
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2186 /* WARNING: do no forget half pels */
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2187 src_x = clip(src_x, -16, s->width);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2188 if (src_x == s->width)
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2189 dxy &= ~3;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2190 src_y = clip(src_y, -16, s->height);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2191 if (src_y == s->height)
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2192 dxy &= ~12;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2193
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2194 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2195 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
2196 if( (unsigned)src_x > s->h_edge_pos - (motion_x&3) - 8
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
2197 || (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
2198 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
2199 ptr= s->edge_emu_buffer;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2200 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2201 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2202 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2203 qpix_op[1][dxy](dest, ptr, s->linesize);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2204
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2205 mx += s->mv[dir][i][0]/2;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2206 my += s->mv[dir][i][1]/2;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2207 }
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2208 }else{
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2209 for(i=0;i<4;i++) {
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2210 motion_x = s->mv[dir][i][0];
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2211 motion_y = s->mv[dir][i][1];
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2212
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2213 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2214 src_x = mb_x * 16 + (motion_x >> 1) + (i & 1) * 8;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2215 src_y = mb_y * 16 + (motion_y >> 1) + (i >>1) * 8;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2216
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2217 /* WARNING: do no forget half pels */
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2218 src_x = clip(src_x, -16, s->width);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2219 if (src_x == s->width)
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2220 dxy &= ~1;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2221 src_y = clip(src_y, -16, s->height);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2222 if (src_y == s->height)
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2223 dxy &= ~2;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2224
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2225 ptr = ref_picture[0] + (src_y * s->linesize) + (src_x);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2226 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
2227 if( (unsigned)src_x > s->h_edge_pos - (motion_x&1) - 8
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
2228 || (unsigned)src_y > s->v_edge_pos - (motion_y&1) - 8){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2229 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
2230 ptr= s->edge_emu_buffer;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2231 }
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2232 }
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2233 dest = dest_y + ((i & 1) * 8) + (i >> 1) * 8 * s->linesize;
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2234 pix_op[1][dxy](dest, ptr, s->linesize, 8);
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2235
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2236 mx += s->mv[dir][i][0];
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2237 my += s->mv[dir][i][1];
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2238 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2239 }
673
242f0f7d8c15 fixing qpel 4mv
michaelni
parents: 671
diff changeset
2240
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2241 if(s->flags&CODEC_FLAG_GRAY) break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2242 /* In case of 8X8, we construct a single chroma motion vector
986e461dc072 Initial revision
glantau
parents:
diff changeset
2243 with a special rounding */
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2244 mx= ff_h263_round_chroma(mx);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
2245 my= ff_h263_round_chroma(my);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2246 dxy = ((my & 1) << 1) | (mx & 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2247 mx >>= 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2248 my >>= 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2249
986e461dc072 Initial revision
glantau
parents:
diff changeset
2250 src_x = mb_x * 8 + mx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2251 src_y = mb_y * 8 + my;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2252 src_x = clip(src_x, -8, s->width/2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2253 if (src_x == s->width/2)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2254 dxy &= ~1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2255 src_y = clip(src_y, -8, s->height/2);
986e461dc072 Initial revision
glantau
parents:
diff changeset
2256 if (src_y == s->height/2)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2257 dxy &= ~2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2258
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
2259 offset = (src_y * (s->uvlinesize)) + src_x;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2260 ptr = ref_picture[1] + offset;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2261 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
2262 if( (unsigned)src_x > (s->h_edge_pos>>1) - (dxy &1) - 8
576861d6343a emu_edge checks simplification and avoid redundant checks for mpeg1/2 if emu_edge is set
michael
parents: 1539
diff changeset
2263 || (unsigned)src_y > (s->v_edge_pos>>1) - (dxy>>1) - 8){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2264 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);
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2265 ptr= s->edge_emu_buffer;
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2266 emu=1;
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2267 }
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2268 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2269 pix_op[1][dxy](dest_cb, ptr, s->uvlinesize, 8);
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2270
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2271 ptr = ref_picture[2] + offset;
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2272 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2273 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);
554
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2274 ptr= s->edge_emu_buffer;
3eb6fe38019a 4mv & qpel edge emu
michaelni
parents: 553
diff changeset
2275 }
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2276 pix_op[1][dxy](dest_cr, ptr, s->uvlinesize, 8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2277 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2278 case MV_TYPE_FIELD:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2279 if (s->picture_structure == PICT_FRAME) {
671
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2280 if(s->quarter_sample){
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2281 /* top field */
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2282 qpel_motion(s, dest_y, dest_cb, dest_cr, 0,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2283 ref_picture, s->field_select[dir][0] ? s->linesize : 0,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2284 1, pix_op, qpix_op,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2285 s->mv[dir][0][0], s->mv[dir][0][1], 8);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2286 /* bottom field */
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2287 qpel_motion(s, dest_y, dest_cb, dest_cr, s->linesize,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2288 ref_picture, s->field_select[dir][1] ? s->linesize : 0,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2289 1, pix_op, qpix_op,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2290 s->mv[dir][1][0], s->mv[dir][1][1], 8);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2291 }else{
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2292 /* top field */
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2293 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2294 ref_picture, s->field_select[dir][0] ? s->linesize : 0,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2295 1, pix_op,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2296 s->mv[dir][0][0], s->mv[dir][0][1], 8);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2297 /* bottom field */
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2298 mpeg_motion(s, dest_y, dest_cb, dest_cr, s->linesize,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2299 ref_picture, s->field_select[dir][1] ? s->linesize : 0,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2300 1, pix_op,
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2301 s->mv[dir][1][0], s->mv[dir][1][1], 8);
3f2e5a282f61 interlaced qpel mpeg4 fixed
michaelni
parents: 664
diff changeset
2302 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2303 } else {
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2304 int offset;
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2305 if(s->picture_structure == s->field_select[dir][0] + 1 || s->pict_type == B_TYPE || s->first_field){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2306 offset= s->field_select[dir][0] ? s->linesize : 0;
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2307 }else{
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2308 ref_picture= s->current_picture.data;
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2309 offset= s->field_select[dir][0] ? s->linesize : -s->linesize;
1096
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2310 }
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2311
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2312 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2313 ref_picture, offset,
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2314 0, pix_op,
5e6e505d8997 field picture decoding support (16x16 MC blocks only as i dont have any samples which use other modes ...)
michaelni
parents: 1095
diff changeset
2315 s->mv[dir][0][0], s->mv[dir][0][1], 16);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2316 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2317 break;
1339
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2318 case MV_TYPE_16X8:{
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2319 int offset;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2320 uint8_t ** ref2picture;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2321
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2322 if(s->picture_structure == s->field_select[dir][0] + 1 || s->pict_type == B_TYPE || s->first_field){
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2323 ref2picture= ref_picture;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2324 offset= s->field_select[dir][0] ? s->linesize : 0;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2325 }else{
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2326 ref2picture= s->current_picture.data;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2327 offset= s->field_select[dir][0] ? s->linesize : -s->linesize;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2328 }
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2329
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2330 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2331 ref2picture, offset,
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2332 0, pix_op,
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2333 s->mv[dir][0][0], s->mv[dir][0][1], 8);
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2334
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2335
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2336 if(s->picture_structure == s->field_select[dir][1] + 1 || s->pict_type == B_TYPE || s->first_field){
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2337 ref2picture= ref_picture;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2338 offset= s->field_select[dir][1] ? s->linesize : 0;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2339 }else{
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2340 ref2picture= s->current_picture.data;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2341 offset= s->field_select[dir][1] ? s->linesize : -s->linesize;
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2342 }
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2343 // I know it is ugly but this is the only way to fool emu_edge without rewrite mpeg_motion
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2344 mpeg_motion(s, dest_y+16*s->linesize, dest_cb+8*s->uvlinesize, dest_cr+8*s->uvlinesize,
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2345 0,
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2346 ref2picture, offset,
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2347 0, pix_op,
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2348 s->mv[dir][1][0], s->mv[dir][1][1]+16, 8);
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2349 }
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2350
338a2f6e6402 Mpeg2 16x8 Patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1328
diff changeset
2351 break;
1326
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2352 case MV_TYPE_DMV:
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2353 {
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2354 op_pixels_func (*dmv_pix_op)[4];
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2355 int offset;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2356
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2357 dmv_pix_op = s->dsp.put_pixels_tab;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2358
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2359 if(s->picture_structure == PICT_FRAME){
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2360 //put top field from top field
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2361 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2362 ref_picture, 0,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2363 1, dmv_pix_op,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2364 s->mv[dir][0][0], s->mv[dir][0][1], 8);
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2365 //put bottom field from bottom field
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2366 mpeg_motion(s, dest_y, dest_cb, dest_cr, s->linesize,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2367 ref_picture, s->linesize,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2368 1, dmv_pix_op,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2369 s->mv[dir][0][0], s->mv[dir][0][1], 8);
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2370
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2371 dmv_pix_op = s->dsp.avg_pixels_tab;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2372
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2373 //avg top field from bottom field
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2374 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2375 ref_picture, s->linesize,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2376 1, dmv_pix_op,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2377 s->mv[dir][2][0], s->mv[dir][2][1], 8);
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2378 //avg bottom field from top field
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2379 mpeg_motion(s, dest_y, dest_cb, dest_cr, s->linesize,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2380 ref_picture, 0,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2381 1, dmv_pix_op,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2382 s->mv[dir][3][0], s->mv[dir][3][1], 8);
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2383
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2384 }else{
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2385 offset=(s->picture_structure == PICT_BOTTOM_FIELD)?
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2386 s->linesize : 0;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2387
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2388 //put field from the same parity
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2389 //same parity is never in the same frame
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2390 mpeg_motion(s, dest_y, dest_cb, dest_cr, 0,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2391 ref_picture,offset,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2392 0,dmv_pix_op,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2393 s->mv[dir][0][0],s->mv[dir][0][1],16);
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2394
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2395 // after put we make avg of the same block
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2396 dmv_pix_op=s->dsp.avg_pixels_tab;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2397
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2398 //opposite parity is always in the same frame if this is second field
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2399 if(!s->first_field){
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2400 ref_picture = s->current_picture.data;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2401 //top field is one linesize from frame beginig
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2402 offset=(s->picture_structure == PICT_BOTTOM_FIELD)?
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2403 -s->linesize : s->linesize;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2404 }else
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2405 offset=(s->picture_structure == PICT_BOTTOM_FIELD)?
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2406 0 : s->linesize;
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2407
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2408 //avg field from the opposite parity
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2409 mpeg_motion(s, dest_y, dest_cb, dest_cr,0,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2410 ref_picture, offset,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2411 0,dmv_pix_op,
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2412 s->mv[dir][2][0],s->mv[dir][2][1],16);
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2413 }
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2414 }
6cdd3b8f4fd3 DMV support patch by ("Ivan Kalvachev" <ivan at cacad dot com>)
michaelni
parents: 1317
diff changeset
2415 break;
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
2416
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2417 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2418 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2419
986e461dc072 Initial revision
glantau
parents:
diff changeset
2420
986e461dc072 Initial revision
glantau
parents:
diff changeset
2421 /* put block[] to dest[] */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2422 static inline void put_dct(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2423 DCTELEM *block, int i, uint8_t *dest, int line_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2424 {
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2425 s->dct_unquantize(s, block, i, s->qscale);
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
2426 s->dsp.idct_put (dest, line_size, block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2427 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2428
986e461dc072 Initial revision
glantau
parents:
diff changeset
2429 /* add block[] to dest[] */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2430 static inline void add_dct(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2431 DCTELEM *block, int i, uint8_t *dest, int line_size)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2432 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2433 if (s->block_last_index[i] >= 0) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
2434 s->dsp.idct_add (dest, line_size, block);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2435 }
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2436 }
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2437
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2438 static inline void add_dequant_dct(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2439 DCTELEM *block, int i, uint8_t *dest, int line_size)
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2440 {
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2441 if (s->block_last_index[i] >= 0) {
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2442 s->dct_unquantize(s, block, i, s->qscale);
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2443
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
2444 s->dsp.idct_add (dest, line_size, block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2445 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2446 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2447
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2448 /**
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2449 * cleans dc, ac, coded_block for the current non intra MB
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2450 */
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2451 void ff_clean_intra_table_entries(MpegEncContext *s)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2452 {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2453 int wrap = s->block_wrap[0];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2454 int xy = s->block_index[0];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2455
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2456 s->dc_val[0][xy ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2457 s->dc_val[0][xy + 1 ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2458 s->dc_val[0][xy + wrap] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2459 s->dc_val[0][xy + 1 + wrap] = 1024;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2460 /* ac pred */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2461 memset(s->ac_val[0][xy ], 0, 32 * sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2462 memset(s->ac_val[0][xy + wrap], 0, 32 * sizeof(int16_t));
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2463 if (s->msmpeg4_version>=3) {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2464 s->coded_block[xy ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2465 s->coded_block[xy + 1 ] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2466 s->coded_block[xy + wrap] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2467 s->coded_block[xy + 1 + wrap] = 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2468 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2469 /* chroma */
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2470 wrap = s->block_wrap[4];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2471 xy = s->mb_x + 1 + (s->mb_y + 1) * wrap;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2472 s->dc_val[1][xy] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2473 s->dc_val[2][xy] = 1024;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2474 /* ac pred */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2475 memset(s->ac_val[1][xy], 0, 16 * sizeof(int16_t));
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2476 memset(s->ac_val[2][xy], 0, 16 * sizeof(int16_t));
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2477
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
2478 s->mbintra_table[s->mb_x + s->mb_y*s->mb_stride]= 0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2479 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2480
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2481 /* generic function called after a macroblock has been parsed by the
986e461dc072 Initial revision
glantau
parents:
diff changeset
2482 decoder or after it has been encoded by the encoder.
986e461dc072 Initial revision
glantau
parents:
diff changeset
2483
986e461dc072 Initial revision
glantau
parents:
diff changeset
2484 Important variables used:
986e461dc072 Initial revision
glantau
parents:
diff changeset
2485 s->mb_intra : true if intra macroblock
986e461dc072 Initial revision
glantau
parents:
diff changeset
2486 s->mv_dir : motion vector direction
986e461dc072 Initial revision
glantau
parents:
diff changeset
2487 s->mv_type : motion vector type
986e461dc072 Initial revision
glantau
parents:
diff changeset
2488 s->mv : motion vector
986e461dc072 Initial revision
glantau
parents:
diff changeset
2489 s->interlaced_dct : true if interlaced dct used (mpeg2)
986e461dc072 Initial revision
glantau
parents:
diff changeset
2490 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2491 void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
986e461dc072 Initial revision
glantau
parents:
diff changeset
2492 {
244
3860331a1ecb * eliminating duplicated code from MPV_common_end
kabi
parents: 239
diff changeset
2493 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
2494 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
2495 #ifdef HAVE_XVMC
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
2496 if(s->avctx->xvmc_acceleration){
1580
628bf341e099 XvMC speedup by removing one memcpy and doing MB packing
iive
parents: 1579
diff changeset
2497 XVMC_decode_mb(s);//xvmc uses pblocks
1381
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
2498 return;
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
2499 }
f07e17427140 initial XvMC support
iive
parents: 1373
diff changeset
2500 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2501
986e461dc072 Initial revision
glantau
parents:
diff changeset
2502 mb_x = s->mb_x;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2503 mb_y = s->mb_y;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2504
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2505 s->current_picture.qscale_table[mb_xy]= s->qscale;
108
1e4a4af694d1 exporting qscale data for postprocessing (for MPlayer)
arpi_esp
parents: 79
diff changeset
2506
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2507 /* update DC predictors for P macroblocks */
986e461dc072 Initial revision
glantau
parents:
diff changeset
2508 if (!s->mb_intra) {
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2509 if (s->h263_pred || s->h263_aic) {
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2510 if(s->mbintra_table[mb_xy])
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2511 ff_clean_intra_table_entries(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2512 } else {
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2513 s->last_dc[0] =
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2514 s->last_dc[1] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2515 s->last_dc[2] = 128 << s->intra_dc_precision;
986e461dc072 Initial revision
glantau
parents:
diff changeset
2516 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2517 }
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
2518 else if (s->h263_pred || s->h263_aic)
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2519 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
2520
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
2521 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
2522 uint8_t *dest_y, *dest_cb, *dest_cr;
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2523 int dct_linesize, dct_offset;
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2524 op_pixels_func (*op_pix)[4];
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2525 qpel_mc_func (*op_qpix)[16];
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2526 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2527 const int uvlinesize= s->current_picture.linesize[1];
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
2528
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2529 /* avoid copy if macroblock skipped in last frame too */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2530 /* skip only during decoding as we might trash the buffers during encoding a bit */
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2531 if(!s->encoding){
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2532 uint8_t *mbskip_ptr = &s->mbskip_table[mb_xy];
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2533 const int age= s->current_picture.age;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2534
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2535 assert(age);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2536
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
2537 if (s->mb_skiped) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2538 s->mb_skiped= 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2539 assert(s->pict_type!=I_TYPE);
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2540
556
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
2541 (*mbskip_ptr) ++; /* indicate that this time we skiped it */
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
2542 if(*mbskip_ptr >99) *mbskip_ptr= 99;
762c67fd4078 uvlinesize
michaelni
parents: 554
diff changeset
2543
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2544 /* 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
2545 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
2546 return;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2547 }
1021
2d7c9f5738de trying to fix mb skip bug in mpeg1/2 if slices are not used
michaelni
parents: 1014
diff changeset
2548 } 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
2549 (*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
2550 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
2551 } else{
7
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
2552 *mbskip_ptr = 0; /* not skipped */
1d3ac9654178 added skip macroblock optimization (big perf win on black regions for example)
glantau
parents: 0
diff changeset
2553 }
717
6cba3b6196f0 optimization
michaelni
parents: 711
diff changeset
2554 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2555
986e461dc072 Initial revision
glantau
parents:
diff changeset
2556 if (s->interlaced_dct) {
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2557 dct_linesize = linesize * 2;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2558 dct_offset = linesize;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2559 } else {
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2560 dct_linesize = linesize;
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2561 dct_offset = linesize * 8;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2562 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2563
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2564 dest_y= s->dest[0];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2565 dest_cb= s->dest[1];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2566 dest_cr= s->dest[2];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2567
986e461dc072 Initial revision
glantau
parents:
diff changeset
2568 if (!s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2569 /* motion handling */
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2570 /* decoding or more than one mb_type (MC was allready done otherwise) */
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2571 if(!s->encoding){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
2572 if ((!s->no_rounding) || s->pict_type==B_TYPE){
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2573 op_pix = s->dsp.put_pixels_tab;
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2574 op_qpix= s->dsp.put_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2575 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2576 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
2577 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2578 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2579
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2580 if (s->mv_dir & MV_DIR_FORWARD) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2581 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
2582 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
2583 op_qpix= s->dsp.avg_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2584 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2585 if (s->mv_dir & MV_DIR_BACKWARD) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2586 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
2587 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2588 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2589
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2590 /* skip dequant / idct if we are really late ;) */
814
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 813
diff changeset
2591 if(s->hurry_up>1) return;
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2592
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2593 /* add dct residue */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
2594 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
2595 || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2596 add_dequant_dct(s, block[0], 0, dest_y, dct_linesize);
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2597 add_dequant_dct(s, block[1], 1, dest_y + 8, dct_linesize);
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2598 add_dequant_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize);
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2599 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2600
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2601 if(!(s->flags&CODEC_FLAG_GRAY)){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2602 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize);
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2603 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize);
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2604 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
2605 } else if(s->codec_id != CODEC_ID_WMV2){
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2606 add_dct(s, block[0], 0, dest_y, dct_linesize);
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2607 add_dct(s, block[1], 1, dest_y + 8, dct_linesize);
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2608 add_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize);
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2609 add_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize);
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2610
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2611 if(!(s->flags&CODEC_FLAG_GRAY)){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2612 add_dct(s, block[4], 4, dest_cb, uvlinesize);
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2613 add_dct(s, block[5], 5, dest_cr, uvlinesize);
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2614 }
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
2615 }
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
2616 #ifdef CONFIG_RISKY
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
2617 else{
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
2618 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr);
481
29a7e17d19dd optimizing MPV_decode_mb
michaelni
parents: 478
diff changeset
2619 }
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
2620 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2621 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
2622 /* dct only in intra block */
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
2623 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2624 put_dct(s, block[0], 0, dest_y, dct_linesize);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2625 put_dct(s, block[1], 1, dest_y + 8, dct_linesize);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2626 put_dct(s, block[2], 2, dest_y + dct_offset, dct_linesize);
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2627 put_dct(s, block[3], 3, dest_y + dct_offset + 8, dct_linesize);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2628
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2629 if(!(s->flags&CODEC_FLAG_GRAY)){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2630 put_dct(s, block[4], 4, dest_cb, uvlinesize);
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2631 put_dct(s, block[5], 5, dest_cr, uvlinesize);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2632 }
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2633 }else{
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
2634 s->dsp.idct_put(dest_y , dct_linesize, block[0]);
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
2635 s->dsp.idct_put(dest_y + 8, dct_linesize, block[1]);
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
2636 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]);
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
2637 s->dsp.idct_put(dest_y + dct_offset + 8, dct_linesize, block[3]);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2638
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2639 if(!(s->flags&CODEC_FLAG_GRAY)){
1138
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2640 s->dsp.idct_put(dest_cb, uvlinesize, block[4]);
e10e841c9bf0 field pic decoding cleanup
michaelni
parents: 1130
diff changeset
2641 s->dsp.idct_put(dest_cr, uvlinesize, block[5]);
711
dcbcf9676c9f optimizing mpeg1_decode_block()
michaelni
parents: 709
diff changeset
2642 }
485
20108840b0e5 grayscale only decoding
michaelni
parents: 481
diff changeset
2643 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
2644 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
2645 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2646 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2647
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
2648 #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
2649
605
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
2650 static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold)
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2651 {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2652 static const char tab[64]=
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2653 {3,2,2,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2654 1,1,1,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2655 1,1,1,1,1,1,1,1,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2656 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2657 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2658 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2659 0,0,0,0,0,0,0,0,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2660 0,0,0,0,0,0,0,0};
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2661 int score=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2662 int run=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2663 int i;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2664 DCTELEM *block= s->block[n];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2665 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
2666 int skip_dc;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2667
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
2668 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
2669 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
2670 threshold= -threshold;
605
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
2671 }else
40874804a5af same dc skip behavior for chroma & luma elimination, its confusing otherwise imho
michaelni
parents: 604
diff changeset
2672 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
2673
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2674 /* are all which we could set to zero are allready zero? */
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2675 if(last_index<=skip_dc - 1) return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2676
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2677 for(i=0; i<=last_index; i++){
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2678 const int j = s->intra_scantable.permutated[i];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2679 const int level = ABS(block[j]);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2680 if(level==1){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2681 if(skip_dc && i==0) continue;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2682 score+= tab[run];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2683 run=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2684 }else if(level>1){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2685 return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2686 }else{
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2687 run++;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2688 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2689 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2690 if(score >= threshold) return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2691 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
2692 const int j = s->intra_scantable.permutated[i];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2693 block[j]=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2694 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2695 if(block[0]) s->block_last_index[n]= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2696 else s->block_last_index[n]= -1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2697 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2698
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2699 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
2700 {
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2701 int i;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2702 const int maxlevel= s->max_qcoeff;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2703 const int minlevel= s->min_qcoeff;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2704
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2705 if(s->mb_intra){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2706 i=1; //skip clipping of intra dc
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2707 }else
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2708 i=0;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2709
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2710 for(;i<=last_index; i++){
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
2711 const int j= s->intra_scantable.permutated[i];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2712 int level = block[j];
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2713
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2714 if (level>maxlevel) level=maxlevel;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2715 else if(level<minlevel) level=minlevel;
1099
988b180afd31 cleanup
michaelni
parents: 1098
diff changeset
2716
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2717 block[j]= level;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2718 }
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
2719 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2720
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2721 #if 0
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2722 static int pix_vcmp16x8(uint8_t *s, int stride){ //FIXME move to dsputil & optimize
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2723 int score=0;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2724 int x,y;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2725
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2726 for(y=0; y<7; y++){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2727 for(x=0; x<16; x+=4){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2728 score+= ABS(s[x ] - s[x +stride]) + ABS(s[x+1] - s[x+1+stride])
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2729 +ABS(s[x+2] - s[x+2+stride]) + ABS(s[x+3] - s[x+3+stride]);
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2730 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2731 s+= stride;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2732 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2733
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2734 return score;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2735 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2736
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2737 static int pix_diff_vcmp16x8(uint8_t *s1, uint8_t*s2, int stride){ //FIXME move to dsputil & optimize
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2738 int score=0;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2739 int x,y;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2740
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2741 for(y=0; y<7; y++){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2742 for(x=0; x<16; x++){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2743 score+= ABS(s1[x ] - s2[x ] - s1[x +stride] + s2[x +stride]);
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2744 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2745 s1+= stride;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2746 s2+= stride;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2747 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2748
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2749 return score;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2750 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2751 #else
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2752 #define SQ(a) ((a)*(a))
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2753
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2754 static int pix_vcmp16x8(uint8_t *s, int stride){ //FIXME move to dsputil & optimize
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2755 int score=0;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2756 int x,y;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2757
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2758 for(y=0; y<7; y++){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2759 for(x=0; x<16; x+=4){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2760 score+= SQ(s[x ] - s[x +stride]) + SQ(s[x+1] - s[x+1+stride])
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2761 +SQ(s[x+2] - s[x+2+stride]) + SQ(s[x+3] - s[x+3+stride]);
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2762 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2763 s+= stride;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2764 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2765
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2766 return score;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2767 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2768
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2769 static int pix_diff_vcmp16x8(uint8_t *s1, uint8_t*s2, int stride){ //FIXME move to dsputil & optimize
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2770 int score=0;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2771 int x,y;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2772
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2773 for(y=0; y<7; y++){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2774 for(x=0; x<16; x++){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2775 score+= SQ(s1[x ] - s2[x ] - s1[x +stride] + s2[x +stride]);
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2776 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2777 s1+= stride;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2778 s2+= stride;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2779 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2780
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2781 return score;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2782 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2783
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2784 #endif
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2785
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
2786 #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
2787
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2788 /**
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2789 *
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2790 * @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
2791 */
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2792 void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2793 if (s->avctx->draw_horiz_band) {
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2794 AVFrame *src;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2795 int offset[4];
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2796
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2797 if(s->picture_structure != PICT_FRAME){
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2798 h <<= 1;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2799 y <<= 1;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2800 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
2801 }
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2802
1098
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2803 h= FFMIN(h, s->height - y);
b7f267d168b7 mpeg2 field pictures + sliced mode (doesnt work with mplayer though, dunno why)
michaelni
parents: 1096
diff changeset
2804
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2805 if(s->pict_type==B_TYPE || s->low_delay || (s->avctx->slice_flags&SLICE_FLAG_CODED_ORDER))
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2806 src= (AVFrame*)s->current_picture_ptr;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2807 else if(s->last_picture_ptr)
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2808 src= (AVFrame*)s->last_picture_ptr;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2809 else
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2810 return;
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2811
1369
8a150a66d2d9 svq3 b frame slices fix
michaelni
parents: 1368
diff changeset
2812 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
2813 offset[0]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2814 offset[1]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2815 offset[2]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2816 offset[3]= 0;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2817 }else{
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2818 offset[0]= y * s->linesize;;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2819 offset[1]=
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2820 offset[2]= (y>>1) * s->uvlinesize;;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2821 offset[3]= 0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2822 }
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
2823
813
dfaa1c45bd27 cleanup
michaelni
parents: 809
diff changeset
2824 emms_c();
dfaa1c45bd27 cleanup
michaelni
parents: 809
diff changeset
2825
1370
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2826 s->avctx->draw_horiz_band(s->avctx, src, offset,
45d761c387cd default for slices is display order again
michaelni
parents: 1369
diff changeset
2827 y, s->picture_structure, h);
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2828 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2829 }
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
2830
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2831 void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2832 const int linesize= s->current_picture.linesize[0]; //not s->linesize as this woulnd be wrong for field pics
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2833 const int uvlinesize= s->current_picture.linesize[1];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2834
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2835 s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1 + s->mb_x*2;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2836 s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1) + s->mb_x*2;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2837 s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1 + s->mb_x*2;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2838 s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2) + s->mb_x*2;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2839 s->block_index[4]= s->block_wrap[4]*(s->mb_y + 1) + s->block_wrap[0]*(s->mb_height*2 + 2) + s->mb_x;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2840 s->block_index[5]= s->block_wrap[4]*(s->mb_y + 1 + s->mb_height + 2) + s->block_wrap[0]*(s->mb_height*2 + 2) + s->mb_x;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2841
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2842 if(s->pict_type==B_TYPE && s->avctx->draw_horiz_band && s->picture_structure==PICT_FRAME){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2843 s->dest[0] = s->current_picture.data[0] + s->mb_x * 16 - 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2844 s->dest[1] = s->current_picture.data[1] + s->mb_x * 8 - 8;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2845 s->dest[2] = s->current_picture.data[2] + s->mb_x * 8 - 8;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2846 }else{
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2847 s->dest[0] = s->current_picture.data[0] + (s->mb_y * 16* linesize ) + s->mb_x * 16 - 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2848 s->dest[1] = s->current_picture.data[1] + (s->mb_y * 8 * uvlinesize) + s->mb_x * 8 - 8;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2849 s->dest[2] = s->current_picture.data[2] + (s->mb_y * 8 * uvlinesize) + s->mb_x * 8 - 8;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2850 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2851 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2852
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
2853 #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
2854
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2855 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
2856 {
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2857 const int mb_x= s->mb_x;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2858 const int mb_y= s->mb_y;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2859 int i;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2860 int skip_dct[6];
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2861 int dct_offset = s->linesize*8; //default for progressive frames
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2862
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2863 for(i=0; i<6; i++) skip_dct[i]=0;
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2864
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2865 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
2866 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
2867 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
2868
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
2869 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
2870 update_qscale(s);
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
2871 s->dquant= s->qscale - last_qp;
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
2872
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
2873 if(s->out_format==FMT_H263)
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
2874 s->dquant= clip(s->dquant, -2, 2); //FIXME RD
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2875
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2876 if(s->codec_id==CODEC_ID_MPEG4){
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2877 if(!s->mb_intra){
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
2878 if((s->mv_dir&MV_DIRECT) || s->mv_type==MV_TYPE_8X8)
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2879 s->dquant=0;
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2880 }
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2881 }
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
2882 s->qscale= last_qp + s->dquant;
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2883 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ];
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2884 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ];
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
2885 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2886
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2887 if (s->mb_intra) {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2888 uint8_t *ptr;
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2889 int wrap_y;
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2890 int emu=0;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2891
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2892 wrap_y = s->linesize;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2893 ptr = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16;
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2894
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2895 if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2896 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, wrap_y, 16, 16, mb_x*16, mb_y*16, s->width, s->height);
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2897 ptr= s->edge_emu_buffer;
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2898 emu=1;
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2899 }
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2900
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2901 if(s->flags&CODEC_FLAG_INTERLACED_DCT){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2902 int progressive_score, interlaced_score;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2903
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2904 progressive_score= pix_vcmp16x8(ptr, wrap_y ) + pix_vcmp16x8(ptr + wrap_y*8, wrap_y );
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2905 interlaced_score = pix_vcmp16x8(ptr, wrap_y*2) + pix_vcmp16x8(ptr + wrap_y , wrap_y*2);
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2906
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2907 if(progressive_score > interlaced_score + 100){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2908 s->interlaced_dct=1;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2909
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2910 dct_offset= wrap_y;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2911 wrap_y<<=1;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2912 }else
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2913 s->interlaced_dct=0;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2914 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2915
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2916 s->dsp.get_pixels(s->block[0], ptr , wrap_y);
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2917 s->dsp.get_pixels(s->block[1], ptr + 8, wrap_y);
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2918 s->dsp.get_pixels(s->block[2], ptr + dct_offset , wrap_y);
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2919 s->dsp.get_pixels(s->block[3], ptr + dct_offset + 8, wrap_y);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2920
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
2921 if(s->flags&CODEC_FLAG_GRAY){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
2922 skip_dct[4]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
2923 skip_dct[5]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
2924 }else{
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2925 int wrap_c = s->uvlinesize;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2926 ptr = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8;
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2927 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2928 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2929 ptr= s->edge_emu_buffer;
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2930 }
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2931 s->dsp.get_pixels(s->block[4], ptr, wrap_c);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2932
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2933 ptr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8;
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2934 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2935 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2936 ptr= s->edge_emu_buffer;
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2937 }
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2938 s->dsp.get_pixels(s->block[5], ptr, wrap_c);
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
2939 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2940 }else{
651
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2941 op_pixels_func (*op_pix)[4];
45e8f39fda50 put/avg_pixels16
michaelni
parents: 650
diff changeset
2942 qpel_mc_func (*op_qpix)[16];
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2943 uint8_t *dest_y, *dest_cb, *dest_cr;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
2944 uint8_t *ptr_y, *ptr_cb, *ptr_cr;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2945 int wrap_y, wrap_c;
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2946 int emu=0;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
2947
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2948 dest_y = s->dest[0];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2949 dest_cb = s->dest[1];
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
2950 dest_cr = s->dest[2];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
2951 wrap_y = s->linesize;
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2952 wrap_c = s->uvlinesize;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2953 ptr_y = s->new_picture.data[0] + (mb_y * 16 * wrap_y) + mb_x * 16;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2954 ptr_cb = s->new_picture.data[1] + (mb_y * 8 * wrap_c) + mb_x * 8;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2955 ptr_cr = s->new_picture.data[2] + (mb_y * 8 * wrap_c) + mb_x * 8;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2956
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
2957 if ((!s->no_rounding) || s->pict_type==B_TYPE){
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2958 op_pix = s->dsp.put_pixels_tab;
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2959 op_qpix= s->dsp.put_qpel_pixels_tab;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
2960 }else{
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2961 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
2962 op_qpix= s->dsp.put_no_rnd_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2963 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
2964
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2965 if (s->mv_dir & MV_DIR_FORWARD) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2966 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
2967 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
2968 op_qpix= s->dsp.avg_qpel_pixels_tab;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2969 }
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
2970 if (s->mv_dir & MV_DIR_BACKWARD) {
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
2971 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
2972 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
2973
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2974 if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
2975 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, wrap_y, 16, 16, mb_x*16, mb_y*16, s->width, s->height);
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2976 ptr_y= s->edge_emu_buffer;
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2977 emu=1;
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
2978 }
697
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2979
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2980 if(s->flags&CODEC_FLAG_INTERLACED_DCT){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2981 int progressive_score, interlaced_score;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2982
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2983 progressive_score= pix_diff_vcmp16x8(ptr_y , dest_y , wrap_y )
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2984 + pix_diff_vcmp16x8(ptr_y + wrap_y*8, dest_y + wrap_y*8, wrap_y );
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2985 interlaced_score = pix_diff_vcmp16x8(ptr_y , dest_y , wrap_y*2)
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2986 + pix_diff_vcmp16x8(ptr_y + wrap_y , dest_y + wrap_y , wrap_y*2);
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2987
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2988 if(progressive_score > interlaced_score + 600){
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2989 s->interlaced_dct=1;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2990
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2991 dct_offset= wrap_y;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2992 wrap_y<<=1;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2993 }else
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2994 s->interlaced_dct=0;
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2995 }
c622224012f0 mpeg4 interlaced dct encoding
michaelni
parents: 695
diff changeset
2996
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2997 s->dsp.diff_pixels(s->block[0], ptr_y , dest_y , wrap_y);
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
2998 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
2999 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
3000 s->dsp.diff_pixels(s->block[3], ptr_y + dct_offset + 8, dest_y + dct_offset + 8, wrap_y);
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3001
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3002 if(s->flags&CODEC_FLAG_GRAY){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3003 skip_dct[4]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3004 skip_dct[5]= 1;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3005 }else{
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
3006 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
3007 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
3008 ptr_cb= s->edge_emu_buffer;
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
3009 }
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
3010 s->dsp.diff_pixels(s->block[4], ptr_cb, dest_cb, wrap_c);
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
3011 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1315
diff changeset
3012 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
570
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
3013 ptr_cr= s->edge_emu_buffer;
274d9c5a75ee use edge emu for encoding of width or height %16!=0 files
michaelni
parents: 569
diff changeset
3014 }
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
3015 s->dsp.diff_pixels(s->block[5], ptr_cr, dest_cr, wrap_c);
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3016 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3017 /* 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
3018 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
3019 //FIXME optimize
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
3020 if(s->dsp.pix_abs8x8(ptr_y , dest_y , wrap_y) < 20*s->qscale) skip_dct[0]= 1;
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
3021 if(s->dsp.pix_abs8x8(ptr_y + 8, dest_y + 8, wrap_y) < 20*s->qscale) skip_dct[1]= 1;
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
3022 if(s->dsp.pix_abs8x8(ptr_y +dct_offset , dest_y +dct_offset , wrap_y) < 20*s->qscale) skip_dct[2]= 1;
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
3023 if(s->dsp.pix_abs8x8(ptr_y +dct_offset+ 8, dest_y +dct_offset+ 8, wrap_y) < 20*s->qscale) skip_dct[3]= 1;
899
9d9a415e3dd9 100l (mixing chroma & luma linesize)
michaelni
parents: 885
diff changeset
3024 if(s->dsp.pix_abs8x8(ptr_cb , dest_cb , wrap_c) < 20*s->qscale) skip_dct[4]= 1;
9d9a415e3dd9 100l (mixing chroma & luma linesize)
michaelni
parents: 885
diff changeset
3025 if(s->dsp.pix_abs8x8(ptr_cr , dest_cr , wrap_c) < 20*s->qscale) skip_dct[5]= 1;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3026 #if 0
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3027 {
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3028 static int stat[7];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3029 int num=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3030 for(i=0; i<6; i++)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3031 if(skip_dct[i]) num++;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3032 stat[num]++;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3033
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3034 if(s->mb_x==0 && s->mb_y==0){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3035 for(i=0; i<7; i++){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3036 printf("%6d %1d\n", stat[i], i);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3037 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3038 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3039 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3040 #endif
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3041 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3042
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3043 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3044
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3045 /* DCT & quantize */
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3046 if(s->out_format==FMT_MJPEG){
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3047 for(i=0;i<6;i++) {
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3048 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
3049 s->block_last_index[i] = s->dct_quantize(s, s->block[i], i, 8, &overflow);
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
3050 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]);
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3051 }
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3052 }else{
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3053 for(i=0;i<6;i++) {
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3054 if(!skip_dct[i]){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3055 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
3056 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
3057 // 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
3058 // 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
3059 // of improve it. Just INTRADC clipping deserves changes in quantizer
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3060 if (overflow) clip_coeffs(s, s->block[i], s->block_last_index[i]);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3061 }else
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3062 s->block_last_index[i]= -1;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
3063 }
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
3064
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3065 if(s->luma_elim_threshold && !s->mb_intra)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3066 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
3067 dct_single_coeff_elimination(s, i, s->luma_elim_threshold);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3068 if(s->chroma_elim_threshold && !s->mb_intra)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3069 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
3070 dct_single_coeff_elimination(s, i, s->chroma_elim_threshold);
1497
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
3071
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
3072 if(s->flags & CODEC_FLAG_CBP_RD){
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
3073 for(i=0;i<6;i++) {
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
3074 if(s->block_last_index[i] == -1)
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
3075 s->coded_score[i]= INT_MAX/256;
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
3076 }
37e16bd36d2c rd cbp + single coeff elimination fix
michaelni
parents: 1494
diff changeset
3077 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3078 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3079
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3080 if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3081 s->block_last_index[4]=
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3082 s->block_last_index[5]= 0;
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3083 s->block[4][0]=
1011
michaelni
parents: 1007
diff changeset
3084 s->block[5][0]= (1024 + s->c_dc_scale/2)/ s->c_dc_scale;
487
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3085 }
cee02f2f4a5a grayscale only encoding
michaelni
parents: 485
diff changeset
3086
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3087 /* huffman encode */
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3088 switch(s->codec_id){ //FIXME funct ptr could be slightly faster
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3089 case CODEC_ID_MPEG1VIDEO:
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3090 case CODEC_ID_MPEG2VIDEO:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3091 mpeg1_encode_mb(s, s->block, motion_x, motion_y); break;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3092 #ifdef CONFIG_RISKY
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3093 case CODEC_ID_MPEG4:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3094 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3095 case CODEC_ID_MSMPEG4V2:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3096 case CODEC_ID_MSMPEG4V3:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3097 case CODEC_ID_WMV1:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3098 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3099 case CODEC_ID_WMV2:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3100 ff_wmv2_encode_mb(s, s->block, motion_x, motion_y); break;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3101 case CODEC_ID_H263:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3102 case CODEC_ID_H263P:
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3103 case CODEC_ID_FLV1:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3104 case CODEC_ID_RV10:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3105 h263_encode_mb(s, s->block, motion_x, motion_y); break;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3106 #endif
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3107 case CODEC_ID_MJPEG:
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3108 mjpeg_encode_mb(s, s->block); break;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3109 default:
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3110 assert(0);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3111 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3112 }
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3113
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
3114 #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
3115
1026
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3116 /**
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3117 * combines the (truncated) bitstream to a complete frame
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3118 * @returns -1 if no complete frame could be created
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3119 */
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3120 int ff_combine_frame( MpegEncContext *s, int next, uint8_t **buf, int *buf_size){
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3121 ParseContext *pc= &s->parse_context;
1218
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3122
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3123 #if 0
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3124 if(pc->overread){
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3125 printf("overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index);
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3126 printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3127 }
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3128 #endif
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3129
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3130 /* copy overreaded byes from last frame into buffer */
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3131 for(; pc->overread>0; pc->overread--){
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3132 pc->buffer[pc->index++]= pc->buffer[pc->overread_index++];
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3133 }
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3134
1026
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3135 pc->last_index= pc->index;
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3136
1218
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3137 /* copy into buffer end return */
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3138 if(next == END_NOT_FOUND){
1026
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3139 pc->buffer= av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3140
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3141 memcpy(&pc->buffer[pc->index], *buf, *buf_size);
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3142 pc->index += *buf_size;
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3143 return -1;
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3144 }
1288
10c21dffe5ab mpeg1 decoding fix
michaelni
parents: 1285
diff changeset
3145
10c21dffe5ab mpeg1 decoding fix
michaelni
parents: 1285
diff changeset
3146 *buf_size=
1218
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3147 pc->overread_index= pc->index + next;
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3148
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3149 /* append to buffer */
1026
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3150 if(pc->index){
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3151 pc->buffer= av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3152
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3153 memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3154 pc->index = 0;
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3155 *buf= pc->buffer;
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3156 }
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3157
1218
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3158 /* store overread bytes */
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3159 for(;next < 0; next++){
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3160 pc->state = (pc->state<<8) | pc->buffer[pc->last_index + next];
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3161 pc->overread++;
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3162 }
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3163
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3164 #if 0
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3165 if(pc->overread){
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3166 printf("overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index);
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3167 printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3168 }
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3169 #endif
358bbc952e27 10l (returning negative number of consumed bytes if the first startcode of a frame was split between 2 buffers)
michaelni
parents: 1215
diff changeset
3170
1026
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3171 return 0;
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3172 }
d6ba0641cc36 cleanup
michaelni
parents: 1021
diff changeset
3173
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3174 void ff_mpeg_flush(AVCodecContext *avctx){
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3175 int i;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3176 MpegEncContext *s = avctx->priv_data;
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3177
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3178 for(i=0; i<MAX_PICTURE_COUNT; i++){
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3179 if(s->picture[i].data[0] && ( s->picture[i].type == FF_BUFFER_TYPE_INTERNAL
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3180 || s->picture[i].type == FF_BUFFER_TYPE_USER))
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3181 avctx->release_buffer(avctx, (AVFrame*)&s->picture[i]);
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3182 }
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3183 s->last_picture_ptr = s->next_picture_ptr = NULL;
1395
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
3184
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
3185 s->parse_context.state= -1;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
3186 s->parse_context.frame_start_found= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
3187 s->parse_context.overread= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
3188 s->parse_context.overread_index= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
3189 s->parse_context.index= 0;
b2ac20ff1458 clear bitstream buffers in AVCodec.flush()
michaelni
parents: 1393
diff changeset
3190 s->parse_context.last_index= 0;
1368
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3191 }
0fd38b711f06 AVCodec.flush()
michaelni
parents: 1354
diff changeset
3192
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
3193 #ifdef CONFIG_ENCODERS
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3194 void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length)
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3195 {
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3196 int bytes= length>>4;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3197 int bits= length&15;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3198 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3199
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3200 if(length==0) return;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3201
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3202 for(i=0; i<bytes; i++) put_bits(pb, 16, be2me_16(((uint16_t*)src)[i]));
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3203 put_bits(pb, bits, be2me_16(((uint16_t*)src)[i])>>(16-bits));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3204 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
3205
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3206 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
3207 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3208
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3209 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
3210
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3211 /* mpeg1 */
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3212 d->mb_skip_run= s->mb_skip_run;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3213 for(i=0; i<3; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3214 d->last_dc[i]= s->last_dc[i];
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3215
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3216 /* statistics */
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3217 d->mv_bits= s->mv_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3218 d->i_tex_bits= s->i_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3219 d->p_tex_bits= s->p_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3220 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
3221 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
3222 d->b_count= s->b_count;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3223 d->skip_count= s->skip_count;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3224 d->misc_bits= s->misc_bits;
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
3225 d->last_bits= 0;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3226
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3227 d->mb_skiped= 0;
912
4a1e6bb1f41c fixing hq + adaptive quant
michaelni
parents: 910
diff changeset
3228 d->qscale= s->qscale;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3229 }
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3230
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3231 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
3232 int i;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3233
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3234 memcpy(d->mv, s->mv, 2*4*2*sizeof(int));
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3235 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
3236
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3237 /* mpeg1 */
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3238 d->mb_skip_run= s->mb_skip_run;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3239 for(i=0; i<3; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3240 d->last_dc[i]= s->last_dc[i];
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3241
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3242 /* statistics */
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3243 d->mv_bits= s->mv_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3244 d->i_tex_bits= s->i_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3245 d->p_tex_bits= s->p_tex_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3246 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
3247 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
3248 d->b_count= s->b_count;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3249 d->skip_count= s->skip_count;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3250 d->misc_bits= s->misc_bits;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3251
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3252 d->mb_intra= s->mb_intra;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3253 d->mb_skiped= s->mb_skiped;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3254 d->mv_type= s->mv_type;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3255 d->mv_dir= s->mv_dir;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3256 d->pb= s->pb;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3257 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3258 d->pb2= s->pb2;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3259 d->tex_pb= s->tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3260 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3261 d->block= s->block;
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3262 for(i=0; i<6; i++)
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3263 d->block_last_index[i]= s->block_last_index[i];
755
d17846a6c164 fixing interlaced dct + hq mode
michaelni
parents: 754
diff changeset
3264 d->interlaced_dct= s->interlaced_dct;
912
4a1e6bb1f41c fixing hq + adaptive quant
michaelni
parents: 910
diff changeset
3265 d->qscale= s->qscale;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3266 }
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3267
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3268 static inline void encode_mb_hq(MpegEncContext *s, MpegEncContext *backup, MpegEncContext *best, int type,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3269 PutBitContext pb[2], PutBitContext pb2[2], PutBitContext tex_pb[2],
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3270 int *dmin, int *next_block, int motion_x, int motion_y)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3271 {
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3272 int score;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3273 uint8_t *dest_backup[3];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3274
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3275 copy_context_before_encode(s, backup, type);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3276
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3277 s->block= s->blocks[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3278 s->pb= pb[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3279 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3280 s->pb2 = pb2 [*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3281 s->tex_pb= tex_pb[*next_block];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3282 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3283
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3284 if(*next_block){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3285 memcpy(dest_backup, s->dest, sizeof(s->dest));
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3286 s->dest[0] = s->me.scratchpad;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3287 s->dest[1] = s->me.scratchpad + 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3288 s->dest[2] = s->me.scratchpad + 16 + 8;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3289 assert(2*s->uvlinesize == s->linesize); //should be no prob for encoding
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3290 assert(s->linesize >= 64); //FIXME
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3291 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3292
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3293 encode_mb(s, motion_x, motion_y);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3294
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3295 score= get_bit_count(&s->pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3296 if(s->data_partitioning){
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3297 score+= get_bit_count(&s->pb2);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3298 score+= get_bit_count(&s->tex_pb);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3299 }
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3300
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3301 if(s->avctx->mb_decision == FF_MB_DECISION_RD){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3302 MPV_decode_mb(s, s->block);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3303
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
3304 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
3305 score += sse_mb(s) << FF_LAMBDA_SHIFT;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3306 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3307
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3308 if(*next_block){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3309 memcpy(s->dest, dest_backup, sizeof(s->dest));
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3310 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3311
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3312 if(score<*dmin){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3313 *dmin= score;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3314 *next_block^=1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3315
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3316 copy_context_after_encode(best, s, type);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3317 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3318 }
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3319
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3320 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
3321 uint32_t *sq = squareTbl + 256;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3322 int acc=0;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3323 int x,y;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3324
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3325 if(w==16 && h==16)
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3326 return s->dsp.sse[0](NULL, src1, src2, stride);
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3327 else if(w==8 && h==8)
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3328 return s->dsp.sse[1](NULL, src1, src2, stride);
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3329
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3330 for(y=0; y<h; y++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3331 for(x=0; x<w; x++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3332 acc+= sq[src1[x + y*stride] - src2[x + y*stride]];
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3333 }
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3334 }
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3335
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3336 assert(acc>=0);
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3337
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3338 return acc;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3339 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3340
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3341 static int sse_mb(MpegEncContext *s){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3342 int w= 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3343 int h= 16;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3344
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3345 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
3346 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
3347
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3348 if(w==16 && h==16)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3349 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)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3350 +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)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3351 +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);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3352 else
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3353 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
3354 +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
3355 +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
3356 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3357
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3358 static void encode_picture(MpegEncContext *s, int picture_number)
986e461dc072 Initial revision
glantau
parents:
diff changeset
3359 {
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3360 int mb_x, mb_y, pdif = 0;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3361 int i;
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3362 int bits;
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3363 MpegEncContext best_s, backup_s;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3364 uint8_t bit_buf[2][3000];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3365 uint8_t bit_buf2[2][3000];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3366 uint8_t bit_buf_tex[2][3000];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3367 PutBitContext pb[2], pb2[2], tex_pb[2];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3368
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3369 for(i=0; i<2; i++){
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1505
diff changeset
3370 init_put_bits(&pb [i], bit_buf [i], 3000);
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1505
diff changeset
3371 init_put_bits(&pb2 [i], bit_buf2 [i], 3000);
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1505
diff changeset
3372 init_put_bits(&tex_pb[i], bit_buf_tex[i], 3000);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3373 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3374
986e461dc072 Initial revision
glantau
parents:
diff changeset
3375 s->picture_number = picture_number;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3376
268
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
3377 /* Reset the average MB variance */
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3378 s->current_picture.mb_var_sum = 0;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3379 s->current_picture.mc_mb_var_sum = 0;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3380
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3381 #ifdef CONFIG_RISKY
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3382 /* we need to initialize some time vars before we can encode b-frames */
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3383 // RAL: Condition added for MPEG1VIDEO
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3384 if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4))
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3385 ff_set_mpeg4_time(s, s->picture_number);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3386 #endif
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3387
608
98e39397636b better scene change detection
michaelni
parents: 605
diff changeset
3388 s->scene_change_score=0;
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
3389
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
3390 s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3391
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1086
diff changeset
3392 if(s->pict_type==I_TYPE){
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
3393 if(s->msmpeg4_version >= 3) s->no_rounding=1;
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1162
diff changeset
3394 else s->no_rounding=0;
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1086
diff changeset
3395 }else if(s->pict_type!=B_TYPE){
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1086
diff changeset
3396 if(s->flipflop_rounding || s->codec_id == CODEC_ID_H263P || s->codec_id == CODEC_ID_MPEG4)
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3397 s->no_rounding ^= 1;
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3398 }
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1086
diff changeset
3399
268
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
3400 /* Estimate motion for every MB */
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3401 s->mb_intra=0; //for the rate distoration & bit compare functions
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3402 if(s->pict_type != I_TYPE){
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3403 if(s->pict_type != B_TYPE){
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3404 if((s->avctx->pre_me && s->last_non_b_pict_type==I_TYPE) || s->avctx->pre_me==2){
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
3405 s->me.pre_pass=1;
954
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
3406 s->me.dia_size= s->avctx->pre_dia_size;
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
3407
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3408 for(mb_y=s->mb_height-1; mb_y >=0 ; mb_y--) {
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3409 for(mb_x=s->mb_width-1; mb_x >=0 ; mb_x--) {
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3410 s->mb_x = mb_x;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3411 s->mb_y = mb_y;
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3412 ff_pre_estimate_p_frame_motion(s, mb_x, mb_y);
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3413 }
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3414 }
952
f348d302a51e pre motion estimation cleanup/bugfix
michaelni
parents: 951
diff changeset
3415 s->me.pre_pass=0;
951
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3416 }
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3417 }
ad264a7d4f94 motion estimation pre pass
michaelni
parents: 947
diff changeset
3418
954
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
3419 s->me.dia_size= s->avctx->dia_size;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3420 for(mb_y=0; mb_y < s->mb_height; mb_y++) {
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3421 s->block_index[0]= s->block_wrap[0]*(mb_y*2 + 1) - 1;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3422 s->block_index[1]= s->block_wrap[0]*(mb_y*2 + 1);
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3423 s->block_index[2]= s->block_wrap[0]*(mb_y*2 + 2) - 1;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3424 s->block_index[3]= s->block_wrap[0]*(mb_y*2 + 2);
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3425 for(mb_x=0; mb_x < s->mb_width; mb_x++) {
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3426 s->mb_x = mb_x;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3427 s->mb_y = mb_y;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3428 s->block_index[0]+=2;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3429 s->block_index[1]+=2;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3430 s->block_index[2]+=2;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3431 s->block_index[3]+=2;
954
13aec7e50c52 qpel in mmx2/3dnow
michaelni
parents: 952
diff changeset
3432
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3433 /* compute motion vector & mb_type and store in context */
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3434 if(s->pict_type==B_TYPE)
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3435 ff_estimate_b_frame_motion(s, mb_x, mb_y);
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3436 else
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3437 ff_estimate_p_frame_motion(s, mb_x, mb_y);
268
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
3438 }
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
3439 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3440 }else /* if(s->pict_type == I_TYPE) */{
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3441 /* I-Frame */
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3442 //FIXME do we need to zero them?
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
3443 memset(s->motion_val[0], 0, sizeof(int16_t)*(s->mb_width*2 + 2)*(s->mb_height*2 + 2)*2);
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3444 memset(s->p_mv_table , 0, sizeof(int16_t)*(s->mb_stride)*s->mb_height*2);
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3445 memset(s->mb_type , MB_TYPE_INTRA, sizeof(uint8_t)*s->mb_stride*s->mb_height);
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3446
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3447 if(!s->fixed_qscale){
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3448 /* finding spatial complexity for I-frame rate control */
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3449 for(mb_y=0; mb_y < s->mb_height; mb_y++) {
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3450 for(mb_x=0; mb_x < s->mb_width; mb_x++) {
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3451 int xx = mb_x * 16;
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3452 int yy = mb_y * 16;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3453 uint8_t *pix = s->new_picture.data[0] + (yy * s->linesize) + xx;
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3454 int varc;
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
3455 int sum = s->dsp.pix_sum(pix, s->linesize);
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3456
853
eacc2dd8fd9d * using DSPContext - so each codec could use its local (sub)set of CPU extension
kabi
parents: 847
diff changeset
3457 varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8;
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3458
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3459 s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3460 s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3461 s->current_picture.mb_var_sum += varc;
612
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3462 }
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3463 }
c0005de2be59 new ratecontrol code
michaelni
parents: 611
diff changeset
3464 }
268
09ae29b27ed9 hopefully better bitrate controll
michaelni
parents: 266
diff changeset
3465 }
814
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 813
diff changeset
3466 emms_c();
8f31ed5bacd1 dont call emms_c() for each MB
michaelni
parents: 813
diff changeset
3467
1471
dcb784544ec6 scenechange_threshold
michaelni
parents: 1458
diff changeset
3468 if(s->scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){
271
997aac7d4e3e scene change detection
michaelni
parents: 270
diff changeset
3469 s->pict_type= I_TYPE;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3470 memset(s->mb_type , MB_TYPE_INTRA, sizeof(uint8_t)*s->mb_stride*s->mb_height);
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3471 //printf("Scene change detected, encoding as I Frame %d %d\n", s->current_picture.mb_var_sum, s->current_picture.mc_mb_var_sum);
271
997aac7d4e3e scene change detection
michaelni
parents: 270
diff changeset
3472 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3473
1089
7e79a58954b1 h263(+) clenaup & bugfixes
michaelni
parents: 1086
diff changeset
3474 if(!s->umvplus){
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3475 if(s->pict_type==P_TYPE || s->pict_type==S_TYPE) {
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3476 s->f_code= ff_get_best_fcode(s, s->p_mv_table, MB_TYPE_INTER);
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3477
1086
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3478 ff_fix_long_p_mvs(s);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3479 }
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3480
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3481 if(s->pict_type==B_TYPE){
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3482 int a, b;
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3483
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3484 a = ff_get_best_fcode(s, s->b_forw_mv_table, MB_TYPE_FORWARD);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3485 b = ff_get_best_fcode(s, s->b_bidir_forw_mv_table, MB_TYPE_BIDIR);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3486 s->f_code = FFMAX(a, b);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3487
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3488 a = ff_get_best_fcode(s, s->b_back_mv_table, MB_TYPE_BACKWARD);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3489 b = ff_get_best_fcode(s, s->b_bidir_back_mv_table, MB_TYPE_BIDIR);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3490 s->b_code = FFMAX(a, b);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3491
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3492 ff_fix_long_b_mvs(s, s->b_forw_mv_table, s->f_code, MB_TYPE_FORWARD);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3493 ff_fix_long_b_mvs(s, s->b_back_mv_table, s->b_code, MB_TYPE_BACKWARD);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3494 ff_fix_long_b_mvs(s, s->b_bidir_forw_mv_table, s->f_code, MB_TYPE_BIDIR);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3495 ff_fix_long_b_mvs(s, s->b_bidir_back_mv_table, s->b_code, MB_TYPE_BIDIR);
d3b93dc997a3 user specified motion estimation range limit
michaelni
parents: 1070
diff changeset
3496 }
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
3497 }
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3498
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
3499 if (!s->fixed_qscale)
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
3500 s->current_picture.quality = ff_rate_estimate_qscale(s);
277
5cb2978e701f new motion estimation (epzs) not complete yet but allready pretty good :)
michaelni
parents: 271
diff changeset
3501
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3502 if(s->adaptive_quant){
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3503 #ifdef CONFIG_RISKY
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3504 switch(s->codec_id){
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3505 case CODEC_ID_MPEG4:
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3506 ff_clean_mpeg4_qscales(s);
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3507 break;
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3508 case CODEC_ID_H263:
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3509 case CODEC_ID_H263P:
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3510 case CODEC_ID_FLV1:
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3511 ff_clean_h263_qscales(s);
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3512 break;
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3513 }
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3514 #endif
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3515
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
3516 s->lambda= s->lambda_table[0];
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
3517 //FIXME broken
695
3525da287ee2 adaptive quantization for h263
michaelni
parents: 693
diff changeset
3518 }else
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
3519 s->lambda= s->current_picture.quality;
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
3520 //printf("%d %d\n", s->avctx->global_quality, s->current_picture.quality);
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
3521 update_qscale(s);
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
3522
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
3523 if(s->qscale < 3 && s->max_qcoeff<=128 && s->pict_type==I_TYPE && !(s->flags & CODEC_FLAG_QSCALE))
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
3524 s->qscale= 3; //reduce cliping problems
690
a1c69cb685b3 adaptive quantization (lumi/temporal & spatial complexity masking)
michaelni
parents: 673
diff changeset
3525
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3526 if (s->out_format == FMT_MJPEG) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3527 /* for mjpeg, we do include qscale in the matrix */
533
3c07cf9595de adding ff prefix to avoid global name conficts with xvid (patch by Marko Kreen <marko at l-t.ee>)
michaelni
parents: 514
diff changeset
3528 s->intra_matrix[0] = ff_mpeg1_default_intra_matrix[0];
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3529 for(i=1;i<64;i++){
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
3530 int j= s->dsp.idct_permutation[i];
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3531
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3532 s->intra_matrix[j] = CLAMP_TO_8BIT((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3);
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
3533 }
1579
039cb2296de2 make convert_matrix() independant of MpegEncContext
michael
parents: 1573
diff changeset
3534 convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16,
1554
d736e24bf303 move mmx quantizer matrixes out of MpegEncContext (23k -> 7k) (no meassureable slowdown)
michael
parents: 1553
diff changeset
3535 s->intra_matrix, s->intra_quant_bias, 8, 8);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3536 }
903
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3537
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3538 //FIXME var duplication
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3539 s->current_picture.key_frame= s->pict_type == I_TYPE;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3540 s->current_picture.pict_type= s->pict_type;
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3541
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3542 if(s->current_picture.key_frame)
22ee74da2cd3 cleanup
michaelni
parents: 899
diff changeset
3543 s->picture_in_gop_number=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3544
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3545 s->last_bits= get_bit_count(&s->pb);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3546 switch(s->out_format) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
3547 case FMT_MJPEG:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3548 mjpeg_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
3549 break;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3550 #ifdef CONFIG_RISKY
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3551 case FMT_H263:
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3552 if (s->codec_id == CODEC_ID_WMV2)
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3553 ff_wmv2_encode_picture_header(s, picture_number);
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3554 else if (s->h263_msmpeg4)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3555 msmpeg4_encode_picture_header(s, picture_number);
986e461dc072 Initial revision
glantau
parents:
diff changeset
3556 else if (s->h263_pred)
986e461dc072 Initial revision
glantau
parents:
diff changeset
3557 mpeg4_encode_picture_header(s, picture_number);
986e461dc072 Initial revision
glantau
parents:
diff changeset
3558 else if (s->h263_rv10)
986e461dc072 Initial revision
glantau
parents:
diff changeset
3559 rv10_encode_picture_header(s, picture_number);
1354
1f89adb69349 flv cleanup / simplify
michaelni
parents: 1353
diff changeset
3560 else if (s->codec_id == CODEC_ID_FLV1)
1f89adb69349 flv cleanup / simplify
michaelni
parents: 1353
diff changeset
3561 ff_flv_encode_picture_header(s, picture_number);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3562 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
3563 h263_encode_picture_header(s, picture_number);
986e461dc072 Initial revision
glantau
parents:
diff changeset
3564 break;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3565 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3566 case FMT_MPEG1:
986e461dc072 Initial revision
glantau
parents:
diff changeset
3567 mpeg1_encode_picture_header(s, picture_number);
986e461dc072 Initial revision
glantau
parents:
diff changeset
3568 break;
1444
958d9c0cedba ctype.h is a common header
bellard
parents: 1424
diff changeset
3569 case FMT_H264:
958d9c0cedba ctype.h is a common header
bellard
parents: 1424
diff changeset
3570 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3571 }
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3572 bits= get_bit_count(&s->pb);
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3573 s->header_bits= bits - s->last_bits;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3574 s->last_bits= bits;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3575 s->mv_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3576 s->misc_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3577 s->i_tex_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3578 s->p_tex_bits=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3579 s->i_count=0;
656
e47fa3e3f2d5 statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents: 652
diff changeset
3580 s->f_count=0;
e47fa3e3f2d5 statistics for forw & back p-MBs instead of just one counter for both
michaelni
parents: 652
diff changeset
3581 s->b_count=0;
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3582 s->skip_count=0;
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
3583
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3584 for(i=0; i<3; i++){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3585 /* init last dc values */
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3586 /* note: quant matrix value (8) is implied here */
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3587 s->last_dc[i] = 128;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3588
1148
michaelni
parents: 1141
diff changeset
3589 s->current_picture_ptr->error[i] = 0;
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3590 }
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3591 s->mb_skip_run = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3592 s->last_mv[0][0][0] = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
3593 s->last_mv[0][0][1] = 0;
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3594 s->last_mv[1][0][0] = 0;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3595 s->last_mv[1][0][1] = 0;
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3596
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3597 s->last_mv_dir = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3598
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3599 #ifdef CONFIG_RISKY
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3600 switch(s->codec_id){
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3601 case CODEC_ID_H263:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3602 case CODEC_ID_H263P:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3603 case CODEC_ID_FLV1:
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3604 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
3605 break;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3606 case CODEC_ID_MPEG4:
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3607 if(s->partitioned_frame)
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3608 ff_mpeg4_init_partitions(s);
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3609 break;
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
3610 }
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3611 #endif
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3612
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3613 s->resync_mb_x=0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3614 s->resync_mb_y=0;
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3615 s->first_slice_line = 1;
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3616 s->ptr_lastgob = s->pb.buf;
233
3f5b72726118 - More work on preliminary bit rate control, just to be able to get an
pulento
parents: 232
diff changeset
3617 for(mb_y=0; mb_y < s->mb_height; mb_y++) {
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3618 s->mb_x=0;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3619 s->mb_y= mb_y;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3620
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
3621 s->y_dc_scale= s->y_dc_scale_table[ s->qscale ];
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
3622 s->c_dc_scale= s->c_dc_scale_table[ s->qscale ];
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3623 ff_init_block_index(s);
233
3f5b72726118 - More work on preliminary bit rate control, just to be able to get an
pulento
parents: 232
diff changeset
3624
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
3625 for(mb_x=0; mb_x < s->mb_width; mb_x++) {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3626 const int xy= mb_y*s->mb_stride + mb_x;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3627 int mb_type= s->mb_type[xy];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3628 // int d;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3629 int dmin= INT_MAX;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3630
232
b640ec5948b0 - Now the ME is done for the entire picture when enconding, the
pulento
parents: 231
diff changeset
3631 s->mb_x = mb_x;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3632 ff_update_block_index(s);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3633
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3634 /* write gob / video packet header */
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3635 #ifdef CONFIG_RISKY
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3636 if(s->rtp_mode && mb_y + mb_x>0){
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3637 int current_packet_size, is_gob_start;
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3638
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3639 current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob;
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3640 is_gob_start=0;
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3641
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3642 if(s->codec_id==CODEC_ID_MPEG4){
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3643 if(current_packet_size >= s->rtp_payload_size){
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3644
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3645 if(s->partitioned_frame){
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3646 ff_mpeg4_merge_partitions(s);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3647 ff_mpeg4_init_partitions(s);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3648 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3649 ff_mpeg4_encode_video_packet_header(s);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3650
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3651 if(s->flags&CODEC_FLAG_PASS1){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3652 int bits= get_bit_count(&s->pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3653 s->misc_bits+= bits - s->last_bits;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3654 s->last_bits= bits;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3655 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3656 ff_mpeg4_clean_buffers(s);
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3657 is_gob_start=1;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3658 }
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3659 }else if(s->codec_id==CODEC_ID_MPEG1VIDEO){
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3660 if( current_packet_size >= s->rtp_payload_size
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3661 && s->mb_skip_run==0){
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3662 ff_mpeg1_encode_slice_header(s);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3663 ff_mpeg1_clean_buffers(s);
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3664 is_gob_start=1;
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3665 }
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3666 }else if(s->codec_id==CODEC_ID_MPEG2VIDEO){
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3667 if( ( current_packet_size >= s->rtp_payload_size || mb_x==0)
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3668 && s->mb_skip_run==0){
1160
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3669 ff_mpeg1_encode_slice_header(s);
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3670 ff_mpeg1_clean_buffers(s);
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3671 is_gob_start=1;
9a5c29575902 mpeg1 slice encoding support
michaelni
parents: 1159
diff changeset
3672 }
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3673 }else{
1159
13ea348d4cf2 simplify slice encoding (variance of packet size is practically identical)
michaelni
parents: 1150
diff changeset
3674 if(current_packet_size >= s->rtp_payload_size
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
3675 && s->mb_x==0 && s->mb_y%s->gob_index==0){
766
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3676
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3677 h263_encode_gob_header(s, mb_y);
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3678 is_gob_start=1;
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3679 }
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3680 }
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3681
8d36b35a7e6e slice encoding cleanup
michaelni
parents: 764
diff changeset
3682 if(is_gob_start){
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3683 s->ptr_lastgob = pbBufPtr(&s->pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3684 s->first_slice_line=1;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3685 s->resync_mb_x=mb_x;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3686 s->resync_mb_y=mb_y;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3687 }
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3688 }
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3689 #endif
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3690
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3691 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
3692 && s->resync_mb_y+1 == s->mb_y){
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
3693 s->first_slice_line=0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3694 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3695
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3696 s->mb_skiped=0;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3697
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3698 if(mb_type & (mb_type-1)){ // more than 1 MB type possible
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3699 int next_block=0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3700 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
3701
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3702 copy_context_before_encode(&backup_s, s, -1);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3703 backup_s.pb= s->pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3704 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
3705 best_s.partitioned_frame= s->partitioned_frame;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3706 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3707 backup_s.pb2= s->pb2;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3708 backup_s.tex_pb= s->tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3709 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3710
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3711 if(mb_type&MB_TYPE_INTER){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3712 s->mv_dir = MV_DIR_FORWARD;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3713 s->mv_type = MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3714 s->mb_intra= 0;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3715 s->mv[0][0][0] = s->p_mv_table[xy][0];
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3716 s->mv[0][0][1] = s->p_mv_table[xy][1];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3717 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER, pb, pb2, tex_pb,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3718 &dmin, &next_block, s->mv[0][0][0], s->mv[0][0][1]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
3719 }
1494
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1490
diff changeset
3720 if(mb_type&MB_TYPE_SKIPED){
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1490
diff changeset
3721 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
3722 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
3723 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
3724 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
3725 s->mv[0][0][1] = 0;
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1490
diff changeset
3726 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_SKIPED, pb, pb2, tex_pb,
3ee63c12ea30 optionally try to encode each MB with MV=<0,0> and choose the one with better RD
michaelni
parents: 1490
diff changeset
3727 &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
3728 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3729 if(mb_type&MB_TYPE_INTER4V){
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3730 s->mv_dir = MV_DIR_FORWARD;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3731 s->mv_type = MV_TYPE_8X8;
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3732 s->mb_intra= 0;
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3733 for(i=0; i<4; i++){
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3734 s->mv[0][i][0] = s->motion_val[s->block_index[i]][0];
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3735 s->mv[0][i][1] = s->motion_val[s->block_index[i]][1];
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3736 }
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3737 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTER4V, pb, pb2, tex_pb,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3738 &dmin, &next_block, 0, 0);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3739 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3740 if(mb_type&MB_TYPE_FORWARD){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3741 s->mv_dir = MV_DIR_FORWARD;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3742 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3743 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3744 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
3745 s->mv[0][0][1] = s->b_forw_mv_table[xy][1];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3746 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_FORWARD, pb, pb2, tex_pb,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3747 &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
3748 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3749 if(mb_type&MB_TYPE_BACKWARD){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3750 s->mv_dir = MV_DIR_BACKWARD;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3751 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3752 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3753 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
3754 s->mv[1][0][1] = s->b_back_mv_table[xy][1];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3755 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BACKWARD, pb, pb2, tex_pb,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3756 &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
3757 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3758 if(mb_type&MB_TYPE_BIDIR){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3759 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
3760 s->mv_type = MV_TYPE_16X16;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3761 s->mb_intra= 0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3762 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
3763 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
3764 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
3765 s->mv[1][0][1] = s->b_bidir_back_mv_table[xy][1];
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3766 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_BIDIR, pb, pb2, tex_pb,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3767 &dmin, &next_block, 0, 0);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3768 }
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3769 if(mb_type&MB_TYPE_DIRECT){
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3770 int mx= s->b_direct_mv_table[xy][0];
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3771 int my= s->b_direct_mv_table[xy][1];
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3772
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3773 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
3774 s->mb_intra= 0;
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3775 #ifdef CONFIG_RISKY
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3776 ff_mpeg4_set_direct_mv(s, mx, my);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3777 #endif
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3778 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_DIRECT, pb, pb2, tex_pb,
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3779 &dmin, &next_block, mx, my);
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3780 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3781 if(mb_type&MB_TYPE_INTRA){
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3782 s->mv_dir = 0;
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3783 s->mv_type = MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3784 s->mb_intra= 1;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3785 s->mv[0][0][0] = 0;
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3786 s->mv[0][0][1] = 0;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3787 encode_mb_hq(s, &backup_s, &best_s, MB_TYPE_INTRA, pb, pb2, tex_pb,
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3788 &dmin, &next_block, 0, 0);
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3789 if(s->h263_pred || s->h263_aic){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3790 if(best_s.mb_intra)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3791 s->mbintra_table[mb_x + mb_y*s->mb_stride]=1;
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3792 else
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3793 ff_clean_intra_table_entries(s); //old mode?
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3794 }
295
6622b0fd036c mpeg4 4MV encoding
michaelni
parents: 294
diff changeset
3795 }
326
6ebb8680885d fixing hq mode with mpeg1 and 2-pass
michaelni
parents: 325
diff changeset
3796 copy_context_after_encode(s, &best_s, -1);
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3797
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3798 pb_bits_count= get_bit_count(&s->pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3799 flush_put_bits(&s->pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3800 ff_copy_bits(&backup_s.pb, bit_buf[next_block^1], pb_bits_count);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3801 s->pb= backup_s.pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3802
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3803 if(s->data_partitioning){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3804 pb2_bits_count= get_bit_count(&s->pb2);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3805 flush_put_bits(&s->pb2);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3806 ff_copy_bits(&backup_s.pb2, bit_buf2[next_block^1], pb2_bits_count);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3807 s->pb2= backup_s.pb2;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3808
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3809 tex_pb_bits_count= get_bit_count(&s->tex_pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3810 flush_put_bits(&s->tex_pb);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3811 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
3812 s->tex_pb= backup_s.tex_pb;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3813 }
329
5cc47d0ba53e fixed ratecontrol & b-frames
michaelni
parents: 327
diff changeset
3814 s->last_bits= get_bit_count(&s->pb);
1451
62c16edd18c6 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents: 1444
diff changeset
3815
62c16edd18c6 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents: 1444
diff changeset
3816 #ifdef CONFIG_RISKY
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3817 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3818 ff_h263_update_motion_val(s);
1451
62c16edd18c6 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents: 1444
diff changeset
3819 #endif
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3820
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3821 if(next_block==0){
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3822 s->dsp.put_pixels_tab[0][0](s->dest[0], s->me.scratchpad , s->linesize ,16);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3823 s->dsp.put_pixels_tab[1][0](s->dest[1], s->me.scratchpad + 16, s->uvlinesize, 8);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3824 s->dsp.put_pixels_tab[1][0](s->dest[2], s->me.scratchpad + 24, s->uvlinesize, 8);
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3825 }
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3826
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3827 if(s->avctx->mb_decision == FF_MB_DECISION_BITS)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3828 MPV_decode_mb(s, s->block);
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3829 } else {
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3830 int motion_x, motion_y;
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3831 int intra_score;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3832 int inter_score= s->current_picture.mb_cmp_score[mb_x + mb_y*s->mb_stride];
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3833
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3834 if(s->avctx->mb_decision==FF_MB_DECISION_SIMPLE && s->pict_type==P_TYPE){ //FIXME check if the mess is usefull at all
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3835 /* get luma score */
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3836 if((s->avctx->mb_cmp&0xFF)==FF_CMP_SSE){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3837 intra_score= (s->current_picture.mb_var[mb_x + mb_y*s->mb_stride]<<8) - 500; //FIXME dont scale it down so we dont have to fix it
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3838 }else{
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3839 uint8_t *dest_y;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3840
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3841 int mean= s->current_picture.mb_mean[mb_x + mb_y*s->mb_stride]; //FIXME
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3842 mean*= 0x01010101;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3843
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3844 dest_y = s->new_picture.data[0] + (mb_y * 16 * s->linesize ) + mb_x * 16;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3845
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3846 for(i=0; i<16; i++){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3847 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 0]) = mean;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3848 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 4]) = mean;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3849 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+ 8]) = mean;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3850 *(uint32_t*)(&s->me.scratchpad[i*s->linesize+12]) = mean;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3851 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3852
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3853 s->mb_intra=1;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3854 intra_score= s->dsp.mb_cmp[0](s, s->me.scratchpad, dest_y, s->linesize);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3855
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3856 /* printf("intra:%7d inter:%7d var:%7d mc_var.%7d\n", intra_score>>8, inter_score>>8,
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
3857 s->current_picture.mb_var[mb_x + mb_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
3858 s->current_picture.mc_mb_var[mb_x + mb_y*s->mb_stride]);*/
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3859 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3860
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3861 /* get chroma score */
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3862 if(s->avctx->mb_cmp&FF_CMP_CHROMA){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3863 int i;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3864
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3865 s->mb_intra=1;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3866 for(i=1; i<3; i++){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3867 uint8_t *dest_c;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3868 int mean;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3869
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3870 if(s->out_format == FMT_H263){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3871 mean= (s->dc_val[i][mb_x + (mb_y+1)*(s->mb_width+2)] + 4)>>3; //FIXME not exact but simple ;)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3872 }else{
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3873 mean= (s->last_dc[i] + 4)>>3;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3874 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3875 dest_c = s->new_picture.data[i] + (mb_y * 8 * (s->uvlinesize)) + mb_x * 8;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3876
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3877 mean*= 0x01010101;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3878 for(i=0; i<8; i++){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3879 *(uint32_t*)(&s->me.scratchpad[i*s->uvlinesize+ 0]) = mean;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3880 *(uint32_t*)(&s->me.scratchpad[i*s->uvlinesize+ 4]) = mean;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3881 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3882
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3883 intra_score+= s->dsp.mb_cmp[1](s, s->me.scratchpad, dest_c, s->uvlinesize);
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3884 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3885 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3886
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3887 /* bias */
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3888 switch(s->avctx->mb_cmp&0xFF){
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3889 default:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3890 case FF_CMP_SAD:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3891 intra_score+= 32*s->qscale;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3892 break;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3893 case FF_CMP_SSE:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3894 intra_score+= 24*s->qscale*s->qscale;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3895 break;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3896 case FF_CMP_SATD:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3897 intra_score+= 96*s->qscale;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3898 break;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3899 case FF_CMP_DCT:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3900 intra_score+= 48*s->qscale;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3901 break;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3902 case FF_CMP_BIT:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3903 intra_score+= 16;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3904 break;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3905 case FF_CMP_PSNR:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3906 case FF_CMP_RD:
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3907 intra_score+= (s->qscale*s->qscale*109*8 + 64)>>7;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3908 break;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3909 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3910
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3911 if(intra_score < inter_score)
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3912 mb_type= MB_TYPE_INTRA;
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3913 }
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3914
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3915 s->mv_type=MV_TYPE_16X16;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3916 // only one MB-Type possible
1013
5d4c95f323d0 finetuneing thresholds/factors
michaelni
parents: 1011
diff changeset
3917
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3918 switch(mb_type){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3919 case MB_TYPE_INTRA:
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3920 s->mv_dir = 0;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3921 s->mb_intra= 1;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3922 motion_x= s->mv[0][0][0] = 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3923 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
3924 break;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3925 case MB_TYPE_INTER:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3926 s->mv_dir = MV_DIR_FORWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3927 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3928 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
3929 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
3930 break;
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3931 case MB_TYPE_INTER4V:
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3932 s->mv_dir = MV_DIR_FORWARD;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3933 s->mv_type = MV_TYPE_8X8;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3934 s->mb_intra= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3935 for(i=0; i<4; i++){
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3936 s->mv[0][i][0] = s->motion_val[s->block_index[i]][0];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3937 s->mv[0][i][1] = s->motion_val[s->block_index[i]][1];
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3938 }
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3939 motion_x= motion_y= 0;
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
3940 break;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3941 case MB_TYPE_DIRECT:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3942 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3943 s->mb_intra= 0;
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3944 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
3945 motion_y=s->b_direct_mv_table[xy][1];
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3946 #ifdef CONFIG_RISKY
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
3947 ff_mpeg4_set_direct_mv(s, motion_x, motion_y);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
3948 #endif
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3949 break;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3950 case MB_TYPE_BIDIR:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3951 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3952 s->mb_intra= 0;
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3953 motion_x=0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3954 motion_y=0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3955 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
3956 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
3957 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
3958 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
3959 break;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3960 case MB_TYPE_BACKWARD:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3961 s->mv_dir = MV_DIR_BACKWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3962 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3963 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
3964 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
3965 break;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3966 case MB_TYPE_FORWARD:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3967 s->mv_dir = MV_DIR_FORWARD;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3968 s->mb_intra= 0;
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3969 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
3970 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
3971 // printf(" %d %d ", motion_x, motion_y);
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3972 break;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3973 default:
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3974 motion_x=motion_y=0; //gcc warning fix
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3975 printf("illegal MB type\n");
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
3976 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3977
324
9c6f056f0e41 fixed mpeg4 time stuff on encoding
michaelni
parents: 321
diff changeset
3978 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
3979
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3980 // RAL: Update last macrobloc type
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3981 s->last_mv_dir = s->mv_dir;
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3982
1451
62c16edd18c6 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents: 1444
diff changeset
3983 #ifdef CONFIG_RISKY
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3984 if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE)
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3985 ff_h263_update_motion_val(s);
1451
62c16edd18c6 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents: 1444
diff changeset
3986 #endif
62c16edd18c6 --disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
michaelni
parents: 1444
diff changeset
3987
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
3988 MPV_decode_mb(s, s->block);
248
56ee684c48bb - H.263+ decoder support for Advanded INTRA Coding (buggy)
pulento
parents: 244
diff changeset
3989 }
1051
e5a9dbf597d4 mpeg1 bframe encoding patch by (Rapha«³l LEGRAND) with some modifications by me
michaelni
parents: 1048
diff changeset
3990
327
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3991 /* 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
3992 if(s->mb_intra /* && I,P,S_TYPE */){
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3993 s->p_mv_table[xy][0]=0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3994 s->p_mv_table[xy][1]=0;
d359db02fc90 much better ME for b frames (a bit slow though)
michaelni
parents: 326
diff changeset
3995 }
909
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3996
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3997 if(s->flags&CODEC_FLAG_PSNR){
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3998 int w= 16;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
3999 int h= 16;
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4000
8ae1e4c24e91 new PSNR code (now works with chroma, b frames, ...)
michaelni
parents: 903
diff changeset
4001 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
4002 if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16;
936
caa77cd960c0 qpel encoding
michaelni
parents: 930
diff changeset
4003
1148
michaelni
parents: 1141
diff changeset
4004 s->current_picture_ptr->error[0] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4005 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
4006 s->dest[0], w, h, s->linesize);
1148
michaelni
parents: 1141
diff changeset
4007 s->current_picture_ptr->error[1] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4008 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
4009 s->dest[1], w>>1, h>>1, s->uvlinesize);
1148
michaelni
parents: 1141
diff changeset
4010 s->current_picture_ptr->error[2] += sse(
1389
da0b3a50d209 rate distortion mb decision support
michaelni
parents: 1384
diff changeset
4011 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
4012 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
4013 }
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1173
diff changeset
4014 //printf("MB %d %d bits\n", s->mb_x+s->mb_y*s->mb_stride, get_bit_count(&s->pb));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4015 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4016 }
294
944632089814 4MV motion estimation (not finished yet)
michaelni
parents: 292
diff changeset
4017 emms_c();
286
91f7c38f5f37 statistics for 2-pass encoding
michaelni
parents: 281
diff changeset
4018
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4019 #ifdef CONFIG_RISKY
745
25d7fb7c89be better/cleaner error resilience (done in a 2nd pass after decoding)
michaelni
parents: 731
diff changeset
4020 if(s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame)
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4021 ff_mpeg4_merge_partitions(s);
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4022
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4023 if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == I_TYPE)
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 207
diff changeset
4024 msmpeg4_encode_ext_header(s);
2eb04d6be309 (commit by michael)
arpi_esp
parents: 207
diff changeset
4025
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4026 if(s->codec_id==CODEC_ID_MPEG4)
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4027 ff_mpeg4_stuffing(&s->pb);
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4028 #endif
456
c006ee838856 single coefficient elimination
michaelni
parents: 429
diff changeset
4029
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 108
diff changeset
4030 //if (s->gob_number)
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 108
diff changeset
4031 // fprintf(stderr,"\nNumber of GOB: %d", s->gob_number);
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4032
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4033 /* Send the last GOB if RTP */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4034 if (s->rtp_mode) {
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4035 flush_put_bits(&s->pb);
234
5fc0c3af3fe4 alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents: 233
diff changeset
4036 pdif = pbBufPtr(&s->pb) - s->ptr_lastgob;
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4037 /* Call the RTP callback to send the last GOB */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4038 if (s->rtp_callback)
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4039 s->rtp_callback(s->ptr_lastgob, pdif, s->gob_number);
234
5fc0c3af3fe4 alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents: 233
diff changeset
4040 s->ptr_lastgob = pbBufPtr(&s->pb);
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4041 //fprintf(stderr,"\nGOB: %2d size: %d (last)", s->gob_number, pdif);
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 230
diff changeset
4042 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4043 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4044
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4045 static int dct_quantize_trellis_c(MpegEncContext *s,
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4046 DCTELEM *block, int n,
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4047 int qscale, int *overflow){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4048 const int *qmat;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
4049 const uint8_t *scantable= s->intra_scantable.scantable;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4050 int max=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4051 unsigned int threshold1, threshold2;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4052 int bias=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4053 int run_tab[65];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4054 int level_tab[65];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4055 int score_tab[65];
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4056 int last_run=0;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4057 int last_level=0;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4058 int last_score= 0;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4059 int last_i= 0;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4060 int not_coded_score= 0;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4061 int coeff[3][64];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4062 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
4063 int qmul, qadd, start_i, last_non_zero, i, dc;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4064 const int esc_length= s->ac_esc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4065 uint8_t * length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4066 uint8_t * last_length;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4067 int score_limit=0;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4068 int left_limit= 0;
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4069 const int lambda= s->lambda2 >> (FF_LAMBDA_SHIFT - 6);
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4070 const int patch_table= s->out_format == FMT_MPEG1 && !s->mb_intra;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4071
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
4072 s->dsp.fdct (block);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4073
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4074 qmul= qscale*16;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4075 qadd= ((qscale-1)|1)*8;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4076
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4077 if (s->mb_intra) {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4078 int q;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4079 if (!s->h263_aic) {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4080 if (n < 4)
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4081 q = s->y_dc_scale;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4082 else
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4083 q = s->c_dc_scale;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4084 q = q << 3;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4085 } else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4086 /* For AIC we skip quant/dequant of INTRADC */
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4087 q = 1 << 3;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4088 qadd=0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4089 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4090
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4091 /* note: block[0] is assumed to be positive */
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4092 block[0] = (block[0] + (q >> 1)) / q;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4093 start_i = 1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4094 last_non_zero = 0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4095 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
4096 if(s->mpeg_quant || s->out_format == FMT_MPEG1)
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4097 bias= 1<<(QMAT_SHIFT-1);
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4098 length = s->intra_ac_vlc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4099 last_length= s->intra_ac_vlc_last_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4100 } else {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4101 start_i = 0;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4102 last_non_zero = -1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4103 qmat = s->q_inter_matrix[qscale];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4104 length = s->inter_ac_vlc_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4105 last_length= s->inter_ac_vlc_last_length;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4106 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4107
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4108 threshold1= (1<<QMAT_SHIFT) - bias - 1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4109 threshold2= (threshold1<<1);
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4110
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4111 for(i=start_i; i<64; i++) {
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4112 const int j = scantable[i];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4113 const int k= i-start_i;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4114 int level = block[j];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4115 level = level * qmat[j];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4116
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4117 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4118 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4119 if(((unsigned)(level+threshold1))>threshold2){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4120 if(level>0){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4121 level= (bias + level)>>QMAT_SHIFT;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4122 coeff[0][k]= level;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4123 coeff[1][k]= level-1;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4124 // coeff[2][k]= level-2;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4125 }else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4126 level= (bias - level)>>QMAT_SHIFT;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4127 coeff[0][k]= -level;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4128 coeff[1][k]= -level+1;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4129 // coeff[2][k]= -level+2;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4130 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4131 coeff_count[k]= FFMIN(level, 2);
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4132 assert(coeff_count[k]);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4133 max |=level;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4134 last_non_zero = i;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4135 }else{
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4136 coeff[0][k]= (level>>31)|1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4137 coeff_count[k]= 1;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4138 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4139 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4140
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4141 *overflow= s->max_qcoeff < max; //overflow might have happend
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4142
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4143 if(last_non_zero < start_i){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4144 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM));
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4145 return last_non_zero;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4146 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4147
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4148 score_tab[0]= 0;
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4149
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
4150 if(patch_table){
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4151 // length[UNI_AC_ENC_INDEX(0, 63)]=
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4152 // length[UNI_AC_ENC_INDEX(0, 65)]= 2;
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4153 }
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
4154
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4155 for(i=0; i<=last_non_zero - start_i; i++){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4156 int level_index, run, j;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4157 const int dct_coeff= block[ scantable[i + start_i] ];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4158 const int zero_distoration= dct_coeff*dct_coeff;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4159 int best_score=256*256*256*120;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4160
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4161 last_score += zero_distoration;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4162 not_coded_score += zero_distoration;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4163 for(level_index=0; level_index < coeff_count[i]; level_index++){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4164 int distoration;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4165 int level= coeff[level_index][i];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4166 int unquant_coeff;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4167
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4168 assert(level);
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4169
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4170 if(s->out_format == FMT_H263){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4171 if(level>0){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4172 unquant_coeff= level*qmul + qadd;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4173 }else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4174 unquant_coeff= level*qmul - qadd;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4175 }
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4176 }else{ //MPEG1
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
4177 j= s->dsp.idct_permutation[ scantable[i + start_i] ]; //FIXME optimize
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4178 if(s->mb_intra){
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4179 if (level < 0) {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4180 unquant_coeff = (int)((-level) * qscale * s->intra_matrix[j]) >> 3;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4181 unquant_coeff = -((unquant_coeff - 1) | 1);
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4182 } else {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4183 unquant_coeff = (int)( level * qscale * s->intra_matrix[j]) >> 3;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4184 unquant_coeff = (unquant_coeff - 1) | 1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4185 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4186 }else{
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4187 if (level < 0) {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4188 unquant_coeff = ((((-level) << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4189 unquant_coeff = -((unquant_coeff - 1) | 1);
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4190 } else {
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4191 unquant_coeff = ((( level << 1) + 1) * qscale * ((int) s->inter_matrix[j])) >> 4;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4192 unquant_coeff = (unquant_coeff - 1) | 1;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4193 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4194 }
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4195 unquant_coeff<<= 3;
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4196 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4197
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4198 distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff);
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4199 level+=64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4200 if((level&(~127)) == 0){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4201 for(run=0; run<=i - left_limit; run++){
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4202 int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4203 score += score_tab[i-run];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4204
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4205 if(score < best_score){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4206 best_score=
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4207 score_tab[i+1]= score;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4208 run_tab[i+1]= run;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4209 level_tab[i+1]= level-64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4210 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4211 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4212
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4213 if(s->out_format == FMT_H263){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4214 for(run=0; run<=i - left_limit; run++){
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4215 int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4216 score += score_tab[i-run];
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4217 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4218 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4219 last_run= run;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4220 last_level= level-64;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4221 last_i= i+1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4222 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4223 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4224 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4225 }else{
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4226 distoration += esc_length*lambda;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4227 for(run=0; run<=i - left_limit; run++){
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4228 int score= distoration + score_tab[i-run];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4229
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4230 if(score < best_score){
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4231 best_score=
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4232 score_tab[i+1]= score;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4233 run_tab[i+1]= run;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4234 level_tab[i+1]= level-64;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4235 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4236 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4237
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4238 if(s->out_format == FMT_H263){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4239 for(run=0; run<=i - left_limit; run++){
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4240 int score= distoration + score_tab[i-run];
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4241 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4242 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4243 last_run= run;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4244 last_level= level-64;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4245 last_i= i+1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4246 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4247 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4248 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4249 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4250 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4251
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4252 for(j=left_limit; j<=i; j++){
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4253 score_tab[j] += zero_distoration;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4254 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4255 score_limit+= zero_distoration;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4256 if(score_tab[i+1] < score_limit)
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4257 score_limit= score_tab[i+1];
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4258
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4259 //Note: there is a vlc code in mpeg4 which is 1 bit shorter then another one with a shorter run and the same level
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4260 while(score_tab[ left_limit ] > score_limit + lambda) left_limit++;
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4261
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
4262 if(patch_table){
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4263 // length[UNI_AC_ENC_INDEX(0, 63)]=
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4264 // length[UNI_AC_ENC_INDEX(0, 65)]= 3;
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1497
diff changeset
4265 }
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4266 }
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4267
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4268 if(s->out_format != FMT_H263){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4269 last_score= 256*256*256*120;
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4270 for(i= left_limit; i<=last_non_zero - start_i + 1; i++){
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4271 int score= score_tab[i];
947
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4272 if(i) score += lambda*2; //FIXME exacter?
9be53be2d1a9 trellis quantization for mpeg1
michaelni
parents: 946
diff changeset
4273
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4274 if(score < last_score){
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4275 last_score= score;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4276 last_i= i;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4277 last_level= level_tab[i];
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4278 last_run= run_tab[i];
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4279 }
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4280 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4281 }
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4282
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4283 s->coded_score[n] = last_score - not_coded_score;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4284
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4285 dc= block[0];
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4286 last_non_zero= last_i - 1 + start_i;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4287 memset(block + start_i, 0, (64-start_i)*sizeof(DCTELEM));
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4288
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4289 if(last_non_zero < start_i)
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4290 return last_non_zero;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4291
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4292 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
4293 int best_level= 0;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4294 int best_score= dc * dc;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4295
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4296 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
4297 int level= coeff[i][0];
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4298 int unquant_coeff, score, distoration;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4299
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4300 if(s->out_format == FMT_H263){
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4301 if(level>0){
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4302 unquant_coeff= (level*qmul + qadd)>>3;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4303 }else{
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4304 unquant_coeff= (level*qmul - qadd)>>3;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4305 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4306 }else{ //MPEG1
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4307 if (level < 0) {
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4308 unquant_coeff = ((((-level) << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4309 unquant_coeff = -((unquant_coeff - 1) | 1);
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4310 } else {
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4311 unquant_coeff = ((( level << 1) + 1) * qscale * ((int) s->inter_matrix[0])) >> 4;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4312 unquant_coeff = (unquant_coeff - 1) | 1;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4313 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4314 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4315 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
4316 unquant_coeff<<= 3 + 3;
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4317
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4318 distoration= (unquant_coeff - dc) * (unquant_coeff - dc);
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4319 level+=64;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4320 if((level&(~127)) == 0)
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4321 score= distoration + last_length[UNI_AC_ENC_INDEX(0, level)]*lambda;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4322 else
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4323 score= distoration + esc_length*lambda;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4324
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4325 if(score < best_score){
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4326 best_score= score;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4327 best_level= level - 64;
1480
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4328 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4329 }
8657d6800d15 slight quality improvement ( < +0.04 PSNR) for high bitrate videos with trellis quantization
michaelni
parents: 1471
diff changeset
4330 block[0]= best_level;
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4331 s->coded_score[n] = best_score - dc*dc;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4332 if(best_level == 0) return -1;
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4333 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
4334 }
1490
0355f2b3519a rate distortion optimal cbp support (h263/mpeg4 non intra only)
michaelni
parents: 1480
diff changeset
4335
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4336 i= last_i;
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4337 assert(last_level);
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4338 //FIXME use permutated scantable
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
4339 block[ s->dsp.idct_permutation[ scantable[last_non_zero] ] ]= last_level;
946
4f522c9e6099 more optimized trellis quantizer
michaelni
parents: 945
diff changeset
4340 i -= last_run + 1;
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4341
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4342 for(;i>0 ; i -= run_tab[i] + 1){
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
4343 const int j= s->dsp.idct_permutation[ scantable[i - 1 + start_i] ];
945
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4344
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4345 block[j]= level_tab[i];
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4346 assert(block[j]);
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4347 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4348
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4349 return last_non_zero;
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4350 }
463f7260b155 trellis quantization
michaelni
parents: 936
diff changeset
4351
220
0b234715e205 (commit by michael)
arpi_esp
parents: 217
diff changeset
4352 static int dct_quantize_c(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4353 DCTELEM *block, int n,
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4354 int qscale, int *overflow)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4355 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4356 int i, j, level, last_non_zero, q;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4357 const int *qmat;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
4358 const uint8_t *scantable= s->intra_scantable.scantable;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4359 int bias;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4360 int max=0;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4361 unsigned int threshold1, threshold2;
828
ace3ccd18dd2 Altivec Patch (Mark III) by (Dieter Shirley <dieters at schemasoft dot com>)
michaelni
parents: 815
diff changeset
4362
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
4363 s->dsp.fdct (block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4364
986e461dc072 Initial revision
glantau
parents:
diff changeset
4365 if (s->mb_intra) {
350
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4366 if (!s->h263_aic) {
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4367 if (n < 4)
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4368 q = s->y_dc_scale;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4369 else
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4370 q = s->c_dc_scale;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4371 q = q << 3;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4372 } else
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4373 /* 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
4374 q = 1 << 3;
6ebbecc10063 - Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.
pulento
parents: 347
diff changeset
4375
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4376 /* note: block[0] is assumed to be positive */
986e461dc072 Initial revision
glantau
parents:
diff changeset
4377 block[0] = (block[0] + (q >> 1)) / q;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4378 i = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4379 last_non_zero = 0;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4380 qmat = s->q_intra_matrix[qscale];
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
4381 bias= s->intra_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4382 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4383 i = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4384 last_non_zero = -1;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4385 qmat = s->q_inter_matrix[qscale];
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
4386 bias= s->inter_quant_bias<<(QMAT_SHIFT - QUANT_BIAS_SHIFT);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4387 }
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
4388 threshold1= (1<<QMAT_SHIFT) - bias - 1;
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
4389 threshold2= (threshold1<<1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4390
986e461dc072 Initial revision
glantau
parents:
diff changeset
4391 for(;i<64;i++) {
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
4392 j = scantable[i];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4393 level = block[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
4394 level = level * qmat[j];
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4395
1215
9182f5e70e9b typo in a comment ...
michaelni
parents: 1214
diff changeset
4396 // if( bias+level >= (1<<QMAT_SHIFT)
9182f5e70e9b typo in a comment ...
michaelni
parents: 1214
diff changeset
4397 // || bias-level >= (1<<QMAT_SHIFT)){
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4398 if(((unsigned)(level+threshold1))>threshold2){
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4399 if(level>0){
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
4400 level= (bias + level)>>QMAT_SHIFT;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4401 block[j]= level;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4402 }else{
635
3e0f62e5eed6 dct cleanup
michaelni
parents: 628
diff changeset
4403 level= (bias - level)>>QMAT_SHIFT;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4404 block[j]= -level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4405 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4406 max |=level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4407 last_non_zero = i;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4408 }else{
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4409 block[j]=0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4410 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4411 }
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4412 *overflow= s->max_qcoeff < max; //overflow might have happend
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4413
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
4414 /* 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
4415 if (s->dsp.idct_permutation_type != FF_NO_IDCT_PERM)
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1089
diff changeset
4416 ff_block_permute(block, s->dsp.idct_permutation, scantable, last_non_zero);
764
d4726182dfd2 optimize block_permute()
michaelni
parents: 763
diff changeset
4417
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4418 return last_non_zero;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4419 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4420
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
4421 #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
4422
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
4423 static void dct_unquantize_mpeg1_c(MpegEncContext *s,
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4424 DCTELEM *block, int n, int qscale)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4425 {
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4426 int i, level, nCoeffs;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
4427 const uint16_t *quant_matrix;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4428
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4429 nCoeffs= s->block_last_index[n];
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4430
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4431 if (s->mb_intra) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4432 if (n < 4)
986e461dc072 Initial revision
glantau
parents:
diff changeset
4433 block[0] = block[0] * s->y_dc_scale;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4434 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
4435 block[0] = block[0] * s->c_dc_scale;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4436 /* XXX: only mpeg1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
4437 quant_matrix = s->intra_matrix;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4438 for(i=1;i<=nCoeffs;i++) {
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4439 int j= s->intra_scantable.permutated[i];
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4440 level = block[j];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4441 if (level) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4442 if (level < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4443 level = -level;
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4444 level = (int)(level * qscale * quant_matrix[j]) >> 3;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4445 level = (level - 1) | 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4446 level = -level;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4447 } else {
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4448 level = (int)(level * qscale * quant_matrix[j]) >> 3;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4449 level = (level - 1) | 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4450 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4451 #ifdef PARANOID
986e461dc072 Initial revision
glantau
parents:
diff changeset
4452 if (level < -2048 || level > 2047)
986e461dc072 Initial revision
glantau
parents:
diff changeset
4453 fprintf(stderr, "unquant error %d %d\n", i, level);
986e461dc072 Initial revision
glantau
parents:
diff changeset
4454 #endif
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4455 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4456 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4457 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4458 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4459 i = 0;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4460 quant_matrix = s->inter_matrix;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4461 for(;i<=nCoeffs;i++) {
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4462 int j= s->intra_scantable.permutated[i];
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4463 level = block[j];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4464 if (level) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4465 if (level < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4466 level = -level;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4467 level = (((level << 1) + 1) * qscale *
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4468 ((int) (quant_matrix[j]))) >> 4;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4469 level = (level - 1) | 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4470 level = -level;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4471 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4472 level = (((level << 1) + 1) * qscale *
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4473 ((int) (quant_matrix[j]))) >> 4;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4474 level = (level - 1) | 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
4475 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4476 #ifdef PARANOID
986e461dc072 Initial revision
glantau
parents:
diff changeset
4477 if (level < -2048 || level > 2047)
986e461dc072 Initial revision
glantau
parents:
diff changeset
4478 fprintf(stderr, "unquant error %d %d\n", i, level);
986e461dc072 Initial revision
glantau
parents:
diff changeset
4479 #endif
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4480 block[j] = level;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4481 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4482 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4483 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
4484 }
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
4485
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4486 static void dct_unquantize_mpeg2_c(MpegEncContext *s,
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4487 DCTELEM *block, int n, int qscale)
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4488 {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4489 int i, level, nCoeffs;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1059
diff changeset
4490 const uint16_t *quant_matrix;
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4491
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4492 if(s->alternate_scan) nCoeffs= 63;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4493 else nCoeffs= s->block_last_index[n];
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4494
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4495 if (s->mb_intra) {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4496 if (n < 4)
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4497 block[0] = block[0] * s->y_dc_scale;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4498 else
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4499 block[0] = block[0] * s->c_dc_scale;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4500 quant_matrix = s->intra_matrix;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4501 for(i=1;i<=nCoeffs;i++) {
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4502 int j= s->intra_scantable.permutated[i];
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4503 level = block[j];
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4504 if (level) {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4505 if (level < 0) {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4506 level = -level;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4507 level = (int)(level * qscale * quant_matrix[j]) >> 3;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4508 level = -level;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4509 } else {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4510 level = (int)(level * qscale * quant_matrix[j]) >> 3;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4511 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4512 #ifdef PARANOID
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4513 if (level < -2048 || level > 2047)
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4514 fprintf(stderr, "unquant error %d %d\n", i, level);
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4515 #endif
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4516 block[j] = level;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4517 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4518 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4519 } else {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4520 int sum=-1;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4521 i = 0;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 341
diff changeset
4522 quant_matrix = s->inter_matrix;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4523 for(;i<=nCoeffs;i++) {
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4524 int j= s->intra_scantable.permutated[i];
325
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4525 level = block[j];
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4526 if (level) {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4527 if (level < 0) {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4528 level = -level;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4529 level = (((level << 1) + 1) * qscale *
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4530 ((int) (quant_matrix[j]))) >> 4;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4531 level = -level;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4532 } else {
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4533 level = (((level << 1) + 1) * qscale *
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4534 ((int) (quant_matrix[j]))) >> 4;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4535 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4536 #ifdef PARANOID
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4537 if (level < -2048 || level > 2047)
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4538 fprintf(stderr, "unquant error %d %d\n", i, level);
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4539 #endif
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4540 block[j] = level;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4541 sum+=level;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4542 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4543 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4544 block[63]^=sum&1;
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4545 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4546 }
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4547
15efd80cf51e mpeg2/mpeg4 dequantizer support (c & mmx)
michaelni
parents: 324
diff changeset
4548
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
4549 static void dct_unquantize_h263_c(MpegEncContext *s,
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4550 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
4551 {
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
4552 int i, level, qmul, qadd;
200
6ab301aaa652 (commit by michael)
arpi_esp
parents: 198
diff changeset
4553 int nCoeffs;
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
4554
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4555 assert(s->block_last_index[n]>=0);
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4556
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4557 qadd = (qscale - 1) | 1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4558 qmul = qscale << 1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4559
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
4560 if (s->mb_intra) {
249
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
4561 if (!s->h263_aic) {
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
4562 if (n < 4)
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
4563 block[0] = block[0] * s->y_dc_scale;
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
4564 else
42a0b7b16738 - Bug fixes in H.263+ Advanced INTRA Coding decoder.
pulento
parents: 248
diff changeset
4565 block[0] = block[0] * s->c_dc_scale;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4566 }else
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4567 qadd = 0;
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4568 i = 1;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4569 nCoeffs= 63; //does not allways use zigzag table
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4570 } 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
4571 i = 0;
1094
0ed00edd4d74 typo (fixes wmv1 regression test in c)
michaelni
parents: 1092
diff changeset
4572 nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4573 }
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
4574
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 704
diff changeset
4575 for(;i<=nCoeffs;i++) {
13
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4576 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
4577 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
4578 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
4579 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
4580 } 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
4581 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
4582 }
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
4583 #ifdef PARANOID
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4584 if (level < -2048 || level > 2047)
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4585 fprintf(stderr, "unquant error %d %d\n", i, level);
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4586 #endif
174ef88f619a use block[] in structure to have it aligned on 8 bytes for mmx optimizations - dct_unquantize is always a function pointer - added specialized dct_unquantize_h263
glantau
parents: 8
diff changeset
4587 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
4588 }
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
4589 }
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
4590 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4591
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
4592
1059
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4593 static const AVOption mpeg4_options[] =
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4594 {
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4595 AVOPTION_CODEC_INT("bitrate", "desired video bitrate", bit_rate, 4, 240000000, 800000),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4596 AVOPTION_CODEC_INT("ratetol", "number of bits the bitstream is allowed to diverge from the reference"
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4597 "the reference can be CBR (for CBR pass1) or VBR (for pass2)",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4598 bit_rate_tolerance, 4, 240000000, 8000),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4599 AVOPTION_CODEC_INT("qmin", "minimum quantizer", qmin, 1, 31, 2),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4600 AVOPTION_CODEC_INT("qmax", "maximum quantizer", qmax, 1, 31, 31),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4601 AVOPTION_CODEC_STRING("rc_eq", "rate control equation",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4602 rc_eq, "tex^qComp,option1,options2", 0),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4603 AVOPTION_CODEC_INT("rc_minrate", "rate control minimum bitrate",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4604 rc_min_rate, 4, 24000000, 0),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4605 AVOPTION_CODEC_INT("rc_maxrate", "rate control maximum bitrate",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4606 rc_max_rate, 4, 24000000, 0),
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4607 AVOPTION_CODEC_DOUBLE("rc_buf_aggresivity", "rate control buffer aggresivity",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4608 rc_buffer_aggressivity, 4, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4609 AVOPTION_CODEC_DOUBLE("rc_initial_cplx", "initial complexity for pass1 ratecontrol",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4610 rc_initial_cplx, 0., 9999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4611 AVOPTION_CODEC_DOUBLE("i_quant_factor", "qscale factor between p and i frames",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4612 i_quant_factor, 0., 0., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4613 AVOPTION_CODEC_DOUBLE("i_quant_offset", "qscale offset between p and i frames",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4614 i_quant_factor, -999999., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4615 AVOPTION_CODEC_INT("dct_algo", "dct alghorithm",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4616 dct_algo, 0, 5, 0), // fixme - "Auto,FastInt,Int,MMX,MLib,Altivec"
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4617 AVOPTION_CODEC_DOUBLE("lumi_masking", "luminance masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4618 lumi_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4619 AVOPTION_CODEC_DOUBLE("temporal_cplx_masking", "temporary complexity masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4620 temporal_cplx_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4621 AVOPTION_CODEC_DOUBLE("spatial_cplx_masking", "spatial complexity masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4622 spatial_cplx_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4623 AVOPTION_CODEC_DOUBLE("p_masking", "p block masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4624 p_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4625 AVOPTION_CODEC_DOUBLE("dark_masking", "darkness masking",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4626 dark_masking, 0., 999999., 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4627 AVOPTION_CODEC_INT("idct_algo", "idct alghorithm",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4628 idct_algo, 0, 8, 0), // fixme - "Auto,Int,Simple,SimpleMMX,LibMPEG2MMX,PS2,MLib,ARM,Altivec"
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4629
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4630 AVOPTION_CODEC_INT("mb_qmin", "minimum MB quantizer",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4631 mb_qmin, 0, 8, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4632 AVOPTION_CODEC_INT("mb_qmax", "maximum MB quantizer",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4633 mb_qmin, 0, 8, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4634
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4635 AVOPTION_CODEC_INT("me_cmp", "ME compare function",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4636 me_cmp, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4637 AVOPTION_CODEC_INT("me_sub_cmp", "subpixel ME compare function",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4638 me_sub_cmp, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4639
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4640
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4641 AVOPTION_CODEC_INT("dia_size", "ME diamond size & shape",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4642 dia_size, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4643 AVOPTION_CODEC_INT("last_predictor_count", "amount of previous MV predictors",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4644 last_predictor_count, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4645
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4646 AVOPTION_CODEC_INT("pre_me", "pre pass for ME",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4647 pre_me, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4648 AVOPTION_CODEC_INT("me_pre_cmp", "ME pre pass compare function",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4649 me_pre_cmp, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4650
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4651 AVOPTION_CODEC_INT("me_range", "maximum ME search range",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4652 me_range, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4653 AVOPTION_CODEC_INT("pre_dia_size", "ME pre pass diamod size & shape",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4654 pre_dia_size, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4655 AVOPTION_CODEC_INT("me_subpel_quality", "subpel ME quality",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4656 me_subpel_quality, 0, 24000000, 0),
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4657 AVOPTION_CODEC_INT("me_range", "maximum ME search range",
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4658 me_range, 0, 24000000, 0),
1059
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4659 AVOPTION_CODEC_FLAG("psnr", "calculate PSNR of compressed frames",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4660 flags, CODEC_FLAG_PSNR, 0),
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4661 AVOPTION_CODEC_RCOVERRIDE("rc_override", "ratecontrol override (=startframe,endframe,qscale,quality_factor)",
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4662 rc_override),
1124
64c7c76ed17c * 'externaly' visible option list begins avoptions_ prefix
kabi
parents: 1116
diff changeset
4663 AVOPTION_SUB(avoptions_common),
1059
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4664 AVOPTION_END()
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4665 };
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4666
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
4667 #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
4668
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4669 AVCodec mpeg1video_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4670 "mpeg1video",
986e461dc072 Initial revision
glantau
parents:
diff changeset
4671 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4672 CODEC_ID_MPEG1VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4673 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
4674 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4675 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4676 MPV_encode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4677 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
4678
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4679 #ifdef CONFIG_RISKY
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4680
1421
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4681 AVCodec mpeg2video_encoder = {
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4682 "mpeg2video",
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4683 CODEC_TYPE_VIDEO,
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4684 CODEC_ID_MPEG2VIDEO,
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4685 sizeof(MpegEncContext),
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4686 MPV_encode_init,
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4687 MPV_encode_picture,
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4688 MPV_encode_end,
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4689 };
340c90faa1dc mpeg2 encoding
michaelni
parents: 1416
diff changeset
4690
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4691 AVCodec h263_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4692 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
4693 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4694 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4695 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
4696 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4697 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4698 MPV_encode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4699 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
4700
986e461dc072 Initial revision
glantau
parents:
diff changeset
4701 AVCodec h263p_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4702 "h263p",
986e461dc072 Initial revision
glantau
parents:
diff changeset
4703 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4704 CODEC_ID_H263P,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4705 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
4706 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4707 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4708 MPV_encode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4709 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
4710
1353
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4711 AVCodec flv_encoder = {
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4712 "flv",
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4713 CODEC_TYPE_VIDEO,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4714 CODEC_ID_FLV1,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4715 sizeof(MpegEncContext),
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4716 MPV_encode_init,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4717 MPV_encode_picture,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4718 MPV_encode_end,
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4719 };
cfc80b3a4ada flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents: 1344
diff changeset
4720
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4721 AVCodec rv10_encoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
4722 "rv10",
986e461dc072 Initial revision
glantau
parents:
diff changeset
4723 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4724 CODEC_ID_RV10,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4725 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
4726 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4727 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4728 MPV_encode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4729 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
4730
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
4731 AVCodec mpeg4_encoder = {
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
4732 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4733 CODEC_TYPE_VIDEO,
71
79be2c581c01 changed opendivx to mpeg4
glantau
parents: 64
diff changeset
4734 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4735 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
4736 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4737 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4738 MPV_encode_end,
1059
890b9fb44e84 * still unfinished code for Options
kabi
parents: 1051
diff changeset
4739 .options = mpeg4_options,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4740 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
4741
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4742 AVCodec msmpeg4v1_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4743 "msmpeg4v1",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4744 CODEC_TYPE_VIDEO,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4745 CODEC_ID_MSMPEG4V1,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4746 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
4747 MPV_encode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4748 MPV_encode_picture,
986e461dc072 Initial revision
glantau
parents:
diff changeset
4749 MPV_encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4750 .options = mpeg4_options,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4751 };
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4752
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4753 AVCodec msmpeg4v2_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4754 "msmpeg4v2",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4755 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4756 CODEC_ID_MSMPEG4V2,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4757 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4758 MPV_encode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4759 MPV_encode_picture,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4760 MPV_encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4761 .options = mpeg4_options,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4762 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4763
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4764 AVCodec msmpeg4v3_encoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4765 "msmpeg4",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4766 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4767 CODEC_ID_MSMPEG4V3,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4768 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4769 MPV_encode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4770 MPV_encode_picture,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4771 MPV_encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4772 .options = mpeg4_options,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 302
diff changeset
4773 };
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4774
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4775 AVCodec wmv1_encoder = {
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4776 "wmv1",
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4777 CODEC_TYPE_VIDEO,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4778 CODEC_ID_WMV1,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4779 sizeof(MpegEncContext),
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4780 MPV_encode_init,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4781 MPV_encode_picture,
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4782 MPV_encode_end,
1130
c8dfb8579606 * added more options
kabi
parents: 1126
diff changeset
4783 .options = mpeg4_options,
499
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4784 };
8b7a54d58549 wmv1 support
michaelni
parents: 487
diff changeset
4785
1042
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4786 #endif
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4787
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4788 AVCodec mjpeg_encoder = {
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4789 "mjpeg",
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4790 CODEC_TYPE_VIDEO,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4791 CODEC_ID_MJPEG,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4792 sizeof(MpegEncContext),
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4793 MPV_encode_init,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4794 MPV_encode_picture,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4795 MPV_encode_end,
a78f6f72d54e --disable-risky support
michaelni
parents: 1026
diff changeset
4796 };
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
4797
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
4798 #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
4799